[cfinck] 30082: - Make use of the new automatically generated contributors list in the ShellAbout dialog, show the authors in the list box - Remove the now unneeded "authors.c" file from shell32 - To get this to build, I also needed to merge-in the changed "include/reactos/version.rc" file from r29924 (forgot that in my previous commit) - Fix the indentation of the "creditsgeneratorenerator.cpp" file and add a newline at the end of the autogenerated file to make GCC happy
Author: cfinck Date: Sat Nov 3 03:03:48 2007 New Revision: 30082
URL: http://svn.reactos.org/svn/reactos?rev=30082&view=rev Log: - Make use of the new automatically generated contributors list in the ShellAbout dialog, show the authors in the list box - Remove the now unneeded "authors.c" file from shell32 - To get this to build, I also needed to merge-in the changed "include/reactos/version.rc" file from r29924 (forgot that in my previous commit) - Fix the indentation of the "creditsgeneratorenerator.cpp" file and add a newline at the end of the autogenerated file to make GCC happy
Removed: branches/rbuild/reactos/dll/win32/shell32/authors.c Modified: branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild branches/rbuild/reactos/dll/win32/shell32/shell32_main.c branches/rbuild/reactos/include/reactos/version.rc branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp
Removed: branches/rbuild/reactos/dll/win32/shell32/authors.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/authors.c (original) +++ branches/rbuild/reactos/dll/win32/shell32/authors.c (removed) @@ -1,1 +1,0 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2007 WINE team", "Copyright 1998-2007 ReactOS Team", 0 };
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS ha estat construit per:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS je d¡lem:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS havde ikke været mulig uden hjælp fra disse personer:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS está disponible gracias a:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS:n toi Sinulle:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc Sat Nov 3 03:03:48 2007 @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS est une réalisation de:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc Sat Nov 3 03:03:48 2007 @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "A ReactOS készítõi:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS è disponibile grazie a:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS UI Gothic" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS is geschreven door:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS foi disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ðàçðàáîò÷èêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS so ustvarili:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS hade inte varit möjligt utan dessa personer:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS'ý size sunan geliþtiriciler:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ðîçðîáíèêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS a estu fwait par:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END
SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
Modified: branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild (original) +++ branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild Sat Nov 3 03:03:48 2007 @@ -24,7 +24,6 @@ <library>devmgr</library> <library>rtl</library> <library>winspool</library> - <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> <file>changenotify.c</file>
Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell32... ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/shell32_main.c (original) +++ branches/rbuild/reactos/dll/win32/shell32/shell32_main.c Sat Nov 3 03:03:48 2007 @@ -44,6 +44,7 @@ #include "shell32_main.h" #include "version.h" #include "shresdef.h" +#include "autocontributors.h"
#include "wine/debug.h" #include "wine/unicode.h" @@ -979,18 +980,26 @@ { case WM_INITDIALOG: { - const char* const *pstr = SHELL_Authors; + const char** pstr;
// Add the authors to the list SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, WM_SETREDRAW, FALSE, 0 ); + + // First add the Wine and ReactOS copyrights + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L"Copyright 1993-2007 WINE Team"); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L"Copyright 1998-2007 ReactOS Team"); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L""); + + // Now add the authors from the autogenerated list + pstr = szAutoContributors;
while (*pstr) { WCHAR name[64];
/* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name)/sizeof(WCHAR) ); - SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, (WPARAM)-1, (LPARAM)name ); + MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name) / sizeof(WCHAR) ); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)name ); pstr++; }
Modified: branches/rbuild/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/include/reactos/v... ============================================================================== --- branches/rbuild/reactos/include/reactos/version.rc (original) +++ branches/rbuild/reactos/include/reactos/version.rc Sat Nov 3 03:03:48 2007 @@ -15,6 +15,13 @@ #include "winver.h" #include "version.h" #include "buildno.h" + +/* Define some defaults (shouldn't be overwritten by applications */ +#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" +#define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0"
/* Set defaults for everything, unless overridden */ #ifndef REACTOS_FILEVERSION @@ -58,11 +65,11 @@ #endif /* REACTOS_FILESUBTYPE */
#ifndef REACTOS_STR_COMPANY_NAME -#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_STR_COMPANY_NAME REACTOS_DEFAULT_STR_COMPANY_NAME #endif /* REACTOS_STR_COMPANY_NAME */
#ifndef REACTOS_STR_FILE_DESCRIPTION -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS core dll\0" +#define REACTOS_STR_FILE_DESCRIPTION REACTOS_DEFAULT_STR_FILE_DESCRIPTION #endif /* REACTOS_STR_FILE_DESCRIPTION */
#ifndef REACTOS_STR_FILE_VERSION @@ -74,11 +81,11 @@ #endif /* REACTOS_STR_FILE_VERSION */
#ifndef REACTOS_STR_INTERNAL_NAME -#define REACTOS_STR_INTERNAL_NAME "\0" +#define REACTOS_STR_INTERNAL_NAME REACTOS_DEFAULT_STR_INTERNAL_NAME #endif /* REACTOS_STR_INTERNAL_NAME */
#ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT #endif /* REACTOS_STR_LEGAL_COPYRIGHT */
#ifndef REACTOS_STR_ORIGINAL_FILENAME @@ -86,7 +93,7 @@ #endif /* REACTOS_STR_ORIGINAL_FILENAME */
#ifndef REACTOS_STR_PRODUCT_NAME -#define REACTOS_STR_PRODUCT_NAME "ReactOS Operating System\0" +#define REACTOS_STR_PRODUCT_NAME REACTOS_DEFAULT_STR_PRODUCT_NAME #endif /* REACTOS_STR_PRODUCT_NAME */
#ifndef REACTOS_STR_PRODUCT_VERSION
Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cred... ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sat Nov 3 03:03:48 2007 @@ -23,7 +23,7 @@
CreditsGenerator::CreditsGenerator ( const Project& project ) - : project ( project ) + : project ( project ) { }
@@ -41,21 +41,21 @@ void CreditsGenerator::GenerateTxt () { - char* buf; - char* s; + char* buf; + char* s;
- buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n");
for ( size_t i = 0; i < project.contributors.size (); i++ ) - { + { Contributor& contributor = *project.contributors[i];
- s = s + sprintf ( s, "\t%s %s (%s)\n" , + s = s + sprintf ( s, "\t%s %s (%s)\n" , contributor.firstName.c_str() , contributor.lastName.c_str() , contributor.alias.c_str()); @@ -69,42 +69,42 @@ contributor.city.c_str() , contributor.country.c_str()); } - } + }
- FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) );
- free ( buf ); + free ( buf ); }
void CreditsGenerator::GenerateHeader () { - char* buf; - char* s; + char* buf; + char* s;
- buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "/* Auto generated */\n"); - s = s + sprintf ( s, "\n" ); + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* Auto generated */\n"); + s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "const char* szAutoContributors[]= {\n" );
for ( size_t i = 0; i < project.contributors.size (); i++ ) - { + { Contributor& contributor = *project.contributors[i];
- s = s + sprintf ( s, "\t"%s %s",\n" , + s = s + sprintf ( s, "\t"%s %s",\n" , contributor.firstName.c_str() , contributor.lastName.c_str()); - } + }
s = s + sprintf ( s, "\t0\n"); - s = s + sprintf ( s, " };" ); + s = s + sprintf ( s, "};\n" );
- FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) );
- free ( buf ); + free ( buf ); }
-
cfinck＠svn.reactos.org