Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[hbelusca] 58012: [MAGNIFY] Fix French translation

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 15:28:28 2012 New Revision: 58012 URL: http://svn.reactos.org/svn/reactos?rev=58012&view=rev Log: [MAGNIFY] Fix 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] Wed Dec 26 15:28:28 2012 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "La loupe a Ã©tÃ© rÃ©alisÃ©e pour fournir quelques fonctionnalitÃ©s aux utilisateurs souffrants de dÃ©ficiences visuelles. La majoritÃ© de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalitÃ©s pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 + LTEXT "La loupe a Ã©tÃ© rÃ©alisÃ©e pour fournir quelques fonctionnalitÃ©s aux utilisateurs souffrant de dÃ©ficiences visuelles. La majoritÃ© de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalitÃ©s pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 CONTROL "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END

11 years, 8 months

[tfaber] 58011: [EXPLORER_NEW] - Add Advanced tab in task bar properties to support ReactOS-specific options (currently: show seconds in tray clock). Patch by Edijs Kolesnikovics. CORE-5410 #commen...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Dec 26 15:14:41 2012 New Revision: 58011 URL: http://svn.reactos.org/svn/reactos?rev=58011&view=rev Log: [EXPLORER_NEW] - Add Advanced tab in task bar properties to support ReactOS-specific options (currently: show seconds in tray clock). Patch by Edijs Kolesnikovics. CORE-5410 #comment Patch committed, thanks! Awaiting the updated save-to-registry functionality. Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/resource.h trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/trayprop.c Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -128,6 +128,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -136,6 +136,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -126,6 +126,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Rodyti s&ekundes", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -123,6 +123,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -127,6 +127,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -130,6 +130,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -130,6 +130,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -26,6 +26,13 @@ #include "initguid.h" #include "undoc.h" +/* Structure to hold non-default options*/ +typedef struct _ADVANCED_SETTINGS { + BOOL bShowSeconds; +} ADVANCED_SETTINGS, *PADVANCED_SETTINGS; + +extern ADVANCED_SETTINGS AdvancedSettings; + /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD); #ifdef UNICODE Modified: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… ============================================================================== --- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -80,6 +80,7 @@ #define IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL 2056 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_QL 2057 #define IDB_TASKBARPROP_NOLOCK_GROUP_QL 2058 +#define IDC_TASKBARPROP_SECONDS 2059 /* Taskbar properties, startmenu*/ #define IDD_TASKBARPROP_STARTMENU 2100 @@ -99,6 +100,7 @@ #define IDC_TASKBARPROP_VOLUME 2205 #define IDC_TASKBARPROP_NETWORK 2206 #define IDC_TASKBARPROP_POWER 2207 +#define IDD_TASKBARPROP_ADVANCED 2208 /* Taskbar properties, toolbars */ #define IDD_TASKBARPROP_TOOLBARS 2300 Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -688,8 +688,6 @@ */ static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass"); -static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); -BOOL blShowSeconds; #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 @@ -722,27 +720,6 @@ else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; return NOERROR; -} - -void LoadSettings(void) -{ - HKEY hKey = NULL; - DWORD dwValue; - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); - if (dwValue == 1) - { - blShowSeconds = TRUE; - } - else - { - blShowSeconds = FALSE; - } - - RegCloseKey(hKey); - } } #define CLOCKWND_FORMAT_COUNT (sizeof(ClockWndFormats) / sizeof(ClockWndFormats[0])) @@ -965,7 +942,7 @@ if (ClockWndFormats[i].IsTime) { iRet = GetTimeFormat(LOCALE_USER_DEFAULT, - ClockWndFormats[i].dwFormatFlags, + AdvancedSettings.bShowSeconds ? ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS, &This->LocalTime, ClockWndFormats[i].lpFormat, This->szLines[i], @@ -983,11 +960,6 @@ if (iRet != 0 && i == 0) { - if (blShowSeconds == FALSE) - { - This->szLines[0][5] = '\0'; - } - /* Set the window text to the time only */ SetWindowText(This->hWnd, This->szLines[i]); @@ -1051,7 +1023,7 @@ /* Calculate the due time */ GetLocalTime(&This->LocalTime); uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds; - if (blShowSeconds == TRUE) + if (AdvancedSettings.bShowSeconds) uiDueTime += (UINT)This->LocalTime.wSecond * 100; else uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; @@ -1117,7 +1089,7 @@ uiDueTime = TrayClockWnd_CalculateDueTime(This); - if (blShowSeconds == TRUE) + if (AdvancedSettings.bShowSeconds) { uiWait1 = 1000 - 200; uiWait2 = 1000; @@ -1403,7 +1375,6 @@ PTRAY_CLOCK_WND_DATA TcData; DWORD dwStyle; HWND hWnd = NULL; - LoadSettings(); TcData = HeapAlloc(hProcessHeap, 0, Modified: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -30,6 +30,8 @@ HBITMAP hTaskbarBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; +ADVANCED_SETTINGS AdvancedSettings = { FALSE }; + static BOOL UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) @@ -38,7 +40,7 @@ HWND hwndBitmap; BOOL bLock, bHide, bGroup, bShowQL; LPTSTR lpImageName = NULL; - BOOL bRet = FALSE; + BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE); @@ -188,8 +190,58 @@ return FALSE; } - -INT_PTR CALLBACK +static INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + CheckDlgButton(hwndDlg, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_TASKBARPROP_SECONDS: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + + switch (pnmh->code) + { + case PSN_SETACTIVE: + break; + + case PSN_APPLY: + AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + break; + } + + break; + } + + case WM_DESTROY: + break; + + default: + return FALSE; + } + + return FALSE; +} + +static INT_PTR CALLBACK StartMenuPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -224,7 +276,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK NotificationPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -259,7 +311,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK ToolbarsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -315,7 +367,7 @@ { PPROPSHEET_INFO pPropInfo; PROPSHEETHEADER psh; - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[5]; TCHAR szCaption[256]; pPropInfo = (PPROPSHEET_INFO)HeapAlloc(hProcessHeap, @@ -349,10 +401,11 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, (DLGPROC)TaskbarPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, (DLGPROC)StartMenuPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, (DLGPROC)NotificationPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, (DLGPROC)ToolbarsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, NotificationPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)pPropInfo); PropertySheet(&psh);

11 years, 8 months

[hbelusca] 58010: [FREELDR] Improve the way we are doing the timing: When the timeout is > 0, we refresh its display. When it becomes == 0, we exit the waiting-loop and do the right action (start t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 02:14:46 2012 New Revision: 58010 URL: http://svn.reactos.org/svn/reactos?rev=58010&view=rev Log: [FREELDR] Improve the way we are doing the timing: When the timeout is > 0, we refresh its display. When it becomes == 0, we exit the waiting-loop and do the right action (start the default OS, ...). However, when we press a key, it is set to -1 by convention, that means, no timeout. The timeout display is then cleared ONLY ONCE since there is no need to refresh it each time we do a waiting-loop-turn when the timeout is == -1. Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Wed Dec 26 02:14:46 2012 @@ -560,7 +560,7 @@ if (CanEscape && KeyPress == KEY_ESC) return FALSE; /* Check if there is a countdown */ - if (MenuInformation.MenuTimeRemaining) + if (MenuInformation.MenuTimeRemaining > 0) { /* Get the updated time, seconds only */ CurrentClockSecond = ArcGetTime()->Second; @@ -576,7 +576,7 @@ UiDrawMenuBox(&MenuInformation); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { /* A time out occurred, exit this loop and return default OS */ break; Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Wed Dec 26 02:14:46 2012 @@ -93,7 +93,7 @@ // // Check if there is a countdown // - if (MenuInformation.MenuTimeRemaining) + if (MenuInformation.MenuTimeRemaining > 0) { // // Get the updated time, seconds only @@ -118,7 +118,7 @@ VideoCopyOffScreenBufferToVRAM(); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { // // A time out occurred, exit this loop and return default OS

11 years, 8 months

[hbelusca] 58009: [FREELDR] Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 01:59:39 2012 New Revision: 58009 URL: http://svn.reactos.org/svn/reactos?rev=58009&view=rev Log: [FREELDR] Code formatting only Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Wed Dec 26 01:59:39 2012 @@ -128,7 +128,7 @@ // // Draw title text // - TuiDrawText( (UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, + TuiDrawText((UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, 2, UiTitleBoxTitleText, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor));

11 years, 8 months

[hbelusca] 58008: [FREELDR] - Show the selected boot options as NTLDR does (in light blue under the "For troubleshooting... press F8" message).- The different safe modes are now mutually exclusive, ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 01:40:18 2012 New Revision: 58008 URL: http://svn.reactos.org/svn/reactos?rev=58008&view=rev Log: [FREELDR] - Show the selected boot options as NTLDR does (in light blue under the "For troubleshooting... press F8" message).- The different safe modes are now mutually exclusive, as they must be. - They can be coupled to the "boot logging", "vga mode" and "debugging" modes, enlarging possibilities (contrary to NTLDR. However you'll remark that these combinations are allowed when set with msconfig...). - Since the safe modes come by default with boot logging, don't show "Boot Logging" when one of the safe modes is selected, but instead show the corresponding safe mode name. - Modify the needed functions. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/include/ui.h trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h trunk/reactos/boot/freeldr/freeldr/options.c trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/minitui.c trunk/reactos/boot/freeldr/freeldr/ui/noui.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -44,6 +44,7 @@ ULONG SelectedMenuItem; if (!UiDisplayMenu("Please choose a boot method:", "", + FALSE, CustomBootMenuList, CustomBootMenuCount, 0, -1, Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -273,6 +273,7 @@ if (!UiDisplayMenu("Please select the operating system to start:", "For troubleshooting and advanced startup options for " "ReactOS, press F8.", + TRUE, OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -20,4 +20,5 @@ #pragma once VOID DoOptionsMenu(VOID); +VOID DisplayBootTimeOptions(VOID); VOID AppendBootTimeOptions(PCHAR BootOptions); Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -70,7 +70,7 @@ VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiShowMessageBoxesInSection(PCSTR SectionName); // Displays all the message boxes in a given section -VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurances of "\n" to '\n' +VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurrences of "\n" to '\n' BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value @@ -91,8 +91,9 @@ { PCSTR MenuHeader; PCSTR MenuFooter; + BOOLEAN ShowBootOptions; - PCSTR *MenuItemList; + PCSTR* MenuItemList; ULONG MenuItemCount; LONG MenuTimeRemaining; ULONG SelectedMenuItem; @@ -105,7 +106,7 @@ typedef BOOLEAN (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); /////////////////////////////////////////////////////////////////////////////////////// // @@ -135,7 +136,7 @@ VOID (*FadeInBackdrop)(VOID); VOID (*FadeOut)(VOID); - BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); + BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); VOID (*DrawMenu)(PUI_MENU_INFO MenuInfo); } UIVTBL, *PUIVTBL; Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -48,6 +48,6 @@ // Menu Functions // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); +BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); extern const UIVTBL GuiVtbl; Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -41,5 +41,5 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo); Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -63,7 +63,7 @@ VOID NTAPI TuiDrawMenuBox(PUI_MENU_INFO MenuInfo); VOID NTAPI TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); ULONG NTAPI TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); -BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); /* Definitions for corners, depending on HORIZ and VERT */ #define UL (0xda) Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -37,6 +37,7 @@ NULL, + "Start ReactOS normally", #ifdef HAS_OPTION_MENU_CUSTOM_BOOT "Custom Boot", #endif @@ -60,41 +61,27 @@ " +peloader\n" "NOTE: all letters must be lowercase, no spaces allowed."; -enum OptionMenuItems -{ - SAFE_MODE = 0, - SAFE_MODE_WITH_NETWORKING = 1, - SAFE_MODE_WITH_COMMAND_PROMPT = 2, - - SEPARATOR1 = 3, - - ENABLE_BOOT_LOGGING = 4, - ENABLE_VGA_MODE = 5, - LAST_KNOWN_GOOD_CONFIGURATION = 6, - DIRECTORY_SERVICES_RESTORE_MODE = 7, - DEBUGGING_MODE = 8, - FREELDR_DEBUGGING = 9, - - SEPARATOR2 = 10, - -#ifdef HAS_OPTION_MENU_CUSTOM_BOOT - CUSTOM_BOOT = 11, -#endif -#ifdef HAS_OPTION_MENU_REBOOT - REBOOT = 12, -#endif +// +// The boot options are mutually exclusive. +// +enum BootOption +{ + NO_OPTION = 0, + + SAFE_MODE, + SAFE_MODE_WITH_NETWORKING, + SAFE_MODE_WITH_COMMAND_PROMPT, + + LAST_KNOWN_GOOD_CONFIGURATION, + DIRECTORY_SERVICES_RESTORE_MODE, }; ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); -BOOLEAN SafeMode = FALSE; -BOOLEAN SafeModeWithNetworking = FALSE; -BOOLEAN SafeModeWithCommandPrompt = FALSE; -BOOLEAN BootLogging = FALSE; -BOOLEAN VgaMode = FALSE; -BOOLEAN LastKnownGoodConfiguration = FALSE; -BOOLEAN DirectoryServicesRepairMode = FALSE; -BOOLEAN DebuggingMode = FALSE; +static enum BootOption BootOptionChoice = NO_OPTION; +static BOOLEAN BootLogging = FALSE; +static BOOLEAN VgaMode = FALSE; +static BOOLEAN DebuggingMode = FALSE; VOID DoOptionsMenu(VOID) { @@ -102,6 +89,7 @@ CHAR DebugChannelString[100]; if (!UiDisplayMenu("Select an option:", "", + TRUE, OptionsMenuList, OptionsMenuItemCount, 0, -1, @@ -118,77 +106,170 @@ switch (SelectedMenuItem) { - case SAFE_MODE: - SafeMode = TRUE; - BootLogging = TRUE; - break; - case SAFE_MODE_WITH_NETWORKING: - SafeModeWithNetworking = TRUE; - BootLogging = TRUE; - break; - case SAFE_MODE_WITH_COMMAND_PROMPT: - SafeModeWithCommandPrompt = TRUE; - BootLogging = TRUE; - break; - //case SEPARATOR1: - // break; - case ENABLE_BOOT_LOGGING: - BootLogging = TRUE; - break; - case ENABLE_VGA_MODE: - VgaMode = TRUE; - break; - case LAST_KNOWN_GOOD_CONFIGURATION: - LastKnownGoodConfiguration = TRUE; - break; - case DIRECTORY_SERVICES_RESTORE_MODE: - DirectoryServicesRepairMode = TRUE; - break; - case DEBUGGING_MODE: - DebuggingMode = TRUE; - break; - case FREELDR_DEBUGGING: - DebugChannelString[0]=0; - if (UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) - DbgParseDebugChannels(DebugChannelString); - break; - //case SEPARATOR2: - // break; + case 0: // Safe Mode + BootOptionChoice = SAFE_MODE; + BootLogging = TRUE; + break; + case 1: // Safe Mode with Networking + BootOptionChoice = SAFE_MODE_WITH_NETWORKING; + BootLogging = TRUE; + break; + case 2: // Safe Mode with Command Prompt + BootOptionChoice = SAFE_MODE_WITH_COMMAND_PROMPT; + BootLogging = TRUE; + break; + // case 3: // Separator + // break; + case 4: // Enable Boot Logging + BootLogging = TRUE; + break; + case 5: // Enable VGA Mode + VgaMode = TRUE; + break; + case 6: // Last Known Good Configuration + BootOptionChoice = LAST_KNOWN_GOOD_CONFIGURATION; + break; + case 7: // Directory Services Restore Mode + BootOptionChoice = DIRECTORY_SERVICES_RESTORE_MODE; + break; + case 8: // Debugging Mode + DebuggingMode = TRUE; + break; + case 9: // FreeLdr debugging + DebugChannelString[0] = 0; + if (UiEditBox(FrldrDbgMsg, + DebugChannelString, + sizeof(DebugChannelString) / sizeof(DebugChannelString[0]))) + { + DbgParseDebugChannels(DebugChannelString); + } + break; + // case 10: // Separator + // break; + case 11: // Start ReactOS normally + // Reset all the parameters to their default values. + BootOptionChoice = NO_OPTION; + BootLogging = FALSE; + VgaMode = FALSE; + DebuggingMode = FALSE; + break; #ifdef HAS_OPTION_MENU_CUSTOM_BOOT - case CUSTOM_BOOT: - OptionMenuCustomBoot(); - break; + case 12: // Custom Boot + OptionMenuCustomBoot(); + break; #endif #ifdef HAS_OPTION_MENU_REBOOT - case REBOOT: - OptionMenuReboot(); - break; + case 13: // Reboot + OptionMenuReboot(); + break; #endif } } +VOID DisplayBootTimeOptions(VOID) +{ + CHAR BootOptions[260] = ""; + + switch (BootOptionChoice) + { + case SAFE_MODE: + strcat(BootOptions, OptionsMenuList[0]); + break; + + case SAFE_MODE_WITH_NETWORKING: + strcat(BootOptions, OptionsMenuList[1]); + break; + + case SAFE_MODE_WITH_COMMAND_PROMPT: + strcat(BootOptions, OptionsMenuList[2]); + break; + + case LAST_KNOWN_GOOD_CONFIGURATION: + strcat(BootOptions, OptionsMenuList[6]); + break; + + case DIRECTORY_SERVICES_RESTORE_MODE: + strcat(BootOptions, OptionsMenuList[7]); + break; + + default: + break; + } + + if (BootLogging) + { + if ( (BootOptionChoice != SAFE_MODE) && + (BootOptionChoice != SAFE_MODE_WITH_NETWORKING) && + (BootOptionChoice != SAFE_MODE_WITH_COMMAND_PROMPT) ) + { + if (BootOptionChoice != NO_OPTION) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[4]); + } + } + + if (VgaMode) + { + if ((BootOptionChoice != NO_OPTION) || + BootLogging) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[5]); + } + + if (DebuggingMode) + { + if ((BootOptionChoice != NO_OPTION) || + BootLogging || VgaMode) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[8]); + } + + /* Display the chosen boot options */ + UiDrawText(0, + UiScreenHeight - 2, + BootOptions, + ATTR(COLOR_LIGHTBLUE, UiMenuBgColor)); +} + VOID AppendBootTimeOptions(PCHAR BootOptions) { - if (SafeMode) - strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); //FIXME: NOGUIBOOT should also be specified - - if (SafeModeWithNetworking) - strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); //FIXME: NOGUIBOOT should also be specified - - if (SafeModeWithCommandPrompt) - strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); //FIXME: NOGUIBOOT should also be specified + switch (BootOptionChoice) + { + case SAFE_MODE: + strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case SAFE_MODE_WITH_NETWORKING: + strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case SAFE_MODE_WITH_COMMAND_PROMPT: + strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case LAST_KNOWN_GOOD_CONFIGURATION: + DbgPrint("Last known good configuration is not supported yet!\n"); + break; + + case DIRECTORY_SERVICES_RESTORE_MODE: + strcat(BootOptions, " /SAFEBOOT:DSREPAIR /SOS"); + break; + + default: + break; + } if (BootLogging) strcat(BootOptions, " /BOOTLOG"); if (VgaMode) strcat(BootOptions, " /BASEVIDEO"); - - if (LastKnownGoodConfiguration) - DbgPrint("Last known good configuration is not supported yet!\n"); - - if (DirectoryServicesRepairMode) - strcat(BootOptions, " /SAFEBOOT:DSREPAIR /SOS"); if (DebuggingMode) strcat(BootOptions, " /DEBUG"); Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -384,6 +384,12 @@ { UiDrawMenuItem(MenuInfo, i); } + + /* Display the boot options if needed */ + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); + } } ULONG @@ -502,6 +508,7 @@ BOOLEAN UiDisplayMenu(IN PCSTR MenuHeader, IN PCSTR MenuFooter, + IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -526,6 +533,7 @@ /* Setup the MENU_INFO structure */ MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; + MenuInformation.ShowBootOptions = ShowBootOptions; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -123,6 +123,14 @@ TuiDrawMenuItem(MenuInfo, i); } + // + // Display the boot options if needed + // + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); + } + VideoCopyOffScreenBufferToVRAM(); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/no… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -109,7 +109,7 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) { *SelectedMenuItem = DefaultMenuItem; return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -128,7 +128,7 @@ // // Draw title text // - TuiDrawText( (UiScreenWidth / 2) - ((ULONG)strlen(UiTitleBoxTitleText) / 2), + TuiDrawText( (UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, 2, UiTitleBoxTitleText, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -16,6 +16,7 @@ BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, + BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, @@ -45,6 +46,7 @@ // MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; + MenuInformation.ShowBootOptions = ShowBootOptions; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; @@ -223,6 +225,12 @@ for (i = 0; i < MenuInfo->MenuItemCount; i++) { TuiDrawMenuItem(MenuInfo, i); + } + + /* Display the boot options if needed */ + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); } VideoCopyOffScreenBufferToVRAM(); Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -442,9 +442,9 @@ } } -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) -{ - return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); +BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +{ + return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, ShowBootOptions, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); } VOID UiFadeInBackdrop(VOID)

11 years, 8 months

[fireball] 58007: [FONTVIEW] - Lee Schroeder: Replaces the current fontview icon with the icon found in the tango icon set (apps/preferences-desktop-font.png). This creates better consistency since...

by fireball＠svn.reactos.org

Author: fireball Date: Tue Dec 25 18:11:55 2012 New Revision: 58007 URL: http://svn.reactos.org/svn/reactos?rev=58007&view=rev Log: [FONTVIEW] - Lee Schroeder: Replaces the current fontview icon with the icon found in the tango icon set (apps/preferences-desktop-font.png). This creates better consistency since that is where the majority of the icons come from. CORE-6827 #resolve Modified: trunk/reactos/base/applications/fontview/ttf.ico Modified: trunk/reactos/base/applications/fontview/ttf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== Binary files - no diff available.

11 years, 8 months

[hbelusca] 58006: [FREELDR] Remove commented-out code (since the new one works) - ThFabba: :P

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 25 13:24:56 2012 New Revision: 58006 URL: http://svn.reactos.org/svn/reactos?rev=58006&view=rev Log: [FREELDR] Remove commented-out code (since the new one works) - ThFabba: :P Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Dec 25 13:24:56 2012 @@ -909,7 +909,7 @@ } else { - VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); // atoi(DisplayModeName); + VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); } }

11 years, 8 months

[hbelusca] 58005: [FREELDR] Allow VideoMode to be set via decimal, hexadecimal, ... number representation in bootcd/livecd/freeldr.ini (see the Brian Palmer's FREELDR.INI example).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 25 12:54:31 2012 New Revision: 58005 URL: http://svn.reactos.org/svn/reactos?rev=58005&view=rev Log: [FREELDR] Allow VideoMode to be set via decimal, hexadecimal, ... number representation in bootcd/livecd/freeldr.ini (see the Brian Palmer's FREELDR.INI example). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Dec 25 12:54:31 2012 @@ -909,7 +909,7 @@ } else { - VideoMode = atoi(DisplayModeName); + VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); // atoi(DisplayModeName); } }

11 years, 8 months

[ekohl] 58004: [NETAPI32] - Implement NetLocalGreoupGetInfo. - Move shared code into separate functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Dec 25 09:54:53 2012 New Revision: 58004 URL: http://svn.reactos.org/svn/reactos?rev=58004&view=rev Log: [NETAPI32] - Implement NetLocalGreoupGetInfo. - Move shared code into separate functions. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Tue Dec 25 09:54:53 2012 @@ -57,6 +57,109 @@ } ENUM_CONTEXT, *PENUM_CONTEXT; +static +NET_API_STATUS +BuildAliasInfoBuffer(PALIAS_GENERAL_INFORMATION AliasInfo, + DWORD level, + LPVOID *Buffer) +{ + LPVOID LocalBuffer = NULL; + PLOCALGROUP_INFO_0 LocalInfo0; + PLOCALGROUP_INFO_1 LocalInfo1; + LPWSTR Ptr; + ULONG Size = 0; + NET_API_STATUS ApiStatus = NERR_Success; + + *Buffer = NULL; + + switch (level) + { + case 0: + Size = sizeof(LOCALGROUP_INFO_0) + + AliasInfo->Name.Length + sizeof(WCHAR); + break; + + case 1: + Size = sizeof(LOCALGROUP_INFO_1) + + AliasInfo->Name.Length + sizeof(WCHAR) + + AliasInfo->AdminComment.Length + sizeof(WCHAR); + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + ApiStatus = NetApiBufferAllocate(Size, &LocalBuffer); + if (ApiStatus != NERR_Success) + goto done; + + ZeroMemory(LocalBuffer, Size); + + switch (level) + { + case 0: + LocalInfo0 = (PLOCALGROUP_INFO_0)LocalBuffer; + + Ptr = (LPWSTR)LocalInfo0++; + LocalInfo0->lgrpi0_name = Ptr; + + memcpy(LocalInfo0->lgrpi0_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo0->lgrpi0_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + + case 1: + LocalInfo1 = (PLOCALGROUP_INFO_1)LocalBuffer; + + Ptr = (LPWSTR)((ULONG_PTR)LocalInfo1 + sizeof(LOCALGROUP_INFO_1)); + LocalInfo1->lgrpi1_name = Ptr; + + memcpy(LocalInfo1->lgrpi1_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo1->lgrpi1_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + AliasInfo->Name.Length + sizeof(WCHAR)); + LocalInfo1->lgrpi1_comment = Ptr; + + memcpy(LocalInfo1->lgrpi1_comment, + AliasInfo->AdminComment.Buffer, + AliasInfo->AdminComment.Length); + LocalInfo1->lgrpi1_comment[AliasInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + } + +done: + if (ApiStatus == NERR_Success) + { + *Buffer = LocalBuffer; + } + else + { + if (LocalBuffer != NULL) + NetApiBufferFree(LocalBuffer); + } + + return ApiStatus; +} + + +static +VOID +FreeAliasInfo(PALIAS_GENERAL_INFORMATION AliasInfo) +{ + if (AliasInfo->Name.Buffer != NULL) + SamFreeMemory(AliasInfo->Name.Buffer); + + if (AliasInfo->AdminComment.Buffer != NULL) + SamFreeMemory(AliasInfo->AdminComment.Buffer); + + SamFreeMemory(AliasInfo); +} + + /************************************************************ * NetLocalGroupAdd (NETAPI32.@) */ @@ -154,11 +257,7 @@ PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; PSID DomainSid = NULL; - PLOCALGROUP_INFO_0 LocalInfo0; - PLOCALGROUP_INFO_1 LocalInfo1; - LPWSTR Ptr; ULONG i; - ULONG Size; SAM_HANDLE AliasHandle = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; @@ -325,72 +424,15 @@ TRACE("Name: %S\n", AliasInfo->Name.Buffer); TRACE("Comment: %S\n", AliasInfo->AdminComment.Buffer); - switch (level) - { - case 0: - Size = sizeof(LOCALGROUP_INFO_0) + - AliasInfo->Name.Length + sizeof(WCHAR); - break; - - case 1: - Size = sizeof(LOCALGROUP_INFO_1) + - AliasInfo->Name.Length + sizeof(WCHAR) + - AliasInfo->AdminComment.Length + sizeof(WCHAR); - break; - - default: - ApiStatus = ERROR_INVALID_LEVEL; - goto done; - } - - ApiStatus = NetApiBufferAllocate(Size, &Buffer); + ApiStatus = BuildAliasInfoBuffer(AliasInfo, + level, + &Buffer); if (ApiStatus != NERR_Success) goto done; - switch (level) - { - case 0: - LocalInfo0 = (PLOCALGROUP_INFO_0)Buffer; - - Ptr = (LPWSTR)LocalInfo0++; - LocalInfo0->lgrpi0_name = Ptr; - - memcpy(LocalInfo0->lgrpi0_name, - AliasInfo->Name.Buffer, - AliasInfo->Name.Length); - LocalInfo0->lgrpi0_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; - break; - - case 1: - LocalInfo1 = (PLOCALGROUP_INFO_1)Buffer; - - Ptr = (LPWSTR)((ULONG_PTR)LocalInfo1 + sizeof(LOCALGROUP_INFO_1)); - LocalInfo1->lgrpi1_name = Ptr; - - memcpy(LocalInfo1->lgrpi1_name, - AliasInfo->Name.Buffer, - AliasInfo->Name.Length); - LocalInfo1->lgrpi1_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; - - Ptr = (LPWSTR)((ULONG_PTR)Ptr + AliasInfo->Name.Length + sizeof(WCHAR)); - LocalInfo1->lgrpi1_comment = Ptr; - - memcpy(LocalInfo1->lgrpi1_comment, - AliasInfo->AdminComment.Buffer, - AliasInfo->AdminComment.Length); - LocalInfo1->lgrpi1_comment[AliasInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; - break; - } - if (AliasInfo != NULL) { - if (AliasInfo->Name.Buffer != NULL) - SamFreeMemory(AliasInfo->Name.Buffer); - - if (AliasInfo->AdminComment.Buffer != NULL) - SamFreeMemory(AliasInfo->AdminComment.Buffer); - - SamFreeMemory(AliasInfo); + FreeAliasInfo(AliasInfo); AliasInfo = NULL; } @@ -439,15 +481,7 @@ SamCloseHandle(AliasHandle); if (AliasInfo != NULL) - { - if (AliasInfo->Name.Buffer != NULL) - SamFreeMemory(AliasInfo->Name.Buffer); - - if (AliasInfo->AdminComment.Buffer != NULL) - SamFreeMemory(AliasInfo->AdminComment.Buffer); - - SamFreeMemory(AliasInfo); - } + FreeAliasInfo(AliasInfo); if (resumehandle != NULL) *resumehandle = (DWORD_PTR)EnumContext; @@ -459,19 +493,208 @@ return ApiStatus; } -/************************************************************ - * NetLocalGroupGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetLocalGroupGetInfo( + +/************************************************************ + * NetLocalGroupGetInfo (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetLocalGroupGetInfo( LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE* bufptr) { + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + PSID DomainSid = NULL; + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + PALIAS_GENERAL_INFORMATION AliasInfo = NULL; + LPVOID Buffer = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); - return NERR_Success; -} + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the Builtin Domain SID */ + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + &GroupName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (Status == STATUS_SUCCESS) + { + /* FIXME: Check Use*/ + + Status = SamOpenAlias(DomainHandle, + ALIAS_READ_INFORMATION, + RelativeIds[0], + &AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + + if (AliasHandle == NULL) + { + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + + /* Get the Account Domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Acount Domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + &GroupName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* FIXME: Check Use*/ + + Status = SamOpenAlias(DomainHandle, + ALIAS_READ_INFORMATION, + RelativeIds[0], + &AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + + Status = SamQueryInformationAlias(AliasHandle, + AliasGeneralInformation, + (PVOID *)&AliasInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + ApiStatus = BuildAliasInfoBuffer(AliasInfo, + level, + &Buffer); + if (ApiStatus != NERR_Success) + goto done; + +done: + if (AliasInfo != NULL) + FreeAliasInfo(AliasInfo); + + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + *bufptr = (LPBYTE)Buffer; + + return NERR_Success; +} + /************************************************************ * NetLocalGroupGetMembers (NETAPI32.@)

11 years, 8 months

[hbelusca] 58003: [FREELDR] Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 25 00:54:20 2012 New Revision: 58003 URL: http://svn.reactos.org/svn/reactos?rev=58003&view=rev Log: [FREELDR] Code formatting only Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] Tue Dec 25 00:54:20 2012 @@ -20,4 +20,4 @@ #pragma once VOID DoOptionsMenu(VOID); -VOID AppendBootTimeOptions(PCHAR BootOptions); +VOID AppendBootTimeOptions(PCHAR BootOptions); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Dec 25 00:54:20 2012 @@ -540,7 +540,7 @@ AllocateAndInitLPB(&LoaderBlock); #ifdef _M_IX86 - /* Setup redirection support */ + /* Setup redirection support */ WinLdrSetupEms(BootOptions); #endif

11 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
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 December 2012