Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/02: [ACPPAGE] Update Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=400a42458c93ffe47f6ff… commit 400a42458c93ffe47f6ff6b0fcfd2c7cc9b05a39 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Mar 20 18:46:29 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Mar 20 23:49:03 2019 +0100 [ACPPAGE] Update Russian translation Addendum to ab3451a. --- dll/shellext/acppage/lang/ru-RU.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/acppage/lang/ru-RU.rc b/dll/shellext/acppage/lang/ru-RU.rc index 7058656539..a3275cb9a6 100644 --- a/dll/shellext/acppage/lang/ru-RU.rc +++ b/dll/shellext/acppage/lang/ru-RU.rc @@ -15,7 +15,7 @@ BEGIN CHECKBOX "Использовать 256 цветов", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Использовать разрешение экрана 640x480", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Отключить визуальное оформление", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - PUSHBUTTON "Настроить режимы совместимости...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + PUSHBUTTON "Настроить режимы совместимости...", IDC_EDITCOMPATIBILITYMODES, 82, 167, 135, 15 LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 CONTROL "Узнать больше о <A>совместимости программ</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END @@ -32,8 +32,8 @@ BEGIN PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED PUSHBUTTON "&OK",IDOK,174,114,60,14 PUSHBUTTON "&Отмена",IDCANCEL,240,114,60,14 - LTEXT "Available modes",-1,6,6,52,8 - LTEXT "Selected modes",-1,168,6,51,8 + LTEXT "Доступные режимы",-1,6,6,68,8 + LTEXT "Выбранные режимы",-1,168,6,68,8 END STRINGTABLE

5 years, 9 months

[reactos] 01/01: [SYSDM] Add some strings that will be used in the user profile dialog.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71f84a3b130b7e1059694… commit 71f84a3b130b7e10596946d6e4589be9ed5a3c77 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Mar 19 23:17:12 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Mar 19 23:19:41 2019 +0100 [SYSDM] Add some strings that will be used in the user profile dialog. --- dll/cpl/sysdm/lang/bg-BG.rc | 5 +++++ dll/cpl/sysdm/lang/cs-CZ.rc | 5 +++++ dll/cpl/sysdm/lang/da-DK.rc | 5 +++++ dll/cpl/sysdm/lang/de-DE.rc | 5 +++++ dll/cpl/sysdm/lang/el-GR.rc | 5 +++++ dll/cpl/sysdm/lang/en-US.rc | 5 +++++ dll/cpl/sysdm/lang/es-ES.rc | 5 +++++ dll/cpl/sysdm/lang/fr-FR.rc | 5 +++++ dll/cpl/sysdm/lang/he-IL.rc | 5 +++++ dll/cpl/sysdm/lang/hu-HU.rc | 5 +++++ dll/cpl/sysdm/lang/id-ID.rc | 5 +++++ dll/cpl/sysdm/lang/it-IT.rc | 5 +++++ dll/cpl/sysdm/lang/ja-JP.rc | 5 +++++ dll/cpl/sysdm/lang/nl-NL.rc | 5 +++++ dll/cpl/sysdm/lang/no-NO.rc | 5 +++++ dll/cpl/sysdm/lang/pl-PL.rc | 5 +++++ dll/cpl/sysdm/lang/ro-RO.rc | 5 +++++ dll/cpl/sysdm/lang/ru-RU.rc | 5 +++++ dll/cpl/sysdm/lang/sk-SK.rc | 5 +++++ dll/cpl/sysdm/lang/sq-AL.rc | 5 +++++ dll/cpl/sysdm/lang/sv-SE.rc | 5 +++++ dll/cpl/sysdm/lang/tr-TR.rc | 5 +++++ dll/cpl/sysdm/lang/uk-UA.rc | 5 +++++ dll/cpl/sysdm/lang/zh-CN.rc | 5 +++++ dll/cpl/sysdm/lang/zh-TW.rc | 5 +++++ dll/cpl/sysdm/resource.h | 45 +++++++++++++++++++++++++-------------------- 26 files changed, 150 insertions(+), 20 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index fb37dd5cda..b8c362698f 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Вид" IDS_USERPROFILE_STATUS "Състояние" IDS_USERPROFILE_MODIFIED "Изменен" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Приложение за таблото за управление на уредбата" IDS_WARNINITIALSIZE "Въведете числена стойност за началния размер на страниращия файл." IDS_WARNMAXIMUMSIZE "Въведете числена стойност за върховия размер на страниращия файл." diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 3837c27381..d49c90479d 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -300,6 +300,11 @@ BEGIN IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Stav" IDS_USERPROFILE_MODIFIED "Upraveno" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Systémový aplet kontrolních panelů" IDS_WARNINITIALSIZE "Zadejte číselnou hodnotu pro počáteční velikost stránkovacího souboru." IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost stránkovacího souboru." diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 103e281508..f1de9a57c0 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 823c372bd5..e36fe0d2ac 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -304,6 +304,11 @@ BEGIN IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Geändert" + IDS_USERPROFILE_LOCAL "Lokal" + IDS_USERPROFILE_ROAMING "Servergespeichert" + IDS_USERPROFILE_MANDATORY "Obligatorisch" + IDS_USERPROFILE_CONFIRM_DELETE "Soll das Profil für folgenden Benutzer gelöscht werden: %s?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Löschen bestätigen" IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index e39ca8b53a..0ce6b37bfa 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Τύπος" IDS_USERPROFILE_STATUS "Κατάσταση" IDS_USERPROFILE_MODIFIED "Τροποποιήθηκε" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index c97e4e1200..40cffc4565 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index edd88a10e1..70d8949b35 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -297,6 +297,11 @@ BEGIN IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Estado" IDS_USERPROFILE_MODIFIED "Modificado" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Applet de sistema del Panel de control" IDS_WARNINITIALSIZE "Introduzca el tamaño inicial del archivo de paginación." IDS_WARNMAXIMUMSIZE "Introduzca el tamaño máximo del archivo de paginación." diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index d802ef2a3a..77bc345257 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Statut" IDS_USERPROFILE_MODIFIED "Modifié" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Entrez une valeur numérique pour la taille initiale du fichier d'échange." IDS_WARNMAXIMUMSIZE "Entrez une valeur numérique pour la taille maximale du fichier d'échange." diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 484b1d2466..a239fe0efc 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -297,6 +297,11 @@ BEGIN IDS_USERPROFILE_TYPE "סוג" IDS_USERPROFILE_STATUS "מצב" IDS_USERPROFILE_MODIFIED "שונה" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index a5e947540a..3ac63d7e51 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -297,6 +297,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index ee8c01d702..2c043e95b3 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index fb0440f20a..56cca496e0 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Stato" IDS_USERPROFILE_MODIFIED "Modificato" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging." diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index d9fd5ab814..f903c6d9b5 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "種類" IDS_USERPROFILE_STATUS "状態" IDS_USERPROFILE_MODIFIED "変更日" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 39695f63e0..f996b289e8 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index c6e208b476..00abf6dbf3 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modifisert" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 4a312434b0..03c5e247ce 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -304,6 +304,11 @@ BEGIN IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Stan" IDS_USERPROFILE_MODIFIED "Zmodyfikowano" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System" IDS_WARNINITIALSIZE "Wprowadź wielkość dla początkowego rozmiaru pliku stronicowania." IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku stronicowania." diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index aad4895d74..37420a4ace 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -304,6 +304,11 @@ BEGIN IDS_USERPROFILE_TYPE "Tip" IDS_USERPROFILE_STATUS "Stare" IDS_USERPROFILE_MODIFIED "Modificat" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Specificare valori de sistem" IDS_WARNINITIALSIZE "Introduceți o valoare numerică pentru dimensiunea inițială a fișierului de paginare." IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă a fișierului de paginare." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 0cb0522e69..173b0b921c 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Тип" IDS_USERPROFILE_STATUS "Состояние" IDS_USERPROFILE_MODIFIED "Изменен" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки." diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index a3fb6402c2..905a4ded47 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -303,6 +303,11 @@ BEGIN IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Stav" IDS_USERPROFILE_MODIFIED "Modifikovaný" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index ca6f45162d..f187550aac 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -295,6 +295,11 @@ BEGIN IDS_USERPROFILE_TYPE "Tipi" IDS_USERPROFILE_STATUS "Gjëndje" IDS_USERPROFILE_MODIFIED "Modifikuar" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Sistemi i kontrollit panelit programeve" IDS_WARNINITIALSIZE "Futni një vlerë numerike për madhësinë fillestare e faqeve të dokumentave." IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e faqeve të dokumentave." diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index d7b22afbca..a801e2f178 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -297,6 +297,11 @@ BEGIN IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Ändrad" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 2e1b180c2b..ea5bd2f7c4 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -297,6 +297,11 @@ BEGIN IDS_USERPROFILE_TYPE "Tür" IDS_USERPROFILE_STATUS "Durum" IDS_USERPROFILE_MODIFIED "Değiştirilmiş" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "Dizge Denetim Masası Uygulaması" IDS_WARNINITIALSIZE "Sayfalama kütüğünün başlangıç büyüklüğü için bir sayılık değer giriniz." IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün en çok büyüklüğü için bir sayılık değer giriniz." diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index bb5ddfa9f1..c09f514044 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -303,6 +303,11 @@ BEGIN IDS_USERPROFILE_TYPE "Тип" IDS_USERPROFILE_STATUS "Стан" IDS_USERPROFILE_MODIFIED "Змінено" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "System control panel applet" IDS_WARNINITIALSIZE "Введіть числове значення для початкового розміру файлу довантаження." IDS_WARNMAXIMUMSIZE "Введіть числове значення для максимального розміру файлу довантаження." diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 8069f29834..24c0b8106c 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -298,6 +298,11 @@ BEGIN IDS_USERPROFILE_TYPE "类型" IDS_USERPROFILE_STATUS "状态" IDS_USERPROFILE_MODIFIED "修改" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 1e60657a97..b0a96bd2bb 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -298,6 +298,11 @@ BEGIN IDS_USERPROFILE_TYPE "類型" IDS_USERPROFILE_STATUS "狀態" IDS_USERPROFILE_MODIFIED "修改" + IDS_USERPROFILE_LOCAL "Local" + IDS_USERPROFILE_ROAMING "Roaming" + IDS_USERPROFILE_MANDATORY "Mandatory" + IDS_USERPROFILE_CONFIRM_DELETE "Are you sure you want to delete %s's profile?" + IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Confirm Delete" IDS_MESSAGEBOXTITLE "系統控制面板小程序" IDS_WARNINITIALSIZE "爲分頁文件的初始大小輸入一個數字值。" IDS_WARNMAXIMUMSIZE "爲分頁文件的最大大小輸入一個數字值。" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 26645d023f..c920876d11 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -33,26 +33,31 @@ #define IDS_USERPROFILE_TYPE 74 #define IDS_USERPROFILE_STATUS 75 #define IDS_USERPROFILE_MODIFIED 76 - -#define IDS_MESSAGEBOXTITLE 77 -#define IDS_WARNINITIALSIZE 78 -#define IDS_WARNMAXIMUMSIZE 79 -#define IDS_WARNINITIALRANGE 80 -#define IDS_WARNMAXIMUMRANGE 81 -#define IDS_PAGEFILE_NONE 82 -#define IDS_PAGEFILE_SYSTEM 83 -#define IDS_INFOREBOOT 84 - -#define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 85 -#define IDS_HWPROFILE_CONFIRM_DELETE 86 -#define IDS_HWPROFILE_ALREADY_IN_USE 87 -#define IDS_HWPROFILE_PROFILE 88 -#define IDS_HWPROFILE_WARNING 89 - -#define IDS_MEGAHERTZ 90 -#define IDS_GIGAHERTZ 91 - -#define IDS_UPTIME_FORMAT 92 +#define IDS_USERPROFILE_LOCAL 77 +#define IDS_USERPROFILE_ROAMING 78 +#define IDS_USERPROFILE_MANDATORY 79 +#define IDS_USERPROFILE_CONFIRM_DELETE 80 +#define IDS_USERPROFILE_CONFIRM_DELETE_TITLE 81 + +#define IDS_MESSAGEBOXTITLE 82 +#define IDS_WARNINITIALSIZE 83 +#define IDS_WARNMAXIMUMSIZE 84 +#define IDS_WARNINITIALRANGE 85 +#define IDS_WARNMAXIMUMRANGE 86 +#define IDS_PAGEFILE_NONE 87 +#define IDS_PAGEFILE_SYSTEM 88 +#define IDS_INFOREBOOT 89 + +#define IDS_HWPROFILE_CONFIRM_DELETE_TITLE 90 +#define IDS_HWPROFILE_CONFIRM_DELETE 91 +#define IDS_HWPROFILE_ALREADY_IN_USE 92 +#define IDS_HWPROFILE_PROFILE 93 +#define IDS_HWPROFILE_WARNING 94 + +#define IDS_MEGAHERTZ 95 +#define IDS_GIGAHERTZ 96 + +#define IDS_UPTIME_FORMAT 97 /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100

5 years, 9 months

[reactos] 01/01: [MSI] Allow to pass product key validation check

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e05f5509c4baa4df9d54… commit 8e05f5509c4baa4df9d543620d5da9552c18f25f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Mar 18 01:14:46 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 19 23:05:57 2019 +0100 [MSI] Allow to pass product key validation check CORE-14710 CORE-15864 --- dll/win32/msi/action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index 3909246869..0eef96a89c 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -7448,7 +7448,11 @@ UINT msi_validate_product_id( MSIPACKAGE *package ) if (key && template) { FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); +#ifdef __REACTOS__ + WARN("Product key validation HACK, see CORE-14710\n"); +#else r = msi_set_property( package->db, szProductID, key, -1 ); +#endif } msi_free( template ); msi_free( key );

5 years, 9 months

[reactos] 01/01: [SAMSRV] Update Chinese translation

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4785291ff3b1616e2ad8a… commit 4785291ff3b1616e2ad8ac4b796a4659a3256add Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Mar 18 21:42:36 2019 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 19 23:05:34 2019 +0100 [SAMSRV] Update Chinese translation --- dll/win32/samsrv/lang/zh-CN.rc | 9 +++++---- dll/win32/samsrv/lang/zh-TW.rc | 15 ++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dll/win32/samsrv/lang/zh-CN.rc b/dll/win32/samsrv/lang/zh-CN.rc index a15600a36d..e5d863d33a 100644 --- a/dll/win32/samsrv/lang/zh-CN.rc +++ b/dll/win32/samsrv/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -10,11 +11,11 @@ BEGIN IDS_ALIAS_ADMINISTRATORS_NAME "管理员" IDS_ALIAS_ADMINISTRATORS_COMMENT "管理员可以无限制地访问计算机或域。" IDS_ALIAS_GUESTS_NAME "来宾" - IDS_ALIAS_GUESTS_COMMENT "来宾在默认情况下享有同样的权利的用户组的成员。" - IDS_ALIAS_POWER_USERS_NAME "超级用户" - IDS_ALIAS_POWER_USERS_COMMENT "超级用户有大多数行政权利有一些限制条件。" + IDS_ALIAS_GUESTS_COMMENT "来宾在默认情况下权限与“用户”组相同。" + IDS_ALIAS_POWER_USERS_NAME "高级用户" + IDS_ALIAS_POWER_USERS_COMMENT "高级用户拥有大多数管理权限，但存在一些限制。" IDS_ALIAS_USERS_NAME "用户" - IDS_ALIAS_USERS_COMMENT "防止用户进行全系统更改。" + IDS_ALIAS_USERS_COMMENT "防止用户进行对系统进行全面更改。" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/zh-TW.rc b/dll/win32/samsrv/lang/zh-TW.rc index 1621bd6b51..01d85d0935 100644 --- a/dll/win32/samsrv/lang/zh-TW.rc +++ b/dll/win32/samsrv/lang/zh-TW.rc @@ -1,4 +1,5 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -8,20 +9,20 @@ BEGIN IDS_GROUP_NONE_NAME "無" IDS_GROUP_NONE_COMMENT "普通使用者" IDS_ALIAS_ADMINISTRATORS_NAME "管理員" - IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問電腦或域。" + IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問電腦或網域。" IDS_ALIAS_GUESTS_NAME "來賓" - IDS_ALIAS_GUESTS_COMMENT "來賓在默認情況下享有同樣的權利的使用者組的成員。" - IDS_ALIAS_POWER_USERS_NAME "超級使用者" - IDS_ALIAS_POWER_USERS_COMMENT "超級使用者有大多數行政權利有一些限制條件。" + IDS_ALIAS_GUESTS_COMMENT "來賓在預設情況下權限與[使用者]群組相同，" + IDS_ALIAS_POWER_USERS_NAME "進階使用者" + IDS_ALIAS_POWER_USERS_COMMENT "進階使用者擁有大多數管理權限，但存在一些限制。" IDS_ALIAS_USERS_NAME "使用者" - IDS_ALIAS_USERS_COMMENT "防止使用者進行全系統更改。" + IDS_ALIAS_USERS_COMMENT "防止使用者對系統進行全面變更。" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. */ IDS_USER_ADMINISTRATOR_NAME "Administrator" - IDS_USER_ADMINISTRATOR_COMMENT "用於管理電腦或域的內建帳戶。" + IDS_USER_ADMINISTRATOR_COMMENT "用於管理電腦或網域的內建帳戶。" IDS_USER_GUEST_NAME "來賓" - IDS_USER_GUEST_COMMENT "來賓訪問電腦或域的內建帳戶。" + IDS_USER_GUEST_COMMENT "用於來賓存取電腦或網域的內建帳戶。" END

5 years, 9 months

[reactos] 01/01: [RICHED20] Simplify MSVC thiscall & stdcall wrappers.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49fbaa758e2bbd42572dc… commit 49fbaa758e2bbd42572dc4b85d922527f65a12f8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 2 15:52:13 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 19 21:19:20 2019 +0100 [RICHED20] Simplify MSVC thiscall & stdcall wrappers. Imports Wine commit b64511c00a5. --- dll/win32/riched20/CMakeLists.txt | 4 -- dll/win32/riched20/msvc-thiscall.c | 121 ------------------------------- dll/win32/riched20/msvc.h | 143 ------------------------------------- dll/win32/riched20/txthost.c | 23 ++++++ dll/win32/riched20/txtsrv.c | 12 ++++ 5 files changed, 35 insertions(+), 268 deletions(-) diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 36f96fe924..d7ed37de70 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -25,10 +25,6 @@ list(APPEND SOURCE writer.c precomp.h) -if(MSVC AND (ARCH STREQUAL "i386")) - list(APPEND SOURCE msvc-thiscall.c) -endif() - list(APPEND riched20_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/riched_tom.rgs ${CMAKE_CURRENT_BINARY_DIR}/riched_tom.tlb) diff --git a/dll/win32/riched20/msvc-thiscall.c b/dll/win32/riched20/msvc-thiscall.c deleted file mode 100644 index 21669a604b..0000000000 --- a/dll/win32/riched20/msvc-thiscall.c +++ /dev/null @@ -1,121 +0,0 @@ -#include "editor.h" - -#define DEFINE_THISCALL_WRAPPER(func,args) \ - typedef struct {int x[args/4];} _tag_##func; \ - void __stdcall func(_tag_##func p1); \ - __declspec(naked) void __thiscall_##func(_tag_##func p1) \ - { \ - __asm pop eax \ - __asm push ecx \ - __asm push eax \ - __asm jmp func \ - } - -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) - -#define DEFINE_STDCALL_WRAPPER(num,func,args) \ - __declspec(naked) void __stdcall_##func(_tag_##func p1) \ - { \ - __asm pop eax \ - __asm pop ecx \ - __asm push eax \ - __asm mov eax, [ecx] \ - __asm jmp dword ptr [eax + 4*num] \ - } - -DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) -DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) -DEFINE_STDCALL_WRAPPER(5,ITextHostImpl_TxShowScrollBar,12) -DEFINE_STDCALL_WRAPPER(6,ITextHostImpl_TxEnableScrollBar,12) -DEFINE_STDCALL_WRAPPER(7,ITextHostImpl_TxSetScrollRange,20) -DEFINE_STDCALL_WRAPPER(8,ITextHostImpl_TxSetScrollPos,16) -DEFINE_STDCALL_WRAPPER(9,ITextHostImpl_TxInvalidateRect,12) -DEFINE_STDCALL_WRAPPER(10,ITextHostImpl_TxViewChange,8) -DEFINE_STDCALL_WRAPPER(11,ITextHostImpl_TxCreateCaret,16) -DEFINE_STDCALL_WRAPPER(12,ITextHostImpl_TxShowCaret,8) -DEFINE_STDCALL_WRAPPER(13,ITextHostImpl_TxSetCaretPos,12) -DEFINE_STDCALL_WRAPPER(14,ITextHostImpl_TxSetTimer,12) -DEFINE_STDCALL_WRAPPER(15,ITextHostImpl_TxKillTimer,8) -DEFINE_STDCALL_WRAPPER(16,ITextHostImpl_TxScrollWindowEx,32) -DEFINE_STDCALL_WRAPPER(17,ITextHostImpl_TxSetCapture,8) -DEFINE_STDCALL_WRAPPER(18,ITextHostImpl_TxSetFocus,4) -DEFINE_STDCALL_WRAPPER(19,ITextHostImpl_TxSetCursor,12) -DEFINE_STDCALL_WRAPPER(20,ITextHostImpl_TxScreenToClient,8) -DEFINE_STDCALL_WRAPPER(21,ITextHostImpl_TxClientToScreen,8) -DEFINE_STDCALL_WRAPPER(22,ITextHostImpl_TxActivate,8) -DEFINE_STDCALL_WRAPPER(23,ITextHostImpl_TxDeactivate,8) -DEFINE_STDCALL_WRAPPER(24,ITextHostImpl_TxGetClientRect,8) -DEFINE_STDCALL_WRAPPER(25,ITextHostImpl_TxGetViewInset,8) -DEFINE_STDCALL_WRAPPER(26,ITextHostImpl_TxGetCharFormat,8) -DEFINE_STDCALL_WRAPPER(27,ITextHostImpl_TxGetParaFormat,8) -DEFINE_STDCALL_WRAPPER(28,ITextHostImpl_TxGetSysColor,8) -DEFINE_STDCALL_WRAPPER(29,ITextHostImpl_TxGetBackStyle,8) -DEFINE_STDCALL_WRAPPER(30,ITextHostImpl_TxGetMaxLength,8) -DEFINE_STDCALL_WRAPPER(31,ITextHostImpl_TxGetScrollBars,8) -DEFINE_STDCALL_WRAPPER(32,ITextHostImpl_TxGetPasswordChar,8) -DEFINE_STDCALL_WRAPPER(33,ITextHostImpl_TxGetAcceleratorPos,8) -DEFINE_STDCALL_WRAPPER(34,ITextHostImpl_TxGetExtent,8) -DEFINE_STDCALL_WRAPPER(35,ITextHostImpl_OnTxCharFormatChange,8) -DEFINE_STDCALL_WRAPPER(36,ITextHostImpl_OnTxParaFormatChange,8) -DEFINE_STDCALL_WRAPPER(37,ITextHostImpl_TxGetPropertyBits,12) -DEFINE_STDCALL_WRAPPER(38,ITextHostImpl_TxNotify,12) -DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4) -DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8) -DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8) - -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll,24) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll,24) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor,40) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint,44) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate,4) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurTargetX,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) diff --git a/dll/win32/riched20/msvc.h b/dll/win32/riched20/msvc.h deleted file mode 100644 index bcc603b103..0000000000 --- a/dll/win32/riched20/msvc.h +++ /dev/null @@ -1,143 +0,0 @@ - - -#define __ASM_STDCALL_FUNC(name,args,code) - -#define typeof(X_) __typeof_ ## X_ - -struct HDC__; -struct ITextHost; -struct tagRECT; -struct _RECTL; -struct _charformatw; -struct _paraformat; -struct tagPOINT; -enum _TXTBACKSTYLE; -struct tagSIZE; -struct ITextServices; -struct tagDVTARGETDEVICE; -struct IDropTarget; - -#define WINAPI __stdcall -#define HRESULT int -#define HDC struct HDC__* -#define BOOL int -#define HIMC void* -#define ITextHost struct ITextHost -#define INT int -#define UINT unsigned int -#define HBITMAP void* -#define LPCRECT const struct tagRECT * -#define LPRECT struct tagRECT * -#define LPCRECTL const struct _RECTL* -#define CHARFORMATW struct _charformatw -#define PARAFORMAT struct _paraformat -#define DWORD unsigned int /* HACK */ -#define COLORREF DWORD -#define LONG int /* HACK */ -#define WPARAM unsigned long -#define LPARAM long -#define HRGN void* -#define HCURSOR void* -#define LPPOINT struct tagPOINT* -#define TXTBACKSTYLE enum _TXTBACKSTYLE -#define WCHAR unsigned short -#define BSTR WCHAR* -#define LPCWSTR const WCHAR * -#define SIZEL struct tagSIZE -#define LPSIZEL struct tagSIZE* -#define ITextServices struct ITextServices -#define LRESULT long -#define DVTARGETDEVICE struct tagDVTARGETDEVICE - -typedef HDC (WINAPI typeof(ITextHostImpl_TxGetDC))(ITextHost * iface); -typedef int (WINAPI typeof(ITextHostImpl_TxReleaseDC))(ITextHost *iface,HDC hdc); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxShowScrollBar))(ITextHost *iface,INT fnBar,BOOL fShow); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxEnableScrollBar))(ITextHost *iface,INT fuSBFlags,INT fuArrowflags); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetScrollRange))(ITextHost *iface,INT fnBar,LONG nMinPos,INT nMaxPos,BOOL fRedraw); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetScrollPos))(ITextHost *iface,INT fnBar,INT nPos,BOOL fRedraw); -typedef void (WINAPI typeof(ITextHostImpl_TxInvalidateRect))(ITextHost *iface,LPCRECT prc,BOOL fMode); -typedef void (WINAPI typeof(ITextHostImpl_TxViewChange))(ITextHost *iface,BOOL fUpdate); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxCreateCaret))(ITextHost *iface,HBITMAP hbmp,INT xWidth, INT yHeight); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxShowCaret))(ITextHost *iface, BOOL fShow); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetCaretPos))(ITextHost *iface,INT x, INT y); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxSetTimer))(ITextHost *iface,UINT idTimer, UINT uTimeout); -typedef void (WINAPI typeof(ITextHostImpl_TxKillTimer))(ITextHost *iface,UINT idTimer); -typedef void (WINAPI typeof(ITextHostImpl_TxScrollWindowEx))(ITextHost *iface,INT dx, INT dy,LPCRECT lprcScroll,LPCRECT lprcClip,HRGN hRgnUpdate,LPRECT lprcUpdate,UINT fuScroll); -typedef void (WINAPI typeof(ITextHostImpl_TxSetCapture))(ITextHost *iface,BOOL fCapture); -typedef void (WINAPI typeof(ITextHostImpl_TxSetFocus))(ITextHost *iface); -typedef void (WINAPI typeof(ITextHostImpl_TxSetCursor))(ITextHost *iface,HCURSOR hcur,BOOL fText); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxScreenToClient))(ITextHost *iface,LPPOINT lppt); -typedef BOOL (WINAPI typeof(ITextHostImpl_TxClientToScreen))(ITextHost *iface,LPPOINT lppt); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxActivate))(ITextHost *iface,LONG *plOldState); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxDeactivate))(ITextHost *iface,LONG lNewState); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetClientRect))(ITextHost *iface,LPRECT prc); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetViewInset))(ITextHost *iface,LPRECT prc); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetCharFormat))(ITextHost *iface,const CHARFORMATW **ppCF); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetParaFormat))(ITextHost *iface,const PARAFORMAT **ppPF); -typedef COLORREF (WINAPI typeof(ITextHostImpl_TxGetSysColor))(ITextHost *iface,int nIndex); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetBackStyle))(ITextHost *iface,TXTBACKSTYLE *pStyle); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetMaxLength))(ITextHost *iface,DWORD *pLength); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetScrollBars))(ITextHost *iface,DWORD *pdwScrollBar); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetPasswordChar))(ITextHost *iface,WCHAR *pch); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetAcceleratorPos))(ITextHost *iface,LONG *pch); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetExtent))(ITextHost *iface,LPSIZEL lpExtent); -typedef HRESULT (WINAPI typeof(ITextHostImpl_OnTxCharFormatChange))(ITextHost *iface,const CHARFORMATW *pcf); -typedef HRESULT (WINAPI typeof(ITextHostImpl_OnTxParaFormatChange))(ITextHost *iface,const PARAFORMAT *ppf); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetPropertyBits))(ITextHost *iface,DWORD dwMask,DWORD *pdwBits); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxNotify))(ITextHost *iface,DWORD iNotify,void *pv); -typedef HIMC (WINAPI typeof(ITextHostImpl_TxImmGetContext))(ITextHost *iface); -typedef void (WINAPI typeof(ITextHostImpl_TxImmReleaseContext))(ITextHost *iface,HIMC himc); -typedef HRESULT (WINAPI typeof(ITextHostImpl_TxGetSelectionBarWidth))(ITextHost *iface,LONG *lSelBarWidth); - -typedef HRESULT (WINAPI typeof(fnTextSrv_TxSendMessage))(ITextServices *iface,UINT msg,WPARAM wparam,LPARAM lparam,LRESULT* plresult); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxDraw))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hdcTargetDev,LPCRECTL lprcBounds,LPCRECTL lprcWBounds,LPRECT lprcUpdate,BOOL (__stdcall * pfnContinue)(DWORD),DWORD dwContinue,LONG lViewId); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetHScroll))(ITextServices *iface,LONG* plMin,LONG* plMax,LONG* plPos,LONG* plPage,BOOL* pfEnabled); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetVScroll))(ITextServices *iface,LONG* plMin,LONG* plMax,LONG* plPos,LONG* plPage,BOOL* pfEnabled); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxSetCursor))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hicTargetDev,LPCRECT lprcClient,INT x, INT y); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxQueryHitPoint))(ITextServices *iface,DWORD dwDrawAspect,LONG lindex,void* pvAspect,DVTARGETDEVICE* ptd,HDC hdcDraw,HDC hicTargetDev,LPCRECT lprcClient,INT x, INT y,DWORD* pHitResult); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxInplaceActivate))(ITextServices *iface,LPCRECT prcClient); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxInplaceDeactivate))(ITextServices *iface); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxUIActivate))(ITextServices *iface); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxUIDeactivate))(ITextServices *iface); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetText))(ITextServices *iface,BSTR* pbstrText); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxSetText))(ITextServices *iface,LPCWSTR pszText); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetCurTargetX))(ITextServices *iface,LONG* x); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetBaseLinePos))(ITextServices *iface,LONG* x); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetNaturalSize))(ITextServices *iface,DWORD dwAspect,HDC hdcDraw,HDC hicTargetDev,DVTARGETDEVICE* ptd,DWORD dwMode,const SIZEL* psizelExtent,LONG* pwidth,LONG* pheight); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetDropTarget))(ITextServices *iface,struct IDropTarget** ppDropTarget); -typedef HRESULT (WINAPI typeof(fnTextSrv_OnTxPropertyBitsChange))(ITextServices *iface,DWORD dwMask,DWORD dwBits); -typedef HRESULT (WINAPI typeof(fnTextSrv_TxGetCachedSize))(ITextServices *iface,DWORD* pdwWidth,DWORD* pdwHeight); - -#undef WINAPI -#undef HRESULT -#undef HDC -#undef BOOL -#undef COLORREF -#undef HIMC -#undef ITextHost -#undef INT -#undef UINT -#undef HBITMAP -#undef LPCRECT -#undef LPRECT -#undef LPCRECTL -#undef CHARFORMATW -#undef PARAFORMAT -#undef DWORD -#undef LONG -#undef WPARAM -#undef LPARAM -#undef HRGN -#undef HCURSOR -#undef LPPOINT -#undef TXTBACKSTYLE -#undef WCHAR -#undef BSTR -#undef LPCWSTR -#undef SIZEL -#undef LPSIZEL -#undef ITextServices -#undef LRESULT -#undef DVTARGETDEVICE - -//#undef typeof diff --git a/dll/win32/riched20/txthost.c b/dll/win32/riched20/txthost.c index eaa6aaef06..d709502a1e 100644 --- a/dll/win32/riched20/txthost.c +++ b/dll/win32/riched20/txthost.c @@ -502,6 +502,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -509,6 +519,7 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ #else /* __i386__ */ @@ -560,6 +571,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) #ifdef __i386__ /* thiscall functions are i386-specific */ #define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \ extern HRESULT __stdcall_ ## func(void); \ __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ @@ -568,6 +590,7 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) "pushl %eax\n\t" \ "movl (%ecx), %eax\n\t" \ "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) diff --git a/dll/win32/riched20/txtsrv.c b/dll/win32/riched20/txtsrv.c index 18c2ca9d69..73815fbbd1 100644 --- a/dll/win32/riched20/txtsrv.c +++ b/dll/win32/riched20/txtsrv.c @@ -36,6 +36,16 @@ #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -43,6 +53,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func

5 years, 9 months

[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=343d6ea6dcd19673c5b0c… commit 343d6ea6dcd19673c5b0cf6872e5033abe897be2 Merge: 68df5a50e6 be54b37dd6 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Mar 18 17:30:01 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Mar 18 17:30:01 2019 -0500 Merge branch 'master' of https://github.com/reactos/reactos dll/win32/userenv/profile.c | 102 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 22 deletions(-)

5 years, 9 months

[reactos] 01/02: [NtUser] Support SWP_FRAMECHANGED

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68df5a50e6a4d821ad8cf… commit 68df5a50e6a4d821ad8cf927907a955140500e39 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Mar 18 17:28:33 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Mar 18 17:28:33 2019 -0500 [NtUser] Support SWP_FRAMECHANGED Implement SWP_FRAMECHANGED support for non-changing window to force a redraw. Patch dedicated to Katayama Hirofumi MZ. --- win32ss/user/ntuser/winpos.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 39dbc0c755..66f3530460 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1950,7 +1950,7 @@ co_WinPosSetWindowPos( REGION_UnlockRgn(DcRgnObj); Dc = UserGetDCEx( Window, DcRgn, - DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); + DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); // DCX_WINDOW will set first, go read WinDC.c. NtGdiBitBlt( Dc, CopyRect.left, CopyRect.top, CopyRect.right - CopyRect.left, @@ -1971,19 +1971,43 @@ co_WinPosSetWindowPos( { CopyRgn = NULL; } -#if 0 - /////// Fixes NoPopup tests but breaks msg_paint tests. - if ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore) + + if ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore ) { - PWND Parent = Window->spwndParent; - ERR("SWP_FRAMECHANGED no chg\n"); - if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) + PWND pwnd = Window; + PWND Parent = pwnd->spwndParent; + + TRACE("SWP_FRAMECHANGED no chg\n"); + + if ( pwnd->style & WS_CHILD ) // Fix ProgMan menu bar drawing. { - ERR("SWP_FRAMECHANGED Parent WS_CLIPCHILDREN\n"); - //IntInvalidateWindows( Window, VisBefore, /*RDW_ERASE |*/ RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + TRACE("SWP_FRAMECHANGED win child %p Parent %p\n",pwnd,Parent); + pwnd = Parent ? Parent : pwnd; + } + + if ( !(pwnd->style & WS_CHILD) ) + { + HDC hdc; + HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + PREGION DcRgnObj = REGION_LockRgn(DcRgn); + + TRACE("SWP_FRAMECHANGED Draw\n"); + + IntGdiCombineRgn(DcRgnObj, VisBefore, NULL, RGN_COPY); + REGION_UnlockRgn(DcRgnObj); + + hdc = UserGetDCEx( pwnd, + DcRgn, + DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); // DCX_WINDOW, see note above.... + + NC_DoNCPaint(pwnd, hdc, -1); // Force full redraw of nonclient area. + + UserReleaseDC(pwnd, hdc, FALSE); + IntValidateParent(pwnd, DcRgnObj); + GreDeleteObject(DcRgn); } } -#endif + /* We need to redraw what wasn't visible before */ if (VisAfter != NULL) {

5 years, 9 months

[reactos] 01/01: [USERENV] UnloadUserProfile: When a profiles ref count gets 0, delete the profile if the user is a member of the guests group.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be54b37dd63bd588a13f6… commit be54b37dd63bd588a13f675cbfe96db583946d22 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 18 23:24:06 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 18 23:27:29 2019 +0100 [USERENV] UnloadUserProfile: When a profiles ref count gets 0, delete the profile if the user is a member of the guests group. --- dll/win32/userenv/profile.c | 102 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 6a079076bf..6c9d29ee26 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -1134,7 +1134,7 @@ DeleteProfileA( _In_opt_ LPCSTR lpComputerName) { BOOL bResult; - UNICODE_STRING SidString, ProfilePath, ComputerName; + UNICODE_STRING SidString = {0, 0, NULL}, ProfilePath = {0, 0, NULL}, ComputerName = {0, 0, NULL}; DPRINT("DeleteProfileA() called\n"); @@ -1177,8 +1177,8 @@ DeleteProfileW( _In_opt_ LPCWSTR lpProfilePath, _In_opt_ LPCWSTR lpComputerName) { - DPRINT1("DeleteProfileW() not implemented!\n"); - return FALSE; + DPRINT1("DeleteProfileW(%S %S %S) not implemented!\n", lpSidString, lpProfilePath, lpComputerName); + return TRUE; //FALSE; } @@ -2104,8 +2104,9 @@ UnloadUserProfile( { UNICODE_STRING SidString = {0, 0, NULL}; HANDLE hProfileMutex = NULL; - DWORD dwRefCount = 0; - LONG Error; + HKEY hProfilesKey = NULL, hProfileKey = NULL; + DWORD dwRefCount = 0, dwLength, dwType, dwState = 0; + DWORD dwError; BOOL bRet = FALSE; DPRINT("UnloadUserProfile() called\n"); @@ -2138,24 +2139,25 @@ UnloadUserProfile( WaitForSingleObject(hProfileMutex, INFINITE); /* Close the profile handle */ + RegFlushKey(hProfile); RegCloseKey(hProfile); - Error = DecrementRefCount(SidString.Buffer, &dwRefCount); - if (Error != ERROR_SUCCESS) + dwError = DecrementRefCount(SidString.Buffer, &dwRefCount); + if (dwError != ERROR_SUCCESS) { - DPRINT1("DecrementRefCount() failed (Error %ld)\n", Error); - SetLastError((DWORD)Error); + DPRINT1("DecrementRefCount() failed (Error %lu)\n", dwError); + SetLastError(dwError); goto cleanup; } if (dwRefCount == 0) { - DPRINT1("RefCount is 0: Unload the Hive!\n"); + DPRINT("RefCount is 0: Unload the Hive!\n"); /* Acquire restore privilege */ if (!AcquireRemoveRestorePrivilege(TRUE)) { - DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %lu)\n", GetLastError()); goto cleanup; } @@ -2163,12 +2165,12 @@ UnloadUserProfile( { HKEY hUserKey; - Error = RegOpenKeyExW(HKEY_USERS, - SidString.Buffer, - 0, - KEY_WRITE, - &hUserKey); - if (Error == ERROR_SUCCESS) + dwError = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + KEY_WRITE, + &hUserKey); + if (dwError == ERROR_SUCCESS) { RegDeleteKeyW(hUserKey, L"Volatile Environment"); @@ -2179,23 +2181,79 @@ UnloadUserProfile( /* End of HACK */ /* Unload the hive */ - Error = RegUnLoadKeyW(HKEY_USERS, - SidString.Buffer); + dwError = RegUnLoadKeyW(HKEY_USERS, + SidString.Buffer); /* Remove restore privilege */ AcquireRemoveRestorePrivilege(FALSE); - if (Error != ERROR_SUCCESS) + if (dwError != ERROR_SUCCESS) { - DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error); - SetLastError((DWORD)Error); + DPRINT1("RegUnLoadKeyW() failed (Error %lu)\n", dwError); + SetLastError(dwError); goto cleanup; } + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hProfilesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + goto cleanup; + } + + dwError = RegOpenKeyExW(hProfilesKey, + SidString.Buffer, + 0, + KEY_QUERY_VALUE, + &hProfileKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + goto cleanup; + } + + /* Get the State value */ + dwLength = sizeof(dwState); + dwError = RegQueryValueExW(hProfileKey, + L"State", + NULL, + &dwType, + (PBYTE)&dwState, + &dwLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegQueryValueExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + goto cleanup; + } + + /* Delete a guest profile */ + if (dwState & 0x80) // PROFILE_GUEST_USER + { + if (!DeleteProfileW(SidString.Buffer, NULL, NULL)) + { + DPRINT1("DeleteProfile(%S, NULL, NULL) failed (Error %lu)\n", + SidString.Buffer, GetLastError()); + goto cleanup; + } + } } bRet = TRUE; cleanup: + if (hProfileKey != NULL) + RegCloseKey(hProfileKey); + + if (hProfilesKey != NULL) + RegCloseKey(hProfilesKey); + if (hProfileMutex != NULL) { ReleaseMutex(hProfileMutex);

5 years, 9 months

[reactos] 01/01: [ACPPAGE] Revamp the 'edit' page to easier select different layers

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab3451aea10543d738e23… commit ab3451aea10543d738e23dcbc0b01777dea114b9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 17 13:31:31 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Mar 18 21:24:44 2019 +0100 [ACPPAGE] Revamp the 'edit' page to easier select different layers --- dll/shellext/acppage/CEditCompatModes.cpp | 158 ++++++++++++++++++++++++++++ dll/shellext/acppage/CLayerUIPropPage.cpp | 168 +----------------------------- dll/shellext/acppage/CLayerUIPropPage.hpp | 11 +- dll/shellext/acppage/CMakeLists.txt | 1 + dll/shellext/acppage/lang/bg-BG.rc | 19 ++-- dll/shellext/acppage/lang/cs-CZ.rc | 19 ++-- dll/shellext/acppage/lang/de-DE.rc | 19 ++-- dll/shellext/acppage/lang/en-US.rc | 19 ++-- dll/shellext/acppage/lang/es-ES.rc | 19 ++-- dll/shellext/acppage/lang/eu-ES.rc | 19 ++-- dll/shellext/acppage/lang/fr-FR.rc | 19 ++-- dll/shellext/acppage/lang/he-IL.rc | 20 ++-- dll/shellext/acppage/lang/hi-IN.rc | 19 ++-- dll/shellext/acppage/lang/hu-HU.rc | 19 ++-- dll/shellext/acppage/lang/id-ID.rc | 19 ++-- dll/shellext/acppage/lang/it-IT.rc | 19 ++-- dll/shellext/acppage/lang/nl-NL.rc | 19 ++-- dll/shellext/acppage/lang/no-NO.rc | 19 ++-- dll/shellext/acppage/lang/pl-PL.rc | 19 ++-- dll/shellext/acppage/lang/ro-RO.rc | 19 ++-- dll/shellext/acppage/lang/ru-RU.rc | 19 ++-- dll/shellext/acppage/lang/sk-SK.rc | 19 ++-- dll/shellext/acppage/lang/sq-AL.rc | 19 ++-- dll/shellext/acppage/lang/sv-SE.rc | 19 ++-- dll/shellext/acppage/lang/tr-TR.rc | 19 ++-- dll/shellext/acppage/lang/uk-UA.rc | 19 ++-- dll/shellext/acppage/lang/zh-CN.rc | 19 ++-- dll/shellext/acppage/lang/zh-TW.rc | 19 ++-- dll/shellext/acppage/precomp.h | 2 + dll/shellext/acppage/resource.h | 5 +- 30 files changed, 412 insertions(+), 390 deletions(-) diff --git a/dll/shellext/acppage/CEditCompatModes.cpp b/dll/shellext/acppage/CEditCompatModes.cpp new file mode 100644 index 0000000000..e7b2989f54 --- /dev/null +++ b/dll/shellext/acppage/CEditCompatModes.cpp @@ -0,0 +1,158 @@ +/* + * PROJECT: ReactOS Compatibility Layer Shell Extension + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CEditCompatModes implementation + * COPYRIGHT: Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <windowsx.h> + + +class CEditCompatModes : public CDialogImpl<CEditCompatModes> +{ +private: + CLayerUIPropPage* m_pPage; + HWND m_hListAdd; + HWND m_hListActive; + + CStringW GetListText(HWND ListBox, int Cur) + { + CStringW Str; + int Length = ListBox_GetTextLen(ListBox, Cur); + LPWSTR Buffer = Str.GetBuffer(Length + 1); + ListBox_GetText(ListBox, Cur, Buffer); + Str.ReleaseBuffer(Length); + return Str; + } + +public: + CEditCompatModes(CLayerUIPropPage* page) + : m_pPage(page) + { + m_pPage->AddRef(); + } + + ~CEditCompatModes() + { + m_pPage->Release(); + } + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + CenterWindow(GetParent()); + + m_hListActive = GetDlgItem(IDC_COMPATIBILITYMODE); + m_hListAdd = GetDlgItem(IDC_NEWCOMPATIBILITYMODE); + + CComObject<CLayerStringList> pList; + + while (TRUE) + { + CComHeapPtr<OLECHAR> str; + HRESULT hr = pList.Next(1, &str, NULL); + if (hr != S_OK) + break; + ListBox_AddString(m_hListAdd, str); + } + + for (int n = 0; n < m_pPage->m_CustomLayers.GetSize(); ++n) + { + const WCHAR* Str = m_pPage->m_CustomLayers[n].GetString(); + int Index = ListBox_FindStringExact(m_hListActive, -1, Str); + if (Index == LB_ERR) + Index = ListBox_AddString(m_hListActive, Str); + } + + OnListboxUpdated(0, 0, 0, bHandled); + return 0; + } + + LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + if (wID == IDOK) + { + int Count = ListBox_GetCount(m_hListActive); + m_pPage->m_CustomLayers.RemoveAll(); + for (int Cur = 0; Cur < Count; ++Cur) + { + CString Str = GetListText(m_hListActive, Cur); + m_pPage->m_CustomLayers.Add(Str); + } + } + EndDialog(wID); + return 0; + } + + LRESULT OnAdd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + int Sel = ListBox_GetCurSel(m_hListAdd); + CStringW Str = GetListText(m_hListAdd, Sel); + + int Index = ListBox_FindStringExact(m_hListActive, -1, Str); + if (Index == LB_ERR) + Index = ListBox_AddString(m_hListActive, Str); + + ::SetFocus(m_hListAdd); + return 0; + } + + LRESULT OnRemove(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + int Sel = ListBox_GetCurSel(m_hListActive); + CStringW Str = GetListText(m_hListActive, Sel); + + ListBox_DeleteString(m_hListActive, Sel); + int Index = ListBox_FindStringExact(m_hListAdd, -1, Str); + if (Index != LB_ERR) + Index = ListBox_SetCurSel(m_hListAdd, Index); + OnListboxUpdated(wNotifyCode, wID, hWndCtl, bHandled); + return 0; + } + + LRESULT OnRemoveAll(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + ListBox_ResetContent(m_hListActive); + OnListboxUpdated(wNotifyCode, wID, hWndCtl, bHandled); + return 0; + } + + LRESULT OnListboxUpdated(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + if (m_hListAdd == hWndCtl) + ListBox_SetCurSel(m_hListActive, -1); + else if (m_hListActive == hWndCtl) + ListBox_SetCurSel(m_hListAdd, -1); + + ::EnableWindow(GetDlgItem(IDC_ADD), ListBox_GetCurSel(m_hListAdd) >= 0); + ::EnableWindow(GetDlgItem(IDC_REMOVE), ListBox_GetCurSel(m_hListActive) >= 0); + ::EnableWindow(GetDlgItem(IDC_REMOVEALL), ListBox_GetCount(m_hListActive) > 0); + bHandled = TRUE; + return 0; + } + +public: + enum { IDD = IDD_EDITCOMPATIBILITYMODES }; + + BEGIN_MSG_MAP(CEditCompatModes) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDC_ADD, OnAdd) + COMMAND_ID_HANDLER(IDC_REMOVE, OnRemove) + COMMAND_ID_HANDLER(IDC_REMOVEALL, OnRemoveAll) + + COMMAND_ID_HANDLER(IDOK, OnButton) + COMMAND_ID_HANDLER(IDCANCEL, OnButton) + COMMAND_ID_HANDLER(IDC_COMPATIBILITYMODE, OnListboxUpdated) + COMMAND_ID_HANDLER(IDC_NEWCOMPATIBILITYMODE, OnListboxUpdated) + END_MSG_MAP() +}; + + +BOOL ShowEditCompatModes(HWND hWnd, CLayerUIPropPage* page) +{ + CEditCompatModes modes(page); + INT_PTR Result = modes.DoModal(hWnd); + return Result == IDOK; +} + + diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index fdc34e8bbb..c18caa1dc5 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Compatibility Layer Shell Extension - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CLayerUIPropPage implementation - * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -16,7 +16,6 @@ #include <sfc.h> const GUID CLSID_CLayerUIPropPage = { 0x513D916F, 0x2A8E, 0x4F51, { 0xAE, 0xAB, 0x0C, 0xBC, 0x76, 0xFB, 0x1A, 0xF8 } }; -#define ACP_WNDPROP L"{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}.Prop" #define GPLK_USER 1 #define GPLK_MACHINE 2 @@ -342,7 +341,7 @@ LRESULT CLayerUIPropPage::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, ComboBox_AddString(cboMode, g_CompatModes[n].Display); ComboBox_SetCurSel(cboMode, 5); - CComBSTR explanation; + CStringW explanation; if (!m_AllowPermLayer) { explanation.LoadString(g_hModule, IDS_FAILED_NETWORK); @@ -407,7 +406,7 @@ LRESULT CLayerUIPropPage::OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl LRESULT CLayerUIPropPage::OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - if (DialogBoxParamW(g_hModule, MAKEINTRESOURCEW(IDD_EDITCOMPATIBILITYMODES), m_hWnd, EditModesProc, (LPARAM)this) == IDOK) + if (ShowEditCompatModes(m_hWnd, this)) UpdateControls(); return 0; } @@ -419,165 +418,6 @@ LRESULT CLayerUIPropPage::OnClickNotify(INT uCode, LPNMHDR hdr, BOOL& bHandled) return 0; } -static void ListboxChanged(HWND hWnd) -{ - int Sel = ListBox_GetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE)); - EnableWindow(GetDlgItem(hWnd, IDC_EDIT), Sel >= 0); - EnableWindow(GetDlgItem(hWnd, IDC_DELETE), Sel >= 0); -} - -static void OnAdd(HWND hWnd) -{ - HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - - int Length = ComboBox_GetTextLength(Combo); - CComBSTR Str(Length); - ComboBox_GetText(Combo, Str, Length+1); - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - int Index = ListBox_FindStringExact(List, -1, Str); - if (Index == LB_ERR) - Index = ListBox_AddString(List, Str); - ListBox_SetCurSel(List, Index); - ListboxChanged(hWnd); - ComboBox_SetCurSel(Combo, -1); - SetFocus(Combo); -} - -static BOOL ComboHasData(HWND hWnd) -{ - HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - if (ComboBox_GetCurSel(Combo) >= 0) - return TRUE; - ULONG Len = ComboBox_GetTextLength(Combo); - return Len > 0; -} - -INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - CLayerUIPropPage* page = NULL; - - switch (uMsg) - { - case WM_INITDIALOG: - page = (CLayerUIPropPage*)lParam; - page->AddRef(); - ::SetProp(hWnd, ACP_WNDPROP, page); - { - HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - CComObject<CLayerStringList> pList; - - while (TRUE) - { - CComHeapPtr<OLECHAR> str; - HRESULT hr = pList.Next(1, &str, NULL); - if (hr != S_OK) - break; - ComboBox_AddString(Combo, str); - } - - HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - for (int n = 0; n < page->m_CustomLayers.GetSize(); ++n) - { - const WCHAR* Str = page->m_CustomLayers[n].GetString(); - int Index = ListBox_FindStringExact(List, -1, Str); - if (Index == LB_ERR) - Index = ListBox_AddString(List, Str); - } - } - break; - case WM_ENDSESSION: - case WM_DESTROY: - page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP); - ::RemoveProp(hWnd, ACP_WNDPROP); - page->Release(); - break; - - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_ADD: - OnAdd(hWnd); - break; - case IDC_EDIT: - { - HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - int Cur = ListBox_GetCurSel(List); - int Length = ListBox_GetTextLen(List, Cur); - CComBSTR Str(Length); - ListBox_GetText(List, Cur, Str); - ListBox_DeleteString(List, Cur); - HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - ComboBox_SetCurSel(Combo, -1); - ::SetWindowText(Combo,Str); - ListboxChanged(hWnd); - ComboBox_SetEditSel(Combo, 30000, 30000); - ::SetFocus(Combo); - } - break; - case IDC_DELETE: - { - HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - ListBox_DeleteString(List, ListBox_GetCurSel(List)); - ListboxChanged(hWnd); - } - break; - case IDC_COMPATIBILITYMODE: - ListboxChanged(hWnd); - break; - case IDC_NEWCOMPATIBILITYMODE: - { - ::EnableWindow(::GetDlgItem(hWnd, IDC_ADD), ComboHasData(hWnd)); - } - break; - case IDOK: - /* Copy from list! */ - { - if (ComboHasData(hWnd)) - { - CComBSTR question, title; - title.LoadString(g_hModule, IDS_COMPAT_TITLE); - question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); - int result = ::MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); - switch (result) - { - case IDYES: - OnAdd(hWnd); - break; - case IDNO: - break; - case IDCANCEL: - return FALSE; - } - } - - page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP); - - HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - int Count = ListBox_GetCount(List); - page->m_CustomLayers.RemoveAll(); - for (int Cur = 0; Cur < Count; ++Cur) - { - int Length = ListBox_GetTextLen(List, Cur); - CString Str; - LPWSTR Buffer = Str.GetBuffer(Length + 1); - ListBox_GetText(List, Cur, Buffer); - Str.ReleaseBuffer(Length); - page->m_CustomLayers.Add(Str); - } - } - /* Fall trough */ - case IDCANCEL: - ::EndDialog(hWnd, LOWORD(wParam)); - break; - } - break; - case WM_CLOSE: - ::EndDialog(hWnd, IDCANCEL); - break; - } - return FALSE; -} - static BOOL DisableShellext() { HKEY hkey; diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp b/dll/shellext/acppage/CLayerUIPropPage.hpp index e86e8eb42a..b7886fc8c4 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.hpp +++ b/dll/shellext/acppage/CLayerUIPropPage.hpp @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Compatibility Layer Shell Extension - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CLayerUIPropPage definition - * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -15,6 +15,8 @@ class CLayerUIPropPage : public IShellPropSheetExt { public: + CSimpleArray<CString> m_CustomLayers; + CLayerUIPropPage(); ~CLayerUIPropPage(); @@ -59,9 +61,6 @@ public: LRESULT OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnClickNotify(INT uCode, LPNMHDR hdr, BOOL& bHandled); - static INT_PTR CALLBACK PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static INT_PTR CALLBACK EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - protected: CString m_Filename; BOOL m_IsSfcProtected; @@ -69,7 +68,7 @@ protected: DWORD m_LayerQueryFlags; DWORD m_RegistryOSMode, m_OSMode; DWORD m_RegistryEnabledLayers, m_EnabledLayers; - CSimpleArray<CString> m_RegistryCustomLayers, m_CustomLayers; + CSimpleArray<CString> m_RegistryCustomLayers; public: enum { IDD = IDD_ACPPAGESHEET }; diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt index 1c4c729691..0f16701e3c 100644 --- a/dll/shellext/acppage/CMakeLists.txt +++ b/dll/shellext/acppage/CMakeLists.txt @@ -18,6 +18,7 @@ spec2def(acppage.dll acppage.spec ADD_IMPORTLIB) list(APPEND SOURCE ACPPage.cpp + CEditCompatModes.cpp CLayerUIPropPage.cpp precomp.h) diff --git a/dll/shellext/acppage/lang/bg-BG.rc b/dll/shellext/acppage/lang/bg-BG.rc index 48ba265722..6ed98d199b 100644 --- a/dll/shellext/acppage/lang/bg-BG.rc +++ b/dll/shellext/acppage/lang/bg-BG.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Промяна на режимите за съвместимост" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Добавяне...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Обработка...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "Из&триване", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&Добре", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Отказ", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&Добре",IDOK,174,114,60,14 + PUSHBUTTON "&Отказ",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Съвместимост" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/cs-CZ.rc b/dll/shellext/acppage/lang/cs-CZ.rc index 2ba59989ed..490ed518e4 100644 --- a/dll/shellext/acppage/lang/cs-CZ.rc +++ b/dll/shellext/acppage/lang/cs-CZ.rc @@ -23,18 +23,20 @@ BEGIN CONTROL "Další informace o <A>kompatibilitě programů</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Upravit režimy kompatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Přidat...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Upravit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "S&mazat", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Storno",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -42,5 +44,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/de-DE.rc b/dll/shellext/acppage/lang/de-DE.rc index e248b9744c..a1232a3c17 100644 --- a/dll/shellext/acppage/lang/de-DE.rc +++ b/dll/shellext/acppage/lang/de-DE.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Weitere Informationen über <A>Programmkompatibilität</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kompatibilitätsmodus ändern" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Hinzufügen...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Ändern...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Löschen", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Abbrechen", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Abbrechen",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilität" IDS_FAILED_NETWORK "Kompatibilitätsmodi können auf diesem Programm nicht angewendet werden, da es sich auf einem Netzlaufwerk befindet." IDS_FAILED_PROTECTED "Kompatibilitätsmodi können auf diesem Programm nicht angewendet werden, da es Teil von ReactOS ist." - IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefügt, möchten Sie ihn jetzt hinzufügen?" END diff --git a/dll/shellext/acppage/lang/en-US.rc b/dll/shellext/acppage/lang/en-US.rc index c3f787060e..574658a4ae 100644 --- a/dll/shellext/acppage/lang/en-US.rc +++ b/dll/shellext/acppage/lang/en-US.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Edit Compatibility Modes" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Delete", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Cancel",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,6 +39,5 @@ BEGIN IDS_COMPAT_TITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/es-ES.rc b/dll/shellext/acppage/lang/es-ES.rc index 086a3136cd..24f79c51be 100644 --- a/dll/shellext/acppage/lang/es-ES.rc +++ b/dll/shellext/acppage/lang/es-ES.rc @@ -26,18 +26,20 @@ BEGIN CONTROL "Saber más acerca de <A>compatibilidad de programas</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Editar modos de compatibilidad" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Añadir...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Editar...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Borrar", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&Aceptar", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Cancelar", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&Aceptar",IDOK,174,114,60,14 + PUSHBUTTON "&Cancelar",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -45,5 +47,4 @@ BEGIN IDS_COMPAT_TITLE "Compatibilidad" IDS_FAILED_NETWORK "No se puede establecer modo de compatibilidad para este programa porque se encuentra en una unidad de red." IDS_FAILED_PROTECTED "No se puede establecer modo de compatibilidad para este programa porque es parte de ReactOS." - IDS_YOU_DID_NOT_ADD "No se ha añadido el modo, ¿desea añadirlo ahora?" END diff --git a/dll/shellext/acppage/lang/eu-ES.rc b/dll/shellext/acppage/lang/eu-ES.rc index f1c974c9a7..4a919ef95c 100644 --- a/dll/shellext/acppage/lang/eu-ES.rc +++ b/dll/shellext/acppage/lang/eu-ES.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "<A> Programen konpatibilitateari buruz gehiago</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konpatibilitate moduak editatu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Gehitu...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Editatu...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Ezabatu", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&Ados", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Utzi", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&Ados",IDOK,174,114,60,14 + PUSHBUTTON "&Utzi",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Konpatibilitatea" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/fr-FR.rc b/dll/shellext/acppage/lang/fr-FR.rc index 9603a37c23..752a0d8d9b 100644 --- a/dll/shellext/acppage/lang/fr-FR.rc +++ b/dll/shellext/acppage/lang/fr-FR.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "En savoir plus sur <A>la compatibilité des programmes</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Editer les Modes de compatibilité" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Éditer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Supprimer", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Annuler", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Annuler",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Compatibilité" IDS_FAILED_NETWORK "Les modes de compatibilité ne peuvent pas être appliqués sur ce programme car il se situe sur un lecteur réseau." IDS_FAILED_PROTECTED "Les modes de compatibilité ne peuvent pas être appliqués sur ce programme car il fait partie de ReactOS." - IDS_YOU_DID_NOT_ADD "Vous n'avez pas ajouté le mode, voulez-vous l'ajouter maintenant ?" END diff --git a/dll/shellext/acppage/lang/he-IL.rc b/dll/shellext/acppage/lang/he-IL.rc index 13962f2bfa..e1bf33a456 100644 --- a/dll/shellext/acppage/lang/he-IL.rc +++ b/dll/shellext/acppage/lang/he-IL.rc @@ -19,19 +19,20 @@ BEGIN CONTROL "למד עוד על <A>תאימות תכניות</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "עריכת מצבי תאימות" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "הוסף...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "ערוך...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "מחק", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "אישור", IDOK, 95, 116, 60, 14 - PUSHBUTTON "ביטול", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "אישור",IDOK,174,114,60,14 + PUSHBUTTON "ביטול",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +40,4 @@ BEGIN IDS_COMPAT_TITLE "תאימות" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/hi-IN.rc b/dll/shellext/acppage/lang/hi-IN.rc index 8d59e2d5a3..fa537e2c3b 100644 --- a/dll/shellext/acppage/lang/hi-IN.rc +++ b/dll/shellext/acppage/lang/hi-IN.rc @@ -25,18 +25,20 @@ BEGIN CONTROL "<A>प्रोग्राम अनुकूलता</A>के बारे में अधिक जानें।", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "अनुकूलता मोड का संपादित" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&ऐड...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&संपादित...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&हटाए", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&ठीक", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&रद्द करें", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&ठीक",IDOK,174,114,60,14 + PUSHBUTTON "&रद्द करें",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -44,6 +46,5 @@ BEGIN IDS_COMPAT_TITLE "अनुकूलता" IDS_FAILED_NETWORK "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि यह नेटवर्क ड्राइव पर है।" IDS_FAILED_PROTECTED "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि यह रिऐक्ट ओएस का एक हिस्सा है।" - IDS_YOU_DID_NOT_ADD "आपने मोड नहीं ऐड करा, क्या आप इसे अभी ऐड करना चाहते हैं?" END diff --git a/dll/shellext/acppage/lang/hu-HU.rc b/dll/shellext/acppage/lang/hu-HU.rc index 759cd3f54a..53b9d6f68b 100644 --- a/dll/shellext/acppage/lang/hu-HU.rc +++ b/dll/shellext/acppage/lang/hu-HU.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sémák szerkesztése" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Hozzáadás...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Szerkesztés...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Törlés", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Mégse", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Mégse",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilitás" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/id-ID.rc b/dll/shellext/acppage/lang/id-ID.rc index 9052bd7d36..bd84d17ff1 100644 --- a/dll/shellext/acppage/lang/id-ID.rc +++ b/dll/shellext/acppage/lang/id-ID.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Edit Mode Kompatibilitas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Tambah...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Hapus", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Batal", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Batal",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilitas" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/it-IT.rc b/dll/shellext/acppage/lang/it-IT.rc index b1c4253ead..0714762686 100644 --- a/dll/shellext/acppage/lang/it-IT.rc +++ b/dll/shellext/acppage/lang/it-IT.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Ulteriori informazioni sulla <A>compatibilità dei programmi</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Modifica la modalità compatibile" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Aggiungi...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Modifica...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Cancella", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "A&nnulla", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "A&nnulla",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "Compatibilità" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/nl-NL.rc b/dll/shellext/acppage/lang/nl-NL.rc index 453a916d51..4568a41984 100644 --- a/dll/shellext/acppage/lang/nl-NL.rc +++ b/dll/shellext/acppage/lang/nl-NL.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Edit Compatibility Modes" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Delete", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Cancel",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Compatibiliteit" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/no-NO.rc b/dll/shellext/acppage/lang/no-NO.rc index c1bdc09e1c..bc42e8a06c 100644 --- a/dll/shellext/acppage/lang/no-NO.rc +++ b/dll/shellext/acppage/lang/no-NO.rc @@ -18,18 +18,20 @@ BEGIN CONTROL "Lær mere om <A>program kompaktibilitet</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Rediger kompaktibilitetsmodus" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Legg til...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Rediger...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Slett", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Avbryt", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Avbryt",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -37,5 +39,4 @@ BEGIN IDS_COMPAT_TITLE "Kompaktibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/pl-PL.rc b/dll/shellext/acppage/lang/pl-PL.rc index 0e0a8cbdae..d8de978e44 100644 --- a/dll/shellext/acppage/lang/pl-PL.rc +++ b/dll/shellext/acppage/lang/pl-PL.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Dowiedz się więcej o <A>zgodności programów</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Edycja trybów zgodności" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Dodaj...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Edytuj...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Usuń", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Anuluj", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Anuluj",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "Zgodność" IDS_FAILED_NETWORK "Nie można ustawić trybu zgodności dla tego programu, ponieważ znajduje się na dysku sieciowym." IDS_FAILED_PROTECTED "Nie można ustawić trybu zgodności dla tego programu, ponieważ jest częścią systemu ReactOS." - IDS_YOU_DID_NOT_ADD "Nie dodałeś trybu zgodności, czy chcesz to zrobić teraz?" END diff --git a/dll/shellext/acppage/lang/ro-RO.rc b/dll/shellext/acppage/lang/ro-RO.rc index ac1c032a46..30a7e20824 100644 --- a/dll/shellext/acppage/lang/ro-RO.rc +++ b/dll/shellext/acppage/lang/ro-RO.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Aflați mai multe despre <A>compatibilitate de program</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Modurile de compatibilitate" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Adăugare…", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "E&ditare…", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Elimnă", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "Con&firmă", IDOK, 95, 116, 60, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "Con&firmă",IDOK,174,114,60,14 + PUSHBUTTON "A&nulează",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,6 +41,5 @@ BEGIN IDS_COMPAT_TITLE "Compatibilitate" IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece rezidă pe o unitate de stocare în rețea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece este parte din ReactOS." - IDS_YOU_DID_NOT_ADD "Nu ați specificat un mod. Doriți să specificați unul?" END diff --git a/dll/shellext/acppage/lang/ru-RU.rc b/dll/shellext/acppage/lang/ru-RU.rc index bc4d071748..7058656539 100644 --- a/dll/shellext/acppage/lang/ru-RU.rc +++ b/dll/shellext/acppage/lang/ru-RU.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Узнать больше о <A>совместимости программ</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Изменить режимы совместимости" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Добавить...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Редактировать...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Удалить", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Отмена", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Отмена",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "Совместимость" IDS_FAILED_NETWORK "Режим совместимости не может быть установлен для этой программы, потому что она находится на сетевом диске." IDS_FAILED_PROTECTED "Режим совместимости не может быть использован для компонентов ReactOS." - IDS_YOU_DID_NOT_ADD "Вы не добавили режим, добавить его сейчас?" END diff --git a/dll/shellext/acppage/lang/sk-SK.rc b/dll/shellext/acppage/lang/sk-SK.rc index 7b3f88bc68..102251aba9 100644 --- a/dll/shellext/acppage/lang/sk-SK.rc +++ b/dll/shellext/acppage/lang/sk-SK.rc @@ -25,18 +25,20 @@ BEGIN CONTROL "Ďalšie informácie o <A>kompatibilite programov</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Úprava režimov kompatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "Prid&ať...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Upraviť...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "O&dstrániť", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Zrušiť", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Zrušiť",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -44,5 +46,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/sq-AL.rc b/dll/shellext/acppage/lang/sq-AL.rc index 92f67635ea..1fe7eec1f7 100644 --- a/dll/shellext/acppage/lang/sq-AL.rc +++ b/dll/shellext/acppage/lang/sq-AL.rc @@ -22,18 +22,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Modifiko Mjetin e Pajtueshmerise" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "Shto...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "Modifiko...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "Fshi", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "Anulo",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -41,5 +43,4 @@ BEGIN IDS_COMPAT_TITLE "Pajtueshmëri" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/sv-SE.rc b/dll/shellext/acppage/lang/sv-SE.rc index e7cd9335c2..eaadadaa59 100644 --- a/dll/shellext/acppage/lang/sv-SE.rc +++ b/dll/shellext/acppage/lang/sv-SE.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Lär dig mer om <A>program-kompatibilitet</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Redigera kompatibilitetslägen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Lägg till...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Ändra...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Ta bort", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Avbryt", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Avbryt",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "Kompatibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/tr-TR.rc b/dll/shellext/acppage/lang/tr-TR.rc index c05c626a20..30b9c50f95 100644 --- a/dll/shellext/acppage/lang/tr-TR.rc +++ b/dll/shellext/acppage/lang/tr-TR.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "<A>İzlence uyumluluğu</A> konusunda daha çok öğren.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Uyumluluk Kiplerini Düzenle" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Ekle...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Düzenle...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "&Sil", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "Tamam", IDOK, 95, 116, 60, 14 - PUSHBUTTON "İptal", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "Tamam",IDOK,174,114,60,14 + PUSHBUTTON "İptal",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,6 +41,5 @@ BEGIN IDS_COMPAT_TITLE "Uyumluluk" IDS_FAILED_NETWORK "Bir ağ sürücüsü üzerinde olduğundan bu programda uyumluluk kipleri ayarlanamaz." IDS_FAILED_PROTECTED "ReactOS'un bir parçası olduğundan bu programda uyumluluk kipleri ayarlanamaz." - IDS_YOU_DID_NOT_ADD "Bu modu eklememeiştiniz, eklemek ister misiniz?" END diff --git a/dll/shellext/acppage/lang/uk-UA.rc b/dll/shellext/acppage/lang/uk-UA.rc index 6ce5de7f7e..f170cf6ef1 100644 --- a/dll/shellext/acppage/lang/uk-UA.rc +++ b/dll/shellext/acppage/lang/uk-UA.rc @@ -26,18 +26,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Редагування режимів сумісності" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "&Додати...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Редагувати...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "В&идалити", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 - PUSHBUTTON "&Скасувати", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "&Скасувати",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -45,5 +47,4 @@ BEGIN IDS_COMPAT_TITLE "Сумісність" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc index e8b6fae96f..978465e9fc 100644 --- a/dll/shellext/acppage/lang/zh-CN.rc +++ b/dll/shellext/acppage/lang/zh-CN.rc @@ -21,18 +21,20 @@ BEGIN CONTROL "了解更多有关<A>程序兼容性</A>的信息。", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "编辑兼容模式" FONT 9, "宋体", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "添加...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "编辑...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "删除(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "确定(&O)", IDOK, 95, 116, 60, 14 - PUSHBUTTON "取消(&C)", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "确定(&O)",IDOK,174,114,60,14 + PUSHBUTTON "取消(&C)",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -40,5 +42,4 @@ BEGIN IDS_COMPAT_TITLE "兼容性" IDS_FAILED_NETWORK "无法在上面设置兼容模式，因为这个程序在网络驱动器上。" IDS_FAILED_PROTECTED "无法在上面设置兼容模式，因为这个程序是 ReactOS 的一部分。" - IDS_YOU_DID_NOT_ADD "目前没有此模式，你想要新建一个吗？" END diff --git a/dll/shellext/acppage/lang/zh-TW.rc b/dll/shellext/acppage/lang/zh-TW.rc index e9fe17cc56..cc0180b5f8 100644 --- a/dll/shellext/acppage/lang/zh-TW.rc +++ b/dll/shellext/acppage/lang/zh-TW.rc @@ -20,18 +20,20 @@ BEGIN CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END -IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "編輯相容模式" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL - LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER - PUSHBUTTON "添加...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "編輯...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED - PUSHBUTTON "刪除(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED - PUSHBUTTON "確定(&O)", IDOK, 95, 116, 60, 14 - PUSHBUTTON "取消(&C)", IDCANCEL, 162, 116, 60, 14 + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "確定(&O)",IDOK,174,114,60,14 + PUSHBUTTON "取消(&C)",IDCANCEL,240,114,60,14 + LTEXT "Available modes",-1,6,6,52,8 + LTEXT "Selected modes",-1,168,6,51,8 END STRINGTABLE @@ -39,5 +41,4 @@ BEGIN IDS_COMPAT_TITLE "相容性" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h index 5fd81bda48..129b6f8447 100644 --- a/dll/shellext/acppage/precomp.h +++ b/dll/shellext/acppage/precomp.h @@ -34,4 +34,6 @@ BOOL IsBuiltinLayer(PCWSTR Name); #include "CLayerStringList.hpp" #include "CLayerUIPropPage.hpp" +BOOL ShowEditCompatModes(HWND hWnd, CLayerUIPropPage* page); + #endif /* ACPPAGE_PRECOMP_H */ diff --git a/dll/shellext/acppage/resource.h b/dll/shellext/acppage/resource.h index b11f2e3f16..49f3c4b703 100644 --- a/dll/shellext/acppage/resource.h +++ b/dll/shellext/acppage/resource.h @@ -14,8 +14,8 @@ #define IDC_COMPATGROUP 1008 #define IDC_NEWCOMPATIBILITYMODE 1009 #define IDC_ADD 1010 -#define IDC_EDIT 1011 -#define IDC_DELETE 1012 +#define IDC_REMOVEALL 1011 +#define IDC_REMOVE 1012 #define IDC_ENABLED_LAYERS 1013 #define IDS_DESCRIPTION 101 @@ -24,7 +24,6 @@ #define IDS_COMPAT_TITLE 2000 #define IDS_FAILED_NETWORK 2001 #define IDS_FAILED_PROTECTED 2002 -#define IDS_YOU_DID_NOT_ADD 2003 /* registry stuff */

5 years, 9 months

[reactos] 13/13: [CALC] Update to version 1.12 -- Update whatsnew.txt

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df424955e06f7b415dad1… commit df424955e06f7b415dad1f9a5938789023cbc61f Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Sun Nov 4 11:38:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:07 2019 +0100 [CALC] Update to version 1.12 -- Update whatsnew.txt --- base/applications/calc/whatsnew.txt | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/base/applications/calc/whatsnew.txt b/base/applications/calc/whatsnew.txt index 8390deb542..387b802f75 100644 --- a/base/applications/calc/whatsnew.txt +++ b/base/applications/calc/whatsnew.txt @@ -1,4 +1,33 @@ -1.11 (20080813) +1.12 (20181104) +======================= +* Fixed bug 12.37 13/06/2009 into multiprecision display (unicode only). +* Added support for average of squares and mean of squares into statistical functions. +* pop() and push() functions in RPN engines now work with nodes instead of stack units. +* Updated translations from ReactOS' repository. +* Added support for new conversion units: + - ANGLE: 'minute of arc', 'second of arc'. + - AREA: 'mu', 'rai'. + - LENGTH: 'chi', 'cun'. 'sun' optimized. + - TIME: 'nanoseconds'. + - WEIGHT: 'Kan', 'Kin'. +* Added support for thailand measure system: + + Invaluable help from this page: + http://www.eppo.go.th/ref/UNIT-ALL.html + +* Moved the POW and SQR operations near the operators. +* Rewritten some units formula by using scientific notation. +* Improved precision of parsec unit conversion formula. +* Fixed bug when calculator was closed with statistics dialog open. +* Do not append decimal separator if "ERROR" messages are printed. +* Improve code readability by using SetDlgItemText and GetDlgItemText functions +* Colours are now declared though RGB() macro. +* Remove call to _tcslen() and use return value of GetDlgItemText() where possible. +* Added theming support. Requires Windows XP or later. +* Configuration is read from WIN.INI under W32S/Win9x/Me and from the registry for all NT platforms. +* Removed safe DS_SHELLFONT declaration. + +1.11 (20090404) ======================= * Updated translations (thanks to the friends at ReactOS' community). * Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not). @@ -16,7 +45,7 @@ * Fixed some unsignaled overflow errors. * Fixed conversion method, now scientific notation is recognized too. * Added compilation for UNICODE executables. -* Plain MINGW toolchain do not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree. +* Plain MINGW toolchain does not support wWinMain function, so I switched to old WinMain if it is not under ReactOS' build tree. * Detect error if UNICODE version is launched into Win9x (avoid the lock). 1.09 (20080630) @@ -103,7 +132,7 @@ * The version number of the programme has been moved from the resource files to ABOUT.C. * "DOT" function can be used for starting a number (integer part will be zero). * Added repeat function. -* If the number is grater than maximum resolution, it will be displayed with exponential notation. +* If the number is greater than maximum resolution, it will be displayed with exponential notation. * Removed mouse and keyboard focuses from displayed buttons. * Added normal and small icons.

5 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2019