Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[ekohl] 70734: [INTL] Add the BS_TOP flag to the multiline checkboxes. The checkbox will display at the top of the control rather than at the middle.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 13 20:47:38 2016 New Revision: 70734 URL: http://svn.reactos.org/svn/reactos?rev=70734&view=rev Log: [INTL] Add the BS_TOP flag to the multiline checkboxes. The checkbox will display at the top of the control rather than at the middle. Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/he-IL.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/no-NO.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/intl/lang/sq-AL.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/lang/zh-TW.rc Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -36,8 +36,8 @@ PUSHBUTTON "ÐÐ¾&Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸...", IDC_DETAIL_BUTTON, 172, 35, 60, 14 GROUPBOX "ÐÐ¾Ð´Ð´ÑÑÐ¶ÐºÐ° Ð½Ð° Ð´Ð¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ ÐµÐ·Ð¸ÑÐ¸", -1, 6, 62, 234, 82 LTEXT "ÐÐ¾Ð²ÐµÑÐµÑÐ¾ ÐµÐ·Ð¸ÑÐ¸ ÑÐ° ÑÐ»Ð¾Ð¶ÐµÐ½Ð¸ Ð¿Ð¾ Ð¿Ð¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ðµ. ÐÐ° Ð´Ð° ÑÐ»Ð¾Ð¶Ð¸ÑÐµ Ð´Ð¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ ÐµÐ·Ð¸ÑÐ¸, Ð¾ÑÐ±ÐµÐ»ÐµÐ¶ÐµÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÐ¾.", -1, 12, 72, 220, 18 - CHECKBOX "&Ð¡Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð·Ð° ÑÐ»Ð¾Ð¶Ð½Ð¸ Ð¿Ð¸ÑÐ¼ÐµÐ½Ð¾ÑÑÐ¸ Ð¸Ð»Ð¸ Ð·Ð° Ð¿Ð¸ÑÐ°Ð½Ðµ Ð¾ÑÐ´ÑÑÐ½Ð¾ Ð½Ð°Ð»ÑÐ²Ð¾.", IDC_INST_FILES_FOR_RTOL_LANG, 15, 93, 216, 22, BS_MULTILINE - CHECKBOX "Ð¡&Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð·Ð° Ð¸Ð·ÑÐ¾ÑÐ½Ð¾ Ð°Ð·Ð¸Ð°ÑÑÐºÐ¸ ÐµÐ·Ð¸ÑÐ¸", IDC_INST_FILES_FOR_ASIAN, 15, 116, 216, 22, BS_MULTILINE + CHECKBOX "&Ð¡Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð·Ð° ÑÐ»Ð¾Ð¶Ð½Ð¸ Ð¿Ð¸ÑÐ¼ÐµÐ½Ð¾ÑÑÐ¸ Ð¸Ð»Ð¸ Ð·Ð° Ð¿Ð¸ÑÐ°Ð½Ðµ Ð¾ÑÐ´ÑÑÐ½Ð¾ Ð½Ð°Ð»ÑÐ²Ð¾.", IDC_INST_FILES_FOR_RTOL_LANG, 15, 93, 216, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Ð¡&Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð·Ð° Ð¸Ð·ÑÐ¾ÑÐ½Ð¾ Ð°Ð·Ð¸Ð°ÑÑÐºÐ¸ ÐµÐ·Ð¸ÑÐ¸", IDC_INST_FILES_FOR_ASIAN, 15, 116, 216, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ GROUPBOX "ÐÐ½Ð°ÐºÐ¾Ð² Ð½Ð°Ð±Ð¾Ñ", -1, 6, 92, 233, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "ÐÐ¾Ð´ÑÐ°Ð·Ð±ÑÐ°Ð½Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÐºÐ¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", -1, 6, 183, 233, 33 - CHECKBOX "ÐÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° ÑÐµÐºÑÑÐ¸Ñ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð¸ Ð¿Ð¾ Ð¿Ð¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ðµ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 192, 223, 22, BS_MULTILINE + CHECKBOX "ÐÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° ÑÐµÐºÑÑÐ¸Ñ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð¸ Ð¿Ð¾ Ð¿Ð¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ðµ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 192, 223, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -41,8 +41,8 @@ PUSHBUTTON "&Podrobnosti...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Podpora pro dalÅ¡Ã jazyky", -1, 5, 62, 234, 82 LTEXT "VÄtÅ¡ina jazykÅ¯ je ve vÃ½chozÃm stavu nainstalovanÃ¡. DalÅ¡Ã jazyky je moÅ¾nÃ© nainstalovat po zaÅ¡krtnutÃ odpovÃdajÃch polÃÄek nÃÅ¾e.", -1, 12, 72, 220, 18 - CHECKBOX "Nai&nstalovat soubory jazykÅ¯ se sloÅ¾itÃ½m pÃsmem a jazykÅ¯ psanÃ½ch zprava doleva", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "Nain&stalovat soubory vÃ½chodoasijskÃ½ch jazykÅ¯", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "Nai&nstalovat soubory jazykÅ¯ se sloÅ¾itÃ½m pÃsmem a jazykÅ¯ psanÃ½ch zprava doleva", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Nain&stalovat soubory vÃ½chodoasijskÃ½ch jazykÅ¯", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -57,7 +57,7 @@ GROUPBOX "PÅevodnÃ tabulky znakovÃ½ch strÃ¡nek", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "VÃ½chozÃ nastavenÃ uÅ¾ivatelskÃ©ho ÃºÄtu", -1, 5, 193, 234, 32 - CHECKBOX "PouÅ¾Ãt vÅ¡echna nastavenÃ na aktuÃ¡lnÃ uÅ¾ivatelskÃ½ ÃºÄet a nastavit jako vÃ½chozÃ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "PouÅ¾Ãt vÅ¡echna nastavenÃ na aktuÃ¡lnÃ uÅ¾ivatelskÃ½ ÃºÄet a nastavit jako vÃ½chozÃ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -36,8 +36,8 @@ PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "ZusÃ¤tzliche SprachunterstÃ¼tzung", -1, 5, 62, 234, 82 LTEXT "Die meisten Sprachen sind standardmÃ¤Ãig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren KontrollkÃ¤stchen.", -1, 12, 72, 220, 18 - AUTOCHECKBOX "Dateien fÃ¼r Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - AUTOCHECKBOX "Dateien fÃ¼r &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + AUTOCHECKBOX "Dateien fÃ¼r Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + AUTOCHECKBOX "Dateien fÃ¼r &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Standardeinstellungen fÃ¼r Benutzerkonten", -1, 5, 193, 234, 32 - AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -36,8 +36,8 @@ PUSHBUTTON "De&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Additional language support", -1, 5, 62, 234, 82 LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18 - AUTOCHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - AUTOCHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + AUTOCHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + AUTOCHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Default user account settings", -1, 5, 193, 234, 32 - AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "&Detalles...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Compatibilidad con idiomas adicionales ", -1, 5, 62, 234, 82 LTEXT "De forma predeterminada se instalan la mayorÃa de los idiomas. Para instalar idiomas adicionales, active las siguientes casillas de verificaciÃ³n.", -1, 12, 72, 220, 24 - CHECKBOX "I&nstalar archivos de escritura compleja y de escritura de derecha a izquierda", IDC_INST_FILES_FOR_RTOL_LANG, 12, 95, 215, 22, BS_MULTILINE - CHECKBOX "In&stalar archivos para los idiomas de Asia Oriental", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nstalar archivos de escritura compleja y de escritura de derecha a izquierda", IDC_INST_FILES_FOR_RTOL_LANG, 12, 95, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "In&stalar archivos para los idiomas de Asia Oriental", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "Tablas de conversiÃ³n de pÃ¡ginas de cÃ³digo ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "ConfiguraciÃ³n de la cuenta de usuario predeterminada ", -1, 5, 193, 234, 32 - CHECKBOX "Aplicar toda la configuraciÃ³n a la cuenta de usuario actual y al perfil de usuario predeterminado", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Aplicar toda la configuraciÃ³n a la cuenta de usuario actual y al perfil de usuario predeterminado", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "DÃ©&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Support de langues additionnelles", -1, 5, 62, 234, 82 LTEXT "La plupart des langues sont installÃ©es par dÃ©faut. Pour installer des langues supplÃ©mentaires, sÃ©lectionnez la case Ã cocher appropriÃ©e ci-dessous.", -1, 12, 72, 220, 18 - CHECKBOX "I&nstaller les fichiers pour les scripts complexes et les langues de droite Ã gauche", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "In&staller les fichiers pour les langues de l'Asie de l'Est", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nstaller les fichiers pour les scripts complexes et les langues de droite Ã gauche", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "In&staller les fichiers pour les langues de l'Asie de l'Est", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "ParamÃ¨tres du compte de l'utilisateur par dÃ©faut ", -1, 5, 193, 234, 32 - CHECKBOX "Appliquer tous ces paramÃ¨tres au compte utilisateur actuel et Ã celui par dÃ©faut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Appliquer tous ces paramÃ¨tres au compte utilisateur actuel et Ã celui par dÃ©faut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/he-IL.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "×ª××× ××ª...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Additional language support", -1, 5, 62, 234, 82 LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18 - CHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Default user account settings", -1, 5, 193, 234, 32 - CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "&Dettagli...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Supporto lingua supplementare", -1, 5, 62, 234, 82 LTEXT "La maggior parte delle lingue viene installata di default. Per installare ulteriori lingue, selezionare la relativa casella.", -1, 12, 72, 220, 18 - CHECKBOX "I&nstalla i file delle lingue con alfabeti non latini e lingue destra-sinistra (incluso l'alfabeto thai)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "In&stalla i file delle lingue per l'Asia orientale", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nstalla i file delle lingue con alfabeti non latini e lingue destra-sinistra (incluso l'alfabeto thai)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "In&stalla i file delle lingue per l'Asia orientale", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -55,7 +55,7 @@ GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Impostazioni account utente predefinito", -1, 5, 193, 234, 32 - CHECKBOX "Appli&ca tutte le impostazioni all'account utente corrente e al profilo utente predefinito", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Appli&ca tutte le impostazioni all'account utente corrente e al profilo utente predefinito", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/no-NO.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -36,8 +36,8 @@ PUSHBUTTON "De&taljer...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Ytterligere sprÃ¥kstÃ¸tte", -1, 5, 62, 234, 82 LTEXT "De fleste sprÃ¥k er innstallert som standard. Merk av i de relevante boksene nedenfor hvis du vil innstallere flere sprÃ¥k.", -1, 12, 72, 220, 18 - CHECKBOX "I&nnstaller filer for for omfattende skript og hÃ¸yre-mot-venstre sprÃ¥k", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "Inn&staller filer for Ã¸stasiatiske sprÃ¥k", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nnstaller filer for for omfattende skript og hÃ¸yre-mot-venstre sprÃ¥k", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Inn&staller filer for Ã¸stasiatiske sprÃ¥k", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ GROUPBOX "Konverteringstabeller for tegntabell", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Standard brukerkonto innstilling", -1, 5, 193, 234, 32 - CHECKBOX "Bruk alle innstillinger pÃ¥ gjeldende brukerkonto og standard brukerprofil", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Bruk alle innstillinger pÃ¥ gjeldende brukerkonto og standard brukerprofil", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -44,8 +44,8 @@ PUSHBUTTON "&SzczegÃ³Åy...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "ObsÅuga jÄzykÃ³w dodatkowych", -1, 5, 62, 234, 82 LTEXT "WiÄkszoÅÄ jÄzykÃ³w jest instalowana domyÅlnie. Aby zainstalowaÄ jÄzyki dodatkowe, zaznacz poniÅ¼ej odpowiednie pole wyboru.", -1, 12, 72, 220, 18 - CHECKBOX "Instalacja jÄzykÃ³w &o zÅoÅ¼onej pisowni i jÄzykÃ³w z pisowniÄ od prawej do lewej", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "Instalacja jÄzykÃ³w &wschodnioazjatyckich", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "Instalacja jÄzykÃ³w &o zÅoÅ¼onej pisowni i jÄzykÃ³w z pisowniÄ od prawej do lewej", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Instalacja jÄzykÃ³w &wschodnioazjatyckich", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -60,7 +60,7 @@ GROUPBOX "Tabele konwersji stron kodowych", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "DomyÅlne ustawienia konta uÅ¼ytkownika", -1, 5, 193, 234, 32 - CHECKBOX "Zastosuj wszystkie ustawienia do bieÅ¼Äcego konta uÅ¼ytkownika i do domyÅlnego profilu uÅ¼ytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Zastosuj wszystkie ustawienia do bieÅ¼Äcego konta uÅ¼ytkownika i do domyÅlnego profilu uÅ¼ytkownika.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "&Detaliiâ¦", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Compatibilitate lingvisticÄ suplimentarÄ", -1, 5, 62, 234, 82 LTEXT "ReactOS posedÄ Ã®n mod implicit compatibilitate pentru majoritatea limbilor. Ãn caz de necesitate, aceastÄ compatibilitate se poate extinde prin instalarea de fiÈiere suplimentare.", -1, 12, 72, 220, 25 - CHECKBOX "InstaleazÄ fiÈierele pentru script-uri comple&xe Èi pentru limbile cu scriere inversÄ", IDC_INST_FILES_FOR_RTOL_LANG, 12, 100, 215, 22, BS_MULTILINE - CHECKBOX "InstaleazÄ fiÈierele pentru limbile din &estul Asiei", IDC_INST_FILES_FOR_ASIAN, 12, 119, 180, 22, BS_MULTILINE + CHECKBOX "InstaleazÄ fiÈierele pentru script-uri comple&xe Èi pentru limbile cu scriere inversÄ", IDC_INST_FILES_FOR_RTOL_LANG, 12, 100, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "InstaleazÄ fiÈierele pentru limbile din &estul Asiei", IDC_INST_FILES_FOR_ASIAN, 12, 119, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "Tabele de conversie cod-paginÄ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "OpÈiuni implicite pentru conturi de utilizator", -1, 5, 193, 234, 32 - CHECKBOX "Apli&cÄ aceste opÈiuni atÃ¢t pentru contul de utilizator curent cÃ¢t Èi pentru cel implicit", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Apli&cÄ aceste opÈiuni atÃ¢t pentru contul de utilizator curent cÃ¢t Èi pentru cel implicit", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -36,8 +36,8 @@ PUSHBUTTON "&ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð°Ñ ÑÐ·ÑÐºÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ°", -1, 5, 61, 234, 90 LTEXT "ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð° ÑÐ·ÑÐºÐ¾Ð² ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ. Ð§ÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¾ÑÐ¾Ð±ÑÐ¼Ð¸ ÑÐ¿Ð¾ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð¿Ð¸ÑÑÐ¼Ð°, ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÑÑÐ¸Ðµ ÑÐ»Ð°Ð¶ÐºÐ¸.", -1, 12, 72, 220, 32 - CHECKBOX "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ ÑÐ¿ÑÐ°Ð²Ð° Ð½Ð°Ð»ÐµÐ²Ð¾ Ð¸ ÑÐ»Ð¾Ð¶Ð½ÑÐ¼ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼", IDC_INST_FILES_FOR_RTOL_LANG, 12, 108, 215, 18, BS_MULTILINE - CHECKBOX "Ð£Ñ&ÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ Ð¸ÐµÑÐ¾Ð³Ð»Ð¸ÑÐ°Ð¼Ð¸", IDC_INST_FILES_FOR_ASIAN, 12, 129, 215, 15, BS_MULTILINE + CHECKBOX "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ ÑÐ¿ÑÐ°Ð²Ð° Ð½Ð°Ð»ÐµÐ²Ð¾ Ð¸ ÑÐ»Ð¾Ð¶Ð½ÑÐ¼ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼", IDC_INST_FILES_FOR_RTOL_LANG, 12, 108, 215, 18, BS_MULTILINE | BS_TOP + CHECKBOX "Ð£Ñ&ÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ ÑÐ·ÑÐºÐ¾Ð² Ñ Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ Ð¸ÐµÑÐ¾Ð³Ð»Ð¸ÑÐ°Ð¼Ð¸", IDC_INST_FILES_FOR_ASIAN, 12, 129, 215, 15, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ GROUPBOX "ÐÐ¾Ð´Ð¾Ð²ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð±Ð»Ð¸Ñ Ð¿ÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸", -1, 5, 193, 234, 32 - CHECKBOX "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sk-SK.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -41,8 +41,8 @@ PUSHBUTTON "&Podrobnosti...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "DoplnkovÃ¡ jazykovÃ¡ podpora", -1, 5, 62, 234, 82 LTEXT "VÃ¤ÄÅ¡ina jazykov sa inÅ¡taluje v predvolenom nastavenÃ. Ak chcete nainÅ¡talovaÅ¥ ÄalÅ¡ie jazyky, zaÄiarknite prÃsluÅ¡nÃ© polÃÄko.", -1, 12, 72, 220, 18 - CHECKBOX "I&nÅ¡talovaÅ¥ sÃºbory pre zloÅ¾itÃ© pÃsma a jazyky so smerom pÃsania sprava doÄ¾ava (vrÃ¡tane thajÄiny)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 95, 215, 19, BS_MULTILINE - CHECKBOX "InÅ¡talovaÅ¥ sÃº&bory pre vÃ½chodoÃ¡zijskÃ© jazyky", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nÅ¡talovaÅ¥ sÃºbory pre zloÅ¾itÃ© pÃsma a jazyky so smerom pÃsania sprava doÄ¾ava (vrÃ¡tane thajÄiny)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 95, 215, 19, BS_MULTILINE | BS_TOP + CHECKBOX "InÅ¡talovaÅ¥ sÃº&bory pre vÃ½chodoÃ¡zijskÃ© jazyky", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -57,7 +57,7 @@ GROUPBOX "&TabuÄ¾ky na konverziu kÃ³dovÃ½ch strÃ¡nok", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "PredvolenÃ© nastavenie pouÅ¾ÃvateÄ¾skÃ©ho konta", -1, 5, 193, 234, 32 - CHECKBOX "&VÅ¡etky nastavenia pouÅ¾iÅ¥ na aktuÃ¡lne pouÅ¾ÃvateÄ¾skÃ© konto a na predvolenÃ½ profil pouÅ¾ÃvateÄ¾a", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "&VÅ¡etky nastavenia pouÅ¾iÅ¥ na aktuÃ¡lne pouÅ¾ÃvateÄ¾skÃ© konto a na predvolenÃ½ profil pouÅ¾ÃvateÄ¾a", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/sq-AL.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -40,8 +40,8 @@ PUSHBUTTON "De&taje...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "MbÃ«shtetje GjuhÃ« shtesÃ«", -1, 5, 62, 234, 82 LTEXT "Shumica e gjuhÃ«ve janÃ« instaluar me parazgjedhje. PÃ«r tÃ« instaluar gjuhÃ« shtesÃ«, zgjidhni kutinÃ« e pÃ«rshtatshme, kontrolloni mÃ« poshtÃ«.", -1, 12, 72, 220, 18 - CHECKBOX "I&nstalo dokumenta pÃ«r skripta komplekse dhe gjuhÃ«t djathtÃ« nÃ« tÃ« majtÃ«", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "In&stalo dokumentat pÃ«r gjuhÃ«t e AzisÃ« Lindore", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "I&nstalo dokumenta pÃ«r skripta komplekse dhe gjuhÃ«t djathtÃ« nÃ« tÃ« majtÃ«", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "In&stalo dokumentat pÃ«r gjuhÃ«t e AzisÃ« Lindore", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -56,7 +56,7 @@ GROUPBOX "Tabela konvertimit dhe kodet e faqeve ", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Konfigurimi llogarise pÃ«rdoruesit parazgjedhur", -1, 5, 193, 234, 32 - CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/tr-TR.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "&AyrÄ±ntÄ±lar...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Ek Dil DesteÄi", -1, 5, 62, 234, 82 LTEXT "BirÃ§ok dil Ã¶n tanÄ±mlÄ± olarak yÃ¼klenmiÅtir. Ek diller yÃ¼klemek iÃ§in aÅaÄÄ±daki uygun kutucuÄu seÃ§iniz.", -1, 12, 72, 220, 18 - CHECKBOX "&KarmaÅÄ±k El YazÄ±sÄ± ve SaÄdan Sola Diller Ä°Ã§in KÃ¼tÃ¼kleri YÃ¼kle", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "&DoÄu Asya Dilleri Ä°Ã§in KÃ¼tÃ¼kleri YÃ¼kle", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "&KarmaÅÄ±k El YazÄ±sÄ± ve SaÄdan Sola Diller Ä°Ã§in KÃ¼tÃ¼kleri YÃ¼kle", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "&DoÄu Asya Dilleri Ä°Ã§in KÃ¼tÃ¼kleri YÃ¼kle", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "Kod SayfasÄ± DÃ¶nÃ¼ÅtÃ¼rme Ãizelgesi", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ãn TanÄ±mlÄ± KullanÄ±cÄ± HesÃ¢bÄ± AyarlarÄ±", -1, 5, 193, 234, 32 - CHECKBOX "&TÃ¼m AyarlarÄ± Åimdiki KullanÄ±cÄ± HesÃ¢bÄ±na Ãn TanÄ±mlÄ±lara Uygula", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "&TÃ¼m AyarlarÄ± Åimdiki KullanÄ±cÄ± HesÃ¢bÄ±na Ãn TanÄ±mlÄ±lara Uygula", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -44,8 +44,8 @@ PUSHBUTTON "&ÐÐ¾Ð´ÑÐ¾Ð±Ð¸ÑÑ...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð° Ð¼Ð¾Ð²Ð½Ð° Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ°", -1, 5, 62, 234, 82 LTEXT "ÐÑÐ»ÑÑÑÑÑÑ Ð¼Ð¾Ð² ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÑÑÑÑÑÑ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼. Ð©Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð¼Ð¾Ð²Ð¸, ÑÑÑÐ°Ð½Ð¾Ð²ÑÑÑ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð½Ñ Ð¿ÑÐ°Ð¿Ð¾ÑÑÑ.", -1, 12, 72, 220, 18 - CHECKBOX "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÑ Ð´Ð»Ñ Ð¼Ð¾Ð² ÑÐ· Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ ÑÐ¿ÑÐ°Ð²Ð° Ð½Ð°Ð»ÑÐ²Ð¾ ÑÐ° Ð´Ð»Ñ Ð¼Ð¾Ð² Ð·Ñ ÑÐºÐ»Ð°Ð´Ð½Ð¸Ð¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "Ð£Ñ&ÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÑ Ð´Ð»Ñ ÑÑÑÐ´Ð½Ð¾-Ð°Ð·ÑÐ°ÑÑÑÐºÐ¸Ñ Ð¼Ð¾Ð²", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÑ Ð´Ð»Ñ Ð¼Ð¾Ð² ÑÐ· Ð¿Ð¸ÑÑÐ¼Ð¾Ð¼ ÑÐ¿ÑÐ°Ð²Ð° Ð½Ð°Ð»ÑÐ²Ð¾ ÑÐ° Ð´Ð»Ñ Ð¼Ð¾Ð² Ð·Ñ ÑÐºÐ»Ð°Ð´Ð½Ð¸Ð¼Ð¸ Ð·Ð½Ð°ÐºÐ°Ð¼Ð¸", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "Ð£Ñ&ÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÑ Ð´Ð»Ñ ÑÑÑÐ´Ð½Ð¾-Ð°Ð·ÑÐ°ÑÑÑÐºÐ¸Ñ Ð¼Ð¾Ð²", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -60,7 +60,7 @@ GROUPBOX "Ð¢Ð°Ð±Ð»Ð¸ÑÑ Ð¿ÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÐºÐ¾Ð´Ð¾Ð²Ð¸Ñ ÑÑÐ¾ÑÑÐ½Ð¾Ðº", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ", -1, 5, 193, 234, 32 - CHECKBOX "ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð²ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¾ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ° Ð´Ð¾ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°ÑÐ¸ Ð²ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¾ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ° Ð´Ð¾ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÐ»Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-CN.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "è¯¦ç»ä¿¡æ¯(&T)...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "éå çè¯è¨æ¯æ", -1, 5, 62, 234, 82 LTEXT "å¤§å¤æ°è¯è¨é½ä¼å¨é»è®¤æåµä¸å¾å°å®è£ãè¦å®è£å¶ä»è¯è¨ï¼éæ©ä¸é¢ç¸åºçå¤éæ¡ã", -1, 12, 72, 220, 18 - CHECKBOX "ä¸ºå¤ææååä»å³å°å·¦çè¯è¨å®è£æä»¶(åæ¬æ³°æ)(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "ä¸ºä¸äºè¯è¨å®è£æä»¶(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "ä¸ºå¤ææååä»å³å°å·¦çè¯è¨å®è£æä»¶(åæ¬æ³°æ)(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "ä¸ºä¸äºè¯è¨å®è£æä»¶(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "ä»£ç é¡µè½¬æ¢è¡¨(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "é»è®¤ç¨æ·å¸æ·è®¾ç½®", -1, 5, 193, 234, 32 - CHECKBOX "å°ææè®¾ç½®åºç¨äºå½åç¨æ·å¸æ·åé»è®¤ç¨æ·éç½®æä»¶(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE + CHECKBOX "å°ææè®¾ç½®åºç¨äºå½åç¨æ·å¸æ·åé»è®¤ç¨æ·éç½®æä»¶(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 Modified: trunk/reactos/dll/cpl/intl/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/zh-TW.rc [iso-8859-1] Sat Feb 13 20:47:38 2016 @@ -38,8 +38,8 @@ PUSHBUTTON "è©³ç´°è³è¨(&T)...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "éå çèªè¨æ¯æ´", -1, 5, 62, 234, 82 LTEXT "å¤§å¤æ¸èªè¨é½æå¨é»èªææ³ä¸å¾å°å®è£ãè¦å®è£å¶ä»èªè¨ï¼é¸æä¸é¢ç¸æçè¦åæ¹å¡ã", -1, 12, 72, 220, 18 - CHECKBOX "çºè¤éæååå¾å³å°å·¦çèªè¨å®è£æªæ¡(åæ¬æ³°æ)(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE - CHECKBOX "çºæ±äºèªè¨å®è£æªæ¡(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE + CHECKBOX "çºè¤éæååå¾å³å°å·¦çèªè¨å®è£æªæ¡(åæ¬æ³°æ)(&N)", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE | BS_TOP + CHECKBOX "çºæ±äºèªè¨å®è£æªæ¡(&S)", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE | BS_TOP END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ GROUPBOX "å§ç¢¼è¡¨è½æè¡¨(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "é»èªä½¿ç¨èå¸³æ¶è¨å®", -1, 5, 193, 234, 32 - CHECKBOX "å°ææè¨å®æç¨æ¼ç¶åä½¿ç¨èå¸³æ¶åé»èªä½¿ç¨èéç½®æªæ¡(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE + CHECKBOX "å°ææè¨å®æç¨æ¼ç¶åä½¿ç¨èå¸³æ¶åé»èªä½¿ç¨èéç½®æªæ¡(&D)", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234

8 years, 10 months

[hbelusca] 70733: Remove trailing whitespace.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 17:05:08 2016 New Revision: 70733 URL: http://svn.reactos.org/svn/reactos?rev=70733&view=rev Log: Remove trailing whitespace. Modified: trunk/reactos/base/applications/clipbrd/scrollutils.c Modified: trunk/reactos/base/applications/clipbrd/scrollutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/scrollutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/scrollutils.c [iso-8859-1] Sat Feb 13 17:05:08 2016 @@ -72,7 +72,7 @@ void HandleMouseScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { - SCROLLINFO si; + SCROLLINFO si; int Delta; int NewPos; @@ -119,7 +119,7 @@ void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { - SCROLLINFO si; + SCROLLINFO si; int Delta; int NewPos; @@ -166,7 +166,7 @@ NewPos = state->CurrentX; break; } - } + } NewPos = min(state->MaxX, max(0, NewPos)); @@ -189,7 +189,7 @@ void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) { - SCROLLINFO si; + SCROLLINFO si; int Delta; int NewPos;

8 years, 10 months

[hbelusca] 70732: [CLIPBRD] - Disable message box messages added for testing purposes (but still keep them here in case one needs them). - Start implementing clipboard write file support. Work in p...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 17:04:40 2016 New Revision: 70732 URL: http://svn.reactos.org/svn/reactos?rev=70732&view=rev Log: [CLIPBRD] - Disable message box messages added for testing purposes (but still keep them here in case one needs them). - Start implementing clipboard write file support. Work in progress. See CORE-10852 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/cliputils.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/fileutils.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -58,7 +58,7 @@ return; } - WriteClipboardFile(szFileName); + WriteClipboardFile(szFileName, CLIP_FMT_NT /* CLIP_FMT_31 */); CloseClipboard(); } Modified: trunk/reactos/base/applications/clipbrd/cliputils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -88,7 +88,7 @@ { if (!GetPredefinedClipboardFormatName(hInstance, uFormat, lpszFormat, cch)) { - if (!GetClipboardFormatName(uFormat, lpszFormat, cch)) + if (!GetClipboardFormatNameW(uFormat, lpszFormat, cch)) { LoadStringW(hInstance, STRING_CF_UNKNOWN, lpszFormat, cch); } Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -262,8 +262,9 @@ BOOL bResult; int i; - /* Open the file */ - hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + /* Open the file for read access */ + hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { ShowLastWin32Error(Globals.hMainWnd); @@ -276,7 +277,6 @@ ShowLastWin32Error(Globals.hMainWnd); goto done; } - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); /* Set data according to the clipboard file format ID */ switch (wFileIdentifier) @@ -286,7 +286,7 @@ SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); pClipFileHeader = &ClipFileHeader; pClipFormatArray = &ClipFormatArray; - MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); + // MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); break; case CLIP_FMT_NT: @@ -295,15 +295,16 @@ SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); pClipFileHeader = &NtClipFileHeader; pClipFormatArray = &NtClipFormatArray; - MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); + // MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); break; default: MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); goto done; } - + /* Completely read the header */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); if (!ReadFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesRead, NULL) || dwBytesRead != SizeOfFileHeader) { @@ -325,8 +326,8 @@ wFormatCount = ((NTCLIPFILEHEADER*)pClipFileHeader)->wFormatCount; break; } - - /* Loop through the data array */ + + /* Loop through the format data array */ for (i = 0; i < wFormatCount; i++) { if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) @@ -415,8 +416,141 @@ return; } -void WriteClipboardFile(LPCWSTR lpFileName) -{ - MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); +void WriteClipboardFile(LPCWSTR lpFileName, WORD wFileIdentifier) +{ + CLIPFILEHEADER ClipFileHeader; + CLIPFORMATHEADER ClipFormatArray; + NTCLIPFILEHEADER NtClipFileHeader; + NTCLIPFORMATHEADER NtClipFormatArray; + PVOID pClipFileHeader; + PVOID pClipFormatArray; + DWORD SizeOfFileHeader, SizeOfFormatHeader; + + WORD wFormatCount; + DWORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + // PVOID szName; + + HANDLE hFile; + DWORD dwBytesWritten; + int i; + + WCHAR szFormatName[MAX_FMT_NAME_LEN]; + + /* Create the file for write access */ + hFile = CreateFileW(lpFileName, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + wFormatCount = CountClipboardFormats(); + + /* Select the file format and setup the header according to the clipboard file format ID */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + SizeOfFileHeader = sizeof(CLIPFILEHEADER); + SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); + pClipFileHeader = &ClipFileHeader; + pClipFormatArray = &ClipFormatArray; + // MessageBox(Globals.hMainWnd, L"We write a Win3.11 clipboard file!", L"File format", 0); + + ClipFileHeader.wFileIdentifier = CLIP_FMT_31; // wFileIdentifier + ClipFileHeader.wFormatCount = wFormatCount; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + SizeOfFileHeader = sizeof(NTCLIPFILEHEADER); + SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); + pClipFileHeader = &NtClipFileHeader; + pClipFormatArray = &NtClipFormatArray; + // MessageBox(Globals.hMainWnd, L"We write a WinNT clipboard file!", L"File format", 0); + + NtClipFileHeader.wFileIdentifier = CLIP_FMT_NT; // wFileIdentifier + NtClipFileHeader.wFormatCount = wFormatCount; + break; + + default: + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + /* Write the header */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + if (!WriteFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesWritten, NULL) || + dwBytesWritten != SizeOfFileHeader) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Compute where the data should start (after the file header and the format array) */ + dwOffData = SizeOfFileHeader + wFormatCount * SizeOfFormatHeader; + + /* Loop through each format and save the data */ + i = 0; + dwFormatID = EnumClipboardFormats(0); + while (dwFormatID) + { + if (i >= wFormatCount) assert(FALSE); // break; + + RetrieveClipboardFormatName(Globals.hInstance, dwFormatID, szFormatName, ARRAYSIZE(szFormatName)); + + // TODO: Copy the format name string into the format header, + // possibly converting into ANSI for Win3.1 format, and render + // in the file the different type of data. From the renderers + // we retrieve the real size of the data into 'dwLenData'. + /* TODO: Write the data stream at 'dwOffData' */ + dwLenData = 0; + + /* Write format data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + ((CLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; + ((CLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; + ((CLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; + // szName = ((CLIPFORMATHEADER*)pClipFormatArray)->szName; + ZeroMemory( ((CLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((CLIPFORMATHEADER*)pClipFormatArray)->szName) ); + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; + // szName = ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName; + ZeroMemory( ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((NTCLIPFORMATHEADER*)pClipFormatArray)->szName) ); + break; + } + + if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!WriteFile(hFile, pClipFormatArray, SizeOfFormatHeader, &dwBytesWritten, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Adjust the offset for the next data stream */ + dwOffData += dwLenData; + + i++; + dwFormatID = EnumClipboardFormats(dwFormatID); + } + +done: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + return; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -49,4 +49,4 @@ } NTCLIPFORMATHEADER; void ReadClipboardFile(LPCWSTR lpFileName); -void WriteClipboardFile(LPCWSTR lpFileName); +void WriteClipboardFile(LPCWSTR lpFileName, WORD wFileIdentifier);

8 years, 10 months

[ekohl] 70731: [USERINIT] - Fill the keyboard layout list. - Try to select a matching keyboard layout when the language selection gets changed.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 13 16:12:24 2016 New Revision: 70731 URL: http://svn.reactos.org/svn/reactos?rev=70731&view=rev Log: [USERINIT] - Fill the keyboard layout list. - Try to select a matching keyboard layout when the language selection gets changed. Modified: trunk/reactos/base/system/userinit/livecd.c Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sat Feb 13 16:12:24 2016 @@ -157,6 +157,250 @@ CB_SELECTSTRING, -1, (LPARAM)langSel); +} + + +#if 0 +static +BOOL +GetLayoutID(LPWSTR szLayoutNum, LPWSTR szLCID) +{ + DWORD dwBufLen; + DWORD dwRes; + HKEY hKey; + WCHAR szTempLCID[9]; + + // Get the Layout ID + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + dwRes = RegQueryValueExW(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen); + + if (dwRes != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + } + + // Look for a substitude of this layout + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + + if (RegQueryValueExW(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + { + // No substitute found, then use the old LCID + wcscpy(szLCID, szTempLCID); + } + + RegCloseKey(hKey); + } + else + { + // Substitutes key couldn't be opened, so use the old LCID + wcscpy(szLCID, szTempLCID); + } + + return TRUE; +} +#endif + + +static +BOOL +GetLayoutName( + LPCWSTR szLCID, + LPWSTR szName) +{ + HKEY hKey; + DWORD dwBufLen; + WCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; + HANDLE hLib; + unsigned i, j, k; + + wsprintf(szBuf, L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s", szLCID); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szBuf); + + if (RegQueryValueExW(hKey, L"Layout Display Name", NULL, NULL, (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) + { + if (szDispName[0] == '@') + { + for (i = 0; i < wcslen(szDispName); i++) + { + if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) + { + for (j = i + 2, k = 0; j < wcslen(szDispName)+1; j++, k++) + { + szIndex[k] = szDispName[j]; + } + szDispName[i - 1] = '\0'; + break; + } + else + szDispName[i] = szDispName[i + 1]; + } + + if (ExpandEnvironmentStringsW(szDispName, szPath, MAX_PATH)) + { + hLib = LoadLibraryW(szPath); + if (hLib) + { + if (LoadStringW(hLib, _wtoi(szIndex), szPath, sizeof(szPath) / sizeof(WCHAR)) != 0) + { + wcscpy(szName, szPath); + RegCloseKey(hKey); + return TRUE; + } + FreeLibrary(hLib); + } + } + } + } + + dwBufLen = sizeof(szBuf); + + if (RegQueryValueExW(hKey, L"Layout Text", NULL, NULL, (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + } + + return FALSE; +} + + +static +VOID +SetKeyboardLayout( + HWND hwnd) +{ +#if 0 + INT iCurSel; + PWSTR pszLCID; + HKL hKl; + WCHAR szLCID[9]; + + iCurSel = SendMessageW(hwnd, CB_GETCURSEL, 0, 0); + if (iCurSel == CB_ERR) + return; + + pszLCID = (PWSTR)SendMessageW(hwnd, CB_GETITEMDATA, iCurSel, 0); + if (pszLCID == (PWSTR)CB_ERR) + return; + + if (GetLayoutID(pszLCID, szLCID)) + { + hKl = LoadKeyboardLayoutW(szLCID, KLF_ACTIVATE | KLF_SETFORPROCESS); + SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + } +#endif +} + + +static +VOID +SelectKeyboardForLanguage( + HWND hwnd, + LCID lcid) +{ + INT i, nCount; + LCID LayoutId; + + TRACE("LCID: %08lx\n", lcid); + TRACE("LangID: %04lx\n", LANGIDFROMLCID(lcid)); + + nCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0); + + for (i = 0; i < nCount; i++) + { + LayoutId = (LCID)SendMessageW(hwnd, CB_GETITEMDATA, i, 0); + TRACE("Layout: %08lx\n", LayoutId); + + if (LANGIDFROMLCID(LayoutId) == LANGIDFROMLCID(lcid)) + { + TRACE("Found 1: %08lx --> %08lx\n", LayoutId, lcid); + SendMessageW(hwnd, CB_SETCURSEL, i, 0); + return; + } + } + + for (i = 0; i < nCount; i++) + { + LayoutId = (LCID)SendMessageW(hwnd, CB_GETITEMDATA, i, 0); + TRACE("Layout: %08lx\n", LayoutId); + + if (PRIMARYLANGID(LayoutId) == PRIMARYLANGID(lcid)) + { + TRACE("Found 2: %08lx --> %08lx\n", LayoutId, lcid); + SendMessageW(hwnd, CB_SETCURSEL, i, 0); + return; + } + } + + TRACE("No match found!\n"); +} + + +static +VOID +CreateKeyboardLayoutList( + HWND hItemsList) +{ + HKEY hKey; + WCHAR szLayoutID[9], KeyName[MAX_PATH]; + DWORD dwIndex = 0; + DWORD dwSize; + INT iIndex; + LONG lError; + ULONG ulLayoutID; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Keyboard Layouts", + 0, + KEY_ENUMERATE_SUB_KEYS, + &hKey); + if (lError != ERROR_SUCCESS) + return; + + while (TRUE) + { + dwSize = sizeof(szLayoutID) / sizeof(WCHAR); + + lError = RegEnumKeyExW(hKey, + dwIndex, + szLayoutID, + &dwSize, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + break; + + GetLayoutName(szLayoutID, KeyName); + + iIndex = (INT)SendMessageW(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); + + ulLayoutID = wcstoul(szLayoutID, NULL, 16); + SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutID); + + // FIXME! + if (wcscmp(szLayoutID, L"00000409") == 0) + { + SendMessageW(hItemsList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); + } + + dwIndex++; + } + + RegCloseKey(hKey); } @@ -365,7 +609,9 @@ /* Center the dialog window */ CenterWindow (hwndDlg); + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); return FALSE; @@ -377,12 +623,11 @@ return TRUE; case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) + switch (LOWORD(wParam)) { - switch (LOWORD(wParam)) - { - case IDOK: - { + case IDC_LANGUAGELIST: + if (HIWORD(wParam) == CBN_SELCHANGE) + { LCID NewLcid; INT iCurSel; @@ -391,28 +636,57 @@ CB_GETCURSEL, 0, 0); - if (iCurSel == CB_ERR) + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + TRACE("LCID: 0x%08lx\n", NewLcid); + SelectKeyboardForLanguage(GetDlgItem(hwndDlg, IDC_LAYOUTLIST), + NewLcid); + } break; - NewLcid = SendDlgItemMessageW(hwndDlg, - IDC_LANGUAGELIST, - CB_GETITEMDATA, - iCurSel, - 0); - if (NewLcid == (LCID)CB_ERR) - break; - - NtSetDefaultLocale(TRUE, NewLcid); - InitializeDefaultUserLocale(&NewLcid); - } + case IDOK: + if (HIWORD(wParam) == BN_CLICKED) + { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + NtSetDefaultLocale(TRUE, NewLcid); + InitializeDefaultUserLocale(&NewLcid); + + SetKeyboardLayout(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); pState->NextPage = STARTPAGE; EndDialog(hwndDlg, 0); - break; - - default: - break; - } + } + break; + + default: + break; } break;

8 years, 10 months

[hbelusca] 70730: [CLIPBRD]: Complete the read support from .clp clipboard files to be actually able to read files saved with the Windows 2k3 clipboard. There actually exist two clipboard file form...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 16:08:09 2016 New Revision: 70730 URL: http://svn.reactos.org/svn/reactos?rev=70730&view=rev Log: [CLIPBRD]: Complete the read support from .clp clipboard files to be actually able to read files saved with the Windows 2k3 clipboard. There actually exist two clipboard file formats, so-called "Win3.1" and a "WinNT" formats. Strangely enough Win2k (and Win2k3) clipboard viewer always save the files under the "Win3.1" format, whichever one you select. I discovered the subtle difference between those two formats by looking at a very old MSDN sample program "EMFDCODE (Enhanced Metafile Decoder)" by Dennis Crain (see https://web.archive.org/web/20080406095812/http://msdn.microsoft.com/archiv… ) that still can be found on the Internet... CORE-10550 #comment Read support fixed in r70730. Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/fileutils.h trunk/reactos/base/applications/clipbrd/precomp.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -318,15 +318,15 @@ break; } + case CF_METAFILEPICT: + { + PlayMetaFileFromClipboard(hdc, &rc); + break; + } + case CF_ENHMETAFILE: { PlayEnhMetaFileFromClipboard(hdc, &rc); - break; - } - - case CF_METAFILEPICT: - { - PlayMetaFileFromClipboard(hdc, &rc); break; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,6 +4,7 @@ * FILE: base/applications/clipbrd/fileutils.c * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke + * Hermes Belusca-Maito */ #include "precomp.h" @@ -16,9 +17,7 @@ hData = GlobalAlloc(GHND, dwLength); if (!hData) - { return NULL; - } lpData = GlobalLock(hData); if (!lpData) @@ -46,20 +45,22 @@ return hData; } -static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, LPCWSTR lpFormatName) +static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, WORD FileIdentifier, PVOID lpFormatName) { HGLOBAL hData; DWORD dwTemp; hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); if (!hData) - { - return FALSE; - } + return FALSE; if ((dwFormat >= 0xC000) && (dwFormat <= 0xFFFF)) { - dwTemp = RegisterClipboardFormatW(lpFormatName); + if (FileIdentifier == CLIP_FMT_31) + dwTemp = RegisterClipboardFormatA((LPCSTR)lpFormatName); + else if ((FileIdentifier == CLIP_FMT_NT) || (FileIdentifier == CLIP_FMT_BK)) + dwTemp = RegisterClipboardFormatW((LPCWSTR)lpFormatName); + if (!dwTemp) { GlobalFree(hData); @@ -120,9 +121,9 @@ return TRUE; } -static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) -{ - HENHMETAFILE hEmf; +static BOOL ClipboardReadMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HMETAFILE hMf; HGLOBAL hData; LPVOID lpData; @@ -139,11 +140,50 @@ return FALSE; } - hEmf = SetEnhMetaFileBits(dwLength, lpData); + hMf = SetMetaFileBitsEx(dwLength, lpData); GlobalUnlock(hData); GlobalFree(hData); + if (!hMf) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_METAFILEPICT, hMf)) + { + DeleteMetaFile(hMf); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HENHMETAFILE hEmf; + HGLOBAL hData; + LPVOID lpData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return FALSE; + } + + hEmf = SetEnhMetaFileBits(dwLength, lpData); + + GlobalUnlock(hData); + GlobalFree(hData); + if (!hEmf) { SetLastError(ERROR_OUTOFMEMORY); @@ -202,13 +242,27 @@ void ReadClipboardFile(LPCWSTR lpFileName) { - CLIPBOARDFILEHEADER cfhFileHeader; - CLIPBOARDFORMATHEADER *cfhFormatArray = NULL; + CLIPFILEHEADER ClipFileHeader; + CLIPFORMATHEADER ClipFormatArray; + NTCLIPFILEHEADER NtClipFileHeader; + NTCLIPFORMATHEADER NtClipFormatArray; + PVOID pClipFileHeader; + PVOID pClipFormatArray; + DWORD SizeOfFileHeader, SizeOfFormatHeader; + + WORD wFileIdentifier; + WORD wFormatCount; + DWORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + PVOID szName; + HANDLE hFile; DWORD dwBytesRead; BOOL bResult; int i; + /* Open the file */ hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -216,39 +270,99 @@ goto done; } - if (!ReadFile(hFile, &cfhFileHeader, sizeof(cfhFileHeader), &dwBytesRead, NULL)) + /* Just read enough bytes to get the clipboard file format ID */ + if (!ReadFile(hFile, &wFileIdentifier, sizeof(wFileIdentifier), &dwBytesRead, NULL)) { ShowLastWin32Error(Globals.hMainWnd); goto done; } - - if ((cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_NT) && (cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_BK)) - { - MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); - goto done; - } - - cfhFormatArray = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER)); - if (!cfhFormatArray) - { - SetLastError(ERROR_OUTOFMEMORY); + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + + /* Set data according to the clipboard file format ID */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + SizeOfFileHeader = sizeof(CLIPFILEHEADER); + SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); + pClipFileHeader = &ClipFileHeader; + pClipFormatArray = &ClipFormatArray; + MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + SizeOfFileHeader = sizeof(NTCLIPFILEHEADER); + SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); + pClipFileHeader = &NtClipFileHeader; + pClipFormatArray = &NtClipFormatArray; + MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); + break; + + default: + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + /* Completely read the header */ + if (!ReadFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesRead, NULL) || + dwBytesRead != SizeOfFileHeader) + { ShowLastWin32Error(Globals.hMainWnd); goto done; } - if (!ReadFile(hFile, cfhFormatArray, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER), &dwBytesRead, NULL)) - { - ShowLastWin32Error(Globals.hMainWnd); - goto done; - } - - for (i = 0; i < cfhFileHeader.wFormatCount; i++) - { - switch (cfhFormatArray[i].dwFormatID) + /* Get header data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + assert(wFileIdentifier == ((CLIPFILEHEADER*)pClipFileHeader)->wFileIdentifier); + wFormatCount = ((CLIPFILEHEADER*)pClipFileHeader)->wFormatCount; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + assert(wFileIdentifier == ((NTCLIPFILEHEADER*)pClipFileHeader)->wFileIdentifier); + wFormatCount = ((NTCLIPFILEHEADER*)pClipFileHeader)->wFormatCount; + break; + } + + /* Loop through the data array */ + for (i = 0; i < wFormatCount; i++) + { + if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, pClipFormatArray, SizeOfFormatHeader, &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Get format data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + dwFormatID = ((CLIPFORMATHEADER*)pClipFormatArray)->dwFormatID; + dwLenData = ((CLIPFORMATHEADER*)pClipFormatArray)->dwLenData; + dwOffData = ((CLIPFORMATHEADER*)pClipFormatArray)->dwOffData; + szName = ((CLIPFORMATHEADER*)pClipFormatArray)->szName; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + dwFormatID = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwFormatID; + dwLenData = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwLenData; + dwOffData = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwOffData; + szName = ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName; + break; + } + + switch (dwFormatID) { case CF_OWNERDISPLAY: - case CF_DSPMETAFILEPICT: - case CF_METAFILEPICT: { break; } @@ -256,49 +370,47 @@ case CF_BITMAP: case CF_DSPBITMAP: { - bResult = ClipboardReadBitmap(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); - break; - } - + bResult = ClipboardReadBitmap(hFile, dwOffData, dwLenData); + break; + } + + case CF_METAFILEPICT: + case CF_DSPMETAFILEPICT: + { + bResult = ClipboardReadMetafile(hFile, dwOffData, dwLenData); + break; + } + + case CF_ENHMETAFILE: case CF_DSPENHMETAFILE: - case CF_ENHMETAFILE: - { - bResult = ClipboardReadEnhMetafile(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + { + bResult = ClipboardReadEnhMetafile(hFile, dwOffData, dwLenData); break; } case CF_PALETTE: { - bResult = ClipboardReadPalette(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + bResult = ClipboardReadPalette(hFile, dwOffData, dwLenData); break; } default: { - if ((cfhFormatArray[i].dwFormatID < CF_PRIVATEFIRST) || (cfhFormatArray[i].dwFormatID > CF_PRIVATELAST)) + if ((dwFormatID < CF_PRIVATEFIRST) || (dwFormatID > CF_PRIVATELAST)) { - bResult = ClipboardReadMemory(hFile, cfhFormatArray[i].dwFormatID, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData, cfhFormatArray[i].szName); + bResult = ClipboardReadMemory(hFile, dwFormatID, dwOffData, dwLenData, wFileIdentifier, szName); } break; } } if (!bResult) - { ShowLastWin32Error(Globals.hMainWnd); - } } done: if (hFile != INVALID_HANDLE_VALUE) - { CloseHandle(hFile); - } - - if (cfhFormatArray) - { - HeapFree(GetProcessHeap(), 0, cfhFormatArray); - } return; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,26 +4,49 @@ * FILE: base/applications/clipbrd/fileutils.h * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke + * Hermes Belusca-Maito */ -#define CLIPBOARD_FORMAT_31 0xC350 -#define CLIPBOARD_FORMAT_NT 0xC351 -#define CLIPBOARD_FORMAT_BK 0xC352 +#define CLIP_FMT_31 0xC350 +#define CLIP_FMT_NT 0xC351 +#define CLIP_FMT_BK 0xC352 #define MAX_FMT_NAME_LEN 79 -typedef struct _CLIPBOARDFILEHEADER +/* + * Win3.1 Clipboard File Format (default) + */ +#pragma pack(push, 1) +typedef struct _CLIPFILEHEADER { WORD wFileIdentifier; WORD wFormatCount; -} CLIPBOARDFILEHEADER; +} CLIPFILEHEADER; -typedef struct _CLIPBOARDFORMATHEADER +typedef struct _CLIPFORMATHEADER +{ + WORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + CHAR szName[MAX_FMT_NAME_LEN]; +} CLIPFORMATHEADER; +#pragma pack(pop) + +/* + * NT Clipboard File Format + */ +typedef struct _NTCLIPFILEHEADER +{ + WORD wFileIdentifier; + WORD wFormatCount; +} NTCLIPFILEHEADER; + +typedef struct _NTCLIPFORMATHEADER { DWORD dwFormatID; DWORD dwLenData; DWORD dwOffData; WCHAR szName[MAX_FMT_NAME_LEN]; -} CLIPBOARDFORMATHEADER; +} NTCLIPFORMATHEADER; void ReadClipboardFile(LPCWSTR lpFileName); void WriteClipboardFile(LPCWSTR lpFileName); Modified: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,6 +4,8 @@ // #pragma once #include <limits.h> + +#include <assert.h> #include <windef.h> #include <winbase.h>

8 years, 10 months

[hbelusca] 70729: [DESK.CPL]: Fix resolution slider issues. Patch by "reactosfanboy" and Mark Jansen (nick "learn_more") CORE-10792 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 13:43:35 2016 New Revision: 70729 URL: http://svn.reactos.org/svn/reactos?rev=70729&view=rev Log: [DESK.CPL]: Fix resolution slider issues. Patch by "reactosfanboy" and Mark Jansen (nick "learn_more") CORE-10792 #resolve Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sat Feb 13 13:43:35 2016 @@ -56,6 +56,28 @@ } } +static int +CompareSettings(PSETTINGS_ENTRY Entry, DWORD dmPelsWidth, DWORD dmPelsHeight, + DWORD dmBitsPerPel, DWORD dmDisplayFrequency) +{ + if (Entry->dmPelsWidth == dmPelsWidth && + Entry->dmPelsHeight == dmPelsHeight && + Entry->dmBitsPerPel == dmBitsPerPel && + Entry->dmDisplayFrequency == dmDisplayFrequency) + { + return 0; + } + else + if ((Entry->dmPelsWidth < dmPelsWidth) || + (Entry->dmPelsWidth == dmPelsWidth && Entry->dmPelsHeight < dmPelsHeight) || + (Entry->dmPelsWidth == dmPelsWidth && Entry->dmPelsHeight == dmPelsHeight && + Entry->dmBitsPerPel < dmBitsPerPel)) + { + return 1; + } + return -1; +} + static PSETTINGS_ENTRY GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) { @@ -66,7 +88,7 @@ PSETTINGS_ENTRY Settings = NULL; HDC hDC; PSETTINGS_ENTRY Current; - DWORD bpp, xres, yres, checkbpp; + DWORD bpp, xres, yres; DWORD curDispFreq; /* Get current settings */ @@ -89,22 +111,17 @@ while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if ((devmode.dmBitsPerPel == 4 || - devmode.dmBitsPerPel == 8 || - devmode.dmBitsPerPel == 16 || - devmode.dmBitsPerPel == 24 || - devmode.dmBitsPerPel == 32) && - devmode.dmDisplayFrequency == curDispFreq) - { - checkbpp=1; - } - else - checkbpp=0; + iMode++; if (devmode.dmPelsWidth < 640 || - devmode.dmPelsHeight < 480 || checkbpp == 0) - { - iMode++; + devmode.dmPelsHeight < 480 || + devmode.dmDisplayFrequency != curDispFreq || + (devmode.dmBitsPerPel != 4 && + devmode.dmBitsPerPel != 8 && + devmode.dmBitsPerPel != 16 && + devmode.dmBitsPerPel != 24 && + devmode.dmBitsPerPel != 32)) + { continue; } @@ -118,12 +135,10 @@ Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmBitsPerPel = devmode.dmBitsPerPel; Current->dmDisplayFrequency = devmode.dmDisplayFrequency; - while (Next != NULL && ( - Next->dmPelsWidth < Current->dmPelsWidth || - (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || - (Next->dmPelsHeight == Current->dmPelsHeight && - Next->dmPelsWidth == Current->dmPelsWidth && - Next->dmBitsPerPel < Current->dmBitsPerPel ))) + while (Next != NULL && + CompareSettings(Next, devmode.dmPelsWidth, + devmode.dmPelsHeight, devmode.dmBitsPerPel, + devmode.dmDisplayFrequency) > 0) { Previous = Next; Next = Next->Flink; @@ -142,7 +157,6 @@ } NbSettings++; } - iMode++; } *pSettingsCount = NbSettings; @@ -538,6 +552,8 @@ PSETTINGS_ENTRY Current; DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; + DWORD dmBitsPerPel; + DWORD dmDisplayFrequency; /* Find if new parameters are valid */ Current = pData->CurrentDisplayDevice->CurrentSettings; @@ -549,14 +565,19 @@ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - if (dmNewPelsHeight < Current->dmPelsHeight) + dmBitsPerPel = Current->dmBitsPerPel; + dmDisplayFrequency = Current->dmDisplayFrequency; + + if (CompareSettings(Current, dmNewPelsWidth, + dmNewPelsHeight, dmBitsPerPel, + dmDisplayFrequency) < 0) { Current = Current->Blink; while (Current != NULL) { if (Current->dmPelsHeight == dmNewPelsHeight - && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == dmBitsPerPel) { pData->CurrentDisplayDevice->CurrentSettings = Current; UpdateDisplay(hwndDlg, pData, bUpdateThumb); @@ -571,8 +592,8 @@ while (Current != NULL) { if (Current->dmPelsHeight == dmNewPelsHeight - && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == dmBitsPerPel) { pData->CurrentDisplayDevice->CurrentSettings = Current; UpdateDisplay(hwndDlg, pData, bUpdateThumb);

8 years, 10 months

[hbelusca] 70728: [MSCONFIG_NEW]: Activate OS-version-specific behaviour (ReactOS vs. Windows and pre-Vista vs. post-Vista).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 13:11:39 2016 New Revision: 70728 URL: http://svn.reactos.org/svn/reactos?rev=70728&view=rev Log: [MSCONFIG_NEW]: Activate OS-version-specific behaviour (ReactOS vs. Windows and pre-Vista vs. post-Vista). Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/msconfig.h trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/msconfig_new/utils.c trunk/reactos/base/applications/msconfig_new/utils.h Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -29,7 +29,7 @@ /* Defaults for ReactOS */ BOOL bIsWindows = FALSE; -BOOL bIsOSVersionLessThanVista = TRUE; +BOOL bIsPreVistaOSVersion = TRUE; /* Language-independent Vendor strings */ const LPCWSTR IDS_REACTOS = L"ReactOS"; @@ -232,7 +232,7 @@ psp[nPages].pfnDlgProc = GeneralPageWndProc; ++nPages; - // if (bIsOSVersionLessThanVista) + // if (bIsPreVistaOSVersion) { /* SYSTEM.INI page */ if (MyFileExists(lpszSystemIni, NULL)) @@ -267,7 +267,7 @@ /* FreeLdr page */ // TODO: Program the interface for Vista: "light" BCD editor... - if (!bIsWindows || (bIsWindows && bIsOSVersionLessThanVista)) + if (!bIsWindows || (bIsWindows && bIsPreVistaOSVersion)) { LPCWSTR lpszLoaderIniFile = NULL; DWORD dwTabNameId = 0; @@ -346,12 +346,12 @@ INITCOMMONCONTROLSEX InitControls; /* Initialize our global version flags */ - bIsWindows = TRUE; /* IsWindowsOS(); */ // TODO: Commented for testing purposes... - bIsOSVersionLessThanVista = TRUE; /* IsOSVersionLessThanVista(); */ // TODO: Commented for testing purposes... + bIsWindows = IsWindowsOS(); + bIsPreVistaOSVersion = IsPreVistaOSVersion(); /* Initialize global strings */ szAppName = LoadResourceString(hInstance, IDS_MSCONFIG); - if (!bIsOSVersionLessThanVista) + if (!bIsPreVistaOSVersion) lpszVistaAppName = LoadResourceString(hInstance, IDS_MSCONFIG_2); /* We use a semaphore in order to have a single-instance application */ @@ -367,7 +367,7 @@ */ if ( (hSingleWnd && IsWindow(hSingleWnd)) || ( (hSingleWnd = FindWindowW(L"#32770", szAppName)) != NULL ) || - (!bIsOSVersionLessThanVista ? ( (hSingleWnd = FindWindowW(L"#32770", lpszVistaAppName)) != NULL ) : FALSE) ) + (!bIsPreVistaOSVersion ? ( (hSingleWnd = FindWindowW(L"#32770", lpszVistaAppName)) != NULL ) : FALSE) ) { /* Found it. Show the window. */ ShowWindow(hSingleWnd, SW_SHOWNORMAL); @@ -377,7 +377,7 @@ /* Quit this instance of MSConfig */ Success = FALSE; } - if (!bIsOSVersionLessThanVista) MemFree(lpszVistaAppName); + if (!bIsPreVistaOSVersion) MemFree(lpszVistaAppName); /* Quit now if we failed */ if (!Success) Modified: trunk/reactos/base/applications/msconfig_new/msconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.h [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -5,7 +5,7 @@ #endif extern BOOL bIsWindows; -extern BOOL bIsOSVersionLessThanVista; +extern BOOL bIsPreVistaOSVersion; extern const LPCWSTR IDS_REACTOS; extern const LPCWSTR IDS_MICROSOFT; Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -287,7 +287,7 @@ bAddServiceToList = params.bIsPresent; - if (bIsWindows && bIsOSVersionLessThanVista && !bAddServiceToList) + if (bIsWindows && bIsPreVistaOSVersion && !bAddServiceToList) { QUERY_REGISTRY_VALUES_TABLE ValuesQueryTable[2] = {}; ValuesQueryTable[0].QueryRoutine = GetRegistryValuedDisabledServicesQueryRoutine; @@ -935,7 +935,7 @@ KeysQueryTable[0].EntryContext = &params; RegQueryRegistryKeys(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", KeysQueryTable, (PVOID)svcName); - if (bIsWindows && bIsOSVersionLessThanVista && !params.bIsPresent) + if (bIsWindows && bIsPreVistaOSVersion && !params.bIsPresent) { QUERY_REGISTRY_VALUES_TABLE ValuesQueryTable[2] = {}; ValuesQueryTable[0].QueryRoutine = GetRegistryValuedDisabledServicesQueryRoutine; @@ -959,7 +959,7 @@ // // Delete also the valued-entry of the service. // - if (bIsWindows && bIsOSVersionLessThanVista) + if (bIsWindows && bIsPreVistaOSVersion) { HKEY hSubKey = NULL; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", 0, KEY_SET_VALUE /*KEY_READ*/, &hSubKey) == ERROR_SUCCESS) @@ -1022,7 +1022,7 @@ // // Save also a valued-entry for the service. // - if (bIsWindows && bIsOSVersionLessThanVista) + if (bIsWindows && bIsPreVistaOSVersion) { RegSetDWORDValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", svcName, TRUE, lpServiceConfig->dwStartType); } Modified: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -221,6 +221,67 @@ //////////////////////////////////////////////////////////////////////////////// +BOOL IsWindowsOS(VOID) +{ + BOOL bIsWindowsOS = FALSE; + + OSVERSIONINFOW osvi = {0}; + osvi.dwOSVersionInfoSize = sizeof(osvi); + + if (!GetVersionExW(&osvi)) + return FALSE; + + if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT) + return FALSE; + + /* ReactOS reports as Windows NT 5.2 */ + + if ( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 2) || + (osvi.dwMajorVersion > 5) ) + { + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + LONG ret; + DWORD dwType = 0, dwBufSize = 0; + + ret = RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, NULL, &dwBufSize); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + LPTSTR lpszProductName = (LPTSTR)MemAlloc(0, dwBufSize); + RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, (LPBYTE)lpszProductName, &dwBufSize); + + bIsWindowsOS = (FindSubStrI(lpszProductName, _T("Windows")) != NULL); + + MemFree(lpszProductName); + } + + RegCloseKey(hKey); + } + } + else + { + bIsWindowsOS = TRUE; + } + + return bIsWindowsOS; +} + +BOOL IsPreVistaOSVersion(VOID) +{ + OSVERSIONINFOW osvi = {0}; + osvi.dwOSVersionInfoSize = sizeof(osvi); + + if (!GetVersionExW(&osvi)) + return FALSE; + + /* Vista+-class OSes are NT >= 6 */ + return ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) ? (osvi.dwMajorVersion < 6) : FALSE ); +} + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename) { Modified: trunk/reactos/base/applications/msconfig_new/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -74,6 +74,9 @@ //////////////////////////////////////////////////////////////////////////////// +BOOL IsWindowsOS(VOID); +BOOL IsPreVistaOSVersion(VOID); + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename);

8 years, 10 months

[hbelusca] 70727: [MAGNIFY]: Improve french translation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 13:00:04 2016 New Revision: 70727 URL: http://svn.reactos.org/svn/reactos?rev=70727&view=rev Log: [MAGNIFY]: Improve french translation. Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 13:00:04 2016 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Quitter", IDOK, 96, 161, 50, 14 - PUSHBUTTON "Aider", IDC_BUTTON_HELP, 38, 161, 50, 14 + PUSHBUTTON "Aide", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Coefficient d'agrandissement:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Poursuite", IDC_STATIC, 7, 25, 139, 59

8 years, 10 months

[hbelusca] 70726: [MSCONFIG_NEW]: Explicitely use unicode APIs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 12:58:41 2016 New Revision: 70726 URL: http://svn.reactos.org/svn/reactos?rev=70726&view=rev Log: [MSCONFIG_NEW]: Explicitely use unicode APIs. Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/startuppage.c Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Feb 13 12:58:41 2016 @@ -190,8 +190,8 @@ /* Set the dialog icons */ hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); - SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + SendMessageW(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); /* Sub-class the property sheet window procedure */ wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc); Modified: trunk/reactos/base/applications/msconfig_new/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/startuppage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/startuppage.c [iso-8859-1] Sat Feb 13 12:58:41 2016 @@ -32,9 +32,9 @@ hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); hStartupDialog = hDlg; - dwStyle = (DWORD) SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD)SendMessageW(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; - SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + SendMessageW(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -131,7 +131,7 @@ { GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } } } @@ -184,7 +184,7 @@ GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; item.iSubItem = 1; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } switch (PtrToLong(hRootKey)) @@ -202,7 +202,7 @@ _tcscat(Path, KeyName); item.pszText = Path; item.iSubItem = 2; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } HeapFree(GetProcessHeap(), 0, Data); }

8 years, 10 months

[pschweitzer] 70725: [EXT2] Add the ReactOS famous... hack? fix? whatever? already present in FastFAT, NTFS...: When accessing a floppy disk, our floppy storage stack can return that the disk type ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 13 09:16:45 2016 New Revision: 70725 URL: http://svn.reactos.org/svn/reactos?rev=70725&view=rev Log: [EXT2] Add the ReactOS famous... hack? fix? whatever? already present in FastFAT, NTFS...: When accessing a floppy disk, our floppy storage stack can return that the disk type is unknown (some would say it's legit - see comments in FastFAT) and will also return a disk sector size of 0. Then, when trying to read the floppy disk with said size, everything goes wrong (null length read is never a good thing). So, as in any other FSD in ReactOS, for disk sector size to 512 bytes in this really specific case. This fixes BSOD when having a floppy drive in ReactOS (whatever its filesystem). CORE-10464 #resolve #comment Fixed with r70725 Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] Sat Feb 13 09:16:45 2016 @@ -1496,6 +1496,13 @@ _SEH2_LEAVE; } +#ifdef __REACTOS__ + if (DiskGeometry.MediaType == Unknown) + { + DiskGeometry.BytesPerSector = 512; + } +#endif + Status = IoCreateDevice( MainDeviceObject->DriverObject, sizeof(EXT2_VCB),

8 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
16
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 February 2016