Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[navaraf] 15600: Define __NO_CTYPE_INLINES.
by navaraf＠svn.reactos.com 28 May '05

28 May '05

Define __NO_CTYPE_INLINES. Modified: trunk/reactos/lib/freetype/freetype.xml _____ Modified: trunk/reactos/lib/freetype/freetype.xml --- trunk/reactos/lib/freetype/freetype.xml 2005-05-28 18:43:25 UTC (rev 15599) +++ trunk/reactos/lib/freetype/freetype.xml 2005-05-28 18:45:55 UTC (rev 15600) @@ -4,6 +4,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__NTDRIVER__" /> + <define name="__NO_CTYPE_INLINES" /> <library>ntoskrnl</library> <library>hal</library> <directory name="i386">

1 0

[chorns] 15599: -mi switch for rbuild to not have rbuild create install directories.
by chorns＠svn.reactos.com 28 May '05

28 May '05

-mi switch for rbuild to not have rbuild create install directories. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-28 18:13:11 UTC (rev 15598) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-28 18:43:25 UTC (rev 15599) @@ -670,7 +670,8 @@ printf ( "Creating directories..." ); intermediateDirectory->GenerateTree ( "", configuration.Verbose ); outputDirectory->GenerateTree ( "", configuration.Verbose ); - installDirectory->GenerateTree ( "", configuration.Verbose ); + if ( !configuration.MakeHandlesInstallDirectories ) + installDirectory->GenerateTree ( "", configuration.Verbose ); printf ( "done\n" ); } _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-05-28 18:13:11 UTC (rev 15598) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-05-28 18:43:25 UTC (rev 15599) @@ -8,6 +8,7 @@ Verbose = false; CleanAsYouGo = false; AutomaticDependencies = true; + MakeHandlesInstallDirectories = false; } Configuration::~Configuration () _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-05-28 18:13:11 UTC (rev 15598) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-05-28 18:43:25 UTC (rev 15599) @@ -21,9 +21,26 @@ static Configuration configuration; bool +ParseMakeSwitch ( char switchChar2 ) +{ + switch ( switchChar2 ) + { + case 'i': + configuration.MakeHandlesInstallDirectories = true; + break; + default: + printf ( "Unknown switch -m%c", + switchChar2 ); + return false; + } + return true; +} + +bool ParseSwitch ( int argc, char** argv, int index ) { - char switchChar = argv[index][1]; + char switchChar = strlen ( argv[index] ) > 1 ? argv[index][1] : ' '; + char switchChar2 = strlen ( argv[index] ) > 2 ? argv[index][2] : ' '; switch ( switchChar ) { case 'v': @@ -38,6 +55,8 @@ case 'r': RootXmlFile = string(&argv[index][2]); break; + case 'm': + return ParseMakeSwitch ( switchChar2 ); default: printf ( "Unknown switch -%c", switchChar ); @@ -72,12 +91,13 @@ if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); - printf ( " rbuild [-v] [-rfile.xml] buildsystem\n\n" ); + printf ( " rbuild [switches] buildsystem\n\n" ); printf ( "Switches:\n" ); - printf ( " -v Be verbose\n" ); - printf ( " -c Clean as you go. Delete generated files as soon as they are not needed anymore\n" ); + printf ( " -v Be verbose.\n" ); + printf ( " -c Clean as you go. Delete generated files as soon as they are not needed anymore.\n" ); printf ( " -d Disable automatic dependencies.\n" ); - printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml\n" ); + printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -mi Let make handle creation of install directories. Rbuild will not generate the directories.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-05-28 18:13:11 UTC (rev 15598) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-05-28 18:43:25 UTC (rev 15599) @@ -76,6 +76,7 @@ bool Verbose; bool CleanAsYouGo; bool AutomaticDependencies; + bool MakeHandlesInstallDirectories; }; class Environment

1 0

[greatlrd] 15598: fix compiling error
by greatlrd＠svn.reactos.com 28 May '05

28 May '05

fix compiling error services\umpnpmgr\umpnpmgr.c:43:1: "DBG" redefined <command line>:5:1: this is the location of the previous definition make3: *** [obj-i386\services\umpnpmgr\umpnpmgr.o] Error 1 Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-05-28 18:10:26 UTC (rev 15597) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-05-28 18:13:11 UTC (rev 15598) @@ -40,7 +40,6 @@ #include "pnp_c.h" -#define DBG #define NDEBUG #include <debug.h>

1 0

[chorns] 15597: Correct documentation for ROS_PREFIX. Spotted by Sylvain Petreolle [spetreolle@yahoo.fr].
by chorns＠svn.reactos.com 28 May '05

28 May '05

Correct documentation for ROS_PREFIX. Spotted by Sylvain Petreolle [spetreolle(a)yahoo.fr]. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-28 17:45:01 UTC (rev 15596) +++ trunk/reactos/Makefile 2005-05-28 18:10:26 UTC (rev 15597) @@ -2,9 +2,9 @@ # # ROS_PREFIX # This variable specifies the prefix of the MinGW installation. On Windows -# a prefix is usually not needed, but on linux it is usually "mingw32-". If +# a prefix is usually not needed, but on linux it is usually "mingw32". If # not present and no executable named "gcc" can be found, then the prefix is -# assumed to be "mingw32-". +# assumed to be "mingw32". # # ROS_INTERMEDIATE # This variable controls where to put intermediate files. Intermediate

1 0

[hpoussin] 15596: Use C99 syntax instead of C89 syntax because some compilers are not smart enough to detect and remove dead code
by hpoussin＠svn.reactos.com 28 May '05

28 May '05

Use C99 syntax instead of C89 syntax because some compilers are not smart enough to detect and remove dead code Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-28 17:35:08 UTC (rev 15595) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-28 17:45:01 UTC (rev 15596) @@ -32,7 +32,7 @@ #include <ddk/ntapi.h> #ifdef DBG -#define DPRINT(arg) DbgPrint(arg) +#define DPRINT(arg) DbgPrint arg; #else #define DPRINT(arg) #endif

1 0

[mf] 15595: fix pattern matching
by mf＠svn.reactos.com 28 May '05

28 May '05

fix pattern matching Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-28 17:23:33 UTC (rev 15594) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-28 17:35:08 UTC (rev 15595) @@ -2562,15 +2562,16 @@ (entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0'))) continue; - if (pattern) - if (!pattern_match(entry->data.cFileName, pattern)) - continue; - /* filter directories in right pane */ if (!pane->treePane && !(filter_flags&TF_DIRECTORIES)) continue; } + /* filter using the file name pattern */ + if (pattern) + if (!pattern_match(entry->data.cFileName, pattern)) + continue; + /* filter system and hidden files */ if (!(filter_flags&TF_HIDDEN) && (entry->data.dwFileAttributes&(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYST EM))) continue;

1 0

[ion] 15594: build acpi with w32api
by ion＠svn.reactos.com 28 May '05

28 May '05

build acpi with w32api Modified: trunk/reactos/drivers/bus/acpi/acpi.xml Modified: trunk/reactos/drivers/bus/acpi/include/acconfig.h Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h Modified: trunk/reactos/drivers/bus/acpi/include/platform/types.h Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c _____ Modified: trunk/reactos/drivers/bus/acpi/acpi.xml --- trunk/reactos/drivers/bus/acpi/acpi.xml 2005-05-28 17:17:27 UTC (rev 15593) +++ trunk/reactos/drivers/bus/acpi/acpi.xml 2005-05-28 17:23:33 UTC (rev 15594) @@ -1,6 +1,7 @@ <module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true"> <include base="acpi">include</include> <include base="acpi">ospm/include</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <directory name="dispatcher"> _____ Modified: trunk/reactos/drivers/bus/acpi/include/acconfig.h --- trunk/reactos/drivers/bus/acpi/include/acconfig.h 2005-05-28 17:17:27 UTC (rev 15593) +++ trunk/reactos/drivers/bus/acpi/include/acconfig.h 2005-05-28 17:23:33 UTC (rev 15594) @@ -148,6 +148,5 @@ #define HI_RSDP_WINDOW_SIZE 0x20000 #define RSDP_SCAN_STEP 16 - #endif /* _ACCONFIG_H */ _____ Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h --- trunk/reactos/drivers/bus/acpi/include/actypes.h 2005-05-28 17:17:27 UTC (rev 15593) +++ trunk/reactos/drivers/bus/acpi/include/actypes.h 2005-05-28 17:23:33 UTC (rev 15594) @@ -156,7 +156,6 @@ #define ACPI_UINT64_MAX (UINT64) 0xFFFFFFFFFFFFFFFF #endif - #ifdef DEFINE_ALTERNATE_TYPES /* * Types used only in translated source _____ Modified: trunk/reactos/drivers/bus/acpi/include/platform/types.h --- trunk/reactos/drivers/bus/acpi/include/platform/types.h 2005-05-28 17:17:27 UTC (rev 15593) +++ trunk/reactos/drivers/bus/acpi/include/platform/types.h 2005-05-28 17:23:33 UTC (rev 15594) @@ -15,4 +15,8 @@ #include <ddk/ntddk.h> +typedef UCHAR UINT8; +typedef USHORT UINT16; +typedef ULONGLONG UINT64; + #endif /* __INCLUDE_ACPI_TYPES_H */ _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c --- trunk/reactos/drivers/bus/acpi/ospm/osl.c 2005-05-28 17:17:27 UTC (rev 15593) +++ trunk/reactos/drivers/bus/acpi/ospm/osl.c 2005-05-28 17:23:33 UTC (rev 15594) @@ -27,6 +27,11 @@ #define NDEBUG #include <debug.h> +/* NDK FIXME */ +NTSTATUS +STDCALL +NtVdmControl (ULONG ControlCode, PVOID ControlData); + static PKINTERRUPT AcpiInterrupt; static BOOLEAN AcpiInterruptHandlerRegistered = FALSE; static OSD_HANDLER AcpiIrqHandler = NULL;

1 0

[ion] 15593: Put dbg=1 as default again
by ion＠svn.reactos.com 28 May '05

28 May '05

Put dbg=1 as default again Modified: trunk/reactos/config.template.xml _____ Modified: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2005-05-28 17:13:56 UTC (rev 15592) +++ trunk/reactos/config.template.xml 2005-05-28 17:17:27 UTC (rev 15593) @@ -36,4 +36,4 @@ Whether to compile for debugging. No compiler optimizations will be performed. --> -<property name="DBG" value="0" /> +<property name="DBG" value="1" />

1 0

[mf] 15592: implement file filtering (matching file name patterns and file types)
by mf＠svn.reactos.com 28 May '05

28 May '05

implement file filtering (matching file name patterns and file types) Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -98,7 +98,7 @@ MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", 409 + MENUITEM "Sortera efter &...", ID_VIEW_FILTER } POPUP "&Instõllningar" { _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -97,7 +97,7 @@ MENUITEM "T°Ýdit podle &velikosti" , ID_VIEW_SORT_SIZE MENUITEM "T°Ýdit podle &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "T°Ýdit podle &..." , 409 + MENUITEM "T°Ýdit podle &..." , ID_VIEW_FILTER } POPUP "&NastavenÝ" { _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -2,7 +2,7 @@ * Winefile * German Language Support * - * Copyright 2000 Martin Fuchs + * Copyright 2000, 2005 Martin Fuchs * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * @@ -96,7 +96,7 @@ MENUITEM "Nach &Gr÷?e" , ID_VIEW_SORT_SIZE MENUITEM "Nach &Datum" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Angaben ausw&õhlen..." , 409 + MENUITEM "Angaben ausw&õhlen..." , ID_VIEW_FILTER } POPUP "&Optionen" { @@ -176,6 +176,29 @@ PUSHBUTTON "&Durchsuchen" , 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Angaben auswõhlen" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Dateityp",-1,7,23,87,56 + CONTROL "&Verzeichnisse",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programme",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokumente",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Andere Dateien",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Vers&teckte/Systemdateien anzeigen",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung" _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -99,7 +99,7 @@ MENUITEM "Sort by Si&ze" , ID_VIEW_SORT_SIZE MENUITEM "Sort by &Date" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Filter by &..." , 409 + MENUITEM "Filter by &..." , ID_VIEW_FILTER } POPUP "&Options" { @@ -179,6 +179,29 @@ PUSHBUTTON "&Browse" , 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "By File Type" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "File Type",-1,7,23,87,56 + CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Applying font settings" _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -95,7 +95,7 @@ MENUITEM "Ordenar por t&ama±o" , ID_VIEW_SORT_SIZE MENUITEM "Ordenar por &fecha" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Ordenar por &..." , 409 + MENUITEM "Ordenar por &..." , ID_VIEW_FILTER } POPUP "&Opciones" { _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -98,7 +98,7 @@ MENUITEM "Trier par Ta&ille" , ID_VIEW_SORT_SIZE MENUITEM "Trier par Dat&e" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Trier par &..." , 409 + MENUITEM "Trier par &..." , ID_VIEW_FILTER } POPUP "&Options" { _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -98,7 +98,7 @@ MENUITEM "RendezÚs &mÚret szerint" , ID_VIEW_SORT_SIZE MENUITEM "RendezÚs &dßtum szerint" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Egyedi rendezÚs &..." , 409 + MENUITEM "Egyedi rendezÚs &..." , ID_VIEW_FILTER } POPUP "&BeßllÝtßsok" { _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -98,7 +98,7 @@ MENUITEM "&Ordina per Dimensione" , ID_VIEW_SORT_SIZE MENUITEM "&Ordina per Data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Ordina per &..." , 409 + MENUITEM "Ordina per &..." , ID_VIEW_FILTER } POPUP "&Opzioni" { _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -94,7 +94,7 @@ MENUITEM "Sorteer op &grootte" , ID_VIEW_SORT_SIZE MENUITEM "Sorteer op &datum" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Sorteer op &..." , 409 + MENUITEM "Sorteer op &..." , ID_VIEW_FILTER } POPUP "&Opties" { _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -98,7 +98,7 @@ MENUITEM "Rozmie£µ &po wielko£ci" , 406 MENUITEM "&Sortuj po dacie" , 407 MENUITEM SEPARATOR - MENUITEM "Sortuj po &..." , 409 + MENUITEM "Sortuj po &..." , ID_VIEW_FILTER } POPUP "&Opcje" { _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -97,7 +97,7 @@ MENUITEM "Cl&assificar por tamanho" , ID_VIEW_SORT_SIZE MENUITEM "Cla&ssificar por &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Classificar &por..." , 409 + MENUITEM "Classificar &por..." , ID_VIEW_FILTER } POPUP "&Opþ§es" { @@ -225,7 +225,7 @@ MENUITEM "Cl&assificar por tamanho" , ID_VIEW_SORT_SIZE MENUITEM "Cla&ssificar por &data" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Classificar &por..." , 409 + MENUITEM "Classificar &por..." , ID_VIEW_FILTER } POPUP "&Opþ§es" { _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-28 17:13:56 UTC (rev 15592) @@ -35,6 +35,7 @@ #define IDD_EXECUTE 103 #define IDD_SELECT_DESTINATION 104 +#define IDD_DIALOG_VIEW_TYPE 105 /* control ids */ @@ -53,6 +54,7 @@ #define ID_VIEW_SORT_TYPE 405 #define ID_VIEW_SORT_SIZE 406 #define ID_VIEW_SORT_DATE 407 +#define ID_VIEW_FILTER 409 #define ID_VIEW_SPLIT 414 #define ID_SELECT_FONT 510 #define ID_VIEW_TOOL_BAR 508 @@ -71,7 +73,14 @@ #define ID_HELP_USING 0xE144 #define ID_HELP 0xE146 +#define IDC_VIEW_PATTERN 1000 +#define IDC_VIEW_TYPE_DIRECTORIES 1001 +#define IDC_VIEW_TYPE_PROGRAMS 1002 +#define IDC_VIEW_TYPE_DOCUMENTS 1003 +#define IDC_VIEW_TYPE_OTHERS 1004 +#define IDC_VIEW_TYPE_HIDDEN 1005 + /* winefile extensions */ #define ID_ABOUT_WINE 0x8000 _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -94,7 +94,7 @@ MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &ÓþýÕ¾" , ID_VIEW_SORT_SIZE MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ õ&Ó?Õ" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &..." , 409 + MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &..." , ID_VIEW_FILTER } POPUP "&?Ó±?¯ÚÛÞ" { _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -95,7 +95,7 @@ MENUITEM "Sort by Si&ze" , ID_VIEW_SORT_SIZE MENUITEM "Sort by &Date" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Filter by &..." , 409 + MENUITEM "Filter by &..." , ID_VIEW_FILTER } POPUP "&Options" { _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-28 17:13:56 UTC (rev 15592) @@ -141,6 +141,8 @@ BOOL header_wdths_ok; TCHAR path[MAX_PATH]; + TCHAR filter_pattern[MAX_PATH]; + int filter_flags; Root root; SORT_ORDER sortOrder; @@ -1375,10 +1377,22 @@ } +/* flags to filter different file types */ +enum TYPE_FILTER { + TF_DIRECTORIES = 0x01, + TF_PROGRAMS = 0x02, + TF_DOCUMENTS = 0x04, + TF_OTHERS = 0x08, + TF_HIDDEN = 0x10, + TF_ALL = 0x1F +}; + + static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) { TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; TCHAR b1[BUFFER_LEN]; + const static TCHAR sAsterics[] = {'*', '\0'}; ChildWnd* child = (ChildWnd*) malloc(sizeof(ChildWnd)); Root* root = &child->root; @@ -1416,6 +1430,9 @@ _tsplitpath(path, drv, dir, name, ext); } + _tcscpy(child->filter_pattern, sAsterics); + child->filter_flags = TF_ALL; + root->entry.level = 0; entry = read_tree(root, path, pidl, drv, child->sortOrder, hwnd); @@ -1637,7 +1654,6 @@ int cmdshow; }; - static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { static struct ExecuteDialog* dlg; @@ -1664,6 +1680,7 @@ return 0; } + static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; @@ -1701,6 +1718,53 @@ } +struct FilterDialog { + TCHAR pattern[MAX_PATH]; + int flags; +}; + +static INT_PTR CALLBACK FilterDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) +{ + static struct FilterDialog* dlg; + + switch(nmsg) { + case WM_INITDIALOG: + dlg = (struct FilterDialog*) lparam; + SetWindowText(GetDlgItem(hwnd, IDC_VIEW_PATTERN), dlg->pattern); + Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DIRECTORIES), (dlg->flags&TF_DIRECTORIES? BST_CHECKED: BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_PROGRAMS), dlg->flags&TF_PROGRAMS? BST_CHECKED: BST_UNCHECKED); + Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DOCUMENTS), dlg->flags&TF_DOCUMENTS? BST_CHECKED: BST_UNCHECKED); + Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_OTHERS), dlg->flags&TF_OTHERS? BST_CHECKED: BST_UNCHECKED); + Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_HIDDEN), dlg->flags&TF_HIDDEN? BST_CHECKED: BST_UNCHECKED); + return 1; + + case WM_COMMAND: { + int id = (int)wparam; + + if (id == IDOK) { + int flags = 0; + + GetWindowText(GetDlgItem(hwnd, IDC_VIEW_PATTERN), dlg->pattern, MAX_PATH); + + flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DIRECTORIES))&BST_CHECKED? TF_DIRECTORIES: 0; + flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_PROGRAMS))&BST_CHECKED? TF_PROGRAMS: 0; + flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DOCUMENTS))&BST_CHECKED? TF_DOCUMENTS: 0; + flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_OTHERS))&BST_CHECKED? TF_OTHERS: 0; + flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_HIDDEN))&BST_CHECKED? TF_HIDDEN: 0; + + dlg->flags = flags; + + EndDialog(hwnd, id); + } else if (id == IDCANCEL) + EndDialog(hwnd, id); + + return 1;} + } + + return 0; +} + + #ifndef _NO_EXTENSIONS static struct FullScreenParameters { @@ -2434,9 +2498,46 @@ } +static BOOL pattern_match(LPCTSTR str, LPCTSTR pattern) +{ + for( ; *str&&*pattern; str++,pattern++) { + if (*pattern == '*') { + do pattern++; + while(*pattern == '*'); + + if (!*pattern) + return TRUE; + + for(; *str; str++) + if (_totupper(*str)==_totupper(*pattern) && pattern_match(str, pattern)) + return TRUE; + + return FALSE; + } + else if (_totupper(*str)!=_totupper(*pattern) && *pattern!='?') + return FALSE; + } + + if (*str || *pattern) + if (*pattern!='*' || pattern[1]!='\0') + return FALSE; + + return TRUE; +} + + +enum FILE_TYPE { + FT_OTHER = 0, + FT_EXECUTABLE = 1, + FT_DOCUMENT = 2 +}; + +static enum FILE_TYPE get_file_type(LPCTSTR filename); + + /* insert listbox entries after index idx */ -static int insert_entries(Pane* pane, Entry* dir, int idx) +static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_flags, int idx) { Entry* entry = dir; @@ -2451,23 +2552,54 @@ continue; #endif - /* don't display entries "." and ".." in the left pane */ - if (pane->treePane && (entry->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) - && entry->data.cFileName[0]==TEXT('.')) - if ( -#ifndef _NO_EXTENSIONS - entry->data.cFileName[1]==TEXT('\0') || -#endif - (entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0'))) + if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + /* don't display entries "." and ".." in the left pane */ + if (pane->treePane && entry->data.cFileName[0]==TEXT('.')) + if ( + #ifndef _NO_EXTENSIONS + entry->data.cFileName[1]==TEXT('\0') || + #endif + (entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0'))) + continue; + + if (pattern) + if (!pattern_match(entry->data.cFileName, pattern)) + continue; + + /* filter directories in right pane */ + if (!pane->treePane && !(filter_flags&TF_DIRECTORIES)) continue; + } + /* filter system and hidden files */ + if (!(filter_flags&TF_HIDDEN) && (entry->data.dwFileAttributes&(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYST EM))) + continue; + + /* filter looking at the file type */ + if ((filter_flags&(TF_PROGRAMS|TF_DOCUMENTS|TF_OTHERS)) != (TF_PROGRAMS|TF_DOCUMENTS|TF_OTHERS)) + switch(get_file_type(entry->data.cFileName)) { + case FT_EXECUTABLE: + if (!(filter_flags & TF_PROGRAMS)) + continue; + break; + + case FT_DOCUMENT: + if (!(filter_flags & TF_DOCUMENTS)) + continue; + break; + + default: // TF_OTHERS + if (!(filter_flags & TF_OTHERS)) + continue; + } + if (idx != -1) idx++; ListBox_InsertItemData(pane->hwnd, idx, entry); if (pane->treePane && entry->expanded) - idx = insert_entries(pane, entry->down, idx); + idx = insert_entries(pane, entry->down, pattern, filter_flags, idx); } ShowWindow(pane->hwnd, SW_SHOW); @@ -2512,7 +2644,7 @@ static WNDPROC g_orgTreeWndProc; -static void create_tree_window(HWND parent, Pane* pane, int id, int id_header) +static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, LPCTSTR pattern, int filter_flags) { const static TCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; @@ -2530,7 +2662,7 @@ /* insert entries into listbox */ if (entry) - insert_entries(pane, entry, -1); + insert_entries(pane, entry, pattern, filter_flags, -1); /* calculate column widths */ if (!s_init) { @@ -2548,8 +2680,8 @@ static void InitChildWindow(ChildWnd* child) { - create_tree_window(child->hwnd, &child->left, IDW_TREE_LEFT, IDW_HEADER_LEFT); - create_tree_window(child->hwnd, &child->right, IDW_TREE_RIGHT, IDW_HEADER_RIGHT); + create_tree_window(child->hwnd, &child->left, IDW_TREE_LEFT, IDW_HEADER_LEFT, NULL, TF_ALL); + create_tree_window(child->hwnd, &child->right, IDW_TREE_RIGHT, IDW_HEADER_RIGHT, child->filter_pattern, child->filter_flags); } @@ -2674,7 +2806,7 @@ } -static int is_exe_file(LPCTSTR ext) +static BOOL is_exe_file(LPCTSTR ext) { static const TCHAR executable_extensions[][4] = { {'C','O','M','\0'}, @@ -2698,20 +2830,36 @@ d++; for(p=executable_extensions; (*p)[0]; p++) - if (!_tcscmp(ext_buffer, *p)) - return 1; + if (!_tcsicmp(ext_buffer, *p)) + return TRUE; - return 0; + return FALSE; } -static int is_registered_type(LPCTSTR ext) +static BOOL is_registered_type(LPCTSTR ext) { - /* TODO */ + /* check if there exists a classname for this file extension in the registry */ + if (!RegQueryValue(HKEY_CLASSES_ROOT, ext, NULL, NULL)) + return TRUE; - return 1; + return FALSE; } +static enum FILE_TYPE get_file_type(LPCTSTR filename) +{ + LPCTSTR ext = _tcsrchr(filename, '.'); + if (!ext) + ext = sEmpty; + if (is_exe_file(ext)) + return FT_EXECUTABLE; + else if (is_registered_type(ext)) + return FT_DOCUMENT; + else + return FT_OTHER; +} + + static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWidthCol) { TCHAR buffer[BUFFER_LEN]; @@ -2744,16 +2892,11 @@ else img = IMG_FOLDER; } else { - LPCTSTR ext = _tcsrchr(entry->data.cFileName, '.'); - if (!ext) - ext = sEmpty; - - if (is_exe_file(ext)) - img = IMG_EXECUTABLE; - else if (is_registered_type(ext)) - img = IMG_DOCUMENT; - else - img = IMG_FILE; + switch(get_file_type(entry->data.cFileName)) { + case FT_EXECUTABLE: img = IMG_EXECUTABLE; break; + case FT_DOCUMENT: img = IMG_DOCUMENT; break; + default: img = IMG_FILE; + } } } else { attrs = 0; @@ -3254,7 +3397,7 @@ } /* insert found entries in right pane */ - insert_entries(&child->right, entry->down, -1); + insert_entries(&child->right, entry->down, child->filter_pattern, child->filter_flags, -1); calc_widths(&child->right, FALSE); #ifndef _NO_EXTENSIONS set_header(&child->right); @@ -3295,7 +3438,7 @@ dir->expanded = TRUE; /* insert entries in left pane */ - insert_entries(&child->left, p, idx); + insert_entries(&child->left, p, NULL, TF_ALL, idx); if (!child->header_wdths_ok) { if (calc_widths(&child->left, FALSE)) { @@ -3334,6 +3477,17 @@ } +static void refresh_right_pane(ChildWnd* child) +{ + ListBox_ResetContent(child->right.hwnd); + insert_entries(&child->right, child->right.root, child->filter_pattern, child->filter_flags, -1); + calc_widths(&child->right, FALSE); + +#ifndef _NO_EXTENSIONS + set_header(&child->right); +#endif +} + static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd) { TCHAR path[MAX_PATH]; @@ -3341,19 +3495,14 @@ path[0] = '\0'; child->left.cur = entry; + child->right.root = entry->down? entry->down: entry; child->right.cur = entry; if (!entry->scanned) scan_entry(child, entry, idx, hwnd); - else { - ListBox_ResetContent(child->right.hwnd); - insert_entries(&child->right, entry->down, -1); - calc_widths(&child->right, FALSE); -#ifndef _NO_EXTENSIONS - set_header(&child->right); -#endif - } + else + refresh_right_pane(child); get_path(entry, path); lstrcpy(child->path, path); @@ -3390,7 +3539,7 @@ if (!entry) entry = &child->root.entry; - insert_entries(&child->left, child->root.entry.down, 0); + insert_entries(&child->left, child->root.entry.down, NULL, TF_ALL, 0); set_curdir(child, entry, 0, child->hwnd); @@ -4000,6 +4149,20 @@ set_sort_order(child, SORT_DATE); break; + case ID_VIEW_FILTER: { + struct FilterDialog dlg; + + memset(&dlg, 0, sizeof(struct FilterDialog)); + _tcscpy(dlg.pattern, child->filter_pattern); + dlg.flags = child->filter_flags; + + if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_DIALOG_VIEW_TYPE), hwnd, FilterDialogDlgProc, (LPARAM)&dlg) == IDOK) { + _tcscpy(child->filter_pattern, dlg.pattern); + child->filter_flags = dlg.flags; + refresh_right_pane(child); + } + break;} + case ID_VIEW_SPLIT: { last_split = child->split_pos; #ifdef _NO_EXTENSIONS _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-28 16:51:42 UTC (rev 15591) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-28 17:13:56 UTC (rev 15592) @@ -95,7 +95,7 @@ MENUITEM "???¾ðí??ð?ú¿&Zú®" , ID_VIEW_SORT_SIZE MENUITEM "???iã???ð?ú¿&Dú®" , ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Â¿Íã??ð?..." , 409 + MENUITEM "Â¿Íã??ð?..." , ID_VIEW_FILTER } POPUP "Ðí¤¯ú¿&Oú®" {

1 0

[chorns] 15591: Add depends target as suggested by Martin Fuchs
by chorns＠svn.reactos.com 28 May '05

28 May '05

Add depends target as suggested by Martin Fuchs Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-28 16:47:15 UTC (rev 15590) +++ trunk/reactos/Makefile 2005-05-28 16:51:42 UTC (rev 15591) @@ -256,3 +256,8 @@ .PHONY: clean clean: makefile_auto_clean + +.PHONY: depends +depends: + @-$(rm) makefile.auto + @$(MAKE) $(filter-out depends, $(MAKECMDGOALS))

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005