Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[peterw] 29871: - Fix a bug when displaying the help for scut.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 13:51:00 2007 New Revision: 29871 URL: http://svn.reactos.org/svn/reactos?rev=29871&view=rev Log: - Fix a bug when displaying the help for scut. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Thu Oct 25 13:51:00 2007 @@ -143,11 +143,11 @@ echo Shortcut as parameter sets this Shortcut active. echo. echo add - Adds a Shortcut. - echo (Optional: "Shortcut" "Directory" as second and third parameter) + echo Optional: "Shortcut" "Directory" as second and third parameter echo rem - Removes a shortcut. - echo (Optional: "Shortcut" as second parameter) + echo Optional: "Shortcut" as second parameter echo edit - Edits a shortcut. - echo (Optional: "Shortcut" "Directory" as second and third parameter) + echo Optional: "Shortcut" "Directory" as second and third parameter echo def - Chooses Default Shortcut which is enabled on echo every start of RosBE. "Default" is the Source echo Directory as you know it from previous Versions

16 years, 11 months

[peterw] 29870: - Fix typo.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 13:31:08 2007 New Revision: 29870 URL: http://svn.reactos.org/svn/reactos?rev=29870&view=rev Log: - Fix typo. Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Thu Oct 25 13:31:08 2007 @@ -31,7 +31,7 @@ { printf("Usage: %s [OPTIONS]\n", argv[0]); printf("Running cpucount without options returns the number of\n"); - printf("the number of processors in the system.\n"); + printf("processors in the system.\n"); printf("-x1 - Number of processors in the system, plus 1.\n"); printf("-x2 - Number of processors in the system, doubled.\n"); }

16 years, 11 months

[peterw] 29869: - Couple of minor tweaks.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 13:28:57 2007 New Revision: 29869 URL: http://svn.reactos.org/svn/reactos?rev=29869&view=rev Log: - Couple of minor tweaks. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/cpucount.c Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Oct 25 13:28:57 2007 @@ -117,7 +117,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION%-4.1.3-20071015 (prerelease) * + echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Thu Oct 25 13:28:57 2007 @@ -15,7 +15,7 @@ time_t getfmodtime( - char* FileName + char* filename ); int main(int argc, char* argv[]) Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Thu Oct 25 13:28:57 2007 @@ -30,7 +30,7 @@ (!strncmp(argv[1], "--help", 6))) { printf("Usage: %s [OPTIONS]\n", argv[0]); - printf("Running cpucount without options returns\n"); + printf("Running cpucount without options returns the number of\n"); printf("the number of processors in the system.\n"); printf("-x1 - Number of processors in the system, plus 1.\n"); printf("-x2 - Number of processors in the system, doubled.\n");

16 years, 11 months

[dreimer] 29868: Shorten the Text Fields a bit. This prevents Graphical errors in the Preview. French, as Russian Language need work

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Oct 25 13:21:08 2007 New Revision: 29868 URL: http://svn.reactos.org/svn/reactos?rev=29868&view=rev Log: Shorten the Text Fields a bit. This prevents Graphical errors in the Preview. French, as Russian Language need work Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Thu Oct 25 13:21:08 2007 @@ -5,18 +5,18 @@ CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pfad zum Kompiler", 0x0, 10, 107, 110, 15 + LTEXT "Pfad zum Kompiler", 0x0, 10, 107, 100, 15 LTEXT "Hintergrundfarbe", 0x0, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Schriftfarbe", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 - CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 - CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Thu Oct 25 13:21:08 2007 @@ -5,18 +5,18 @@ CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15 LTEXT "Background Color", 0x0, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Font Color", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 - CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Thu Oct 25 13:21:08 2007 @@ -5,18 +5,18 @@ CAPTION "Paramètres de l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15 LTEXT "Couleur d'arrière plan", 0x0, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Couleur de la police", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 - CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 - CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 - CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 1, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Thu Oct 25 13:21:08 2007 @@ -7,18 +7,18 @@ CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ" FONT 8,"MS Sans Serif",0,0 BEGIN - LTEXT "Path to gcc Compiler", 0x0, 10, 107, 110, 15 + LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15 LTEXT "Öâåò Ôîíà", 0x0, 10, 10, 75, 12 - COMBOBOX IDC_BACK, 100, 10, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 75, 12 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Sample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 - CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 110, 12 - CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 110, 12 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 110, 12 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 110, 12 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 110, 12 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 110, 12 + CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Thu Oct 25 13:21:08 2007 @@ -1,5 +1,4 @@ Additional Tools needed: -tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm cut: http://www.ltr-data.se/files/cut.zip sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm

16 years, 11 months

[peterw] 29867: - Cleanup cpucount a bit, add usage info etc...

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 12:16:01 2007 New Revision: 29867 URL: http://svn.reactos.org/svn/reactos?rev=29867&view=rev Log: - Cleanup cpucount a bit, add usage info etc... Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Thu Oct 25 12:16:01 2007 @@ -15,27 +15,39 @@ { SYSTEM_INFO SystemInformation; + if (argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + GetSystemInfo(&SystemInformation); if (argc == 1) { - GetSystemInfo(&SystemInformation); printf("%ld\n", SystemInformation.dwNumberOfProcessors); - return 0; } - else if (!strcmp(argv[1], "-x1")) + else if ((!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) { - GetSystemInfo(&SystemInformation); + printf("Usage: %s [OPTIONS]\n", argv[0]); + printf("Running cpucount without options returns\n"); + printf("the number of processors in the system.\n"); + printf("-x1 - Number of processors in the system, plus 1.\n"); + printf("-x2 - Number of processors in the system, doubled.\n"); + } + else if (!strncmp(argv[1], "-x1", 3)) + { printf("%ld\n", (SystemInformation.dwNumberOfProcessors + 1)); - return 0; } - else if (!strcmp(argv[1], "-x2")) + else if (!strncmp(argv[1], "-x2", 3)) { - GetSystemInfo(&SystemInformation); printf("%ld\n", (SystemInformation.dwNumberOfProcessors + SystemInformation.dwNumberOfProcessors)); - return 0; } else { - printf("Unknown parameter specified. Exiting.\n"); - return 1; + fprintf(stderr, "%s: Error unknown parameter '%s' specified.\n", argv[0], argv[1]); + return -1; } + + return 0; }

16 years, 11 months

[peterw] 29866: - Added a minimal replacement for tee. - Some other miscellaneous cleanup.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 11:14:03 2007 New Revision: 29866 URL: http://svn.reactos.org/svn/reactos?rev=29866&view=rev Log: - Added a minimal replacement for tee. - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/tee.c (with props) Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c trunk/tools/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE-Windows/Tools/chkslash.c trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Thu Oct 25 11:14:03 2007 @@ -82,9 +82,7 @@ } CommandLineBuffer[0] = 0; - //strcat(CommandLineBuffer, "\""); strcat(CommandLineBuffer, CommandLine); - //strcat(CommandLineBuffer, "\""); // // Grab the starting timestamp. Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Thu Oct 25 11:14:03 2007 @@ -25,7 +25,7 @@ if (argc > 3) { - printf("%s: Error too many parameters specified.\n", argv[0]); + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } if ((argc == 1) || @@ -43,19 +43,20 @@ FILE1 = fopen(argv[1], "r"); if (!FILE1) { - printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); return -1; } else { if (fclose(FILE1)) { - printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + return -1; } file1time = getfmodtime(argv[1]); if (!file1time) { - printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); + fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); return -1; } } @@ -63,19 +64,20 @@ FILE2 = fopen(argv[2], "r"); if (!FILE2) { - printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); return -1; } else { if (fclose(FILE2)) { - printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[2]); + return -1; } file2time = getfmodtime(argv[2]); if (!file2time) { - printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); + fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); return -1; } } Modified: trunk/tools/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chkslash… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chkslash.c (original) +++ trunk/tools/RosBE-Windows/Tools/chkslash.c Thu Oct 25 11:14:03 2007 @@ -17,7 +17,7 @@ if (argc > 2) { - printf("%s: Error too many parameters specified.\n", argv[0]); + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } if ((argc == 1) || Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Thu Oct 25 11:14:03 2007 @@ -7,7 +7,7 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime chknewer chkslash cpucount echoh flash getdate +all: buildtime chknewer chkslash cpucount echoh flash getdate tee buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c @@ -30,5 +30,8 @@ getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c +tee: tee.c + ${CC} ${CFLAGS} tee tee.c + clean: - del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe chkslash.exe cpucount.exe echoh.exe flash.exe getdate.exe tee.exe Added: trunk/tools/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/tee.c?re… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/tee.c (added) +++ trunk/tools/RosBE-Windows/Tools/tee.c Thu Oct 25 11:14:03 2007 @@ -1,0 +1,69 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/tee.c + * PURPOSE: Spit stdin to stdout and a file. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <stdio.h> +#include <string.h> + +int main(int argc, char* argv[]) +{ + unsigned char charbuff; + FILE *FILE; + + if (argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s FILE\n", argv[0]); + printf("Takes standard input and sends it to standard output\n"); + printf("and FILE.\n\n"); + return 0; + } + + FILE = fopen(argv[1], "r"); + if (FILE) + { + fprintf(stderr, "%s: Error file \"%s\" already exists.\n", argv[0], argv[1]); + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + } + return -1; + } + else + { + FILE = fopen(argv[1], "w"); + if (!FILE) + { + fprintf(stderr, "%s: Error cannot create file \"%s\".\n", argv[0], argv[1]); + return -1; + } + while (!feof(stdin)) + { + charbuff = fgetc(stdin); + if (!feof(stdin)) + { + fputc(charbuff, stdout); + fputc(charbuff, FILE); + } + } + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + return -1; + } + } + + return 0; +} Propchange: trunk/tools/RosBE-Windows/Tools/tee.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 11 months

[peterw] 29865: Silence an error msg I missed and make reladdr2line.cmd display the binary it's reading from.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 07:50:41 2007 New Revision: 29865 URL: http://svn.reactos.org/svn/reactos?rev=29865&view=rev Log: Silence an error msg I missed and make reladdr2line.cmd display the binary it's reading from. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 07:50:41 2007 @@ -49,6 +49,7 @@ echo ERROR: The path specified doesn't seem to exist. goto :EOC ) +echo %_1% for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i lss %_2% ( raddr2line "%_1%" "%_2%" @@ -80,7 +81,7 @@ :CHECKPATH chkslash %_1% if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% | findstr "%_1%""`) do set _1=%%i + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i ) goto :EOF

16 years, 11 months

[jimtabor] 29864: Sync with Wine: Static controls.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 25 06:25:53 2007 New Revision: 29864 URL: http://svn.reactos.org/svn/reactos?rev=29864&view=rev Log: Sync with Wine: Static controls. Modified: trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c (original) +++ trunk/reactos/dll/win32/user32/controls/static.c Thu Oct 25 06:25:53 2007 @@ -115,6 +115,33 @@ #endif }; +static void setup_clipping(HWND hwnd, HDC hdc, HRGN *orig) +{ + RECT rc; + HRGN hrgn; + + /* Native control has always a clipping region set (this may be because + * builtin controls uses CS_PARENTDC) and an application depends on it + */ + hrgn = CreateRectRgn(0, 0, 1, 1); + if (GetClipRgn(hdc, hrgn) != 1) + { + DeleteObject(hrgn); + *orig = NULL; + } else + *orig = hrgn; + + GetClientRect(hwnd, &rc); + DPtoLP(hdc, (POINT *)&rc, 2); + IntersectClipRect(hdc, rc.left, rc.top, rc.right, rc.bottom); +} + +static void restore_clipping(HDC hdc, HRGN hrgn) +{ + SelectClipRgn(hdc, hrgn); + if (hrgn != NULL) + DeleteObject(hrgn); +} /*********************************************************************** * STATIC_SetIcon @@ -140,8 +167,21 @@ { return 0; } - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - info->nWidth, wr.bottom - info->nHeight, + info->nWidth, info->nHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } } return prevIcon; } @@ -157,7 +197,7 @@ if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { - ERR("huh? hBitmap!=0, but not bitmap\n"); + WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; } hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); @@ -165,8 +205,20 @@ { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - bm.bmWidth, wr.bottom - bm.bmHeight, + bm.bmWidth, bm.bmHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } } return hOldBitmap; } @@ -298,15 +350,23 @@ if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) { HDC hdc; + HRGN hOrigClipping; + hdc = GetDC( hwnd ); + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); ReleaseDC( hwnd, hdc ); } } static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { - HBRUSH hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if(!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); if (!hBrush) /* did the app forget to call DefWindowProc ? */ { @@ -382,13 +442,22 @@ else return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : DefWindowProcA(hwnd, uMsg, wParam, lParam); + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; + case WM_PRINTCLIENT: case WM_PAINT: { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); if (staticPaintFunc[style]) + { + HRGN hOrigClipping; + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); + } if (!wParam) EndPaint(hwnd, &ps); } break; @@ -479,7 +548,7 @@ { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - STATIC_TryPaintFcn( hwnd, full_style ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; @@ -598,7 +667,7 @@ HBRUSH hBrush; HFONT hFont, hOldFont = NULL; WORD wFormat; - INT len; + INT len, buf_size; WCHAR *text; GetClientRect( hwnd, &rc); @@ -656,12 +725,21 @@ if ((style & SS_TYPEMASK) != SS_SIMPLE) { FillRect( hdc, &rc, hBrush ); - if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); - } - - if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return; - if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; - SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text ); + if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); + } + + buf_size = 256; + if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + + while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) + { + buf_size *= 2; + if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + } + + if (!len) goto no_TextOut; if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) { @@ -673,9 +751,10 @@ } else { - DrawTextW( hdc, text, -1, &rc, wFormat ); - } - + DrawTextW( hdc, text, -1, &rc, wFormat ); + } + +no_TextOut: HeapFree( GetProcessHeap(), 0, text ); if (hFont) @@ -689,6 +768,7 @@ GetClientRect( hwnd, &rc); + /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: @@ -833,6 +913,7 @@ { RECT rc; + /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); switch (style & SS_TYPEMASK) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Oct 25 06:25:53 2007 @@ -127,7 +127,7 @@ reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20071023 reactos/dll/win32/user32/controls/scrollbar.c # Forked - reactos/dll/win32/user32/controls/static.c # Synced at 20060908 + reactos/dll/win32/user32/controls/static.c # Synced at 20071024 reactos/dll/win32/user32/misc/dde.c # Synced at 20060623 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced at 20060623

16 years, 11 months

[peterw] 29863: Missed this little fellow.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Oct 25 05:53:11 2007 New Revision: 29863 URL: http://svn.reactos.org/svn/reactos?rev=29863&view=rev Log: Missed this little fellow. Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 05:53:11 2007 @@ -80,7 +80,7 @@ :CHECKPATH chkslash %_1% if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %1 | findstr "%_1%""`) do set _1=%%i + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% | findstr "%_1%""`) do set _1=%%i ) goto :EOF

16 years, 11 months

[mpiulachs] 29862: fix cat.exe > tcat.exe executable filename

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Thu Oct 25 05:21:44 2007 New Revision: 29862 URL: http://svn.reactos.org/svn/reactos?rev=29862&view=rev Log: fix cat.exe > tcat.exe executable filename Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 25 05:21:44 2007 @@ -497,7 +497,7 @@ modules\rosapps\sysutils\man\man.exe 1 optional modules\rosapps\sysutils\pedump\pedump.exe 1 optional modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\cat.exe 1 optional +modules\rosapps\sysutils\tcat\tcat.exe 1 optional modules\rosapps\sysutils\tlist\tlist.exe 1 optional modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional modules\rosapps\sysutils\utils\cat\cat.exe 1 optional

16 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
71
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 October 2007