Ros-diffs May 2023

ros-diffs@reactos.org

16 participants
69 discussions

[reactos] 01/01: [SHELL32] Improve disk properties pie chart (#5239)

by Tom Brogan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5bff2457a1014c266ce9… commit a5bff2457a1014c266ce9c808d22a9967a4baca2 Author: Tom Brogan <brogan.tom.iii(a)gmail.com> AuthorDate: Fri May 5 07:35:32 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 13:35:32 2023 +0200 [SHELL32] Improve disk properties pie chart (#5239) CORE-18906 - Increase the vertical height of the disk space pie chart and center the "Drive %c" label below it. - Add a 1 pixel outline at the sides and bottom of the disk properties pie chart. - Explicitly set the outline pen instead of relying on the DC's default pen. - Widen "Disk Cleanup" button on ja-JP locale, to prevent the text from being clipped due to the larger font size and spacing. --- dll/win32/shell32/dialogs/drvdefext.cpp | 16 +++++++++++++++- dll/win32/shell32/lang/bg-BG.rc | 12 ++++++------ dll/win32/shell32/lang/ca-ES.rc | 12 ++++++------ dll/win32/shell32/lang/cs-CZ.rc | 12 ++++++------ dll/win32/shell32/lang/da-DK.rc | 12 ++++++------ dll/win32/shell32/lang/de-DE.rc | 12 ++++++------ dll/win32/shell32/lang/el-GR.rc | 12 ++++++------ dll/win32/shell32/lang/en-GB.rc | 12 ++++++------ dll/win32/shell32/lang/en-US.rc | 12 ++++++------ dll/win32/shell32/lang/es-ES.rc | 12 ++++++------ dll/win32/shell32/lang/et-EE.rc | 12 ++++++------ dll/win32/shell32/lang/eu-ES.rc | 12 ++++++------ dll/win32/shell32/lang/fi-FI.rc | 12 ++++++------ dll/win32/shell32/lang/fr-FR.rc | 12 ++++++------ dll/win32/shell32/lang/he-IL.rc | 12 ++++++------ dll/win32/shell32/lang/hi-IN.rc | 12 ++++++------ dll/win32/shell32/lang/hu-HU.rc | 12 ++++++------ dll/win32/shell32/lang/id-ID.rc | 12 ++++++------ dll/win32/shell32/lang/it-IT.rc | 12 ++++++------ dll/win32/shell32/lang/ja-JP.rc | 12 ++++++------ dll/win32/shell32/lang/ko-KR.rc | 12 ++++++------ dll/win32/shell32/lang/nl-NL.rc | 12 ++++++------ dll/win32/shell32/lang/no-NO.rc | 12 ++++++------ dll/win32/shell32/lang/pl-PL.rc | 12 ++++++------ dll/win32/shell32/lang/pt-BR.rc | 12 ++++++------ dll/win32/shell32/lang/pt-PT.rc | 12 ++++++------ dll/win32/shell32/lang/ro-RO.rc | 12 ++++++------ dll/win32/shell32/lang/ru-RU.rc | 12 ++++++------ dll/win32/shell32/lang/sk-SK.rc | 12 ++++++------ dll/win32/shell32/lang/sl-SI.rc | 12 ++++++------ dll/win32/shell32/lang/sq-AL.rc | 12 ++++++------ dll/win32/shell32/lang/sv-SE.rc | 12 ++++++------ dll/win32/shell32/lang/tr-TR.rc | 12 ++++++------ dll/win32/shell32/lang/uk-UA.rc | 12 ++++++------ dll/win32/shell32/lang/zh-CN.rc | 12 ++++++------ dll/win32/shell32/lang/zh-HK.rc | 12 ++++++------ dll/win32/shell32/lang/zh-TW.rc | 12 ++++++------ 37 files changed, 231 insertions(+), 217 deletions(-) diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp index 949ba581f84..c11375e0b88 100644 --- a/dll/win32/shell32/dialogs/drvdefext.cpp +++ b/dll/win32/shell32/dialogs/drvdefext.cpp @@ -216,6 +216,7 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem) HBRUSH hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); HBRUSH hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); HBRUSH hbrOld; + HPEN hBlackPen = (HPEN)GetStockObject(BLACK_PEN); HPEN hDarkBluePen = CreatePen(PS_SOLID, 1, RGB(0, 0, 128)); HPEN hDarkMagPen = CreatePen(PS_SOLID, 1, RGB(128, 0, 128)); HPEN hOldPen = (HPEN)SelectObject(pDrawItem->hDC, hDarkMagPen); @@ -232,15 +233,27 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem) { double cos_val = (x - xCenter) * 2.0f / cx; INT y = yCenter + (INT)(sin(acos(cos_val)) * cy / 2) - 1; + HPEN hCenterPen; if (m_FreeSpacePerc < 50 && x == xRadial) SelectObject(pDrawItem->hDC, hDarkBluePen); + + /* Temporarily change pens to draw edges */ + if (x == pDrawItem->rcItem.left) + hCenterPen = (HPEN)SelectObject(pDrawItem->hDC, hBlackPen); + else if (x == pDrawItem->rcItem.right - 1) + SelectObject(pDrawItem->hDC, hBlackPen); MoveToEx(pDrawItem->hDC, x, y, NULL); LineTo(pDrawItem->hDC, x, y + 10); + SetPixel(pDrawItem->hDC, x, y + 10, RGB(0, 0, 0)); + + /* Restore fill section pens */ + if (x == pDrawItem->rcItem.left) + SelectObject(pDrawItem->hDC, hCenterPen); } - SelectObject(pDrawItem->hDC, hOldPen); + SelectObject(pDrawItem->hDC, hBlackPen); if (m_FreeSpacePerc > 50) { @@ -274,6 +287,7 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem) } SelectObject(pDrawItem->hDC, hbrOld); + SelectObject(pDrawItem->hDC, hOldPen); DeleteObject(hBlueBrush); DeleteObject(hMagBrush); diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index be62be7fa57..bf5671ca0e8 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -322,12 +322,12 @@ BEGIN LTEXT "Обем:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Устройство %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Почистване на &диска", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Устройство %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Почистване на &диска", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Уплътняване на устройството за спестяване на място", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Индексиращата услуга да индексира диска за по- бързо търсене", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index b96f2a33e8e..e72d59e6f37 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index a5508bc23ac..00f86b7f7f7 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -327,12 +327,12 @@ BEGIN LTEXT "Kapacita:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Disk %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Vyčištění &disku", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Disk %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Vyčištění &disku", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Šetřit místo na disku jeho kompresí", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Povolit indexování disku pro rychlejší vyhledávání", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index f8041238667..1db709ae97e 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -327,12 +327,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index a9cccf0065f..31c4180d87a 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Speicherkapazität:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Laufwerk %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Bereinigen", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Laufwerk %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Bereinigen", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 7ad21a193db..6401af1a4bf 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Χωρητικότητα:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Δίσκος %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Εκκαθάριση δίσκου", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Δίσκος %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Εκκαθάριση δίσκου", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Συμπίεση δίσκου για εξοικονόμηση χώρου", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Δημιουργία ευρετηρίου για γρηγορότερη αναζήτηση", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 723449a545c..2af4ee52e10 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 6597e6198ba..66a1f67e6ff 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 18ed800d0c0..cde7eedeaf4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -330,12 +330,12 @@ BEGIN LTEXT "Capacidad:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Unidad %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Liberar espacio en disco", 14010, 143, 152, 88, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Permitir al servidor de indexación indizar el disco para acelerar la búsqueda", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Unidad %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Liberar espacio en disco", 14010, 143, 159, 88, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Comprimir contenido para ahorrar espacio en disco", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Permitir al servidor de indexación indizar el disco para acelerar la búsqueda", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 7e4881deeef..a2ed3f8e801 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -328,12 +328,12 @@ BEGIN LTEXT "Maht:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Draiv %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Kettapuhastus", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Tihenda draiv kettaruumi säästmiseks", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Luba indekseerimisteenusel ketas failiotsinguks indekseerida", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Draiv %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Kettapuhastus", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Tihenda draiv kettaruumi säästmiseks", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Luba indekseerimisteenusel ketas failiotsinguks indekseerida", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 36928e4af05..9af6cd6e01c 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -328,12 +328,12 @@ BEGIN LTEXT "Edukiera:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "%c: unitatea", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Garbitu diskoa", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Konprimatu unitatea diskoan leku gehiago egiteko", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "&Fitxategiak bizkor bilatzeko, eman baimena Indexatze-zerbitzuari disko hau indexatzeko", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "%c: unitatea", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Garbitu diskoa", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "&Konprimatu unitatea diskoan leku gehiago egiteko", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "&Fitxategiak bizkor bilatzeko, eman baimena Indexatze-zerbitzuari disko hau indexatzeko", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 6938479bb4d..c7a382f76cb 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index b7bd7692c7a..d844a06399a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacité :", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Lecteur %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Nettoyage de &disque", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Autoriser l'indexation de ce disque pour la recherche rapide", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Lecteur %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Nettoyage de &disque", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Autoriser l'indexation de ce disque pour la recherche rapide", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 6b69cd4a248..982086d4e35 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -323,12 +323,12 @@ BEGIN LTEXT "קיבולת:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "כונן %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "ניקוי הדיסק", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "דחוס כונן זה כדי לחסוך בשטח דיסק", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "אפשר סידור תוכן באינדקס עבור קבצים בכונן זה בנוסף למאפייני קובץ", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "כונן %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "ניקוי הדיסק", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "דחוס כונן זה כדי לחסוך בשטח דיסק", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "אפשר סידור תוכן באינדקס עבור קבצים בכונן זה בנוסף למאפייני קובץ", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 10e30d44a12..f8900f3c051 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "क्षमता:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "ड्राइव %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&डिस्क की सफाई", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "डिस्क के स्पेस को सहेजने के लिए ड्राइव को संक्षिप्त करें", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "तेजी से फ़ाइल खोज के लिए इस डिस्क को इंडेक्स करने के लिए इंडेक्सिंग सर्विस को अनुमति दें", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "ड्राइव %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&डिस्क की सफाई", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "डिस्क के स्पेस को सहेजने के लिए ड्राइव को संक्षिप्त करें", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "तेजी से फ़ाइल खोज के लिए इस डिस्क को इंडेक्स करने के लिए इंडेक्सिंग सर्विस को अनुमति दें", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ee0b93401b7..78571abcf8a 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Kapacitás:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "%c meghajtó", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Lemeztisztítás", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Meghajtó tömörítése helymegtakarításhoz", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Lemez indexelése a gyors fájlkereséshez", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "%c meghajtó", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Lemeztisztítás", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Meghajtó tömörítése helymegtakarításhoz", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Lemez indexelése a gyors fájlkereséshez", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index c1a90895bf7..c71c07b211f 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Kapasitas:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Pembersihan disk", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "kompres drive untuk menyimpan ruang disk", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Izinkan Layanan Pengindeksan untuk mengindeks disk ini agar lebih cepat mencari berkas", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Pembersihan disk", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "kompres drive untuk menyimpan ruang disk", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Izinkan Layanan Pengindeksan untuk mengindeks disk ini agar lebih cepat mencari berkas", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 4fd5b36705f..1e8b52d5bd2 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacità:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Disco %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Pulitura &disco", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Disco %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Pulitura &disco", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Comprimere il disco per recuperare dello spazio", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Indicizza il disco per ricerche più rapide dei file", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index b4cb4538eff..d371e033ca2 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "容量:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "ドライブ %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "ディスクのクリーンアップ", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "ドライブ %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "ディスクのクリーンアップ", 14010, 143, 159, 88, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "ドライブを圧縮してディスク領域を確保する", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "このディスクにインデックスを付けてファイル検索を速くする", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 39fcd10f167..5617027cecc 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -328,12 +328,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 03533b2dd17..4a5cb5a46b1 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 54708e59847..83520bc7347 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Kapasitet:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Stasjon %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Diskoppryding", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Stasjon %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Diskoppryding", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Komprimer denne stasjonen for å frigjøre diskplass", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Indekser denne stasjonen for raskere søking", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 73213eea15e..b34b21e0769 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -327,12 +327,12 @@ BEGIN LTEXT "Pojemność:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Napęd %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Oczyszczanie &dysku", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Kompresuj dysk, aby zaoszczędzić miejsce na dysku", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyspieszyć\nwyszukiwanie plików", 14012, 8, 205, 230, 17, WS_DISABLED | BS_MULTILINE + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Napęd %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Oczyszczanie &dysku", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Kompresuj dysk, aby zaoszczędzić miejsce na dysku", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Zezwalaj na indeksowanie tego dysku, aby przyspieszyć\nwyszukiwanie plików", 14012, 8, 214, 230, 17, WS_DISABLED | BS_MULTILINE END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index f410e8a957f..cf8137cbafb 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacidade:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Limpeza de &Disco", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir drive para ganhar espaço em disco", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Permitir Serviço de Indexação para indexar este disco para rápida busca de arquivos", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Limpeza de &Disco", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Comprimir drive para ganhar espaço em disco", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Permitir Serviço de Indexação para indexar este disco para rápida busca de arquivos", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7000f6734e2..53204839888 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacidade:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Disco %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Limpeza do &disco", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Permitir indexar este disco para acelerar a procura de ficheiros", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Disco %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Limpeza do &disco", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Comprimir unidade para libertar espaço no disco", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Permitir indexar este disco para acelerar a procura de ficheiros", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index a329d63ae92..784db24fa75 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -323,12 +323,12 @@ BEGIN LTEXT "Capacitate:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Partiție %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Curățare &disc…", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Comprimă volumul pentru a economisi spațiu", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Permite „Serviciu de inde&xare” pentru accelerarea căutărilor", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Partiție %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Curățare &disc…", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "&Comprimă volumul pentru a economisi spațiu", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Permite „Serviciu de inde&xare” pentru accelerarea căutărilor", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index b3931478987..6e9e6fa277e 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -328,12 +328,12 @@ BEGIN LTEXT "Емкость:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Диск %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Очистка &диска", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "&Сжимать для экономии места", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Диск %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Очистка &диска", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "&Сжимать для экономии места", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Разрешить &индексирование диска для быстрого поиска", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 27135d0645f..0958ed5f1be 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Kapacita:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Jednotka %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Čistenie &disku", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Jednotka %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Čistenie &disku", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Ušetriť miesto na disku &kompresiou jednotky", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "&Povoliť indexovanie pre tento disk, a zrýchliť tak hľadanie súborov", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 81a8f6375a5..9e28b34e4e5 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Capacity:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Cleanup", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Compress drive to save disk space", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 3c42675ecb9..b0f93afbf6e 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -325,12 +325,12 @@ BEGIN LTEXT "Kapaciteti:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Pastrim &Disku", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Kompres drivin për të kursyer hapësirë në disk", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Lejo Shërbimet e Indeksimi për indeksim të këtij disku për dokumentat të shpejtë në kërkim", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Drive %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Pastrim &Disku", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Kompres drivin për të kursyer hapësirë në disk", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Lejo Shërbimet e Indeksimi për indeksim të këtij disku për dokumentat të shpejtë në kërkim", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e4964c77566..a1ff05ea847 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Kapacitet:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Enhet %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Diskrensning", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Komprimera enhet för att spara diskutrymme", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Tillåt indexeringstjänsten att indexera den här disken för snabb filsökning", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Enhet %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Diskrensning", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Komprimera enhet för att spara diskutrymme", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Tillåt indexeringstjänsten att indexera den här disken för snabb filsökning", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 3c6a1d8c3c2..c8d7e6ed25c 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -323,12 +323,12 @@ BEGIN LTEXT "Kapasite:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Sürücü %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Temizleme", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Di&sk alanını arttırmak için sürücüyü sıkıştır", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "&Hızlı dosya araması için, Dizinleme Hizmeti'ni etkinleştir.", 14012, 8, 205, 222, 25, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Sürücü %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "&Disk Temizleme", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Di&sk alanını arttırmak için sürücüyü sıkıştır", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "&Hızlı dosya araması için, Dizinleme Hizmeti'ni etkinleştir.", 14012, 8, 214, 222, 25, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 13ef5465f5d..0eb28fcec9c 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -321,12 +321,12 @@ BEGIN LTEXT "Місткість:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Диск %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "Очищення &диску", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Стискати диск для заощадження місця", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "Диск %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "Очищення &диску", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "Стискати диск для заощадження місця", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "Дозволити індексування диску для прискорення пошуку", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index a8020c94bfb..52e09e4db73 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -331,12 +331,12 @@ BEGIN LTEXT "容量：", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "磁盘 %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "磁盘清理(&D)", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "磁盘 %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "磁盘清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 851bbe22524..d74fe7ebb36 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -329,12 +329,12 @@ BEGIN LTEXT "容量：", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "磁碟機 %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "磁碟清理(&D)", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "磁碟機 %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "磁碟清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 8f8584eb0c0..979669f12f0 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -330,12 +330,12 @@ BEGIN LTEXT "容量：", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "磁碟機 %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "磁碟清理(&D)", 14010, 160, 154, 70, 15, WS_TABSTOP - LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 205, 222, 10, WS_DISABLED + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 40 + CTEXT "磁碟機 %c", 14009, 95, 162, 50, 10 + PUSHBUTTON "磁碟清理(&D)", 14010, 160, 159, 70, 15, WS_TABSTOP + LTEXT "", -1, 8, 176, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE + CHECKBOX "壓縮磁碟機來節省磁碟空間", 14011, 8, 200, 222, 10, WS_DISABLED + CHECKBOX "允許建立索引以便快速搜尋", 14012, 8, 214, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230

1 year, 7 months

[reactos] 01/01: [THEMES] Several fixes for Lautus style (#5253)

by Splitwirez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba5ed3ffbba494ddd7915… commit ba5ed3ffbba494ddd7915f8221c2c72d1bc048db Author: Splitwirez <Splitwirez(a)gmail.com> AuthorDate: Fri May 5 07:32:44 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 13:32:44 2023 +0200 [THEMES] Several fixes for Lautus style (#5253) - CheckBoxes now show checkmarks when checked; - Titlebar text alignment is now consistent between restored/maximized windows; - 2-column Start Menu header now shows its intended background image. --- .../lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp | Bin 3574 -> 3574 bytes .../lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp | Bin 12342 -> 4150 bytes .../lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp | Bin 30054 -> 9478 bytes .../lautus.msstyles/textfiles/ExtraLargeNormal.INI | 4 ++-- .../lautus.msstyles/textfiles/LargeFontsNormal.INI | 4 ++-- .../lautus.msstyles/textfiles/NormalNormal.INI | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp index 805c1491c04..f834be0015c 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp differ diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp index 03c3a5a121f..c8129f39bf8 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp differ diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp index 346bd18b8fc..52395945e1b 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp differ diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI index 411e2c58a91..3b8fca227dc 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI @@ -746,7 +746,7 @@ TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 [StartPanel.UserPane] -BgType = None +BgType = ImageFile DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 Font = Trebuchet MS, 8, Bold @@ -1472,7 +1472,7 @@ UniformSizing = true [Window.MaxCaption] CaptionMargins = 4, 3, 4, 2 -ContentAlignment = Center +ContentAlignment = Left ContentMargins = 1, 1, 1, 1 FillColorHint = 0 84 229 ImageCount = 2 diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI index 9d72583e432..3c283d7dc15 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/LargeFontsNormal.INI @@ -746,7 +746,7 @@ TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 [StartPanel.UserPane] -BgType = None +BgType = ImageFile DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 Font = Tahoma, 9, Bold @@ -1472,7 +1472,7 @@ UniformSizing = true [Window.MaxCaption] CaptionMargins = 4, 3, 4, 2 -ContentAlignment = Center +ContentAlignment = Left ContentMargins = 1, 1, 1, 1 FillColorHint = 0 84 229 ImageCount = 2 diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI index cada612c297..79ef57c6e88 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/NormalNormal.INI @@ -746,7 +746,7 @@ TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 [StartPanel.UserPane] -BgType = None +BgType = ImageFile DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 Font = Tahoma, 8, Bold @@ -1472,7 +1472,7 @@ UniformSizing = true [Window.MaxCaption] CaptionMargins = 4, 3, 4, 2 -ContentAlignment = Center +ContentAlignment = Left ContentMargins = 1, 1, 1, 1 FillColorHint = 0 84 229 ImageCount = 2

1 year, 7 months

[reactos] 01/01: [REGEDIT] de-DE.rc Fix accelerator collision (#5265)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4393e6cb54d7c1ec89e31… commit 4393e6cb54d7c1ec89e31061655803875c23a6ca Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri May 5 13:30:21 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 13:30:21 2023 +0200 [REGEDIT] de-DE.rc Fix accelerator collision (#5265) Alt+D in german translation is already reserved for the file menu "&Datei" in ROS and in MS Windows, thus we cannot use the same as accelerator for focusing the address bar. So for german we will use Alt+S instead, which is the same shortcut that german MS+ROS explorer use for focusing their address bar. This is an addendum to commit f908d37bb from PR #4885 which broke the german file-menu accelerator. --- base/applications/regedit/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index f6d23a14570..6394f18e3ae 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN - "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT + "S", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT

1 year, 7 months

[reactos] 01/01: [NTUSER] Remember old KL for Chinese IMEs (#5266)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d31b06c67901db77b34a… commit 2d31b06c67901db77b34a9207b8b6313d8720279 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 5 17:00:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 17:00:05 2023 +0900 [NTUSER] Remember old KL for Chinese IMEs (#5266) The Chinese user uses Ctrl+Space key combination to switch between the IME keyboard and the non-IME keyboard. To enable Ctrl+Space, the system has to remember the previous keyboard layout. In IntImmActivateLayout function, remember the previous keyboard layout (hklPrev) to switch back for Chinese IMEs. CORE-18950 --- win32ss/user/ntuser/kbdlayout.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index f3971cf5c67..ef66cad9ddc 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -650,14 +650,21 @@ IntImmActivateLayout( co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)pKL->hkl); UserDerefObjectCo(pImeWnd); } - else if (pti->spDefaultImc) + else { - /* IME Activation is needed */ - pti->pClientInfo->CI_flags |= CI_IMMACTIVATE; + /* Remember old keyboard layout to switch back for Chinese IMEs */ + pti->hklPrev = pti->KeyboardLayout->hkl; + + if (pti->spDefaultImc) + { + /* IME Activation is needed */ + pti->pClientInfo->CI_flags |= CI_IMMACTIVATE; + } } UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKL); pti->pClientInfo->hKL = pKL->hkl; + pti->pClientInfo->CodePage = pKL->CodePage; } static VOID co_IntSetKeyboardLayoutForProcess(PPROCESSINFO ppi, PKL pKL)

1 year, 7 months

[reactos] 01/01: [NTOS:KDBG] Only load symbols on x86

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df72bcd06c64672f1943c… commit df72bcd06c64672f1943c487a8b0275e9bcc653f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Apr 14 13:07:11 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu May 4 14:09:14 2023 +0300 [NTOS:KDBG] Only load symbols on x86 Symbol loading leads to a hang on x64 boot in 2nd stage and KDBG symbols don't work on x64 anyway. --- ntoskrnl/kdbg/kdb_symbols.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 8cd897f339d..11ccd572219 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -355,8 +355,10 @@ KdbSymInit( SHORT Found = FALSE; CHAR YesNo; - /* By default, load symbols in DBG builds, but not in REL builds */ -#if DBG + /* By default, load symbols in DBG builds, but not in REL builds + or anything other than x86, because they only work on x86 + and can cause the system to hang on x64. */ +#if DBG && defined(_M_IX86) LoadSymbols = TRUE; #else LoadSymbols = FALSE;

1 year, 7 months

[reactos] 01/01: [FREELDR][SDK] Build UEFI bootloader for ARM32 (#5196)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2a58733e85158a8325e6… commit f2a58733e85158a8325e657e9cdfc32f35d516ba Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Wed May 3 11:56:06 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 20:56:06 2023 +0200 [FREELDR][SDK] Build UEFI bootloader for ARM32 (#5196) CORE-17604 - Disable some functions for ARM32; - Remove some link options not used on ARM; - Add get _controlfp() to LIBCNTPR to link properly on ARM; - Unify Freeldr UI Drawing on ARM; - Add qemu UART debugging for ARM32/ARM64. --- boot/freeldr/freeldr/arch/arm/debug.c | 35 ++++++++++++++ boot/freeldr/freeldr/arch/arm/entry.c | 11 ----- boot/freeldr/freeldr/arch/arm/macharm.c | 4 ++ boot/freeldr/freeldr/arch/uefi/stubs.c | 2 + boot/freeldr/freeldr/arch/uefi/uefildr.c | 2 + boot/freeldr/freeldr/include/debug.h | 2 +- boot/freeldr/freeldr/lib/debug.c | 7 ++- boot/freeldr/freeldr/uefi.cmake | 8 +++- boot/freeldr/freeldr/ui/directui.c | 3 +- boot/freeldr/freeldr/ui/gui.c | 2 - boot/freeldr/freeldr/ui/minitui.c | 13 ----- boot/freeldr/freeldr/ui/noui.c | 3 -- boot/freeldr/freeldr/ui/tui.c | 15 ------ boot/freeldr/freeldr/ui/tuimenu.c | 82 +++----------------------------- boot/freeldr/freeldr/ui/ui.c | 37 -------------- boot/freeldr/freeldr/ui/video.c | 2 - sdk/lib/crt/float/float.cmake | 7 +++ 17 files changed, 71 insertions(+), 164 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/debug.c b/boot/freeldr/freeldr/arch/arm/debug.c new file mode 100644 index 00000000000..f7d65d2bfc5 --- /dev/null +++ b/boot/freeldr/freeldr/arch/arm/debug.c @@ -0,0 +1,35 @@ +/* + * PROJECT: Freeldr ARM32 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Arch specific debug + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <freeldr.h> +#include <debug.h> + +#define QEMUUART 0x09000000 +volatile unsigned int * UART0DR = (unsigned int *) QEMUUART; + +BOOLEAN +Rs232PortInitialize(IN ULONG ComPort, + IN ULONG BaudRate) +{ + return TRUE; +} + +VOID +Rs232PortPutByte(UCHAR ByteToSend) +{ + *UART0DR = ByteToSend; +} + +VOID +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...) +{ +} diff --git a/boot/freeldr/freeldr/arch/arm/entry.c b/boot/freeldr/freeldr/arch/arm/entry.c index 4f5a015e4f8..6dbbb2be4df 100644 --- a/boot/freeldr/freeldr/arch/arm/entry.c +++ b/boot/freeldr/freeldr/arch/arm/entry.c @@ -18,14 +18,3 @@ RealEntryPoint(VOID) { BootMain(""); } - -VOID -FrLdrBugCheckWithMessage( - ULONG BugCode, - PCHAR File, - ULONG Line, - PSTR Format, - ...) -{ - -} diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index cfca3b17169..b62ba474df5 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -18,7 +18,9 @@ ULONG gDiskReadBuffer, gFileSysBuffer; BOOLEAN ArmHwDetectRan; PCONFIGURATION_COMPONENT_DATA RootNode; +#ifndef UEFIBOOT BOOLEAN AcpiPresent = FALSE; +#endif ULONG FirstLevelDcacheSize; ULONG FirstLevelDcacheFillSize; @@ -174,6 +176,7 @@ ArmHwIdle(VOID) /* UNIMPLEMENTED */ } +#ifndef UEFIBOOT VOID MachInit(IN PCCH CommandLine) { @@ -229,3 +232,4 @@ MachInit(IN PCCH CommandLine) MachVtbl.HwDetect = ArmHwDetect; MachVtbl.HwIdle = ArmHwIdle; } +#endif diff --git a/boot/freeldr/freeldr/arch/uefi/stubs.c b/boot/freeldr/freeldr/arch/uefi/stubs.c index 28f11b7795b..513f9f8f85d 100644 --- a/boot/freeldr/freeldr/arch/uefi/stubs.c +++ b/boot/freeldr/freeldr/arch/uefi/stubs.c @@ -9,12 +9,14 @@ #include <debug.h> +#ifndef _M_ARM /* TODO: Handle this with custom Disk / partition setup */ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) { return 0; } +#endif VOID StallExecutionProcessor(ULONG Microseconds) diff --git a/boot/freeldr/freeldr/arch/uefi/uefildr.c b/boot/freeldr/freeldr/arch/uefi/uefildr.c index ded8e405f69..ef0dd85cba3 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefildr.c +++ b/boot/freeldr/freeldr/arch/uefi/uefildr.c @@ -31,7 +31,9 @@ EfiEntry( return 0; } +#ifndef _M_ARM VOID __cdecl Reboot(VOID) { } +#endif diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index feed051d013..3c9d741dac6 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -38,7 +38,7 @@ #define DPRINT_HEAP 15 // messages in a bottle #define DBG_CHANNELS_COUNT 16 -#if DBG && !defined(_M_ARM) +#if DBG VOID DebugInit(IN ULONG_PTR FrLdrSectionId); ULONG DbgPrint(const char *Format, ...); diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index b7a37977696..4edb35e4bae 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -#if DBG && !defined(_M_ARM) +#if DBG // #define DEBUG_ALL // #define DEBUG_WARN @@ -54,6 +54,11 @@ ULONG PortIrq = 0; // Not used at the moment. BOOLEAN DebugStartOfLine = TRUE; +#ifdef UEFIBOOT +VOID +ARMWriteToUART(UCHAR Data); +#endif + VOID DebugInit(IN ULONG_PTR FrLdrSectionId) { PCHAR CommandLine, PortString, BaudString, IrqString; diff --git a/boot/freeldr/freeldr/uefi.cmake b/boot/freeldr/freeldr/uefi.cmake index 0adb0a25f4b..76483f0529e 100644 --- a/boot/freeldr/freeldr/uefi.cmake +++ b/boot/freeldr/freeldr/uefi.cmake @@ -29,6 +29,9 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") #TBD elseif(ARCH STREQUAL "arm") + list(APPEND UEFILDR_ARC_SOURCE + arch/arm/macharm.c + arch/arm/debug.c) #TBD elseif(ARCH STREQUAL "arm64") #TBD @@ -86,7 +89,10 @@ set_target_properties(uefildr PROPERTIES SUFFIX ".efi") target_compile_definitions(uefildr PRIVATE UEFIBOOT) if(MSVC) - target_link_options(uefildr PRIVATE /DYNAMICBASE:NO /NXCOMPAT:NO /ignore:4078 /ignore:4254 /DRIVER) +if(NOT ARCH STREQUAL "arm") + target_link_options(uefildr PRIVATE /DYNAMICBASE:NO) +endif() + target_link_options(uefildr PRIVATE /NXCOMPAT:NO /ignore:4078 /ignore:4254 /DRIVER) # We don't need hotpatching remove_target_compile_option(uefildr "/hotpatch") else() diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index f34f1dc2158..8bd47b2be0e 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -6,8 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifdef _M_ARM - +#if 0 #include <freeldr.h> /* GLOBALS ********************************************************************/ diff --git a/boot/freeldr/freeldr/ui/gui.c b/boot/freeldr/freeldr/ui/gui.c index 3c631902e2f..d3160199ac9 100644 --- a/boot/freeldr/freeldr/ui/gui.c +++ b/boot/freeldr/freeldr/ui/gui.c @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _M_ARM #include <freeldr.h> VOID GuiDrawBackdrop(VOID) @@ -113,4 +112,3 @@ const UIVTBL GuiVtbl = NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 872b9aac6ed..d44aef6bc67 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -13,8 +13,6 @@ // #define NTLDR_PROGRESSBAR // #define BTMGR_PROGRESSBAR /* Default style */ -#ifndef _M_ARM - BOOLEAN MiniTuiInitialize(VOID) { /* Initialize main TUI */ @@ -71,8 +69,6 @@ VOID MiniTuiDrawStatusText(PCSTR StatusText) /* Minimal UI doesn't have a status bar */ } -#endif // _M_ARM - /*static*/ VOID MiniTuiSetProgressBarText( _In_ PCSTR ProgressText) @@ -143,10 +139,8 @@ MiniTuiTickProgressBar( UiProgressBar.Right, UiProgressBar.Bottom, ' ', ATTR(UiTextColor, UiMenuBgColor)); -#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); -#endif } VOID @@ -191,10 +185,8 @@ MiniTuiDrawMenu( { ULONG i; -#ifndef _M_ARM /* Draw the backdrop */ UiDrawBackdrop(); -#endif /* No GUI status bar text, just minimal text. Show the menu header. */ if (MenuInfo->MenuHeader) @@ -239,13 +231,9 @@ MiniTuiDrawMenu( DisplayBootTimeOptions(); } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } -#ifndef _M_ARM - const UIVTBL MiniTuiVtbl = { MiniTuiInitialize, @@ -274,4 +262,3 @@ const UIVTBL MiniTuiVtbl = MiniTuiDrawMenu, }; -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 5bc33d70e69..1e7c21d1554 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -6,7 +6,6 @@ * PROGRAMMERS: Hervé Poussineau */ -#ifndef _M_ARM #include <freeldr.h> BOOLEAN NoUiInitialize(VOID) @@ -183,5 +182,3 @@ NoUiDrawMenu( _In_ PUI_MENU_INFO MenuInfo) { } - -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index be9cb22567d..bb5646aa917 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -19,9 +19,7 @@ #include <freeldr.h> -#ifndef _M_ARM PVOID TextVideoBuffer = NULL; -#endif /* GENERIC TUI UTILS *********************************************************/ @@ -93,9 +91,7 @@ TuiDrawText2( _In_reads_or_z_(MaxNumChars) PCSTR Text, _In_ UCHAR Attr) { -#ifndef _M_ARM PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; -#endif ULONG i, j; /* Don't display anything if we are out of the screen */ @@ -105,13 +101,8 @@ TuiDrawText2( /* Draw the text, not exceeding the width */ for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) { -#ifndef _M_ARM ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; -#else - /* Write the character */ - MachVideoPutChar(Text[j], Attr, i, Y); -#endif } } @@ -196,8 +187,6 @@ TuiDrawCenteredText( /* FULL TUI THEME ************************************************************/ -#ifndef _M_ARM - #define TAG_TUI_SCREENBUFFER 'SiuT' #define TAG_TUI_PALETTE 'PiuT' @@ -802,10 +791,8 @@ TuiTickProgressBar( UiProgressBar.Right, UiProgressBar.Bottom, '\xB2', ATTR(UiTextColor, UiMenuBgColor)); -#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); -#endif } static VOID @@ -1241,5 +1228,3 @@ const UIVTBL TuiVtbl = TuiDisplayMenu, TuiDrawMenu, }; - -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 548d209e42b..e65b642f367 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -91,11 +91,7 @@ TuiDisplayMenu( TuiCalcMenuBoxSize(&MenuInformation); /* Draw the menu */ -#ifdef _M_ARM - UiDrawMenu(&MenuInformation); -#else UiVtbl.DrawMenu(&MenuInformation); -#endif /* Get the current second of time */ LastClockSecond = ArcGetTime()->Second; @@ -117,10 +113,9 @@ TuiDisplayMenu( /* Update the time information */ LastClockSecond = CurrentClockSecond; -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Update the date & time */ TuiUpdateDateTime(); -#endif /* If there is a countdown, update it */ if (MenuInformation.MenuTimeRemaining > 0) @@ -131,19 +126,13 @@ TuiDisplayMenu( else if (MenuInformation.MenuTimeRemaining == 0) { /* A timeout occurred, exit this loop and return selection */ -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif break; } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } -#ifndef _M_ARM MachHwIdle(); -#endif } /* Return the selected item */ @@ -178,7 +167,6 @@ TuiCalcMenuBoxSize( /* Allow room for left & right borders, plus 8 spaces on each side */ Width += 18; -#ifndef _M_ARM /* Check if we're drawing a centered menu */ if (UiCenterMenu) { @@ -188,7 +176,6 @@ TuiCalcMenuBoxSize( Height) / 2) + TUI_TITLE_BOX_CHAR_HEIGHT; } else -#endif { /* Put the menu in the default left-corner position */ MenuInfo->Left = -1; @@ -206,21 +193,9 @@ TuiDrawMenu( { ULONG i; -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw the backdrop */ UiDrawBackdrop(); -#else - - /* No GUI status bar text, just minimal text. Show the menu header. */ - if (MenuInfo->MenuHeader) - { - UiDrawText(0, - MenuInfo->Top - 2, - MenuInfo->MenuHeader, - ATTR(UiMenuFgColor, UiMenuBgColor)); - } - -#endif /* Draw the menu box */ TuiDrawMenuBox(MenuInfo); @@ -231,43 +206,17 @@ TuiDrawMenu( TuiDrawMenuItem(MenuInfo, i); } -#ifndef _M_ARM // FIXME: Theme-specific - + // FIXME: Theme-specific /* Update the status bar */ UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); -#else - - /* Now tell the user how to choose */ - UiDrawText(0, - MenuInfo->Bottom + 1, - "Use \x18 and \x19 to move the highlight to your choice.", - ATTR(UiMenuFgColor, UiMenuBgColor)); - UiDrawText(0, - MenuInfo->Bottom + 2, - "Press ENTER to choose.", - ATTR(UiMenuFgColor, UiMenuBgColor)); - - /* And show the menu footer */ - if (MenuInfo->MenuFooter) - { - UiDrawText(0, - UiScreenHeight - 4, - MenuInfo->MenuFooter, - ATTR(UiMenuFgColor, UiMenuBgColor)); - } - -#endif - /* Display the boot options if needed */ if (MenuInfo->ShowBootOptions) { DisplayBootTimeOptions(); } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } static VOID @@ -330,7 +279,6 @@ TuiDrawMenuTimeout( * 1 1 Pad on the left with blanks + box bottom border. **/ -#ifndef _M_ARM if (UiCenterMenu) { /* In boxed menu mode, pad on the left with blanks and box border, @@ -368,7 +316,6 @@ TuiDrawMenuTimeout( } } else -#endif { if (Length > 0) { @@ -385,13 +332,8 @@ TuiDrawMenuTimeout( MenuInfo->Bottom + 4, Length ? (Length + 1) : (UiScreenWidth - 1), MenuInfo->Bottom + 4, -#ifndef _M_ARM UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor) -#else - 0, // ' ' - ATTR(UiTextColor, COLOR_BLACK) // UiMenuBgColor -#endif ); } } @@ -400,7 +342,7 @@ VOID TuiDrawMenuBox( _In_ PUI_MENU_INFO MenuInfo) { -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw the menu box if requested */ if (UiMenuBox) { @@ -417,8 +359,6 @@ TuiDrawMenuBox( /* Update the date & time */ TuiUpdateDateTime(); -#endif - TuiDrawMenuTimeout(MenuInfo); } @@ -435,7 +375,7 @@ TuiDrawMenuItem( /* If this is a separator */ if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw its left box corner */ if (UiMenuBox) { @@ -444,7 +384,6 @@ TuiDrawMenuItem( "\xC7", ATTR(UiMenuFgColor, UiMenuBgColor)); } -#endif /* Make it a separator line and use menu colors */ RtlZeroMemory(MenuLineText, sizeof(MenuLineText)); @@ -458,7 +397,7 @@ TuiDrawMenuItem( MenuLineText, ATTR(UiMenuFgColor, UiMenuBgColor)); -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw its right box corner */ if (UiMenuBox) { @@ -467,7 +406,6 @@ TuiDrawMenuItem( "\xB6", ATTR(UiMenuFgColor, UiMenuBgColor)); } -#endif /* We are done */ return; @@ -476,7 +414,6 @@ TuiDrawMenuItem( /* This is not a separator */ ASSERT(MenuInfo->MenuItemList[MenuItemNumber]); -#ifndef _M_ARM /* Check if using centered menu */ if (UiCenterMenu) { @@ -491,7 +428,6 @@ TuiDrawMenuItem( SpaceRight = (SpaceTotal - SpaceLeft) + 1; } else -#endif { /* Simply left-align it */ SpaceLeft = 4; @@ -556,11 +492,7 @@ TuiProcessMenuKeyboardEvent( KeyPressFilter(KeyEvent, MenuInfo->SelectedMenuItem, MenuInfo->Context)) { /* It processed the key character, so redraw and exit */ -#ifdef _M_ARM - UiDrawMenu(MenuInfo); -#else UiVtbl.DrawMenu(MenuInfo); -#endif return 0; } @@ -618,9 +550,7 @@ TuiProcessMenuKeyboardEvent( /* Select new item and update video buffer */ TuiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } /* Return the pressed key */ diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 78ea2f16dd1..7d1b379d3e0 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -22,8 +22,6 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(UI); -#ifndef _M_ARM - UCHAR UiStatusBarFgColor; // Status bar foreground color UCHAR UiStatusBarBgColor; // Status bar background color UCHAR UiBackdropFgColor; // Backdrop foreground color @@ -56,8 +54,6 @@ const PCSTR UiMonthNames[12] = { "January", "February", "March", "April", "May", ULONG UiScreenWidth; // Screen Width ULONG UiScreenHeight; // Screen Height -#endif // _M_ARM - /* * Loading progress bar, based on the NTOS Inbv one. * Supports progress within sub-ranges, used when loading @@ -65,8 +61,6 @@ ULONG UiScreenHeight; // Screen Height */ UI_PROGRESS_BAR UiProgressBar = {{0}}; -#ifndef _M_ARM - UIVTBL UiVtbl = { NoUiInitialize, @@ -386,8 +380,6 @@ UCHAR UiTextToFillStyle(PCSTR FillStyleText) return UiVtbl.TextToFillStyle(FillStyleText); } -#endif // _M_ARM - VOID UiInitProgressBar( _In_ ULONG Left, @@ -413,13 +405,8 @@ UiInitProgressBar( UiProgressBar.Show = TRUE; /* Initial drawing: set the "Loading..." text and the original position */ -#ifndef _M_ARM UiVtbl.SetProgressBarText(ProgressText); UiVtbl.TickProgressBar(0); -#else - MiniTuiSetProgressBarText(ProgressText); - MiniTuiTickProgressBar(0); -#endif } VOID @@ -477,11 +464,7 @@ UiUpdateProgressBar( TotalProgress = UiProgressBar.State.Floor + (Percentage * UiProgressBar.State.Bias); // TotalProgress /= (100 * 100); -#ifndef _M_ARM UiVtbl.TickProgressBar(TotalProgress); -#else - MiniTuiTickProgressBar(TotalProgress); -#endif } VOID @@ -492,22 +475,14 @@ UiSetProgressBarText( if (!UiProgressBar.Show) return; -#ifndef _M_ARM UiVtbl.SetProgressBarText(ProgressText); -#else - MiniTuiSetProgressBarText(ProgressText); -#endif } VOID UiDrawProgressBarCenter( _In_ PCSTR ProgressText) { -#ifndef _M_ARM UiVtbl.DrawProgressBarCenter(ProgressText); -#else - MiniTuiDrawProgressBarCenter(ProgressText); -#endif } VOID @@ -518,15 +493,9 @@ UiDrawProgressBar( _In_ ULONG Bottom, _In_ PCSTR ProgressText) { -#ifndef _M_ARM UiVtbl.DrawProgressBar(Left, Top, Right, Bottom, ProgressText); -#else - MiniTuiDrawProgressBar(Left, Top, Right, Bottom, ProgressText); -#endif } -#ifndef _M_ARM - static VOID UiEscapeString(PCHAR String) { @@ -662,9 +631,3 @@ BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) return UiVtbl.EditBox(MessageText, EditTextBuffer, Length); } -#else -BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) -{ - return FALSE; -} -#endif diff --git a/boot/freeldr/freeldr/ui/video.c b/boot/freeldr/freeldr/ui/video.c index ab77d694a3c..a07ff083f6c 100644 --- a/boot/freeldr/freeldr/ui/video.c +++ b/boot/freeldr/freeldr/ui/video.c @@ -5,7 +5,6 @@ * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> */ -#ifndef _M_ARM #include <freeldr.h> #define RGB_MAX 64 @@ -173,4 +172,3 @@ VOID VideoFadeOut(ULONG ColorCount) } } -#endif diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index 24fe327fbd5..d3ca0e6a9c6 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -40,8 +40,15 @@ elseif(ARCH STREQUAL "arm") float/arm/_fpreset.c float/arm/_statusfp.c ) + list(APPEND LIBCNTPR_FLOAT_SOURCE + float/arm/_controlfp.c + ) list(APPEND CRT_FLOAT_ASM_SOURCE float/arm/__getfp.s float/arm/__setfp.s ) + list(APPEND LIBCNTPR_FLOAT_ASM_SOURCE + float/arm/__getfp.s + float/arm/__setfp.s + ) endif()

1 year, 7 months

[reactos] 01/01: [KBSWITCH] Rely on GetKeyboardLayoutList for getting list (#5263)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0bef1998e07c8d75db26… commit a0bef1998e07c8d75db26eaa5696bbb9a81c596e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 3 07:45:35 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 07:45:35 2023 +0900 [KBSWITCH] Rely on GetKeyboardLayoutList for getting list (#5263) - Use GetKeyboardLayoutList to get the keyboard list instead of using Preload registry key. - Get the special IDs from registry to handle special HKLs in newly-added LoadSpecialIds function. - Add GetKLIDFromHKL, GetHKLFromLayoutNum, UpdateLayoutList, and GetKLIDFromLayoutNum helper functions. CORE-13145, CORE-10667, CORE-18924 --- base/applications/kbswitch/kbswitch.c | 400 ++++++++++++++++++---------------- 1 file changed, 218 insertions(+), 182 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 984e2801bc3..bc9e698774a 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -26,6 +26,13 @@ * won't be generated in Vista+. */ +#define IME_MASK (0xE0000000UL) +#define SPECIAL_MASK (0xF0000000UL) + +#define IS_IME_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == IME_MASK) +#define IS_SPECIAL_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == SPECIAL_MASK) +#define SPECIALIDFROMHKL(hKL) ((WORD)(HIWORD(hKL) & 0x0FFF)) + #define WM_NOTIFYICONMSG (WM_USER + 248) PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; @@ -35,52 +42,158 @@ UINT ShellHookMessage = 0; HINSTANCE hInst; HANDLE hProcessHeap; HMODULE g_hHookDLL = NULL; -ULONG ulCurrentLayoutNum = 1; +INT g_nCurrentLayoutNum = 1; HICON g_hTrayIcon = NULL; HWND g_hwndLastActive = NULL; +INT g_cKLs = 0; +HKL g_ahKLs[64]; -static BOOL -GetLayoutID(LPCTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength) +typedef struct { - DWORD dwBufLen, dwRes; - HKEY hKey; - TCHAR szTempLCID[CCH_LAYOUT_ID + 1]; + DWORD dwLayoutId; + HKL hKL; + TCHAR szKLID[CCH_LAYOUT_ID + 1]; +} SPECIAL_ID, *PSPECIAL_ID; + +SPECIAL_ID g_SpecialIds[80]; +INT g_cSpecialIds = 0; - /* Get the Layout ID */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) +static VOID LoadSpecialIds(VOID) +{ + TCHAR szKLID[KL_NAMELENGTH], szLayoutId[16]; + DWORD dwSize, dwIndex; + HKEY hKey, hLayoutKey; + + g_cSpecialIds = 0; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts"), + 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - dwBufLen = sizeof(szTempLCID); - dwRes = RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen); - if (dwRes != ERROR_SUCCESS) + return; + } + + for (dwIndex = 0; dwIndex < 1000; ++dwIndex) + { + dwSize = ARRAYSIZE(szKLID); + if (RegEnumKeyEx(hKey, dwIndex, szKLID, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyEx(hKey, szKLID, 0, KEY_READ, &hLayoutKey) != ERROR_SUCCESS) + continue; + + dwSize = sizeof(szLayoutId); + if (RegQueryValueEx(hLayoutKey, TEXT("Layout Id"), NULL, NULL, + (LPBYTE)szLayoutId, &dwSize) == ERROR_SUCCESS) { - RegCloseKey(hKey); - return FALSE; + DWORD dwKLID = _tcstoul(szKLID, NULL, 16); + WORD wLangId = LOWORD(dwKLID), wLayoutId = LOWORD(_tcstoul(szLayoutId, NULL, 16)); + HKL hKL = (HKL)(LONG_PTR)(SPECIAL_MASK | MAKELONG(wLangId, wLayoutId)); + + /* Add a special ID */ + g_SpecialIds[g_cSpecialIds].dwLayoutId = wLayoutId; + g_SpecialIds[g_cSpecialIds].hKL = hKL; + StringCchCopy(g_SpecialIds[g_cSpecialIds].szKLID, + ARRAYSIZE(g_SpecialIds[g_cSpecialIds].szKLID), szKLID); + ++g_cSpecialIds; } - RegCloseKey(hKey); + RegCloseKey(hLayoutKey); + + if (g_cSpecialIds >= ARRAYSIZE(g_SpecialIds)) + { + OutputDebugStringA("g_SpecialIds is full!"); + break; + } + } + + RegCloseKey(hKey); +} + +static VOID +GetKLIDFromHKL(HKL hKL, LPTSTR szKLID, SIZE_T KLIDLength) +{ + szKLID[0] = 0; + + if (IS_IME_HKL(hKL)) + { + StringCchPrintf(szKLID, KLIDLength, _T("%08lx"), (DWORD)(DWORD_PTR)hKL); + return; } - /* Look for a substitute of this layout */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (IS_SPECIAL_HKL(hKL)) { - dwBufLen = sizeof(szTempLCID); - if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + INT i; + for (i = 0; i < g_cSpecialIds; ++i) { - /* No substitute found, then use the old LCID */ - StringCchCopy(szLCID, LCIDLength, szTempLCID); + if (g_SpecialIds[i].hKL == hKL) + { + StringCchCopy(szKLID, KLIDLength, g_SpecialIds[i].szKLID); + return; + } } + } + else + { + StringCchPrintf(szKLID, KLIDLength, _T("%08lx"), LOWORD(hKL)); + } +} - RegCloseKey(hKey); +static VOID UpdateLayoutList(HKL hKL OPTIONAL) +{ + INT iKL; + + if (!hKL) + { + if (0 <= (g_nCurrentLayoutNum - 1) && (g_nCurrentLayoutNum - 1) < g_cKLs) + { + hKL = g_ahKLs[g_nCurrentLayoutNum - 1]; + } + else + { + HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); + DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); + hKL = GetKeyboardLayout(dwTID); + } + } + + g_cKLs = GetKeyboardLayoutList(ARRAYSIZE(g_ahKLs), g_ahKLs); + + g_nCurrentLayoutNum = -1; + for (iKL = 0; iKL < g_cKLs; ++iKL) + { + if (g_ahKLs[iKL] == hKL) + { + g_nCurrentLayoutNum = iKL + 1; + break; + } + } + + if (g_nCurrentLayoutNum == -1 && g_cKLs < ARRAYSIZE(g_ahKLs)) + { + g_nCurrentLayoutNum = g_cKLs; + g_ahKLs[g_cKLs++] = hKL; + } +} + +static HKL GetHKLFromLayoutNum(INT nLayoutNum) +{ + if (0 <= (nLayoutNum - 1) && (nLayoutNum - 1) < g_cKLs) + { + return g_ahKLs[nLayoutNum - 1]; } else { - /* Substitutes key couldn't be opened, so use the old LCID */ - StringCchCopy(szLCID, LCIDLength, szTempLCID); + HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); + DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); + return GetKeyboardLayout(dwTID); } +} - return TRUE; +static VOID +GetKLIDFromLayoutNum(INT nLayoutNum, LPTSTR szKLID, SIZE_T KLIDLength) +{ + GetKLIDFromHKL(GetHKLFromLayoutNum(nLayoutNum), szKLID, KLIDLength); } static BOOL @@ -95,21 +208,19 @@ GetSystemLibraryPath(LPTSTR szPath, SIZE_T cchPath, LPCTSTR FileName) } static BOOL -GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) +GetLayoutName(INT nLayoutNum, LPTSTR szName, SIZE_T NameLength) { HKEY hKey; HRESULT hr; DWORD dwBufLen; - TCHAR szBuf[MAX_PATH]; - TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szBuf[MAX_PATH], szKLID[CCH_LAYOUT_ID + 1]; - if (!GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID))) - return FALSE; + GetKLIDFromLayoutNum(nLayoutNum, szKLID, ARRAYSIZE(szKLID)); StringCchPrintf(szBuf, ARRAYSIZE(szBuf), - _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szKLID); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; /* Use "Layout Display Name" value as an entry name if possible */ @@ -123,17 +234,17 @@ GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) /* Otherwise, use "Layout Text" value as an entry name */ dwBufLen = NameLength * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, - (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) + (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) { RegCloseKey(hKey); - return FALSE; + return TRUE; } RegCloseKey(hKey); - return TRUE; + return FALSE; } -static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szLCID) +static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szKLID) { HKEY hKey; DWORD dwBufLen; @@ -141,19 +252,17 @@ static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szLCID) szImeFile[0] = UNICODE_NULL; - if (_tcslen(szLCID) != CCH_LAYOUT_ID) + if (_tcslen(szKLID) != CCH_LAYOUT_ID) return FALSE; /* Invalid LCID */ - if (szLCID[0] != TEXT('E') && szLCID[0] != TEXT('e')) + if (szKLID[0] != TEXT('E') && szKLID[0] != TEXT('e')) return FALSE; /* Not an IME HKL */ StringCchPrintf(szBuf, ARRAYSIZE(szBuf), - _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szKLID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { return FALSE; - } dwBufLen = cchImeFile * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("IME File"), NULL, NULL, @@ -223,7 +332,7 @@ static HBITMAP BitmapFromIcon(HICON hIcon) } static HICON -CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) +CreateTrayIcon(LPTSTR szKLID, LPCTSTR szImeFile OPTIONAL) { LANGID LangID; TCHAR szBuf[4]; @@ -245,7 +354,7 @@ CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) } /* Getting "EN", "FR", etc. from English, French, ... */ - LangID = LANGIDFROMLCID(_tcstoul(szLCID, NULL, 16)); + LangID = LANGIDFROMLCID(_tcstoul(szKLID, NULL, 16)); if (GetLocaleInfo(LangID, LOCALE_SABBREVLANGNAME | LOCALE_NOUSEROVERRIDE, szBuf, @@ -323,15 +432,14 @@ static VOID AddTrayIcon(HWND hwnd) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; - TCHAR szLCID[CCH_LAYOUT_ID + 1], szName[MAX_PATH]; - TCHAR szImeFile[80]; + TCHAR szKLID[CCH_LAYOUT_ID + 1], szName[MAX_PATH], szImeFile[80]; - GetLayoutID(_T("1"), szLCID, ARRAYSIZE(szLCID)); - GetLayoutName(_T("1"), szName, ARRAYSIZE(szName)); - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + GetKLIDFromLayoutNum(g_nCurrentLayoutNum, szKLID, ARRAYSIZE(szKLID)); + GetLayoutName(g_nCurrentLayoutNum, szName, ARRAYSIZE(szName)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); + tnid.hIcon = CreateTrayIcon(szKLID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_ADD, &tnid); @@ -355,15 +463,15 @@ DeleteTrayIcon(HWND hwnd) } static VOID -UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) +UpdateTrayIcon(HWND hwnd, LPTSTR szKLID, LPTSTR szName) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; TCHAR szImeFile[80]; - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); + tnid.hIcon = CreateTrayIcon(szKLID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_MODIFY, &tnid); @@ -373,12 +481,6 @@ UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) g_hTrayIcon = tnid.hIcon; } -static VOID -GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID, SIZE_T LayoutIDLength) -{ - StringCchPrintf(szLayoutID, LayoutIDLength, _T("%08lx"), (DWORD)(DWORD_PTR)(hKl)); -} - static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { @@ -390,25 +492,24 @@ static VOID ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoActivate) { HKL hKl; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; + TCHAR szKLID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; LANGID LangID; /* The layout number starts from one. Zero is invalid */ if (uLayoutNum == 0 || uLayoutNum > 0xFF) /* Invalid */ return; - _ultot(uLayoutNum, szLayoutNum, 10); - GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); - LangID = (LANGID)_tcstoul(szLCID, NULL, 16); + GetKLIDFromLayoutNum(uLayoutNum, szKLID, ARRAYSIZE(szKLID)); + LangID = (LANGID)_tcstoul(szKLID, NULL, 16); /* Switch to the new keyboard layout */ GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); - UpdateTrayIcon(hwnd, szLCID, szLangName); + UpdateTrayIcon(hwnd, szKLID, szLangName); if (hwndTarget && !bNoActivate) SetForegroundWindow(hwndTarget); - hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); + hKl = LoadKeyboardLayout(szKLID, KLF_ACTIVATE); if (hKl) ActivateKeyboardLayout(hKl, KLF_SETFORPROCESS); @@ -423,95 +524,45 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoAc EnumWindows(EnumWindowsProc, (LPARAM) hKl); } - ulCurrentLayoutNum = uLayoutNum; + g_nCurrentLayoutNum = uLayoutNum; } static HMENU BuildLeftPopupMenu(VOID) { HMENU hMenu = CreatePopupMenu(); - HKEY hKey; - DWORD dwIndex, dwSize; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szName[MAX_PATH]; - TCHAR szLCID[CCH_LAYOUT_ID + 1], szImeFile[80]; + TCHAR szName[MAX_PATH], szKLID[CCH_LAYOUT_ID + 1], szImeFile[80]; HICON hIcon; MENUITEMINFO mii = { sizeof(mii) }; + INT iKL; - /* Add the keyboard layouts to the popup menu */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + for (iKL = 0; iKL < g_cKLs; ++iKL) { - for (dwIndex = 0; ; dwIndex++) - { - dwSize = sizeof(szLayoutNum); - if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, - NULL, NULL) != ERROR_SUCCESS) - { - break; - } + GetKLIDFromHKL(g_ahKLs[iKL], szKLID, ARRAYSIZE(szKLID)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); - GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + if (!GetLayoutName(iKL + 1, szName, ARRAYSIZE(szName))) + continue; - if (!GetLayoutName(szLayoutNum, szName, ARRAYSIZE(szName))) - continue; - - mii.fMask = MIIM_ID | MIIM_STRING; - mii.wID = _ttoi(szLayoutNum); - mii.dwTypeData = szName; - - hIcon = CreateTrayIcon(szLCID, szImeFile); - if (hIcon) - { - mii.hbmpItem = BitmapFromIcon(hIcon); - if (mii.hbmpItem) - mii.fMask |= MIIM_BITMAP; - } - - InsertMenuItem(hMenu, -1, TRUE, &mii); - DestroyIcon(hIcon); - } - - CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED); - - RegCloseKey(hKey); - } - - return hMenu; -} - -static ULONG -GetMaxLayoutNum(VOID) -{ - HKEY hKey; - ULONG dwIndex, dwSize, uLayoutNum, uMaxLayoutNum = 0; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLayoutID[CCH_LAYOUT_ID + 1]; + mii.fMask = MIIM_ID | MIIM_STRING; + mii.wID = iKL + 1; + mii.dwTypeData = szName; - /* Get the maximum layout number in the Preload key */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - for (dwIndex = 0; ; dwIndex++) + hIcon = CreateTrayIcon(szKLID, szImeFile); + if (hIcon) { - dwSize = sizeof(szLayoutNum); - if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, - NULL, NULL) != ERROR_SUCCESS) - { - break; - } - - if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) - { - uLayoutNum = _ttoi(szLayoutNum); - if (uMaxLayoutNum < uLayoutNum) - uMaxLayoutNum = uLayoutNum; - } + mii.hbmpItem = BitmapFromIcon(hIcon); + if (mii.hbmpItem) + mii.fMask |= MIIM_BITMAP; } - RegCloseKey(hKey); + InsertMenuItem(hMenu, -1, TRUE, &mii); + DestroyIcon(hIcon); } - return uMaxLayoutNum; + CheckMenuItem(hMenu, g_nCurrentLayoutNum, MF_CHECKED); + + return hMenu; } BOOL @@ -549,37 +600,36 @@ DeleteHooks(VOID) } } -ULONG -GetNextLayout(VOID) +static UINT GetLayoutNum(HKL hKL) { - TCHAR szLayoutNum[3 + 1], szLayoutID[CCH_LAYOUT_ID + 1]; - ULONG uLayoutNum, uMaxNum = GetMaxLayoutNum(); + INT iKL; - for (uLayoutNum = ulCurrentLayoutNum + 1; ; ++uLayoutNum) + for (iKL = 0; iKL < g_cKLs; ++iKL) { - if (uLayoutNum > uMaxNum) - uLayoutNum = 1; - if (uLayoutNum == ulCurrentLayoutNum) - break; - - _ultot(uLayoutNum, szLayoutNum, 10); - if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) - return uLayoutNum; + if (g_ahKLs[iKL] == hKL) + return iKL + 1; } - return ulCurrentLayoutNum; + return 0; +} + +ULONG +GetNextLayout(VOID) +{ + return (g_nCurrentLayoutNum % g_cKLs) + 1; } UINT -UpdateLanguageDisplay(HWND hwnd, HKL hKl) +UpdateLanguageDisplay(HWND hwnd, HKL hKL) { - TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; + TCHAR szKLID[MAX_PATH], szLangName[MAX_PATH]; LANGID LangID; - GetLayoutIDByHkl(hKl, szLCID, ARRAYSIZE(szLCID)); - LangID = (LANGID)_tcstoul(szLCID, NULL, 16); + GetKLIDFromHKL(hKL, szKLID, ARRAYSIZE(szKLID)); + LangID = (LANGID)_tcstoul(szKLID, NULL, 16); GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); - UpdateTrayIcon(hwnd, szLCID, szLangName); + UpdateTrayIcon(hwnd, szKLID, szLangName); + g_nCurrentLayoutNum = GetLayoutNum(hKL); return 0; } @@ -611,21 +661,6 @@ UpdateLanguageDisplayCurrent(HWND hwnd, HWND hwndFore) return 0; } -static UINT GetCurLayoutNum(HKL hKL) -{ - UINT i, nCount; - HKL ahKL[256]; - - nCount = GetKeyboardLayoutList(ARRAYSIZE(ahKL), ahKL); - for (i = 0; i < nCount; ++i) - { - if (ahKL[i] == hKL) - return i + 1; - } - - return 0; -} - static BOOL RememberLastActive(HWND hwnd, HWND hwndFore) { TCHAR szClass[64]; @@ -641,8 +676,7 @@ static BOOL RememberLastActive(HWND hwnd, HWND hwndFore) return FALSE; /* Special window */ } - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (_tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) { HKL hKL = GetKeyboardLayout(0); @@ -671,15 +705,19 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) return -1; } + LoadSpecialIds(); + + UpdateLayoutList(NULL); AddTrayIcon(hwnd); - ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, TRUE); + ActivateLayout(hwnd, g_nCurrentLayoutNum, NULL, TRUE); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); break; } case WM_LANG_CHANGED: /* Comes from kbsdll.dll and this module */ { + UpdateLayoutList((HKL)lParam); UpdateLanguageDisplay(hwnd, (HKL)lParam); break; } @@ -757,8 +795,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) if (hwndTarget == NULL) hwndTarget = g_hwndLastActive; - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (hwndTarget && GetClassName(hwndTarget, szClass, ARRAYSIZE(szClass)) && _tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) @@ -772,19 +809,17 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { dwThreadID = GetWindowThreadProcessId(hwndTarget, NULL); hKL = GetKeyboardLayout(dwThreadID); - uNum = GetCurLayoutNum(hKL); + uNum = GetLayoutNum(hKL); if (uNum != 0) - ulCurrentLayoutNum = uNum; + g_nCurrentLayoutNum = uNum; } ActivateLayout(hwnd, GetNextLayout(), hwndTarget, TRUE); - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (bCONWND) - { - ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave, TRUE); - } + ActivateLayout(hwnd, g_nCurrentLayoutNum, hwndTargetSave, TRUE); + break; } @@ -826,6 +861,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { if (Message == s_uTaskbarRestart) { + UpdateLayoutList(NULL); AddTrayIcon(hwnd); break; }

1 year, 7 months

[reactos] 01/01: [EXPLORER][RUNDLL32] Restore minimized non-task windows (#5228)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6bced7a353132121387c… commit e6bced7a353132121387c77ed16d67bd10e9d8d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 3 07:39:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 07:39:05 2023 +0900 [EXPLORER][RUNDLL32] Restore minimized non-task windows (#5228) The minimized non-task windows were not usable due to the bugs. In some situations, the system will restore the minimized non-task windows. - Add IsTaskWnd helper function. - Add SendPulseToTray function to send a pulse to the tray window. - At some shell hook handlings, send a pulse to the tray window. - Add IgnorePulse flag to control the timing of restoring. - Add a timer to reset IgnorePulse flag. - If the pulse has come and IgnorePulse flag is false, then restore the minimized non-task windows. - Modify the rundll32 window procedure. - Use WINDOWPLACEMENT to restore the minimized windows. CORE-13895, CORE-18350 --- base/shell/explorer/precomp.h | 3 + base/shell/explorer/taskswnd.cpp | 40 +++++++------ base/shell/explorer/traywnd.cpp | 123 +++++++++++++++++++++++++++++++-------- base/system/rundll32/rundll32.c | 51 +++++++++++++++- 4 files changed, 175 insertions(+), 42 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index efce3c2a233..881c2d05bce 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -130,6 +130,7 @@ HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void #define TWM_GETTASKSWITCH (WM_USER + 236) #define TWM_OPENSTARTMENU (WM_USER + 260) #define TWM_SETTINGSCHANGED (WM_USER + 300) +#define TWM_PULSE (WM_USER + 400) extern const GUID IID_IShellDesktopTray; @@ -149,6 +150,7 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown) STDMETHOD_(HWND, DisplayProperties) (THIS) PURE; STDMETHOD_(BOOL, ExecContextMenuCmd) (THIS_ UINT uiCmd) PURE; STDMETHOD_(BOOL, Lock) (THIS_ BOOL bLock) PURE; + STDMETHOD_(BOOL, IsTaskWnd) (THIS_ HWND hWnd) PURE; }; #undef INTERFACE @@ -166,6 +168,7 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown) #define ITrayWindow_DisplayProperties(p) (p)->lpVtbl->DisplayProperties(p) #define ITrayWindow_ExecContextMenuCmd(p,a) (p)->lpVtbl->ExecContextMenuCmd(p,a) #define ITrayWindow_Lock(p,a) (p)->lpVtbl->Lock(p,a) +#define ITrayWindow_IsTaskWnd(p,a) (p)->lpVtbl->IsTaskWnd(p,a) #endif HRESULT CreateTrayWindow(ITrayWindow ** ppTray); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index da260dbc3e2..5437f4701f0 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -82,6 +82,7 @@ typedef struct _TASK_ITEM PTASK_GROUP Group; INT Index; INT IconIndex; + WINDOWPLACEMENT wndpl; union { @@ -1112,6 +1113,8 @@ public: TaskItem->hWnd = hWnd; TaskItem->Index = -1; TaskItem->Group = AddToTaskGroup(hWnd); + TaskItem->wndpl.length = sizeof(TaskItem->wndpl); + ::GetWindowPlacement(hWnd, &TaskItem->wndpl); if (!m_IsDestroying) { @@ -1131,7 +1134,6 @@ public: } CheckActivateTaskItem(TaskItem); - return FALSE; } @@ -1384,22 +1386,11 @@ public: BOOL CALLBACK EnumWindowsProc(IN HWND hWnd) { - /* Only show windows that still exist and are visible and none of explorer's - special windows (such as the desktop or the tray window) */ - if (::IsWindow(hWnd) && ::IsWindowVisible(hWnd) && - !m_Tray->IsSpecialHWND(hWnd)) + if (m_Tray->IsTaskWnd(hWnd)) { - DWORD exStyle = ::GetWindowLong(hWnd, GWL_EXSTYLE); - /* Don't list popup windows and also no tool windows */ - if ((::GetWindow(hWnd, GW_OWNER) == NULL || exStyle & WS_EX_APPWINDOW) && - !(exStyle & WS_EX_TOOLWINDOW)) - { - TRACE("Adding task for %p...\n", hWnd); - AddTask(hWnd); - } - + TRACE("Adding task for %p...\n", hWnd); + AddTask(hWnd); } - return TRUE; } @@ -1475,6 +1466,12 @@ public: return TRUE; } + VOID SendPulseToTray(BOOL bDelete, HWND hwndActive) + { + HWND hwndTray = m_Tray->GetHWND(); + ::SendMessage(hwndTray, TWM_PULSE, bDelete, (LPARAM)hwndActive); + } + BOOL HandleAppCommand(IN WPARAM wParam, IN LPARAM lParam) { BOOL Ret = FALSE; @@ -1516,17 +1513,20 @@ public: break; case HSHELL_WINDOWCREATED: + SendPulseToTray(FALSE, (HWND)lParam); AddTask((HWND) lParam); break; case HSHELL_WINDOWDESTROYED: /* The window still exists! Delay destroying it a bit */ - DeleteTask((HWND) lParam); + SendPulseToTray(TRUE, (HWND)lParam); + DeleteTask((HWND)lParam); break; case HSHELL_RUDEAPPACTIVATED: case HSHELL_WINDOWACTIVATED: - ActivateTask((HWND) lParam); + SendPulseToTray(FALSE, (HWND)lParam); + ActivateTask((HWND)lParam); break; case HSHELL_FLASH: @@ -1597,12 +1597,17 @@ public: if (!bIsMinimized && bIsActive) { + TaskItem->wndpl.length = sizeof(TaskItem->wndpl); + ::GetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); + ::ShowWindowAsync(TaskItem->hWnd, SW_MINIMIZE); TRACE("Valid button clicked. App window Minimized.\n"); } else { ::SwitchToThisWindow(TaskItem->hWnd, TRUE); + ::SetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); + TRACE("Valid button clicked. App window Restored.\n"); } } @@ -1631,6 +1636,7 @@ public: TaskItem = FindTaskItemByIndex((INT) wIndex); if (TaskItem != NULL) { + SendPulseToTray(FALSE, TaskItem->hWnd); HandleTaskItemClick(TaskItem); return TRUE; } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index ca930e56e55..05d130b4c3d 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -169,7 +169,13 @@ IsThereAnyEffectiveWindow(BOOL bMustBeInMonitor) return ei.hwndFound != NULL; } -CSimpleArray<HWND> g_MinimizedAll; +/* Minimized window position info */ +struct MINWNDPOS +{ + HWND hwnd; + WINDOWPLACEMENT wndpl; +}; +CSimpleArray<MINWNDPOS> g_MinimizedAll; /* * ITrayWindow @@ -559,6 +565,7 @@ public: DWORD InSizeMove : 1; DWORD IsDragging : 1; DWORD NewPosSize : 1; + DWORD IgnorePulse : 1; }; }; @@ -587,6 +594,7 @@ public: ZeroMemory(&m_TraySize, sizeof(m_TraySize)); ZeroMemory(&m_AutoHideOffset, sizeof(m_AutoHideOffset)); ZeroMemory(&m_MouseTrackingInfo, sizeof(m_MouseTrackingInfo)); + IgnorePulse = TRUE; } virtual ~CTrayWindow() @@ -2460,6 +2468,22 @@ ChangePos: return bPrevLock; } + /* The task window is visible and non-WS_EX_TOOLWINDOW and + { has WS_EX_APPWINDOW style or has no owner } and is none of explorer's + special windows (such as the desktop or the tray window) */ + BOOL STDMETHODCALLTYPE IsTaskWnd(HWND hWnd) + { + if (::IsWindow(hWnd) && ::IsWindowVisible(hWnd) && !IsSpecialHWND(hWnd)) + { + DWORD exStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_EXSTYLE); + if (((exStyle & WS_EX_APPWINDOW) || ::GetWindow(hWnd, GW_OWNER) == NULL) && + !(exStyle & WS_EX_TOOLWINDOW)) + { + return TRUE; + } + } + return FALSE; + } /* * IContextMenu @@ -2596,6 +2620,15 @@ ChangePos: return TRUE; } +#define TIMER_ID_IGNOREPULSERESET 888 +#define TIMER_IGNOREPULSERESET_TIMEOUT 200 + + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + KillTimer(TIMER_ID_IGNOREPULSERESET); + return 0; + } + LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_Theme) @@ -3160,6 +3193,39 @@ HandleTrayContextMenu: return (LRESULT)m_TaskSwitch; } + void RestoreMinimizedNonTaskWnds(BOOL bDestroyed, HWND hwndActive) + { + for (INT i = g_MinimizedAll.GetSize() - 1; i >= 0; --i) + { + HWND hwnd = g_MinimizedAll[i].hwnd; + if (!hwnd || hwndActive == hwnd) + continue; + + if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd) && + (!IsTaskWnd(hwnd) || !::IsWindowEnabled(hwnd))) + { + ::SetWindowPlacement(hwnd, &g_MinimizedAll[i].wndpl); // Restore + } + } + + g_MinimizedAll.RemoveAll(); + + if (!bDestroyed) + ::SetForegroundWindow(hwndActive); + } + + LRESULT OnPulse(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (IgnorePulse) + return 0; + + KillTimer(TIMER_ID_IGNOREPULSERESET); + IgnorePulse = TRUE; + RestoreMinimizedNonTaskWnds((BOOL)wParam, (HWND)lParam); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); + return 0; + } + LRESULT OnHotkey(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { return HandleHotKey(wParam); @@ -3170,8 +3236,7 @@ HandleTrayContextMenu: HWND hwndDesktop; HWND hTrayWnd; HWND hwndProgman; - BOOL bRet; - CSimpleArray<HWND> *pMinimizedAll; + CSimpleArray<MINWNDPOS> *pMinimizedAll; BOOL bShowDesktop; }; @@ -3185,11 +3250,9 @@ HandleTrayContextMenu: static BOOL CALLBACK MinimizeWindowsProc(HWND hwnd, LPARAM lParam) { MINIMIZE_INFO *info = (MINIMIZE_INFO *)lParam; - if (hwnd == info->hwndDesktop || hwnd == info->hTrayWnd || - hwnd == info->hwndProgman) - { - return TRUE; - } + if (hwnd == info->hwndDesktop || hwnd == info->hTrayWnd || hwnd == info->hwndProgman) + return TRUE; // Ignore special windows + if (!info->bShowDesktop) { if (!::IsWindowEnabled(hwnd) || IsDialog(hwnd)) @@ -3198,35 +3261,38 @@ HandleTrayContextMenu: if (hwndOwner && !::IsWindowEnabled(hwndOwner)) return TRUE; } + if (::IsWindowVisible(hwnd) && !::IsIconic(hwnd)) { + MINWNDPOS mwp; + mwp.hwnd = hwnd; + mwp.wndpl.length = sizeof(mwp.wndpl); + ::GetWindowPlacement(hwnd, &mwp.wndpl); // Save the position and status + + info->pMinimizedAll->Add(mwp); + ::ShowWindowAsync(hwnd, SW_MINIMIZE); - info->bRet = TRUE; - info->pMinimizedAll->Add(hwnd); } + return TRUE; } VOID MinimizeAll(BOOL bShowDesktop = FALSE) { + IgnorePulse = TRUE; + KillTimer(TIMER_ID_IGNOREPULSERESET); + MINIMIZE_INFO info; info.hwndDesktop = GetDesktopWindow();; info.hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); info.hwndProgman = FindWindowW(L"Progman", NULL); - info.bRet = FALSE; info.pMinimizedAll = &g_MinimizedAll; info.bShowDesktop = bShowDesktop; EnumWindows(MinimizeWindowsProc, (LPARAM)&info); - // invalid handles should be cleared to avoid mismatch of handles - for (INT i = 0; i < g_MinimizedAll.GetSize(); ++i) - { - if (!::IsWindow(g_MinimizedAll[i])) - g_MinimizedAll[i] = NULL; - } - ::SetForegroundWindow(m_DesktopWnd); ::SetFocus(m_DesktopWnd); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); } VOID ShowDesktop() @@ -3236,15 +3302,20 @@ HandleTrayContextMenu: VOID RestoreAll() { + IgnorePulse = TRUE; + KillTimer(TIMER_ID_IGNOREPULSERESET); + for (INT i = g_MinimizedAll.GetSize() - 1; i >= 0; --i) { - HWND hwnd = g_MinimizedAll[i]; + HWND hwnd = g_MinimizedAll[i].hwnd; if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd)) { - ::ShowWindowAsync(hwnd, SW_RESTORE); + ::SetWindowPlacement(hwnd, &g_MinimizedAll[i].wndpl); } } + g_MinimizedAll.RemoveAll(); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); } LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -3288,9 +3359,12 @@ HandleTrayContextMenu: { ProcessAutoHide(); } - - bHandled = FALSE; - return TRUE; + else if (wParam == TIMER_ID_IGNOREPULSERESET) + { + KillTimer(TIMER_ID_IGNOREPULSERESET); + IgnorePulse = FALSE; + } + return 0; } LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -3479,7 +3553,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CREATE, OnCreate) - /*MESSAGE_HANDLER(WM_DESTROY, OnDestroy)*/ + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand) @@ -3512,6 +3586,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) MESSAGE_HANDLER(TWM_GETTASKSWITCH, OnGetTaskSwitch) + MESSAGE_HANDLER(TWM_PULSE, OnPulse) ALT_MSG_MAP(1) END_MSG_MAP() diff --git a/base/system/rundll32/rundll32.c b/base/system/rundll32/rundll32.c index b02517ef56a..44b3e543813 100644 --- a/base/system/rundll32/rundll32.c +++ b/base/system/rundll32/rundll32.c @@ -29,6 +29,7 @@ #include <winnls.h> #include <winuser.h> #include <tchar.h> +#include <undocuser.h> // For WM_POPUPSYSTEMMENU #include "resource.h" @@ -299,9 +300,57 @@ LPSTR DuplicateToMultiByte(LPCTSTR lptString, size_t nBufferSize) return lpString; } +typedef struct +{ + HWND hwndOwner; + HWND hwndTarget; +} FIND_OWNED, *PFIND_OWNED; + +static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + PFIND_OWNED pFindOwned = (PFIND_OWNED)lParam; + if (pFindOwned->hwndOwner == GetWindow(hwnd, GW_OWNER)) + { + pFindOwned->hwndTarget = hwnd; + return FALSE; + } + return TRUE; +} + LRESULT CALLBACK EmptyWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hWnd, uMsg, wParam, lParam); + switch (uMsg) + { + case WM_POPUPSYSTEMMENU: + case WM_SYSCOMMAND: + { + /* Find the owned window */ + FIND_OWNED FindOwned = { hWnd, NULL }; + EnumWindows(EnumWindowsProc, (LPARAM)&FindOwned); + /* Forward message */ + if (FindOwned.hwndTarget) + PostMessageW(FindOwned.hwndTarget, uMsg, wParam, lParam); + break; + } + case WM_ACTIVATE: + { + /* Find the owned window */ + FIND_OWNED FindOwned = { hWnd, NULL }; + EnumWindows(EnumWindowsProc, (LPARAM)&FindOwned); + if (FindOwned.hwndTarget) + { + if (LOWORD(wParam) != WA_INACTIVE) /* To be activated */ + { + SetActiveWindow(FindOwned.hwndTarget); + return 0; + } + } + /* Fall through */ + } + default: + return DefWindowProc(hWnd, uMsg, wParam, lParam); + } + return 0; } // Registers a minimal window class for passing to the dll function

1 year, 7 months

[reactos] 01/01: [REGEDIT] Strip redundant include, minor formatting (#5264)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31fdaca8c014ef916be82… commit 31fdaca8c014ef916be824685e3af09712aef4dc Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon May 1 16:50:01 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 1 16:50:01 2023 +0200 [REGEDIT] Strip redundant include, minor formatting (#5264) strsafe.h is already included via regedit.h --- base/applications/regedit/childwnd.c | 2 +- base/applications/regedit/lang/el-GR.rc | 2 +- base/applications/regedit/lang/sl-SI.rc | 8 ++++---- base/applications/regedit/settings.c | 1 - base/applications/regedit/treeview.c | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 7910dcefdaa..67a88bc90a5 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -656,7 +656,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } } } - TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd/*g_pChildWnd->hWnd*/, NULL); + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } } break; diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 0c840b3662e..5fdb8ff7a26 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -82,7 +82,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Αρχείο" BEGIN - MENUITEM "&Εισαγωγή ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Εισαγωγή...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Εξαγωγή...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Φόρτωση Hive...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 4d8d89eb17f..345b80f37cc 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -82,14 +82,14 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Register" BEGIN - MENUITEM "&Uvozi registrsko datoteko ...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Izvozi registrsko datoteko ...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Uvozi registrsko datoteko...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Izvozi registrsko datoteko...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "P&oveži se z omrežnim registrom ...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "P&rekini povezavo z omrežnim registrom ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "P&oveži se z omrežnim registrom...", ID_REGISTRY_CONNECTNETWORKREGISTRY + MENUITEM "P&rekini povezavo z omrežnim registrom...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Na&tisni...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/regedit/settings.c b/base/applications/regedit/settings.c index 9266ec1a0c1..c82a3a0520d 100644 --- a/base/applications/regedit/settings.c +++ b/base/applications/regedit/settings.c @@ -20,7 +20,6 @@ */ #include "regedit.h" -#include <strsafe.h> const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; DECLSPEC_IMPORT ULONG WINAPIV DbgPrint(PCCH Format,...); diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index 28222432fea..9c957cfe2ad 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -674,7 +674,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) break; case TVN_BEGINLABELEDIT: { - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; /* cancel label edit for rootkeys */ if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) || !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem))) @@ -692,7 +692,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) LPCWSTR keyPath; HKEY hRootKey; HKEY hKey = NULL; - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; LONG nRenResult; LONG lResult = TRUE; WCHAR szBuffer[MAX_PATH];

1 year, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2023