Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[sedwards] 13885: more lower case changes for Makefile -> makefile

by sedwards＠svn.reactos.com

more lower case changes for Makefile -> makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Deleted: branches/xmlbuildsystem/reactos/tools/buildno/Makefile Added: branches/xmlbuildsystem/reactos/tools/buildno/makefile Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c _____ Modified: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-08 20:12:43 UTC (rev 13884) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-08 20:19:07 UTC (rev 13885) @@ -51,11 +51,11 @@ -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean -include tools/buildno/Makefile +include tools/buildno/makefile include tools/cdmake/makefile include tools/nci/makefile include tools/rbuild/makefile -include tools/unicode/Makefile +include tools/unicode/makefile include tools/wmc/makefile -include tools/wpp/Makefile +include tools/wpp/makefile include tools/wrc/makefile _____ Deleted: branches/xmlbuildsystem/reactos/tools/buildno/Makefile --- branches/xmlbuildsystem/reactos/tools/buildno/Makefile 2005-03-08 20:12:43 UTC (rev 13884) +++ branches/xmlbuildsystem/reactos/tools/buildno/Makefile 2005-03-08 20:19:07 UTC (rev 13885) @@ -1,32 +0,0 @@ -BUILDNO_BASE = tools$(SEP)buildno - -BUILDNO_TARGET = \ - $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) - -BUILDNO_SOURCES = \ - $(BUILDNO_BASE)$(SEP)buildno.cpp \ - $(BUILDNO_BASE)$(SEP)exception.cpp \ - $(BUILDNO_BASE)$(SEP)ssprintf.cpp \ - $(BUILDNO_BASE)$(SEP)XML.cpp - -BUILDNO_OBJECTS = \ - $(BUILDNO_SOURCES:.cpp=.o) - -BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall - -BUILDNO_HOST_LFLAGS = -g - -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) - -$(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ - -.PHONY: buildno_clean -buildno_clean: - -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) - -BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h - -$(BUILDNO_H): $(BUILDNO_TARGET) - $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) _____ Copied: branches/xmlbuildsystem/reactos/tools/buildno/makefile (from rev 13883, branches/xmlbuildsystem/reactos/tools/buildno/Makefile) _____ Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-08 20:12:43 UTC (rev 13884) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-08 20:19:07 UTC (rev 13885) @@ -13,9 +13,11 @@ #if defined(WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" +#define DOS_PATHS #else #define DIR_SEPARATOR_CHAR '/' #define DIR_SEPARATOR_STRING "/" +#define UNIX_PATHS #endif char* convert_path(char* origpath)

19 years, 9 months

[sedwards] 13884: lower case please

by sedwards＠svn.reactos.com

lower case please Deleted: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile Added: branches/xmlbuildsystem/reactos/tools/cdmake/makefile _____ Deleted: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile --- branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-03-08 19:19:45 UTC (rev 13883) +++ branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-03-08 20:12:43 UTC (rev 13884) @@ -1,26 +0,0 @@ -CDMAKE_BASE = tools$(SEP)cdmake - -CDMAKE_TARGET = \ - $(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) - -CDMAKE_SOURCES = \ - $(CDMAKE_BASE)$(SEP)cdmake.c \ - $(CDMAKE_BASE)$(SEP)llmosrt.c - -CDMAKE_OBJECTS = \ - $(CDMAKE_SOURCES:.c=.o) - -CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall - -CDMAKE_HOST_LFLAGS = -g - -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) - -$(CDMAKE_OBJECTS): %.o : %.c - ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ - -.PHONY: cdmake_clean -cdmake_clean: - -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) -clean: cdmake_clean _____ Copied: branches/xmlbuildsystem/reactos/tools/cdmake/makefile (from rev 13883, branches/xmlbuildsystem/reactos/tools/cdmake/Makefile)

19 years, 9 months

[hpoussin] 13883: Minor changes to remove warnings

by hpoussin＠svn.reactos.com

Minor changes to remove warnings "memmory" -> "memory" Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/todo.txt _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 19:03:11 UTC (rev 13882) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 19:19:45 UTC (rev 13883) @@ -1646,9 +1646,9 @@ if ((ptrStartNode = malloc(sizeof(struct TDirFindListNode))) == NULL) { #ifdef _DEBUG - ConErrPrintf("DEBUG: Cannot allocate memmory for ptrStartNode!\n"); + ConErrPrintf("DEBUG: Cannot allocate memory for ptrStartNode!\n"); #endif - return 1; /* Error cannot allocate memmory for 1st object */ + return 1; /* Error cannot allocate memory for 1st object */ } ptrNextNode = ptrStartNode; @@ -1701,6 +1701,7 @@ } }while(FindNextFile(hSearch,&wfdFileInfo)); + FindClose(hSearch); /* Terminate list */ ptrNextNode->ptrNext = NULL; @@ -1710,7 +1711,7 @@ if (!(ptrFileArray)) { #ifdef _DEBUG - ConErrPrintf("DEBUG: Cannot allocate memmory for ptrFileArray!\n"); + ConErrPrintf("DEBUG: Cannot allocate memory for ptrFileArray!\n"); #endif goto _DirList_clear_n_exit; } @@ -1732,6 +1733,9 @@ /* Print Data */ DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); + + /* Free array */ + free(ptrFileArray); /* Print Directory Summary */ /* Condition to print summary is: @@ -1774,10 +1778,11 @@ } } }while(FindNextFile(hRecSearch,&wfdFileInfo)); + FindClose(hRecSearch); } _DirList_clear_n_exit: -/* Deallocate memmory */ +/* Deallocate memory */ /* Free linked list */ while (ptrStartNode) { @@ -1786,15 +1791,7 @@ ptrStartNode = ptrNextNode; dwCount --; } - /* Free array */ - free(ptrFileArray); - /* Close Handles */ - if (hSearch != INVALID_HANDLE_VALUE) - FindClose(hSearch); - if (hRecSearch != INVALID_HANDLE_VALUE) - FindClose(hRecSearch); - return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-03-08 19:03:11 UTC (rev 13882) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-03-08 19:19:45 UTC (rev 13883) @@ -5,8 +5,6 @@ Optimize the code! For size and speed. There are numerous places where the code is hardly optimal for either. -Sorting in DIR command ("dir /o..."). - ^S and ^Q to pause/resume displays. Improve DEL, COPY and MOVE commands.

19 years, 9 months

[frik85] 13882: appwiz.cpl:

by frik85＠svn.reactos.com

appwiz.cpl: * add language support * english and german language files Added: trunk/reactos/lib/cpl/appwiz/De.rc Added: trunk/reactos/lib/cpl/appwiz/En.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Modified: trunk/reactos/lib/cpl/appwiz/resources/applet.ico _____ Added: trunk/reactos/lib/cpl/appwiz/De.rc --- trunk/reactos/lib/cpl/appwiz/De.rc 2005-03-08 19:00:44 UTC (rev 13881) +++ trunk/reactos/lib/cpl/appwiz/De.rc 2005-03-08 19:03:11 UTC (rev 13882) @@ -0,0 +1,32 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Programme õndern/entfernen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Um ein neues Programm zu installieren, klicken Sie auf Installieren",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Installieren...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "Die folgende Software kann automatisch entfernt werden. Um ein Programm zu entfernen oder die installierten Programmpakete zu õndern, wõhlen Sie das Programm in der Liste und klicken auf ?ndern/Entfernen.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "?ndern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 198, 70, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Reactos Setup" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Add/Remove Programs" + IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." +END _____ Added: trunk/reactos/lib/cpl/appwiz/En.rc --- trunk/reactos/lib/cpl/appwiz/En.rc 2005-03-08 19:00:44 UTC (rev 13881) +++ trunk/reactos/lib/cpl/appwiz/En.rc 2005-03-08 19:03:11 UTC (rev 13882) @@ -0,0 +1,50 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Install/Uninstall" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "To install a new program, click Install",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Install...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Add/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Reactos Setup" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Add/Remove Programs" + IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." +END _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-08 19:00:44 UTC (rev 13881) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-03-08 19:03:11 UTC (rev 13882) @@ -19,33 +19,11 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" -IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Install/Uninstall" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 - LTEXT "To install a new program, click Install",-1,36,18,PROPSHEETWIDTH-48,8 - PUSHBUTTON "&Install...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 - LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN - - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 - LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Add/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 -END +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ -IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Reactos Setup" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Add/Remove Programs" - IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." -END +#include "En.rc" +#include "De.rc" _____ Modified: trunk/reactos/lib/cpl/appwiz/resources/applet.ico (Binary files differ)

19 years, 9 months

[frik85] 13881: System Control Panel:

by frik85＠svn.reactos.com

System Control Panel: * add language support * english and german language files Added: trunk/reactos/lib/cpl/control/De.rc Added: trunk/reactos/lib/cpl/control/En.rc Modified: trunk/reactos/lib/cpl/control/control.rc _____ Added: trunk/reactos/lib/cpl/control/De.rc --- trunk/reactos/lib/cpl/control/De.rc 2005-03-08 18:48:01 UTC (rev 13880) +++ trunk/reactos/lib/cpl/control/De.rc 2005-03-08 19:00:44 UTC (rev 13881) @@ -0,0 +1,28 @@ +// German language resource file (frik85, 2005-03-08) + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", IDM_CLOSE + END + POPUP "&Ansicht" + BEGIN + MENUITEM "Gro?e Symbole", IDM_LARGEICONS + MENUITEM "Kleine Symbole", IDM_SMALLICONS + MENUITEM "Liste", IDM_LIST + MENUITEM "Details", IDM_DETAILS + END + POPUP "&?" + BEGIN + MENUITEM "Inf&o", IDM_ABOUT + END +END + _____ Added: trunk/reactos/lib/cpl/control/En.rc --- trunk/reactos/lib/cpl/control/En.rc 2005-03-08 18:48:01 UTC (rev 13880) +++ trunk/reactos/lib/cpl/control/En.rc 2005-03-08 19:00:44 UTC (rev 13881) @@ -0,0 +1,28 @@ +// English language resource file (frik85, 2005-03-08) + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Close", IDM_CLOSE + END + POPUP "&View" + BEGIN + MENUITEM "Large Icons", IDM_LARGEICONS + MENUITEM "Small Icons", IDM_SMALLICONS + MENUITEM "List", IDM_LIST + MENUITEM "Details", IDM_DETAILS + END + POPUP "Help" + BEGIN + MENUITEM "About", IDM_ABOUT + END +END + _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-03-08 18:48:01 UTC (rev 13880) +++ trunk/reactos/lib/cpl/control/control.rc 2005-03-08 19:00:44 UTC (rev 13881) @@ -22,31 +22,6 @@ //////////////////////////////////////////////////////////////////////// ///// // -// Menu -// - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Close", IDM_CLOSE - END - POPUP "&View" - BEGIN - MENUITEM "Large Icons", IDM_LARGEICONS - MENUITEM "Small Icons", IDM_SMALLICONS - MENUITEM "List", IDM_LIST - MENUITEM "Details", IDM_DETAILS - END - POPUP "Help" - BEGIN - MENUITEM "About", IDM_ABOUT - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// // Icon // @@ -54,3 +29,17 @@ // remains consistent on all systems. IDI_MAINICON ICON DISCARDABLE "resources/config.ico" //////////////////////////////////////////////////////////////////////// ///// + + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ + +#include "En.rc" +#include "De.rc" + + + +

19 years, 9 months

[frik85] 13880: Slayer: german language file

by frik85＠svn.reactos.com

Slayer: german language file Added: trunk/reactos/lib/shellext/slayer/De.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc _____ Added: trunk/reactos/lib/shellext/slayer/De.rc --- trunk/reactos/lib/shellext/slayer/De.rc 2005-03-08 18:25:25 UTC (rev 13879) +++ trunk/reactos/lib/shellext/slayer/De.rc 2005-03-08 18:48:01 UTC (rev 13880) @@ -0,0 +1,38 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Kompatibilitõt" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Falls dieses Programm Probleme verursacht, wõhlen Sie den zutreffenden Kompatibilitõtsmodus, der mit der Betriebssystem-Version ³bereinstimmt, unter der das Programm korrekt funktionierte.", -1, 7,7,210,31 + GROUPBOX "Kompatibilitõtsmodus", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Programm im Kompatibilitõtsmodus ausf³hren f³r:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Anzeigeeinstellungen", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Mit 256 Farben ausf³hren", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "In Bildschirmaufl÷sung 640 x 480 ausf³hren", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Visuelle Designs deaktivieren", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Kompatibilitõtsmodus õndern", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Weitere Informationen ³ber <A>Programmkompatibilitõt</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kompatibilitõtsmodus õndern" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Hinzuf³gen...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&?ndern...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&L÷schen", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Abbrechen", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END + _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-03-08 18:25:25 UTC (rev 13879) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-03-08 18:48:01 UTC (rev 13880) @@ -9,5 +9,12 @@ #define REACTOS_STR_ORIGINAL_FILENAME "slayer.dll\0" #include <reactos/version.rc> -#include "en.rc" +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ +#include "En.rc" +#include "De.rc" +

19 years, 9 months

[hpoussin] 13879: Remove warning

by hpoussin＠svn.reactos.com

Remove warning Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 17:14:07 UTC (rev 13878) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 18:25:25 UTC (rev 13879) @@ -1463,7 +1463,7 @@ /* u64 variables used to translate some broken 32bit info */ ULARGE_INTEGER u64File1, u64File2; int i; /* An indexer for "for"s */ -long iComp; /* The comparison result */ +long iComp = 0; /* The comparison result */ /* Calculate critiries by order given from user */ for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++)

19 years, 9 months

[royce] 13878: detect PCH support ( not doing anything more than detection yet )

by royce＠svn.reactos.com

detect PCH support ( not doing anything more than detection yet ) Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 15:08:01 UTC (rev 13877) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 17:14:07 UTC (rev 13878) @@ -26,6 +26,8 @@ void MingwBackend::Process () { + DetectPCHSupport(); + CreateMakefile (); GenerateHeader (); GenerateGlobalVariables (); @@ -323,3 +325,24 @@ { return string("$(ROS_INTERMEDIATE)") + NormalizeFilename ( targetFilename ); } + +void +MingwBackend::DetectPCHSupport() +{ + string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; + system ( ssprintf("gcc -c %s", path.c_str()).c_str() ); + path += ".gch"; + { + FILE* f = fopen ( path.c_str(), "rb" ); + if ( f ) + { + use_pch = true; + fclose(f); + unlink ( path.c_str() ); + } + else + use_pch = false; + } + // TODO FIXME - eventually check for ROS_USE_PCH env var and + // allow that to override use_pch if true +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-08 15:08:01 UTC (rev 13877) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-08 17:14:07 UTC (rev 13878) @@ -32,7 +32,10 @@ void GenerateInitTarget () const; void GenerateXmlBuildFilesMacro() const; void CheckAutomaticDependencies (); + void DetectPCHSupport(); + FILE* fMakefile; + bool use_pch; }; std::string FixupTargetFilename ( const std::string& targetFilename ); _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h 2005-03-08 15:08:01 UTC (rev 13877) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h 2005-03-08 17:14:07 UTC (rev 13878) @@ -0,0 +1 @@ +// this file is intentionally left empty \ No newline at end of file Property changes on: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pch_detection .h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 9 months

[fireball] 13877: 27-Feb-2005 (Konstantinos Paliouras <squarious@gmail.com>)

by fireball＠svn.reactos.com

27-Feb-2005 (Konstantinos Paliouras <squarious(a)gmail.com>) Implemented all the switches that were missing, and made the ros dir very similar to windows dir. Major part of the code is rewritten. /p is removed, to be rewriten in the main cmd code. Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 15:02:41 UTC (rev 13876) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-03-08 15:08:01 UTC (rev 13877) @@ -119,6 +119,13 @@ * * 30-Apr-2004 (Filip Navara <xnavara(a)volny.cz>) * Fix /w to print long names. + * + * 27-Feb-2005 (Konstantinos Paliouras <squarious(a)gmail.com>) + * Implemented all the switches that were missing, and made + * the ros dir very similar to windows dir. Major part of + * the code is rewritten. /p is removed, to be rewriten in + * the main cmd code. + * */ #include "precomp.h" @@ -126,21 +133,62 @@ #ifdef INCLUDE_CMD_DIR -/* flag definitions */ -enum + +/* Time Field enumeration */ +enum ETimeField { - DIR_RECURSE = 0x0001, - DIR_PAGE = 0x0002, - DIR_WIDE = 0x0004, /* Rob Lake */ - DIR_BARE = 0x0008, /* Rob Lake */ - DIR_ALL = 0x0010, /* Rob Lake */ - DIR_LWR = 0x0020, /* Rob Lake */ - DIR_SORT = 0x0040, /* /O sort */ - DIR_NEW = 0x0080, /* /N new style */ - DIR_FOUR = 0x0100 /* /4 four digit year */ + TF_CREATIONDATE = 0, + TF_MODIFIEDDATE = 1, + TF_LASTACCESSEDDATE = 2 }; +/* Ordered by enumeration */ +enum EOrderBy +{ + ORDER_NAME = 0, + ORDER_SIZE = 1, + ORDER_DIRECTORY = 2, + ORDER_EXTENSION = 3, + ORDER_TIME = 4 +}; +/* The struct for holding the switches */ +typedef struct TDirSwitchesFlags +{ + BOOL bBareFormat; /* Bare Format */ + BOOL bTSeperator; /* Thousands seperator */ + BOOL bWideList; /* Wide list format */ + BOOL bWideListColSort; /* Wide list format but sorted by column */ + BOOL bLowerCase; /* Uses lower case */ + BOOL bNewLongList; /* New long list */ + BOOL bPause; /* Pause per page */ + BOOL bUser; /* Displays the owner of file */ + BOOL bRecursive; /* Displays files in specified directory and all sub */ + BOOL bShortName; /* Displays the sort name of files if exist */ + BOOL b4Digit; /* Four digit year */ + struct + { + DWORD dwAttribVal; /* The desired state of attribute */ + DWORD dwAttribMask; /* Which attributes to check */ + BOOL bUnSet; /* A helper flag if "-" was given with the switch */ + BOOL bParSetted; /* A helper flag if parameters of switch were given */ + } stAttribs; /* Displays files with this attributes only */ + struct + { + enum EOrderBy eCriteria[3]; /* Criterias used to order by */ + BOOL bCriteriaRev[3]; /* If the criteria is in reversed order */ + short sCriteriaCount; /* The quantity of criterias */ + BOOL bUnSet; /* A helper flag if "-" was given with the switch */ + BOOL bParSetted; /* A helper flag if parameters of switch were given */ + } stOrderBy; /* Ordered by criterias */ + struct + { + enum ETimeField eTimeField; /* The time field that will be used for */ + BOOL bUnSet; /* A helper flag if "-" was given with the switch */ + BOOL bParSetted; /* A helper flag if parameters of switch were given */ + } stTimeField; /* The time field to display or use for sorting */ +}DIRSWITCHFLAGS, * LPDIRSWITCHFLAGS; + typedef BOOL STDCALL (*PGETFREEDISKSPACEEX)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); @@ -158,177 +206,382 @@ * displays help screen for dir * Rob Lake */ -static VOID Help (VOID) +static VOID + DirHelp (VOID) { - ConOutPuts(_T("Displays a list of files and subdirectories in a directory.\n" - "\n" - "DIR [drive:][path][filename] [/A] [/B] [/L] [/N] [/S] [/P] [/W] [/4]\n" - "\n" - " [drive:][path][filename]\n" - " Specifies drive, directory, and/or files to list.\n" - "\n" - " /A Displays files with HIDDEN SYSTEM attributes\n" - " default is ARCHIVE and READ ONLY\n" - " /B Uses bare format (no heading information or summary).\n" - " /L Uses lowercase.\n" - " /N New long list format where filenames are on the far right.\n" - " /S Displays files in specified directory and all subdirectories\n" - " /P Pauses after each screen full\n" - " /W Prints in wide format\n" - " /4 Display four digit years.\n" - "\n" - "Switches may be present in the DIRCMD environment variable. Use\n" - "of the - (hyphen) can turn off defined swtiches. Ex. /-W would\n" - "turn off printing in wide format.\n" + ConOutPuts(_T( + "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n" + " [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n" + "\n" + " [drive:][path][filename]\n" + " Specifies drive, directory, and/or files to list.\n" + "\n" + " /A Displays files with specified attributes.\n" + " attributes D Directories R Read-only files\n" + " H Hidden files A Files ready for archiving\n" + " S System files - Prefix meaning not\n" + " /B Uses bare format (no heading information or summary).\n" + " /C Display the thousand separator in file sizes. This is the\n" + " default. Use /-C to disable display of separator.\n" + " /D Same as wide but files are list sorted by column.\n" + " /L Uses lowercase.\n" + " /N New long list format where filenames are on the far right.\n" + " /O List by files in sorted order.\n" + " sortorder N By name (alphabetic) S By size (smallest first)\n" + " E By extension (alphabetic) D By date/time (oldest first)\n" + " G Group directories first - Prefix to reverse order\n" + " /P Pauses after each screenful of information.\n" + " /Q Display the owner of the file.\n" + " /S Displays files in specified directory and all subdirectories.\n" + " /T Controls which time field displayed or used for sorting\n" + " timefield C Creation\n" + " A Last Access\n" + " W Last Written\n" + " /W Uses wide list format.\n" + " /X This displays the short names generated for non-8dot3 file\n" + " names. The format is that of /N with the short name inserted\n" + " before the long name. If no short name is present, blanks are\n" + " displayed in its place.\n" + " /4 Displays four-digit years\n" + " \n" + "Switches may be preset in the DIRCMD environment variable. Override\n" + "preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" )); } + /* - * DirReadParam + * DirReadParameters * - * read the parameters from the command line + * Parse the parameters and switches of the command line and exports them */ -static BOOL -DirReadParam (LPTSTR line, LPTSTR *param, LPDWORD lpFlags) +static BOOL +DirReadParam (LPTSTR line, /* [IN] The line with the parameters & switches */ + LPTSTR *param, /* [OUT] The parameters after parsing */ + LPDIRSWITCHFLAGS lpFlags /* [IN/OUT] The flags after calculating switches */ + ) { - INT slash = 0; +TCHAR cCurSwitch; /* The current switch */ +TCHAR cCurChar; /* Current examing character */ +TCHAR cCurUChar; /* Current upper examing character */ +BOOL bNegative; /* Negative switch */ +BOOL bPNegative; /* Negative switch parameter */ +BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ +LPTSTR ptrLast; /* A pointer to the last character of param */ - if (!line) - return TRUE; + /* Initialize variables; */ + cCurSwitch = _T(' '); + bNegative = FALSE; + bPNegative = FALSE; + bIntoQuotes = FALSE; + /* No parameters yet */ *param = NULL; + ptrLast = NULL; + + /* We suppose that switch parameters + were given to avoid setting them to default + if the switch was not given */ + lpFlags->stAttribs.bParSetted = TRUE; + lpFlags->stOrderBy.bParSetted = TRUE; + lpFlags->stTimeField.bParSetted = TRUE; - /* scan the command line, processing switches */ + /* Main Loop (see README_DIR.txt) */ + /* scan the command line char per char, and we process its char */ while (*line) { - /* process switch */ - if (*line == _T('/') || slash) + /* we save current character as it is and its upper case */ + cCurChar = *line; + cCurUChar = _toupper(*line); + + /* 1st section (see README_DIR.txt) */ + /* When a switch is expecting */ + if (cCurSwitch == _T('/')) { - if (!slash) - line++; - slash = 0; - if (*line == _T('-')) - { - line++; - if (_totupper (*line) == _T('S')) - *lpFlags &= ~DIR_RECURSE; - else if (_totupper (*line) == _T('P')) - *lpFlags &= ~DIR_PAGE; - else if (_totupper (*line) == _T('W')) - *lpFlags &= ~DIR_WIDE; - else if (_totupper (*line) == _T('B')) - *lpFlags &= ~DIR_BARE; - else if (_totupper (*line) == _T('A')) - *lpFlags &= ~DIR_ALL; - else if (_totupper (*line) == _T('L')) - *lpFlags &= ~DIR_LWR; - else if (_totupper (*line) == _T('N')) - *lpFlags &= ~DIR_NEW; - else if (_totupper (*line) == _T('O')) - *lpFlags &= ~DIR_SORT; - else if (_totupper (*line) == _T('4')) - *lpFlags &= ~DIR_FOUR; - else + if ((cCurUChar == _T('A')) ||(cCurUChar == _T('T')) || (cCurUChar == _T('O'))) + { + cCurSwitch = cCurUChar; + switch (cCurUChar) { - error_invalid_switch ((TCHAR)_totupper (*line)); - return FALSE; + case _T('A'): + lpFlags->stAttribs.bUnSet = bNegative; + lpFlags->stAttribs.bParSetted = FALSE; + break; + case _T('T'): + lpFlags->stTimeField.bUnSet = bNegative; + lpFlags->stTimeField.bParSetted = FALSE; + break; + case _T('O'): + lpFlags->stOrderBy.bUnSet = bNegative; + lpFlags->stOrderBy.bParSetted = FALSE; + break; } - line++; - continue; } - else + else if (cCurUChar == _T('L')) + lpFlags->bLowerCase = ! bNegative; + else if (cCurUChar == _T('B')) + lpFlags->bBareFormat = ! bNegative; + else if (cCurUChar == _T('C')) + lpFlags->bTSeperator = ! bNegative; + else if (cCurUChar == _T('W')) + lpFlags->bWideList = ! bNegative; + else if (cCurUChar == _T('D')) + lpFlags->bWideListColSort = ! bNegative; + else if (cCurUChar == _T('N')) + lpFlags->bNewLongList = ! bNegative; + else if (cCurUChar == _T('P')) + lpFlags->bPause = ! bNegative; + else if (cCurUChar == _T('Q')) + lpFlags->bUser = ! bNegative; + else if (cCurUChar == _T('S')) + lpFlags->bRecursive = ! bNegative; + else if (cCurUChar == _T('X')) + lpFlags->bShortName = ! bNegative; + else if (cCurChar == _T('4')) + lpFlags->b4Digit = ! bNegative; + else if (cCurChar == _T('?')) { - if (_totupper (*line) == _T('S')) - *lpFlags |= DIR_RECURSE; - else if (_totupper (*line) == _T('P')) - *lpFlags |= DIR_PAGE; - else if (_totupper (*line) == _T('W')) - *lpFlags |= DIR_WIDE; - else if (_totupper (*line) == _T('B')) - *lpFlags |= DIR_BARE; - else if (_totupper (*line) == _T('A')) - *lpFlags |= DIR_ALL; - else if (_totupper (*line) == _T('L')) - *lpFlags |= DIR_LWR; - else if (_totupper (*line) == _T('N')) - *lpFlags |= DIR_NEW; - else if (_totupper (*line) == _T('O')) - *lpFlags |= DIR_SORT; - else if (_totupper (*line) == _T('4')) - *lpFlags |= DIR_FOUR; - else if (*line == _T('?')) + DirHelp(); + return FALSE; + } + else if (cCurChar == _T('-')) + bNegative = TRUE; + else + { + error_invalid_switch ((TCHAR)_totupper (*line)); + return FALSE; + } + + /* We check if we calculated the negative value and realese the flag */ + if ((cCurChar != _T('-')) && bNegative) + bNegative = FALSE; + + /* if not a,o,t or - option then next parameter is not a switch */ + if ((cCurSwitch == _T('/')) && (!bNegative)) + cCurSwitch = _T(' '); + + } + /* 2nd section (see README_DIR.txt) */ + /* We are expecting parameter or the unknown */ + else if ((cCurSwitch == _T(' ')) || (cCurSwitch == _T('P'))) + { + if (cCurChar == _T('/')) + cCurSwitch = _T('/'); + + /* Process a spacer */ + else if (cCurChar == _T(' ')) + { + if (!bIntoQuotes) { - Help(); - return FALSE; - } - else + cCurSwitch = _T(' '); + if ((*param) && !(ptrLast)) + ptrLast = line; + } + + } + /* Process a quote */ + else if (cCurChar == _T('\"')) + { + bIntoQuotes = !bIntoQuotes; + if (!bIntoQuotes) ptrLast = line; + } + /* Process a character for parameter */ + else + { + if ((cCurSwitch == _T(' ')) && (*param)) { - error_invalid_switch ((TCHAR)_totupper (*line)); + error_too_many_parameters(line); return FALSE; } - line++; - continue; + cCurSwitch = _T('P'); + if (!(*param)) + *param = line; } + } - - /* process parameter */ - if (!_istspace (*line)) + /* 3rd section (see README_DIR.txt) */ + /* We are waiting for switch parameters */ + else { - if (*param) + /* Check if there are no more switch parameters */ + if ((cCurChar == _T('/')) || ( cCurChar == _T(' '))) { - error_too_many_parameters (line); - return FALSE; + /* Wrong desicion path, reprocess current character */ + cCurSwitch = cCurChar; + continue; } + /* Process parameter switch */ + switch(cCurSwitch) + { + case _T('A'): /* Switch parameters for /A (attributes filter) */ + /* Ok a switch parameter was given */ + lpFlags->stAttribs.bParSetted = TRUE; - *param = line; + if (cCurChar == _T(':')) + /* =V= dead command, used to make the "if" work */ + cCurChar = cCurChar; + else if(cCurChar == _T('-')) + bPNegative = TRUE; + else if(cCurUChar == _T('D')) + { + lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_DIRECTORY; + if (bPNegative) + lpFlags->stAttribs.dwAttribVal &= ~FILE_ATTRIBUTE_DIRECTORY; + else + lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_DIRECTORY; + } + else if(cCurUChar == _T('R')) + { + lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_READONLY; + if (bPNegative) + lpFlags->stAttribs.dwAttribVal &= ~FILE_ATTRIBUTE_READONLY; + else + lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_READONLY; + } + else if(cCurUChar == _T('H')) + { + lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_HIDDEN; + if (bPNegative) + lpFlags->stAttribs.dwAttribVal &= ~FILE_ATTRIBUTE_HIDDEN; + else + lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_HIDDEN; + } + else if(cCurUChar == _T('A')) + { + lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_ARCHIVE; + if (bPNegative) + lpFlags->stAttribs.dwAttribVal &= ~FILE_ATTRIBUTE_ARCHIVE; + else + lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_ARCHIVE; + } + else if(cCurUChar == _T('S')) + { + lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_SYSTEM; + if (bPNegative) + lpFlags->stAttribs.dwAttribVal &= ~FILE_ATTRIBUTE_SYSTEM; + else + lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_SYSTEM; + } + else + { + error_parameter_format((TCHAR)_totupper (*line)); + return FALSE; + } + break; + case _T('T'): /* Switch parameters for /T (time field) */ - /* skip to end of line or next whitespace or next / */ - if (*line != _T('\"')) - { - while (*line && !_istspace (*line) && *line != _T('/')) - line++; + /* Ok a switch parameter was given */ + lpFlags->stTimeField.bParSetted = TRUE; - /* if end of line, return */ - if (!*line) - return TRUE; - } - else - { - /* skip over the initial quote */ - (*param)++; - line++; + if (cCurChar == _T(':')) + /* =V= dead command, used to make the "if" work */ + cCurChar = cCurChar; + else if(cCurUChar == _T('C')) + lpFlags->stTimeField.eTimeField= TF_CREATIONDATE ; + else if(cCurUChar == _T('A')) + lpFlags->stTimeField.eTimeField= TF_LASTACCESSEDDATE ; + else if(cCurUChar == _T('W')) + lpFlags->stTimeField.eTimeField= TF_MODIFIEDDATE ; + else + { + error_parameter_format((TCHAR)_totupper (*line)); + return FALSE; + } + break; + case _T('O'): /* Switch parameters for /O (order) */ + /* Ok a switch parameter was given */ + lpFlags->stOrderBy.bParSetted = TRUE; - while (*line && *line != _T('"')) - line++; + if (cCurChar == _T(':')) + /* <== dead command, used to make the "if" work */ + cCurChar = cCurChar; + else if(cCurChar == _T('-')) + bPNegative = TRUE; + else if(cCurUChar == _T('N')) + { + if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; + lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; + lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_NAME; + } + else if(cCurUChar == _T('S')) + { + if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; + lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; + lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_SIZE; + } + else if(cCurUChar == _T('G')) + { + if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; + lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; + lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_DIRECTORY; + } + else if(cCurUChar == _T('E')) + { + if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; + lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; + lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_EXTENSION; + } + else if(cCurUChar == _T('D')) + { + if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; + lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; + lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_TIME; + } - if (*line == _T('"')) - *line = 0; else - return TRUE; - } + { + error_parameter_format((TCHAR)_totupper (*line)); + return FALSE; + } - /* if parameter, remember to process it later */ - if (*line == _T('/')) - slash = 1; - *line++ = 0; - continue; + } + /* We check if we calculated the negative value and realese the flag */ + if ((cCurChar != _T('-')) && bPNegative) + bPNegative = FALSE; } - + line++; } + /* Terminate the parameters */ + if (ptrLast) *ptrLast = 0; - if (slash) + /* Calculate the switches with no switch paramater */ + if (!(lpFlags->stAttribs.bParSetted)) { - error_invalid_switch ((TCHAR)_totupper (*line)); - return FALSE; + lpFlags->stAttribs.dwAttribVal = 0L; + lpFlags->stAttribs.dwAttribMask = lpFlags->stAttribs.dwAttribVal; } + if (!(lpFlags->stOrderBy.bParSetted)) + { + lpFlags->stOrderBy.sCriteriaCount = 1; + lpFlags->stOrderBy.eCriteria[0] = ORDER_NAME; + lpFlags->stOrderBy.bCriteriaRev[0] = FALSE; + } + if (!(lpFlags->stOrderBy.bParSetted)) + lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE ; + /* Calculate the unsetted switches (the "-" prefixed)*/ + if (lpFlags->stAttribs.bUnSet) + { + lpFlags->stAttribs.bUnSet = FALSE; + lpFlags->stAttribs.dwAttribVal = 0L; + lpFlags->stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; + } + if (lpFlags->stOrderBy.bUnSet) + { + lpFlags->stOrderBy.bUnSet = FALSE; + lpFlags->stOrderBy.sCriteriaCount = 0; + } + if (lpFlags->stTimeField.bUnSet ) + { + lpFlags->stTimeField.bUnSet = FALSE; + lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE; + } return TRUE; } - /* * ExtendFilespec * @@ -507,9 +760,9 @@ * incline * * increment our line if paginating, display message at end of screen - */ + *//*Maybe needed in future static BOOL -IncLine (LPINT pLine, DWORD dwFlags) +IncLine (LPINT pLine, LPDIRSWITCHFLAGS lpFlags) { BOOL error; CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo; @@ -518,16 +771,21 @@ WindowHeight= lpConsoleScreenBufferInfo.srWindow.Bottom - lpConsoleScreenBufferInfo.srWindow.Top; - if (!WindowHeight) //That prevents bad behave if WindowHeight couln't calc + //That prevents bad behave if WindowHeight couln't calc + if (!WindowHeight) { WindowHeight= 1000000; } - if (!(dwFlags & DIR_PAGE)) + if (!(lpFlags->bPause)) return FALSE; (*pLine)++; - if (*pLine >= (int)maxy - 2 || *pLine >= WindowHeight) //Because I don't know if WindowsHeight work under all cases, perhaps then maxy is the right value + // Because I don't know if WindowsHeight + work under all cases, perhaps then maxy + is the right value + + if (*pLine >= (int)maxy - 2 || *pLine >= WindowHeight) { *pLine = 0; return (PagePrompt () == PROMPT_BREAK); @@ -535,22 +793,22 @@ return FALSE; } +*/ - /* * PrintDirectoryHeader * * print the header for the dir command */ static BOOL -PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, DWORD dwFlags) +PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags) { TCHAR szRootName[MAX_PATH]; TCHAR szVolName[80]; DWORD dwSerialNr; LPTSTR p; - if (dwFlags & DIR_BARE) + if (lpFlags->bBareFormat) return(TRUE); /* build usable root path */ @@ -607,15 +865,10 @@ else ConOutPrintf(_T(" has no label\n")); - if (IncLine(pLine, dwFlags)) - return(FALSE); - /* print the volume serial number if the return was successful */ ConOutPrintf(_T(" Volume Serial Number is %04X-%04X\n"), HIWORD(dwSerialNr), LOWORD(dwSerialNr)); - if (IncLine(pLine, dwFlags)) - return(FALSE); return(TRUE); } @@ -625,7 +878,7 @@ * convert * * insert commas into a number - */ + *//* Maybe needed in future static INT ConvertULong (ULONG num, LPTSTR des, INT len) { @@ -656,10 +909,10 @@ return n; } +*/ - static INT -ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len) +ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) { TCHAR temp[32]; INT c = 0; @@ -676,7 +929,7 @@ temp[31] = 0; while (num.QuadPart > 0) { - if (((c + 1) % (nNumberGroups + 1)) == 0) + if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator)) temp[30 - c++] = cThousandSeparator; temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0'); num.QuadPart /= 10; @@ -691,44 +944,80 @@ static VOID -PrintFileDateTime (LPSYSTEMTIME dt, DWORD dwFlags) +DirPrintFileDateTime (TCHAR * lpDate, + TCHAR * lpTime, + LPWIN32_FIND_DATA lpFile, + LPDIRSWITCHFLAGS lpFlags) { - WORD wYear = (dwFlags & DIR_FOUR) ? dt->wYear : dt->wYear%100; +FILETIME ft; +SYSTEMTIME dt; +TCHAR szDate[30]; +TCHAR szTime[30]; +WORD wYear; + /* Select the right time field */ + switch (lpFlags->stTimeField.eTimeField) + { + case TF_CREATIONDATE: + if (!FileTimeToLocalFileTime(&lpFile->ftCreationTime, &ft)) + return; + FileTimeToSystemTime(&ft, &dt); + break; + case TF_LASTACCESSEDDATE : + if (!FileTimeToLocalFileTime(&lpFile->ftLastAccessTime, &ft)) + return; + FileTimeToSystemTime(&ft, &dt); + break; + case TF_MODIFIEDDATE: + if (!FileTimeToLocalFileTime(&lpFile->ftLastWriteTime, &ft)) + return; + FileTimeToSystemTime(&ft, &dt); + break; + } + + /* Format date */ + wYear = (lpFlags->b4Digit) ? dt.wYear : dt.wYear%100; switch (nDateFormat) { case 0: /* mmddyy */ default: - ConOutPrintf (_T("%.2d%c%.2d%c%d"), - dt->wMonth, cDateSeparator, dt->wDay, cDateSeparator, wYear); + _stprintf (szDate,_T("%02d%c%02d%c%0*d"), + dt.wMonth, cDateSeparator, + dt.wDay, cDateSeparator, + lpFlags->b4Digit?4:2, wYear); break; case 1: /* ddmmyy */ - ConOutPrintf (_T("%.2d%c%.2d%c%d"), - dt->wDay, cDateSeparator, dt->wMonth, cDateSeparator, wYear); + _stprintf (szDate, _T("%02d%c%02d%c%0*d"), + dt.wDay, cDateSeparator, dt.wMonth, + cDateSeparator,lpFlags->b4Digit?4:2, wYear); break; case 2: /* yymmdd */ - ConOutPrintf (_T("%d%c%.2d%c%.2d"), - wYear, cDateSeparator, dt->wMonth, cDateSeparator, dt->wDay); + _stprintf (szDate, _T("%0*d%c%02d%c%02d"), + lpFlags->b4Digit?4:2, wYear, cDateSeparator, + dt.wMonth, cDateSeparator, dt.wDay); break; } - + /* Format Time */ switch (nTimeFormat) { case 0: /* 12 hour format */ default: - ConOutPrintf (_T(" %2d%c%.2u%c"), - (dt->wHour == 0 ? 12 : (dt->wHour <= 12 ? dt->wHour : dt->wHour - 12)), + _stprintf (szTime,_T(" %02d%c%02u%c"), + (dt.wHour == 0 ? 12 : (dt.wHour <= 12 ? dt.wHour : dt.wHour - 12)), cTimeSeparator, - dt->wMinute, (dt->wHour <= 11 ? 'a' : 'p')); + dt.wMinute, (dt.wHour <= 11 ? 'a' : 'p')); break; case 1: /* 24 hour format */ - ConOutPrintf (_T(" %2d%c%.2u"), - dt->wHour, cTimeSeparator, dt->wMinute); + _stprintf (szTime, _T(" %02d%c%02u"), + dt.wHour, cTimeSeparator, dt.wMinute); break; } + /* Copy results */ + _tcscpy(lpDate, szDate); + _tcscpy(lpTime, szTime); } @@ -783,457 +1072,734 @@ PrintSummary(LPTSTR szPath, ULONG ulFiles, ULONG ulDirs, - ULARGE_INTEGER bytes, + ULARGE_INTEGER u64Bytes, LPINT pLine, - DWORD dwFlags) + LPDIRSWITCHFLAGS lpFlags) { - TCHAR buffer[64]; - ULARGE_INTEGER uliFree; - TCHAR szRoot[] = _T("A:\\"); +TCHAR szBuffer[64]; +ULARGE_INTEGER uliFree; +TCHAR szRoot[] = _T("A:\\"); - if (dwFlags & DIR_BARE) - return(0); - /* Print number of files and bytes */ - ConvertULong (ulFiles, buffer, sizeof(buffer)); - ConOutPrintf (_T(" %6s File%c"), - buffer, ulFiles == 1 ? _T(' ') : _T('s')); + /* Here we check if we didn't find anything */ + if (!(ulFiles + ulDirs)) + { + error_file_not_found(); + return 1; + } + /* In bare format we don't print results */ + if (lpFlags->bBareFormat) + return 0; - ConvertULargeInteger (bytes, buffer, sizeof(buffer)); - ConOutPrintf (_T(" %15s byte%c\n"), - buffer, bytes.QuadPart == 1 ? _T(' ') : _T('s')); + /* Print recursive specific results */ + if (lpFlags->bRecursive) + { + ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + ConOutPrintf (_T("\n Total Files Listed:\n")); + ConOutPrintf(_T("%16i File(s)% 14s bytes\n"),ulFiles, szBuffer); + } - if (IncLine (pLine, dwFlags)) - return 1; + /* Print total directories and freespace */ + szRoot[0] = szPath[0]; + GetUserDiskFreeSpace(szRoot, &uliFree); + ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + ConOutPrintf (_T("%16i Dir(s)% 15s bytes\n"),ulDirs, szBuffer); - /* Print number of dirs and bytes free */ - ConvertULong (ulDirs, buffer, sizeof(buffer)); - ConOutPrintf (_T(" %6s Dir%c"), - buffer, ulDirs == 1 ? _T(' ') : _T('s')); - - if (!(dwFlags & DIR_RECURSE)) - { - szRoot[0] = szPath[0]; - GetUserDiskFreeSpace(szRoot, &uliFree); - ConvertULargeInteger (uliFree, buffer, sizeof(buffer)); - ConOutPrintf (_T(" %15s bytes free\n"), buffer); - if (IncLine (pLine, dwFlags)) - return 1; - } - else - { - if ((dwFlags & DIR_BARE) == 0) - { - ConOutPrintf (_T("\n")); - if (IncLine (pLine, dwFlags)) - return 1; - ConOutPrintf (_T("\n")); - } - if (IncLine (pLine, dwFlags)) - return 1; - } - return 0; } +/* + * getExt + * + * Get the extension of a filename + */ +TCHAR* getExt(const TCHAR* file) +{ + + TCHAR* tmp = _tcsrchr(file,'.'); + return tmp?tmp+1:""; +} /* - * dir_list + * getName * - * list the files in the directory + * Get the name of the file without extension */ -static INT -DirList (LPTSTR szPath, LPTSTR szFilespec, LPINT pLine, DWORD dwFlags) +TCHAR * getName(const TCHAR* file, TCHAR * dest) { - TCHAR szFullPath[MAX_PATH]; - WIN32_FIND_DATA file; - ULARGE_INTEGER bytecount; - FILETIME ft; - SYSTEMTIME dt; - HANDLE hFile; - TCHAR buffer[32]; - ULONG filecount = 0; - ULONG dircount = 0; - INT count = 0; - SHORT screenwidth; - INT longestfname = 0; +int iLen; +TCHAR* end; + + /* Check for "." and ".." folders */ + if ((_tcscmp(file, _T(".")) == 0) + || (_tcscmp(file, _T("..")) == 0)) + { + _tcscpy(dest,file); + return dest; + } - bytecount.QuadPart = 0; + end = _tcsrchr(file,'.'); + if (!end) + iLen = _tcslen(file); + else + iLen = (end - file); + - _tcscpy (szFullPath, szPath); - if (szFullPath[_tcslen(szFullPath) - 1] != _T('\\')) - _tcscat (szFullPath, _T("\\")); - _tcscat (szFullPath, szFilespec); + _tcsncpy(dest, file, iLen); + *(dest + iLen) = _T('\0'); + + return dest; +} +/* + * DirPrintNewList + * + * The function that prints in new style + */ +static int +DirPrintNewList(LPWIN32_FIND_DATA ptrFiles[], /* [IN]Files' Info */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR * szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ +{ +DWORD i; /* An indexer for "for"s */ +TCHAR szSize[30]; /* The size of file */ +TCHAR szShortName[15]; /* The sort name */ +TCHAR szDate[20], szTime[20]; /* Date and time strings */ +int iSizeFormat; /* The format of size field */ +ULARGE_INTEGER u64FileSize; /* The file size */ - hFile = FindFirstFile (szFullPath, &file); - if (hFile == INVALID_HANDLE_VALUE) + for(i = 0;i < dwCount;i++) { - /* Don't want to print anything if scanning recursively - * for a file. RL - */ - if ((dwFlags & DIR_RECURSE) == 0) + + /* Calculate size */ + if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + /* Directory */ { - FindClose (hFile); - error_file_not_found (); - if (IncLine (pLine, dwFlags)) - return 0; - return 1; + iSizeFormat = -14; + _tcscpy(szSize, _T("<DIR>")); } - FindClose (hFile); - return 0; + else + /* File */ + { + iSizeFormat = 14; + u64FileSize.HighPart = ptrFiles[i]->nFileSizeHigh; + u64FileSize.LowPart = ptrFiles[i]->nFileSizeLow; + ConvertULargeInteger(u64FileSize, szSize, 20,lpFlags->bTSeperator); + } + /* Calculate short name */ [truncated at 1000 lines; 1015 more skipped]

19 years, 9 months

[fireball] 13876: Added error_parameter_format(), patch by Konstantinos Paliouras <squarious@gmail.com>

by fireball＠svn.reactos.com

Added error_parameter_format(), patch by Konstantinos Paliouras <squarious(a)gmail.com> Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/error.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-03-08 14:28:04 UTC (rev 13875) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-03-08 15:02:41 UTC (rev 13876) @@ -228,6 +228,7 @@ VOID error_file_not_found (VOID); VOID error_path_not_found (VOID); VOID error_too_many_parameters (LPTSTR); +VOID error_parameter_format(TCHAR); VOID error_invalid_switch (TCHAR); VOID error_invalid_parameter_format (LPTSTR); VOID error_out_of_memory (VOID); _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-03-08 14:28:04 UTC (rev 13875) +++ trunk/reactos/subsys/system/cmd/error.c 2005-03-08 15:02:41 UTC (rev 13876) @@ -20,6 +20,7 @@ #include "precomp.h" +#define PARAMETERF_ERROR _T("Parameter format not correct - %c\n") #define INVALID_SWITCH _T("Invalid switch - /%c\n") #define TOO_MANY_PARAMETERS _T("Too many parameters - %s\n") #define PATH_NOT_FOUND _T("Path not found\n") @@ -95,6 +96,10 @@ #endif } +VOID error_parameter_format(TCHAR ch) +{ + ConErrPrintf (PARAMETERF_ERROR, ch); +} VOID error_invalid_switch (TCHAR ch)

19 years, 9 months

← Newer
1
...
49
50
51
52
53
54
55
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005