Ros-diffs July 2022

ros-diffs@reactos.org

7 participants
26 discussions

[reactos] 01/01: [MAIN] Improve mouse UI icons (#4583)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d520f3c27ad0f8a2836c… commit 8d520f3c27ad0f8a2836c092dfdf6787c6598c0c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 19 20:50:54 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 19 20:50:54 2022 +0900 [MAIN] Improve mouse UI icons (#4583) - Replace IDI_MOUSE_SPEED icon. - Add and use IDI_MOUSE_HIDE icon for "Hide pointer while typing". CORE-10728 --- dll/cpl/main/lang/bg-BG.rc | 2 +- dll/cpl/main/lang/cs-CZ.rc | 2 +- dll/cpl/main/lang/de-DE.rc | 2 +- dll/cpl/main/lang/el-GR.rc | 2 +- dll/cpl/main/lang/en-US.rc | 2 +- dll/cpl/main/lang/es-ES.rc | 2 +- dll/cpl/main/lang/fr-FR.rc | 2 +- dll/cpl/main/lang/he-IL.rc | 2 +- dll/cpl/main/lang/hu-HU.rc | 2 +- dll/cpl/main/lang/id-ID.rc | 2 +- dll/cpl/main/lang/it-IT.rc | 2 +- dll/cpl/main/lang/ja-JP.rc | 2 +- dll/cpl/main/lang/nl-NL.rc | 2 +- dll/cpl/main/lang/no-NO.rc | 2 +- dll/cpl/main/lang/pl-PL.rc | 2 +- dll/cpl/main/lang/pt-PT.rc | 2 +- dll/cpl/main/lang/ro-RO.rc | 2 +- dll/cpl/main/lang/ru-RU.rc | 2 +- dll/cpl/main/lang/sk-SK.rc | 2 +- dll/cpl/main/lang/sq-AL.rc | 2 +- dll/cpl/main/lang/tr-TR.rc | 2 +- dll/cpl/main/lang/uk-UA.rc | 2 +- dll/cpl/main/lang/zh-CN.rc | 2 +- dll/cpl/main/lang/zh-HK.rc | 2 +- dll/cpl/main/lang/zh-TW.rc | 2 +- dll/cpl/main/main.rc | 1 + dll/cpl/main/resource.h | 1 + dll/cpl/main/resources/mouse_hide.ico | Bin 0 -> 177367 bytes dll/cpl/main/resources/mouse_speed.ico | Bin 4470 -> 173223 bytes 29 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dll/cpl/main/lang/bg-BG.rc b/dll/cpl/main/lang/bg-BG.rc index 56157fc935a..9ef7d2e17e1 100644 --- a/dll/cpl/main/lang/bg-BG.rc +++ b/dll/cpl/main/lang/bg-BG.rc @@ -121,7 +121,7 @@ BEGIN CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 //Сменено 60, 150, 90, 10->60, 150, 150, 10 CHECKBOX "&Скриване на показалеца по време на писане", IDC_CHECK_HIDE_POINTER,60, 150, 170, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Показване мястото на показалеца, при натискне на Ctrl", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc index 600dd5987ba..207afb38c5f 100644 --- a/dll/cpl/main/lang/cs-CZ.rc +++ b/dll/cpl/main/lang/cs-CZ.rc @@ -124,7 +124,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Skrýt ukazatel, pokud píšete.", IDC_CHECK_HIDE_POINTER, 60, 150, 150, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Ukázat pozici ukazatele při stisknutí klávesy Ctrl.", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/de-DE.rc b/dll/cpl/main/lang/de-DE.rc index e418a70f5cd..e858533cb95 100644 --- a/dll/cpl/main/lang/de-DE.rc +++ b/dll/cpl/main/lang/de-DE.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 145, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/el-GR.rc b/dll/cpl/main/lang/el-GR.rc index 6bf3d20298d..d4ca1e4d796 100644 --- a/dll/cpl/main/lang/el-GR.rc +++ b/dll/cpl/main/lang/el-GR.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Απόκρυψη του δείκτη κατά την πληκτρολόγηση", IDC_CHECK_HIDE_POINTER, 60, 150, 170, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Εμφάνηση της θέσης του δείκτη όταν πατάω CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/en-US.rc b/dll/cpl/main/lang/en-US.rc index 4617e223543..033b265e4af 100644 --- a/dll/cpl/main/lang/en-US.rc +++ b/dll/cpl/main/lang/en-US.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/es-ES.rc b/dll/cpl/main/lang/es-ES.rc index db7014eedbb..4434f07abd2 100644 --- a/dll/cpl/main/lang/es-ES.rc +++ b/dll/cpl/main/lang/es-ES.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Ocultar puntero mientras se escribe", IDC_CHECK_HIDE_POINTER, 60, 150, 140, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Mo&strar ubicación del puntero al presionar la tecla CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc index 94e40573c22..c523ebfcee8 100644 --- a/dll/cpl/main/lang/fr-FR.rc +++ b/dll/cpl/main/lang/fr-FR.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Cacher le pointeur en écrivant", IDC_CHECK_HIDE_POINTER, 40, 150, 110, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Afficher le curseur quand je presse la touche CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/he-IL.rc b/dll/cpl/main/lang/he-IL.rc index be647e0138d..7b03f3b4df3 100644 --- a/dll/cpl/main/lang/he-IL.rc +++ b/dll/cpl/main/lang/he-IL.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/hu-HU.rc b/dll/cpl/main/lang/hu-HU.rc index e41189e2dc1..680d92d2dfa 100644 --- a/dll/cpl/main/lang/hu-HU.rc +++ b/dll/cpl/main/lang/hu-HU.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "Mutató el&rejtése gépelés közben", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Mutató helyének megjelenítése a CTRL lenyomásakor", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/id-ID.rc b/dll/cpl/main/lang/id-ID.rc index 51126c877da..c47eafe12a0 100644 --- a/dll/cpl/main/lang/id-ID.rc +++ b/dll/cpl/main/lang/id-ID.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Sembunyikan penunjuk saat mengetik", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "T&ampilkan lokasi penunjuk saat Saya menekan tombol CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc index 292399e100a..d042575cc27 100644 --- a/dll/cpl/main/lang/it-IT.rc +++ b/dll/cpl/main/lang/it-IT.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 119, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 74, 17 CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 154, 140, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 149, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 149, 15, 15 CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", IDC_CHECK_SHOW_POINTER, 60, 179, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 174, 15, 15 diff --git a/dll/cpl/main/lang/ja-JP.rc b/dll/cpl/main/lang/ja-JP.rc index 62dd0f50c8d..6b84aa1d8f4 100644 --- a/dll/cpl/main/lang/ja-JP.rc +++ b/dll/cpl/main/lang/ja-JP.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "タイピング中にポインタを隠す(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "CTRLキーを押したらポインタの位置を表示する(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/nl-NL.rc b/dll/cpl/main/lang/nl-NL.rc index 9815955eba6..69b93ab3fdf 100644 --- a/dll/cpl/main/lang/nl-NL.rc +++ b/dll/cpl/main/lang/nl-NL.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Aanwijzer verbergen tijdens het typen", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Laat zien waar de aanwijzer is met de CTRL toets", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/no-NO.rc b/dll/cpl/main/lang/no-NO.rc index 4dbe251fde4..c7566905289 100644 --- a/dll/cpl/main/lang/no-NO.rc +++ b/dll/cpl/main/lang/no-NO.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Skjul pekeren ved tastetrykk", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Vis hvor pekeren er når Crtl-tasten trykkes", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc index a0eeab727ee..d1c49a5a706 100644 --- a/dll/cpl/main/lang/pl-PL.rc +++ b/dll/cpl/main/lang/pl-PL.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Ukryj wskaźnik podczas pisania", IDC_CHECK_HIDE_POINTER, 60, 150, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Pokaż lokalizację wskaźnika po naciśnięciu klawisza &CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 378a43a1ad1..4646b79fce4 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Ocultar o ponteiro ao escrever", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Mostrar a localização do ponteiro ao premir a tecla CTRL", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc index 40cac5a341f..6d53e33f3f5 100644 --- a/dll/cpl/main/lang/ro-RO.rc +++ b/dll/cpl/main/lang/ro-RO.rc @@ -123,7 +123,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "As&cunde indicatorul în timpul scrierii", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Evidențiază poziția indicatorului apăsând tasta «Ctrl»", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/ru-RU.rc b/dll/cpl/main/lang/ru-RU.rc index 5a0c1dbe992..b583ac990eb 100644 --- a/dll/cpl/main/lang/ru-RU.rc +++ b/dll/cpl/main/lang/ru-RU.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 134, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 82, 146, 70, 17 CHECKBOX "&Скрывать указатель во время ввода с клавиатуры", IDC_CHECK_HIDE_POINTER, 44, 164, 190, 20 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 167, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 167, 15, 15 CHECKBOX "Обозначать поло&жение указателя при нажатии CTRL", IDC_CHECK_SHOW_POINTER, 44, 197, 186, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 194, 15, 15 diff --git a/dll/cpl/main/lang/sk-SK.rc b/dll/cpl/main/lang/sk-SK.rc index 1a5e35feec8..0a8288e0695 100644 --- a/dll/cpl/main/lang/sk-SK.rc +++ b/dll/cpl/main/lang/sk-SK.rc @@ -123,7 +123,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/sq-AL.rc b/dll/cpl/main/lang/sq-AL.rc index 18cc4cc8f08..f57d11b2a80 100644 --- a/dll/cpl/main/lang/sq-AL.rc +++ b/dll/cpl/main/lang/sq-AL.rc @@ -122,7 +122,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide treguesin ndërsa shkruani", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Trego vendndodhjen e treguesit kur shtypni butonin CTRL", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc index 91e7d3e00bf..a205c1e92e2 100644 --- a/dll/cpl/main/lang/tr-TR.rc +++ b/dll/cpl/main/lang/tr-TR.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Yazarken imleci gizle", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&CTRL tuşuna bastığımda imlecin konumunu göster", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/uk-UA.rc b/dll/cpl/main/lang/uk-UA.rc index 3c584bd0563..49ecf2e27e5 100644 --- a/dll/cpl/main/lang/uk-UA.rc +++ b/dll/cpl/main/lang/uk-UA.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 130, 70, 17 CHECKBOX "П&риховувати вказівник під час введення з клавіатури", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Показувати ро&зташування вказівника при натисненні CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc index d18c249b1ba..aaa5eecefaa 100644 --- a/dll/cpl/main/lang/zh-CN.rc +++ b/dll/cpl/main/lang/zh-CN.rc @@ -125,7 +125,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字时隐藏指针(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "当按 CTRL 键时显示指针的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/zh-HK.rc b/dll/cpl/main/lang/zh-HK.rc index 2c759d9b3e9..01f4c3c9b1a 100644 --- a/dll/cpl/main/lang/zh-HK.rc +++ b/dll/cpl/main/lang/zh-HK.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字時隱藏指標(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "當按 CTRL 鍵時顯示指標的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc index 5d365891a1d..fd8e83b6245 100644 --- a/dll/cpl/main/lang/zh-TW.rc +++ b/dll/cpl/main/lang/zh-TW.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字時隱藏指標(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "當按 CTRL 鍵時顯示指標的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/main.rc b/dll/cpl/main/main.rc index 109c586e8b5..92dfeef9e21 100644 --- a/dll/cpl/main/main.rc +++ b/dll/cpl/main/main.rc @@ -21,6 +21,7 @@ IDI_MOUSE_RIGHT ICON "resources/mouse_right.ico" IDI_MOUSE_SPEED ICON "resources/mouse_speed.ico" IDI_MOUSE_BUTTON ICON "resources/mouse_button.ico" IDI_MOUSE_TRAILS ICON "resources/mouse_trails.ico" +IDI_MOUSE_HIDE ICON "resources/mouse_hide.ico" IDI_FONTS_FOLDER ICON "resources/fonts_folder.ico" IDI_ADMIN_TOOLS_FOLDER ICON "resources/admintools_folder.ico" IDI_MOUSE_POINTER ICON "resources/mouse_pointer.ico" diff --git a/dll/cpl/main/resource.h b/dll/cpl/main/resource.h index 1a5d38d3479..9bff0b95d1e 100644 --- a/dll/cpl/main/resource.h +++ b/dll/cpl/main/resource.h @@ -12,6 +12,7 @@ #define IDI_MOUSE_SPEED 205 #define IDI_MOUSE_BUTTON 206 #define IDI_MOUSE_TRAILS 207 +#define IDI_MOUSE_HIDE 208 #define IDI_FONTS_FOLDER 400 #define IDI_ADMIN_TOOLS_FOLDER 500 #define IDI_MOUSE_POINTER 600 diff --git a/dll/cpl/main/resources/mouse_hide.ico b/dll/cpl/main/resources/mouse_hide.ico new file mode 100644 index 00000000000..1715b3bdeec Binary files /dev/null and b/dll/cpl/main/resources/mouse_hide.ico differ diff --git a/dll/cpl/main/resources/mouse_speed.ico b/dll/cpl/main/resources/mouse_speed.ico index b960de39f9d..53b8d24271e 100644 Binary files a/dll/cpl/main/resources/mouse_speed.ico and b/dll/cpl/main/resources/mouse_speed.ico differ

2 years, 3 months

[reactos] 01/01: [SYSDM] Don't use magic number (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fc9180a1c1dbb7099c3e… commit 9fc9180a1c1dbb7099c3e5fbaef03fb7820105f3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 19 13:05:07 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 19 13:05:07 2022 +0900 [SYSDM] Don't use magic number (ja-JP) --- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 059097bfabe..35b92143abb 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -139,7 +139,7 @@ CAPTION "プロファイル名の変更" FONT 9, "MS UI Gothic" BEGIN LTEXT "元の名前:", IDC_STATIC, 5, 10, 40, 8 - LTEXT "", 1401, 50, 10, 140, 10 + LTEXT "", IDC_RENPROFEDITFROM, 50, 10, 140, 10 LTEXT "新しい名前:", IDC_STATIC, 5, 30, 40, 8 EDITTEXT IDC_RENPROFEDITTO, 50, 30, 140, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14

2 years, 3 months

[reactos] 01/01: [EXPLORER] Fix assertion failure on start button (#4581)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=255f43086db6af47c2766… commit 255f43086db6af47c27664063c9deab36a93642f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 22:20:25 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 18 22:20:25 2022 +0900 [EXPLORER] Fix assertion failure on start button (#4581) CORE-18024 --- base/shell/explorer/traywnd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index c4a30a6ffe3..da62c75c269 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2687,6 +2687,7 @@ ChangePos: { CComPtr<IContextMenu> ctxMenu; CStartMenuBtnCtxMenu_CreateInstance(this, m_hWnd, &ctxMenu); + ctxMenu->AddRef(); TrackCtxMenu(ctxMenu, ppt, hWndExclude, m_Position == ABE_BOTTOM, this); } }

2 years, 3 months

[reactos] 01/01: [CONSOLE] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f80670040c88faf7c5e3… commit 5f80670040c88faf7c5e3d1d9fb8ecde52a6f79f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:46:15 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:46:15 2022 +0900 [CONSOLE] Improve Japanese translation (ja-JP) --- dll/cpl/console/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/console/lang/ja-JP.rc b/dll/cpl/console/lang/ja-JP.rc index 3f7b56524b7..f0414a10dfb 100644 --- a/dll/cpl/console/lang/ja-JP.rc +++ b/dll/cpl/console/lang/ja-JP.rc @@ -150,5 +150,5 @@ BEGIN IDS_CPLDESCRIPTION "コンソールプロパティを設定します。" IDS_APPLY_SHORTCUT_ALL "このウィンドウを開始したショートカットを編集します(&S)" IDS_RASTERFONTS "ラスターフォント" - IDS_GROUPBOX_FONT_NAME "Selected Font: " + IDS_GROUPBOX_FONT_NAME "選択中のフォント: " END

2 years, 3 months

[reactos] 01/01: [APPWIZ] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7f06eb4806c7c356a2ee… commit a7f06eb4806c7c356a2eee3e3b4cbc242664faba Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:44:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:44:25 2022 +0900 [APPWIZ] Improve Japanese translation (ja-JP) --- dll/cpl/appwiz/lang/ja-JP.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index ddbe0f6cc4f..3c9b052a5dd 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -78,12 +78,12 @@ BEGIN IDS_DOWNLOADING "ダウンロード中..." IDS_INSTALLING "インストール中..." IDS_INVALID_SHA "ダウンロードしたファイルのチェックサムが合致しません。壊れたファイルのインストールを中止しています。" - IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" - IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." - IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." - IDS_CANTMAKESHORTCUT "Failed to create shortcut." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_NEW_INTERNET_SHORTCUT "新しいインターネットショートカット" + IDS_DWL_FAILED "Geckoパッケージをダウンロードできません。ダウンロードするためにインターネット接続を確認して下さい。セットアップはGeckoをインストールせずに続行します。" + IDS_CANTMAKEINETSHORTCUT "インターネットショートカットの作成に失敗しました。" + IDS_CANTMAKESHORTCUT "ショートカットの作成に失敗しました。" + IDS_NO_MEMORY "メモリーが割り当てできませんでした！" + IDS_NO_DIRECTORY "ディレクトリが与えられてません!" + IDS_INVALID_PATH "与えられたパスは無効です!" + IDS_INVALID_NAME "入力したショートカット名にファイル名としては無効な文字が含まれているか長すぎます。" END

2 years, 3 months

[reactos] 01/01: [INTL] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01643b8d9e4aed5030e64… commit 01643b8d9e4aed5030e64cfe8dbef3ac2a03f48b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:39:29 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:39:29 2022 +0900 [INTL] Improve Japanese translation (ja-JP) --- dll/cpl/intl/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/intl/lang/ja-JP.rc b/dll/cpl/intl/lang/ja-JP.rc index b3a90521435..5ce9ec97199 100644 --- a/dll/cpl/intl/lang/ja-JP.rc +++ b/dll/cpl/intl/lang/ja-JP.rc @@ -113,7 +113,7 @@ END IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Time" +CAPTION "時刻" FONT 9, "MS UI Gothic" BEGIN GROUPBOX "表示例", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE @@ -213,5 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "input.dllを開始できません" - IDS_ERROR_UNICODE "Unable to install a new language for programs that don't support Unicode!" + IDS_ERROR_UNICODE "Unicodeをサポートしていないプログラムのための新しい言語をインストールできません。" END

2 years, 3 months

[reactos] 01/01: [SYSDM] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=971e33b73494abc748670… commit 971e33b73494abc748670626eb4e308aa729b57d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:01:05 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:01:05 2022 +0900 [SYSDM] Improve Japanese translation (ja-JP) --- dll/cpl/sysdm/lang/ja-JP.rc | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index e3dac72815e..059097bfabe 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -125,10 +125,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "プロファイルのコピー" FONT 9, "MS UI Gothic" BEGIN - LTEXT "コピー元:", IDC_STATIC, 5, 10, 30, 8 - LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "コピー先:", IDC_STATIC, 5, 30, 25, 8 - EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + LTEXT "コピー元:", IDC_STATIC, 5, 10, 40, 8 + LTEXT "", IDC_COPYPROFILEFROM, 50, 10, 140, 10 + LTEXT "コピー先:", IDC_STATIC, 5, 30, 40, 8 + EDITTEXT IDC_COPYPROFILETO, 50, 30, 140, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 199, 30, 70, 14 END @@ -138,10 +138,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "プロファイル名の変更" FONT 9, "MS UI Gothic" BEGIN - LTEXT "元の名前:", IDC_STATIC, 5, 10, 20, 8 - LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 - LTEXT "新しい名前:", IDC_STATIC, 5, 30, 20, 8 - EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + LTEXT "元の名前:", IDC_STATIC, 5, 10, 40, 8 + LTEXT "", 1401, 50, 10, 140, 10 + LTEXT "新しい名前:", IDC_STATIC, 5, 30, 40, 8 + EDITTEXT IDC_RENPROFEDITTO, 50, 30, 140, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 199, 30, 50, 14 END @@ -167,7 +167,7 @@ END IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Change Profile Type" +CAPTION "プロファイルの種類を変更" FONT 9, "MS UI Gothic" BEGIN LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 @@ -182,14 +182,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "コピー先" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "次へプロファイルをコピーする", -1, 8, 9, 195, 52 + GROUPBOX "次へプロファイルをコピーする", -1, 8, 9, 185, 52 EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL PUSHBUTTON "参照(&B)", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 GROUPBOX "使用許可", -1, 8, 77, 185, 48 LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 PUSHBUTTON "変更(&C)", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 204, 13, 60, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 204, 30, 60, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 204, 30, 50, 14 END IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 @@ -291,8 +291,8 @@ BEGIN EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 314, 50, 50, 14 - PUSHBUTTON "Browse &Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 - PUSHBUTTON "Browse &Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 + PUSHBUTTON "ディレクトリ(&D)...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "ファイル(&F)...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 END IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 @@ -303,13 +303,13 @@ BEGIN SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE - PUSHBUTTON "&New", IDC_BUTTON_NEW, 242, 10, 50, 14 - PUSHBUTTON "&Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 - PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 - PUSHBUTTON "Move &Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 - PUSHBUTTON "Move D&own", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 - PUSHBUTTON "Edit &text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + PUSHBUTTON "新規(&N)", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "編集(&E)", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "参照(&B)...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "削除(&D)", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "上へ(&U)", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "下へ(&O)", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "テキスト(&T)...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 242, 228, 50, 14 END @@ -367,7 +367,7 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "プロファイル名は使用中です。" IDS_HWPROFILE_PROFILE "プロファイル" IDS_HWPROFILE_WARNING "警告" - IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." - IDS_ENVIRONMENT_WARNING_TITLE "System Properties" - IDS_FILE_BROWSE_FILTER "All Files (*.*)\0*.*\0" + IDS_ENVIRONMENT_WARNING "変更点はすべて破棄され、変数の値はテキストとして編集されます。" + IDS_ENVIRONMENT_WARNING_TITLE "システムプロパティ" + IDS_FILE_BROWSE_FILTER "すべてのファイル (*.*)\0*.*\0" END

2 years, 3 months

[reactos] 01/01: [CRT] Add round and roundf and add it to msvcrtex to make clang v14 happy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc9409daba5ad76765434… commit bc9409daba5ad76765434de639c6c66d583b3dce Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jul 15 18:51:20 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 17 17:32:32 2022 +0200 [CRT] Add round and roundf and add it to msvcrtex to make clang v14 happy --- sdk/include/crt/math.h | 3 +++ sdk/lib/crt/math/round.c | 16 ++++++++++++++++ sdk/lib/crt/math/roundf.c | 16 ++++++++++++++++ sdk/lib/crt/msvcrtex.cmake | 2 ++ 4 files changed, 37 insertions(+) diff --git a/sdk/include/crt/math.h b/sdk/include/crt/math.h index ce896484cd7..80aafd21d9c 100644 --- a/sdk/include/crt/math.h +++ b/sdk/include/crt/math.h @@ -275,6 +275,8 @@ _Check_return_ long lrintf(_In_ float x); _Check_return_ long lrintl(_In_ long double x); #pragma function(lrint, lrintf, lrintl) #endif + +#ifndef _CRTBLD _Check_return_ __CRT_INLINE double round(_In_ double x) { return (x < 0) ? ceil(x - 0.5f) : floor(x + 0.5); } _Check_return_ __CRT_INLINE float roundf(_In_ float x) { return (x < 0) ? ceilf(x - 0.5f) : floorf(x + 0.5); } _Check_return_ __CRT_INLINE long double roundl(_In_ long double x) { return (x < 0) ? ceill(x - 0.5f) : floorl(x + 0.5); } @@ -294,6 +296,7 @@ _Check_return_ __CRT_INLINE long long llrint(_In_ double x) { return (long long) _Check_return_ __CRT_INLINE long long llrintf(_In_ float x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } _Check_return_ __CRT_INLINE long long llrintl(_In_ long double x) { return (long long)((x < 0) ? (x - 0.5f) : (x + 0.5)); } _Check_return_ __CRT_INLINE double log2(_In_ double x) { return log(x) / log(2); } +#endif /* !_CRTBLD */ #ifndef NO_OLDNAMES /* !__STDC__ */ diff --git a/sdk/lib/crt/math/round.c b/sdk/lib/crt/math/round.c new file mode 100644 index 00000000000..36eec2dd776 --- /dev/null +++ b/sdk/lib/crt/math/round.c @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Portable implementation of round + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <math.h> + +double round(double arg) +{ + if (arg < 0.0) + return ceil(arg - 0.5); + else + return floor(arg + 0.5); +} diff --git a/sdk/lib/crt/math/roundf.c b/sdk/lib/crt/math/roundf.c new file mode 100644 index 00000000000..454484a649e --- /dev/null +++ b/sdk/lib/crt/math/roundf.c @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT library + * PURPOSE: Portable implementation of roundf + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <math.h> + +float roundf(float arg) +{ + if (arg < 0.0) + return ceilf(arg - 0.5); + else + return floorf(arg + 0.5); +} diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index e8acbd7e2ca..272d844252e 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -13,6 +13,8 @@ list(APPEND MSVCRTEX_SOURCE if(CMAKE_C_COMPILER_ID STREQUAL "Clang") # Clang performs some optimizations requiring those funtions list(APPEND MSVCRTEX_SOURCE + math/round.c + math/roundf.c math/exp2.c math/exp2f.c )

2 years, 3 months

[reactos] 01/01: [GITHUB] Fix LLVM version for the clang-cl build (#4578)

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83faa2da5ee5925d18308… commit 83faa2da5ee5925d18308649a1d7f3a5037af7ca Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jul 16 16:10:56 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 16 16:10:56 2022 +0300 [GITHUB] Fix LLVM version for the clang-cl build (#4578) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50f2c5ac91b..e10e19c50ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,7 +225,7 @@ jobs: run: choco install -y ninja - name: Install LLVM run: | - choco install -y llvm + choco install -y --allow-downgrade llvm --version 13.0.1 echo "LLVM_PATH=${env:PROGRAMFILES}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Install Flex & Bison run: |

2 years, 3 months

[reactos] 02/02: [NTOS:KE/x64] Handle user faults in KiGeneralProtectionFaultHandler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45f75d5d320caf7ab1113… commit 45f75d5d320caf7ab1113f0a2cf7c853e9ad4216 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 26 18:49:47 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jul 14 18:35:28 2022 +0200 [NTOS:KE/x64] Handle user faults in KiGeneralProtectionFaultHandler --- ntoskrnl/ke/amd64/except.c | 190 ++++++++++++++++++++++++++++++++++++++++++--- ntoskrnl/ke/amd64/trap.S | 16 +++- sdk/lib/rtl/amd64/unwind.c | 7 +- 3 files changed, 198 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/ke/amd64/except.c b/ntoskrnl/ke/amd64/except.c index dfaee9ed3cc..a04d3038bd9 100644 --- a/ntoskrnl/ke/amd64/except.c +++ b/ntoskrnl/ke/amd64/except.c @@ -425,6 +425,184 @@ KiNpxNotAvailableFaultHandler( return -1; } +static +BOOLEAN +KiIsPrivilegedInstruction(PUCHAR Ip, BOOLEAN Wow64) +{ + ULONG i; + + /* Handle prefixes */ + for (i = 0; i < 15; i++) + { + if (!Wow64) + { + /* Check for REX prefix */ + if ((Ip[0] >= 0x40) && (Ip[0] <= 0x4F)) + { + Ip++; + continue; + } + } + + switch (Ip[0]) + { + /* Check prefixes */ + case 0x26: // ES + case 0x2E: // CS / null + case 0x36: // SS + case 0x3E: // DS + case 0x64: // FS + case 0x65: // GS + case 0x66: // OP + case 0x67: // ADDR + case 0xF0: // LOCK + case 0xF2: // REP + case 0xF3: // REP INS/OUTS + Ip++; + continue; + } + + break; + } + + if (i == 15) + { + /* Too many prefixes. Should only happen, when the code was concurrently modified. */ + return FALSE; + } + + switch (Ip[0]) + { + case 0xF4: // HLT + case 0xFA: // CLI + case 0xFB: // STI + return TRUE; + + case 0x0F: + { + switch (Ip[1]) + { + case 0x06: // CLTS + case 0x07: // SYSRET + case 0x08: // INVD + case 0x09: // WBINVD + case 0x20: // MOV CR, XXX + case 0x21: // MOV DR, XXX + case 0x22: // MOV XXX, CR + case 0x23: // MOV YYY, DR + case 0x30: // WRMSR + case 0x32: // RDMSR + case 0x33: // RDPMC + case 0x35: // SYSEXIT + case 0x78: // VMREAD + case 0x79: // VMWRITE + return TRUE; + + case 0x00: + { + /* Check MODRM Reg field */ + switch ((Ip[2] >> 3) & 0x7) + { + case 2: // LLDT + case 3: // LTR + return TRUE; + } + break; + } + + case 0x01: + { + switch (Ip[2]) + { + case 0xC1: // VMCALL + case 0xC2: // VMLAUNCH + case 0xC3: // VMRESUME + case 0xC4: // VMXOFF + case 0xC8: // MONITOR + case 0xC9: // MWAIT + case 0xD1: // XSETBV + case 0xF8: // SWAPGS + return TRUE; + } + + /* Check MODRM Reg field */ + switch ((Ip[2] >> 3) & 0x7) + { + case 2: // LGDT + case 3: // LIDT + case 6: // LMSW + case 7: // INVLPG / SWAPGS / RDTSCP + return TRUE; + } + break; + } + + case 0x38: + { + switch (Ip[2]) + { + case 0x80: // INVEPT + case 0x81: // INVVPID + return TRUE; + } + break; + } + + case 0xC7: + { + /* Check MODRM Reg field */ + switch ((Ip[2] >> 3) & 0x7) + { + case 0x06: // VMPTRLD, VMCLEAR, VMXON + case 0x07: // VMPTRST + return TRUE; + } + break; + } + } + + break; + } + } + + return FALSE; +} + +static +NTSTATUS +KiGeneralProtectionFaultUserMode( + _In_ PKTRAP_FRAME TrapFrame) +{ + BOOLEAN Wow64 = TrapFrame->SegCs == KGDT64_R3_CMCODE; + PUCHAR InstructionPointer; + NTSTATUS Status; + + /* We need to decode the instruction at RIP */ + InstructionPointer = (PUCHAR)TrapFrame->Rip; + + _SEH2_TRY + { + /* Probe the instruction address */ + ProbeForRead(InstructionPointer, 64, 1); + + /* Check if it's a privileged instruction */ + if (KiIsPrivilegedInstruction(InstructionPointer, Wow64)) + { + Status = STATUS_PRIVILEGED_INSTRUCTION; + } + else + { + Status = STATUS_ACCESS_VIOLATION; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + return Status; +} NTSTATUS NTAPI @@ -436,8 +614,7 @@ KiGeneralProtectionFaultHandler( /* Check for user-mode GPF */ if (TrapFrame->SegCs & 3) { - UNIMPLEMENTED; - ASSERT(FALSE); + return KiGeneralProtectionFaultUserMode(TrapFrame); } /* Check for lazy segment load */ @@ -454,15 +631,6 @@ KiGeneralProtectionFaultHandler( return STATUS_SUCCESS; } - /* Check for nested exception */ - if ((TrapFrame->Rip >= (ULONG64)KiGeneralProtectionFaultHandler) && - (TrapFrame->Rip < (ULONG64)KiGeneralProtectionFaultHandler)) - { - /* Not implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); - } - /* Get Instruction Pointer */ Instructions = (PUCHAR)TrapFrame->Rip; diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 1598cef290c..644b4c2032d 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -285,7 +285,7 @@ KiInvalidOpcodeKernel: /* Kernel mode fault */ /* Dispatch the exception */ - DispatchException STATUS_ILLEGAL_INSTRUCTION, 3, 0, 0, 0 + DispatchException STATUS_ILLEGAL_INSTRUCTION, 0, 0, 0, 0 /* Return */ ExitTrap TF_SAVE_ALL @@ -385,8 +385,18 @@ FUNC KiGeneralProtectionFault test eax, eax jge KiGpfExit - /* Dispatch the exception */ - DispatchException eax, 3, 0, 0, 0 + /* Check for access violation */ + cmp eax, STATUS_ACCESS_VIOLATION + je DispatchAccessViolation + + /* Dispatch privileged instruction fault */ + DispatchException eax, 0, 0, 0, 0 + jmp KiGpfFatal + +DispatchAccessViolation: + + /* Dispatch access violation */ + DispatchException eax, 2, 0, -1, 0 KiGpfFatal: diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 49e3740bec4..619d31b6bb9 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -701,9 +701,15 @@ RtlpUnwindInternal( Note: this can happen after the first frame as the result of an exception */ UnwindContext.Rip = *(DWORD64*)UnwindContext.Rsp; UnwindContext.Rsp += sizeof(DWORD64); + + /* Copy the context back for the next iteration */ + *ContextRecord = UnwindContext; continue; } + /* Save Rip before the virtual unwind */ + DispatcherContext.ControlPc = UnwindContext.Rip; + /* Do a virtual unwind to get the next frame */ ExceptionRoutine = RtlVirtualUnwind(HandlerType, ImageBase, @@ -749,7 +755,6 @@ RtlpUnwindInternal( sizeof(DispatcherContext)); /* Set up the variable fields of the dispatcher context */ - DispatcherContext.ControlPc = ContextRecord->Rip; DispatcherContext.ImageBase = ImageBase; DispatcherContext.FunctionEntry = FunctionEntry; DispatcherContext.LanguageHandler = ExceptionRoutine;

2 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2022