Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[gedmurphy] 72600: Stub 'LoadString(UINT)'

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 20:30:13 2016 New Revision: 72600 URL: http://svn.reactos.org/svn/reactos?rev=72600&view=rev Log: Stub 'LoadString(UINT)' Modified: trunk/reactos/sdk/lib/atl/cstringt.h Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] Tue Sep 6 20:30:13 2016 @@ -433,6 +433,11 @@ return *this; } + BOOL LoadString(_In_ UINT nID) + { + return 0; + } + _Check_return_ BOOL LoadString(_In_ HINSTANCE hInstance, _In_ UINT nID) {

8 years, 3 months

[gedmurphy] 72599: try to fix unix build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 20:26:26 2016 New Revision: 72599 URL: http://svn.reactos.org/svn/reactos?rev=72599&view=rev Log: try to fix unix build Modified: trunk/reactos/base/applications/fltmc/fltmc.cpp Modified: trunk/reactos/base/applications/fltmc/fltmc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] Tue Sep 6 20:26:26 2016 @@ -19,7 +19,7 @@ #else #include <Windows.h> #endif -#include <fltUser.h> +#include <fltuser.h> #include <atlstr.h> #include "resource.h"

8 years, 3 months

[gedmurphy] 72598: [FLTMC] - Add fltmc to the build - Add some resource files for translation

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 20:22:04 2016 New Revision: 72598 URL: http://svn.reactos.org/svn/reactos?rev=72598&view=rev Log: [FLTMC] - Add fltmc to the build - Add some resource files for translation Added: trunk/reactos/base/applications/fltmc/lang/bg-BG.rc (with props) trunk/reactos/base/applications/fltmc/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/fltmc/lang/de-DE.rc (with props) trunk/reactos/base/applications/fltmc/lang/es-ES.rc (with props) trunk/reactos/base/applications/fltmc/lang/fr-FR.rc (with props) trunk/reactos/base/applications/fltmc/lang/it-IT.rc (with props) trunk/reactos/base/applications/fltmc/lang/pl-PL.rc (with props) trunk/reactos/base/applications/fltmc/lang/ro-RO.rc (with props) trunk/reactos/base/applications/fltmc/lang/ru-RU.rc (with props) trunk/reactos/base/applications/fltmc/lang/sq-AL.rc (with props) trunk/reactos/base/applications/fltmc/lang/sv-SE.rc (with props) trunk/reactos/base/applications/fltmc/lang/tr-TR.rc (with props) trunk/reactos/base/applications/fltmc/lang/uk-UA.rc (with props) trunk/reactos/base/applications/fltmc/lang/zh-CN.rc (with props) trunk/reactos/base/applications/fltmc/lang/zh-TW.rc (with props) Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/fltmc/fltmc.rc Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -9,6 +9,7 @@ add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) +add_subdirectory(fltmc) add_subdirectory(fontview) add_subdirectory(games) add_subdirectory(hh) Modified: trunk/reactos/base/applications/fltmc/fltmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fltmc/fltmc.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -5,56 +5,56 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Filter Manager Control Program" #define REACTOS_STR_INTERNAL_NAME "fltmc" #define REACTOS_STR_ORIGINAL_FILENAME "fltmc.exe" -//#include <reactos/version.rc> +#include <reactos/version.rc> /* UTF-8 */ #pragma code_page(65001) -//#ifdef LANGUAGE_BG_BG -// #include "lang/bg-BG.rc" -//#endif -//#ifdef LANGUAGE_CS_CZ -// #include "lang/cs-CZ.rc" -//#endif -//#ifdef LANGUAGE_DE_DE -// #include "lang/de-DE.rc" -//#endif -//#ifdef LANGUAGE_EN_US +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US #include "lang/en-US.rc" -//#endif -//#ifdef LANGUAGE_ES_ES -// #include "lang/es-ES.rc" -//#endif -//#ifdef LANGUAGE_FR_FR -// #include "lang/fr-FR.rc" -//#endif -//#ifdef LANGUAGE_IT_IT -// #include "lang/it-IT.rc" -//#endif -//#ifdef LANGUAGE_PL_PL -// #include "lang/pl-PL.rc" -//#endif -//#ifdef LANGUAGE_RO_RO -// #include "lang/ro-RO.rc" -//#endif -//#ifdef LANGUAGE_RU_RU -// #include "lang/ru-RU.rc" -//#endif -//#ifdef LANGUAGE_SV_SE -// #include "lang/sv-SE.rc" -//#endif -//#ifdef LANGUAGE_SQ_AL -// #include "lang/sq-AL.rc" -//#endif -//#ifdef LANGUAGE_TR_TR -// #include "lang/tr-TR.rc" -//#endif -//#ifdef LANGUAGE_UK_UA -// #include "lang/uk-UA.rc" -//#endif -//#ifdef LANGUAGE_ZH_CN -// #include "lang/zh-CN.rc" -//#endif -//#ifdef LANGUAGE_ZH_TW -// #include "lang/zh-TW.rc" -//#endif +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Added: trunk/reactos/base/applications/fltmc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/bg-BG.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/cs-CZ.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/de-DE.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/es-ES.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/fr-FR.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/it-IT.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/pl-PL.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/ro-RO.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/ru-RU.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/sq-AL.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/sq-AL.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/sq-AL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/sv-SE.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/sv-SE.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/tr-TR.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/uk-UA.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/zh-CN.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/zh-TW.rc [iso-8859-1] Tue Sep 6 20:22:04 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 3 months

[gedmurphy] 72597: [FLTMGR] - We can now swap the 2k3 fltmgr with ours and successfully boot windows, so we can use the same name from here on. - Start type is still demand as I've not done too muc...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 17:10:14 2016 New Revision: 72597 URL: http://svn.reactos.org/svn/reactos?rev=72597&view=rev Log: [FLTMGR] - We can now swap the 2k3 fltmgr with ours and successfully boot windows, so we can use the same name from here on. - Start type is still demand as I've not done too much testing in ros, but it seems to be boot and run fine, so can be changed to boot start for anyone wanting to experiment a bit. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Sep 6 17:10:14 2016 @@ -2008,11 +2008,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Type",0x00010001,0x00000002 ; Filesystem Filter Manager driver -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"FSFilter Infrastructure" -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Group",0x00000000,"FSFilter Infrastructure" +HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","ImagePath",0x00020000,"system32\drivers\fltmgr.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Type",0x00010001,0x00000002 ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001

8 years, 3 months

[gedmurphy] 72596: [FLTMGR] - Set correct major and minor versions - Update the cmakelist file - Export FltRegisterFilter and FltUnregisterFilter - Minor cleanup

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 17:03:27 2016 New Revision: 72596 URL: http://svn.reactos.org/svn/reactos?rev=72596&view=rev Log: [FLTMGR] - Set correct major and minor versions - Update the cmakelist file - Export FltRegisterFilter and FltUnregisterFilter - Minor cleanup Added: trunk/reactos/drivers/filters/fltmgr/fltmgr.spec (with props) Modified: trunk/reactos/drivers/filters/fltmgr/CMakeLists.txt trunk/reactos/drivers/filters/fltmgr/Lib.c trunk/reactos/drivers/filters/fltmgr/Object.c trunk/reactos/drivers/filters/fltmgr/fltmgr.h Modified: trunk/reactos/drivers/filters/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/CMa… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/CMakeLists.txt [iso-8859-1] Tue Sep 6 17:03:27 2016 @@ -1,14 +1,26 @@ list(APPEND SOURCE + Context.c + Dispatch.c + Filter.c Interface.c - Registration.c + Lib.c Object.c - Lib.c + ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) -add_library(rosfltmgr SHARED ${SOURCE} fltmgr.rc) -set_module_type(rosfltmgr kernelmodedriver) -target_link_libraries(rosfltmgr ${PSEH_LIB}) -add_importlibs(rosfltmgr ntoskrnl hal) -add_pch(rosfltmgr fltmgr.h SOURCE) -add_cd_file(TARGET rosfltmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr + includes) + +spec2def(fltmgr.sys fltmgr.spec ADD_IMPORTLIB) + +add_library(fltmgr SHARED + ${SOURCE} + fltmgr.rc) + +set_module_type(fltmgr kernelmodedriver) +target_link_libraries(fltmgr ${PSEH_LIB}) +add_importlibs(fltmgr ntoskrnl hal) +add_pch(fltmgr fltmgr.h SOURCE) +add_cd_file(TARGET fltmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filters/fltmgr/Lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Lib… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Lib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Lib.c [iso-8859-1] Tue Sep 6 17:03:27 2016 @@ -1,7 +1,7 @@ /* * PROJECT: Filesystem Filter Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/fs_minifilter/fltmgr/Lib.c +* FILE: drivers/filters/fltmgr/Lib.c * PURPOSE: Miscellaneous library functions * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) */ Modified: trunk/reactos/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Obj… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] Tue Sep 6 17:03:27 2016 @@ -1,7 +1,7 @@ /* * PROJECT: Filesystem Filter Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/fs_minifilter/fltmgr/Object.c +* FILE: drivers/filters/fltmgr/Object.c * PURPOSE: Miscellaneous library functions * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) */ @@ -12,6 +12,7 @@ /* INCLUDES ******************************************************************/ #include "fltmgr.h" +#include "fltmgrint.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/filters/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/flt… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/fltmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/fltmgr.h [iso-8859-1] Tue Sep 6 17:03:27 2016 @@ -9,16 +9,19 @@ #include <fltkernel.h> #include <pseh/pseh2.h> -#define DRIVER_NAME L"RosFltMgr" - -#define FLT_MAJOR_VERSION 0x02 -#define FLT_MINOR_VERSION 0x00 //win2k3 +#define DRIVER_NAME L"FltMgr" + +#define FLT_MAJOR_VERSION 0x0200 +#define FLT_MINOR_VERSION 0x0000 //win2k3 #define FM_TAG_DISPATCH_TABLE 'ifMF' #define FM_TAG_REGISTRY_DATA 'rtMF' #define FM_TAG_DEV_OBJ_PTRS 'ldMF' #define FM_TAG_UNICODE_STRING 'suMF' #define FM_TAG_FILTER 'lfMF' +#define FM_TAG_CONTEXT_REGISTA 'rcMF' + +#define MAX_DEVNAME_LENGTH 64 typedef struct _DRIVER_DATA @@ -27,113 +30,35 @@ PDEVICE_OBJECT DeviceObject; UNICODE_STRING ServiceKey; + PDEVICE_OBJECT CommsDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; FAST_MUTEX FilterAttachLock; } DRIVER_DATA, *PDRIVER_DATA; - -typedef enum _FLT_OBJECT_FLAGS +typedef struct _FLTMGR_DEVICE_EXTENSION { - FLT_OBFL_DRAINING = 1, - FLT_OBFL_ZOMBIED = 2, - FLT_OBFL_TYPE_INSTANCE = 0x1000000, - FLT_OBFL_TYPE_FILTER = 0x2000000, - FLT_OBFL_TYPE_VOLUME = 0x4000000 - -} FLT_OBJECT_FLAGS, *PFLT_OBJECT_FLAGS; - -typedef enum _FLT_FILTER_FLAGS -{ - FLTFL_MANDATORY_UNLOAD_IN_PROGRESS = 1, - FLTFL_FILTERING_INITIATED = 2 - -} FLT_FILTER_FLAGS, *PFLT_FILTER_FLAGS; - -typedef struct _FLT_OBJECT // size = 0x14 -{ - volatile FLT_OBJECT_FLAGS Flags; - ULONG PointerCount; - EX_RUNDOWN_REF RundownRef; - LIST_ENTRY PrimaryLink; - -} FLT_OBJECT, *PFLT_OBJECT; - -typedef struct _FLT_RESOURCE_LIST_HEAD -{ - ERESOURCE rLock; - LIST_ENTRY rList; - ULONG rCount; - -} FLT_RESOURCE_LIST_HEAD, *PFLT_RESOURCE_LIST_HEAD; - -typedef struct _FLT_MUTEX_LIST_HEAD -{ - FAST_MUTEX mLock; - LIST_ENTRY mList; - ULONG mCount; - -} FLT_MUTEX_LIST_HEAD, *PFLT_MUTEX_LIST_HEAD; - -typedef struct _FLT_FILTER // size = 0x120 -{ - FLT_OBJECT Base; - PVOID Frame; //FLTP_FRAME - UNICODE_STRING Name; - UNICODE_STRING DefaultAltitude; - FLT_FILTER_FLAGS Flags; - PDRIVER_OBJECT DriverObject; - FLT_RESOURCE_LIST_HEAD InstanceList; - PVOID VerifierExtension; - PFLT_FILTER_UNLOAD_CALLBACK FilterUnload; - PFLT_INSTANCE_SETUP_CALLBACK InstanceSetup; - PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK InstanceQueryTeardown; - PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownStart; - PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownComplete; - PVOID SupportedContextsListHead; //PALLOCATE_CONTEXT_HEADER - PVOID SupportedContexts; //PALLOCATE_CONTEXT_HEADER - PVOID PreVolumeMount; - PVOID PostVolumeMount; - PFLT_GENERATE_FILE_NAME GenerateFileName; - PFLT_NORMALIZE_NAME_COMPONENT NormalizeNameComponent; - PFLT_NORMALIZE_CONTEXT_CLEANUP NormalizeContextCleanup; - PFLT_OPERATION_REGISTRATION Operations; - PFLT_FILTER_UNLOAD_CALLBACK OldDriverUnload; - FLT_MUTEX_LIST_HEAD ActiveOpens; - FLT_MUTEX_LIST_HEAD PortList; - EX_PUSH_LOCK PortLock; - -} FLT_FILTER, *PFLT_FILTER; - -typedef enum _FLT_INSTANCE_FLAGS -{ - INSFL_CAN_BE_DETACHED = 0x01, - INSFL_DELETING = 0x02, - INSFL_INITING = 0x04 - -} FLT_INSTANCE_FLAGS, *PFLT_INSTANCE_FLAGS; - -typedef struct _FLT_INSTANCE // size = 0x144 -{ - FLT_OBJECT Base; - ULONG OperationRundownRef; - PVOID Volume; //PFLT_VOLUME - PFLT_FILTER Filter; - FLT_INSTANCE_FLAGS Flags; - UNICODE_STRING Altitude; - UNICODE_STRING Name; - LIST_ENTRY FilterLink; - ERESOURCE ContextLock; - PVOID Context; - PVOID TrackCompletionNodes; - PVOID CallbackNodes; - -} FLT_INSTANCE, *PFLT_INSTANCE; - - - - + /* The file system we're attached to */ + PDEVICE_OBJECT AttachedToDeviceObject; + + /* The storage stack(disk) accociated with the file system device object we're attached to */ + PDEVICE_OBJECT StorageStackDeviceObject; + + /* Either physical drive for volume device objects otherwise + * it's the name of the control device we're attached to */ + UNICODE_STRING DeviceName; + WCHAR DeviceNameBuffer[MAX_DEVNAME_LENGTH]; + +} FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; + + +NTSTATUS +FltpRegisterContexts( + _In_ PFLT_FILTER Filter, + _In_ const FLT_CONTEXT_REGISTRATION *Context +); VOID FltpExInitializeRundownProtection( Added: trunk/reactos/drivers/filters/fltmgr/fltmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/flt… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/fltmgr.spec (added) +++ trunk/reactos/drivers/filters/fltmgr/fltmgr.spec [iso-8859-1] Tue Sep 6 17:03:27 2016 @@ -0,0 +1,4 @@ + + @ stdcall FltRegisterFilter(ptr ptr ptr) + @ stdcall FltUnregisterFilter(ptr) + Propchange: trunk/reactos/drivers/filters/fltmgr/fltmgr.spec ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 3 months

[gedmurphy] 72595: [FLTMGR] - Add stubs for context registration - Add dispatch and device control handlers - Implement the load IOCTL. We can now load minifilters with 'fltmc load <myfilter>'

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 16:59:11 2016 New Revision: 72595 URL: http://svn.reactos.org/svn/reactos?rev=72595&view=rev Log: [FLTMGR] - Add stubs for context registration - Add dispatch and device control handlers - Implement the load IOCTL. We can now load minifilters with 'fltmc load <myfilter>' Added: trunk/reactos/drivers/filters/fltmgr/Context.c (with props) trunk/reactos/drivers/filters/fltmgr/Dispatch.c (with props) Added: trunk/reactos/drivers/filters/fltmgr/Context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Con… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Context.c (added) +++ trunk/reactos/drivers/filters/fltmgr/Context.c [iso-8859-1] Tue Sep 6 16:59:11 2016 @@ -0,0 +1,79 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/filters/fltmgr/Context.c +* PURPOSE: Contains context routines +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +static +BOOLEAN +IsContextTypeValid( + _In_ FLT_CONTEXT_TYPE ContextType +); + +static +NTSTATUS +SetupContextHeader( + _In_ PFLT_FILTER Filter, + _In_ PFLT_CONTEXT_REGISTRATION ContextPtr, + _Out_ PALLOCATE_CONTEXT_HEADER ContextHeader +); + +/* EXPORTED FUNCTIONS ******************************************************/ + + + + +/* INTERNAL FUNCTIONS ******************************************************/ + + +NTSTATUS +FltpRegisterContexts(_In_ PFLT_FILTER Filter, + _In_ const FLT_CONTEXT_REGISTRATION *Context) +{ + UNREFERENCED_PARAMETER(Filter); + UNREFERENCED_PARAMETER(Context); + return STATUS_NOT_IMPLEMENTED; +} + + +/* PRIVATE FUNCTIONS ******************************************************/ + +static +BOOLEAN +IsContextTypeValid(_In_ FLT_CONTEXT_TYPE ContextType) +{ + switch (ContextType) + { + case FLT_VOLUME_CONTEXT: + case FLT_INSTANCE_CONTEXT: + case FLT_FILE_CONTEXT: + case FLT_STREAM_CONTEXT: + case FLT_STREAMHANDLE_CONTEXT: + case FLT_TRANSACTION_CONTEXT: + return TRUE; + } + + return FALSE; +} + +static +NTSTATUS +SetupContextHeader(_In_ PFLT_FILTER Filter, + _In_ PFLT_CONTEXT_REGISTRATION ContextPtr, + _Out_ PALLOCATE_CONTEXT_HEADER ContextHeader) +{ + return 0; +} Propchange: trunk/reactos/drivers/filters/fltmgr/Context.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filters/fltmgr/Dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Dis… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Dispatch.c (added) +++ trunk/reactos/drivers/filters/fltmgr/Dispatch.c [iso-8859-1] Tue Sep 6 16:59:11 2016 @@ -0,0 +1,129 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/filters/fltmgr/Dispatch.c +* PURPOSE: Contains dispatch handler routines +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" +#include "fltmgr_shared.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +NTSTATUS +HandleLoadUnloadIoctl( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +HandleFindFirstIoctl( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + + +/* sdsfds *******************************************************************/ + +NTSTATUS +FltpDeviceControlHandler(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + ULONG ControlCode; + NTSTATUS Status; + + StackPtr = IoGetCurrentIrpStackLocation(Irp); + FLT_ASSERT(StackPtr->MajorFunction == IRP_MJ_DEVICE_CONTROL); + + ControlCode = StackPtr->Parameters.DeviceIoControl.IoControlCode; + switch (ControlCode) + { + case IOCTL_LOAD_FILTER: + Status = HandleLoadUnloadIoctl(DeviceObject, Irp); + break; + + case IOCTL_UNLOAD_FILTER: + Status = HandleLoadUnloadIoctl(DeviceObject, Irp); + break; + + case IOCTL_FIND_FIRST_FILTER: + Status = HandleFindFirstIoctl(DeviceObject, Irp); + break; + + default: + Status = STATUS_INVALID_PARAMETER; + break; + } + + return Status; +} + +NTSTATUS +FltpDispatchHandler(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + StackPtr = IoGetCurrentIrpStackLocation(Irp); + UNREFERENCED_PARAMETER(StackPtr); + + // implement me + + return STATUS_SUCCESS; +} + + +/* INTERNAL FUNCTIONS ******************************************************/ + +NTSTATUS +HandleLoadUnloadIoctl(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + UNICODE_STRING Name; + PFILTER_NAME FilterName; + ULONG BufferLength; + ULONG ControlCode; + + /* Get the IOCTL data from the stack pointer */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + BufferLength = StackPtr->Parameters.DeviceIoControl.InputBufferLength; + ControlCode = StackPtr->Parameters.DeviceIoControl.IoControlCode; + + FLT_ASSERT(ControlCode == IOCTL_LOAD_FILTER || ControlCode == IOCTL_UNLOAD_FILTER); + + /* Make sure the buffer is valid */ + if (BufferLength < sizeof(FILTER_NAME)) + return STATUS_INVALID_PARAMETER; + + /* Convert the file name buffer into a string */ + FilterName = (PFILTER_NAME)Irp->AssociatedIrp.SystemBuffer; + Name.Length = FilterName->Length; + Name.MaximumLength = FilterName->Length; + Name.Buffer = (PWCH)((PCHAR)FilterName + FIELD_OFFSET(FILTER_NAME, FilterName[0])); + + /* Forward the request to our Flt routines */ + if (ControlCode == IOCTL_LOAD_FILTER) + { + return FltLoadFilter(&Name); + } + else + { + return FltUnloadFilter(&Name); + } +} + +NTSTATUS +HandleFindFirstIoctl(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + return STATUS_NOT_SUPPORTED; +} Propchange: trunk/reactos/drivers/filters/fltmgr/Dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 3 months

[gedmurphy] 72594: [FLTMGR] - Implement FltLoadFilter and stub FltUnloadFilter - Register contexts if the caller requests (coming later) - Stubpliment FltStartFiltering

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 16:47:43 2016 New Revision: 72594 URL: http://svn.reactos.org/svn/reactos?rev=72594&view=rev Log: [FLTMGR] - Implement FltLoadFilter and stub FltUnloadFilter - Register contexts if the caller requests (coming later) - Stubpliment FltStartFiltering Added: trunk/reactos/drivers/filters/fltmgr/Filter.c - copied, changed from r72588, trunk/reactos/drivers/filters/fltmgr/Registration.c Copied: trunk/reactos/drivers/filters/fltmgr/Filter.c (from r72588, trunk/reactos/drivers/filters/fltmgr/Registration.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Fil… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Registration.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Filter.c [iso-8859-1] Tue Sep 6 16:47:43 2016 @@ -1,7 +1,7 @@ /* * PROJECT: Filesystem Filter Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/fs_minifilter/fltmgr/Registration.c +* FILE: drivers/filters/fltmgr/Filter.c * PURPOSE: Handles registration of mini filters * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) */ @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include "fltmgr.h" +#include "fltmgrint.h" #define NDEBUG #include <debug.h> @@ -16,6 +17,8 @@ /* DATA *********************************************************************/ +#define SERVICES_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" +#define MAX_KEY_LENGTH 0x200 NTSTATUS FltpStartingToDrainObject( @@ -24,6 +27,38 @@ /* EXPORTED FUNCTIONS ******************************************************/ + +NTSTATUS +NTAPI +FltLoadFilter(_In_ PCUNICODE_STRING FilterName) +{ + UNICODE_STRING DriverServiceName; + UNICODE_STRING ServicesKey; + CHAR Buffer[MAX_KEY_LENGTH]; + + /* Setup the base services key */ + RtlInitUnicodeString(&ServicesKey, SERVICES_KEY); + + /* Initialize the string data */ + DriverServiceName.Length = 0; + DriverServiceName.Buffer = (PWCH)Buffer; + DriverServiceName.MaximumLength = MAX_KEY_LENGTH; + + /* Create the full service key for this filter */ + RtlCopyUnicodeString(&DriverServiceName, &ServicesKey); + RtlAppendUnicodeStringToString(&DriverServiceName, FilterName); + + /* Ask the kernel to load it for us */ + return ZwLoadDriver(&DriverServiceName); +} + +NTSTATUS +NTAPI +FltUnloadFilter(_In_ PCUNICODE_STRING FilterName) +{ + UNREFERENCED_PARAMETER(FilterName); + return STATUS_NOT_IMPLEMENTED; +} NTSTATUS NTAPI @@ -39,8 +74,6 @@ PCHAR Ptr; NTSTATUS Status; - Status = 0; //remove me - /* Make sure we're targeting the correct major revision */ if ((Registration->Version & 0xFF00) != FLT_MAJOR_VERSION) { @@ -70,7 +103,8 @@ /* Calculate the buffer sizes */ CallbackBufferSize = Count * sizeof(FLT_OPERATION_REGISTRATION); - FilterBufferSize = sizeof(FLT_FILTER) + CallbackBufferSize + + FilterBufferSize = sizeof(FLT_FILTER) + + CallbackBufferSize + DriverObject->DriverExtension->ServiceKeyName.Length; /* Allocate a buffer to hold our filter data */ @@ -116,12 +150,21 @@ InitializeListHead(&Filter->PortList.mList); Filter->PortList.mCount = 0; + /* We got this far, assume success from here */ + Status = STATUS_SUCCESS; + /* Check if the caller requested any context data */ if (Registration->ContextRegistration) { - // register the context information - } - + /* Register the contexts for this filter */ + Status = FltpRegisterContexts(Filter, Registration->ContextRegistration); + if (NT_SUCCESS(Status)) + { + goto Quit; + } + } + + /* Check if the caller is registering any callbacks */ if (Registration->OperationRegistration) { /* The callback data comes after the fixed struct */ @@ -162,7 +205,7 @@ // - More stuff?? // -//Quit: +Quit: if (!NT_SUCCESS(Status)) { // Add cleanup for context resources @@ -230,6 +273,32 @@ /* Hand the memory back */ ExFreePoolWithTag(Filter, FM_TAG_FILTER); +} + +NTSTATUS +NTAPI +FltStartFiltering(_In_ PFLT_FILTER Filter) +{ + NTSTATUS Status; + + /* Grab a ref to the filter */ + Status = FltObjectReference(&Filter->Base); + if (NT_SUCCESS(Status)) + { + /* Make sure we aren't already starting up */ + if (!(Filter->Flags & FLTFL_FILTERING_INITIATED)) + { + // Startup + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + FltObjectDereference(&Filter->Base); + } + + return Status; }

8 years, 3 months

[gedmurphy] 72593: [FLTMGR] - Properly handle requests that were sent directly to the fltmgr instead of sending them down the stack - Add a separate callback for IRP_MJ_DEVICE_CONTROL and forward t...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 16:33:46 2016 New Revision: 72593 URL: http://svn.reactos.org/svn/reactos?rev=72593&view=rev Log: [FLTMGR] - Properly handle requests that were sent directly to the fltmgr instead of sending them down the stack - Add a separate callback for IRP_MJ_DEVICE_CONTROL and forward them on to an internal handler - We can now open a handle to the fltmgr and send IOCTLs down to it. Modified: trunk/reactos/drivers/filters/fltmgr/Interface.c Modified: trunk/reactos/drivers/filters/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Int… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Interface.c [iso-8859-1] Tue Sep 6 16:33:46 2016 @@ -1,7 +1,7 @@ /* * PROJECT: Filesystem Filter Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: drivers/fs_minifilter/fltmgr/interface.c +* FILE: drivers/filters/fltmgr/interface.c * PURPOSE: Implements the driver interface * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) */ @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include "fltmgr.h" +#include "fltmgrint.h" //#define NDEBUG #include <debug.h> @@ -95,6 +96,13 @@ NTSTATUS NTAPI FltpFsControl( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +NTAPI +FltpDeviceControl( _In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp ); @@ -344,6 +352,7 @@ #pragma alloc_text(PAGE, FltpFsNotification) #pragma alloc_text(PAGE, FltpCreate) #pragma alloc_text(PAGE, FltpFsControl) +#pragma alloc_text(PAGE, FltpDeviceControl) #pragma alloc_text(PAGE, FltpFastIoRead) #pragma alloc_text(PAGE, FltpFastIoWrite) #pragma alloc_text(PAGE, FltpFastIoQueryBasicInfo) @@ -366,25 +375,10 @@ #pragma alloc_text(PAGE, FltpFastIoQueryOpen) #endif -#define MAX_DEVNAME_LENGTH 64 + DRIVER_DATA DriverData; - -typedef struct _FLTMGR_DEVICE_EXTENSION -{ - /* The file system we're attached to */ - PDEVICE_OBJECT AttachedToDeviceObject; - - /* The storage stack(disk) accociated with the file system device object we're attached to */ - PDEVICE_OBJECT StorageStackDeviceObject; - - /* Either physical drive for volume device objects otherwise - * it's the name of the control device we're attached to */ - UNICODE_STRING DeviceName; - WCHAR DeviceNameBuffer[MAX_DEVNAME_LENGTH]; - -} FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; typedef struct _DETACH_DEVICE_WORK_ITEM { @@ -427,17 +421,37 @@ { PFLTMGR_DEVICE_EXTENSION DeviceExtension; PIO_STACK_LOCATION StackPtr; - - DeviceExtension = DeviceObject->DeviceExtension; - __debugbreak(); + NTSTATUS Status; + + DeviceExtension = DeviceObject->DeviceExtension; + + /* Check if this is a request for us */ + if (DeviceObject == DriverData.DeviceObject) + { + FLT_ASSERT(DeviceObject->DriverObject == DriverData.DriverObject); + FLT_ASSERT(DeviceExtension == NULL); + + /* Hand it off to our internal handler */ + Status = FltpDispatchHandler(DeviceObject, Irp); + if (Status != STATUS_REPARSE) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + return Status; + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); StackPtr = IoGetCurrentIrpStackLocation(Irp); if (StackPtr->MajorFunction == IRP_MJ_SHUTDOWN) { - //FltpProcessShutdownRequest(DeviceObject); - } + // handle shutdown request + } + + DPRINT1("Received %X from %wZ\n", StackPtr->MajorFunction, &DeviceExtension->DeviceName); /* Just pass the IRP down the stack */ IoSkipCurrentIrpStackLocation(Irp); @@ -454,9 +468,24 @@ PAGED_CODE(); DeviceExtension = DeviceObject->DeviceExtension; - __debugbreak(); + + /* Check if this is a request for us */ + if (DeviceObject == DriverData.DeviceObject) + { + FLT_ASSERT(DeviceObject->DriverObject == DriverData.DriverObject); + FLT_ASSERT(DeviceExtension == NULL); + + /* Someone wants a handle to the fltmgr, allow it */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IofCompleteRequest(Irp, 0); + return STATUS_SUCCESS; + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); + + DPRINT1("Received create from %wZ (%lu)\n", &DeviceExtension->DeviceName, PsGetCurrentProcessId()); /* Just pass the IRP down the stack */ IoSkipCurrentIrpStackLocation(Irp); @@ -472,10 +501,53 @@ PAGED_CODE(); - DeviceExtension = DeviceObject->DeviceExtension; - __debugbreak(); + /* Check if this is a request for us */ + if (DeviceObject == DriverData.DeviceObject) + { + /* We don't handle this request */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + IofCompleteRequest(Irp, 0); + return STATUS_INVALID_DEVICE_REQUEST; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); + + /* Just pass the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->AttachedToDeviceObject, Irp); +} + +NTSTATUS +NTAPI +FltpDeviceControl(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + /* Check if the request was meant for us */ + if (DeviceObject == DriverData.DeviceObject) + { + Status = FltpDeviceControlHandler(DeviceObject, Irp); + if (Status != STATUS_REPARSE) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + + return Status; + } + + DeviceExtension = DeviceObject->DeviceExtension; + + FLT_ASSERT(DeviceExtension && + DeviceExtension->AttachedToDeviceObject); + /* Just pass the IRP down the stack */ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->AttachedToDeviceObject, Irp); @@ -1890,7 +1962,6 @@ LONG_PTR Count; PAGED_CODE(); - __debugbreak(); /* Get the top device in the chain and increment the ref count on it */ AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); @@ -2099,6 +2170,7 @@ DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = FltpCreate; DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = FltpCreate; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FltpFsControl; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = FltpDeviceControl; /* The FastIo diapatch table is stored in the pool along with a tag */ FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_IO_DISPATCH), FM_TAG_DISPATCH_TABLE);

8 years, 3 months

[gedmurphy] 72592: Turn off building of the fltmgr for now while I (slowly) update it.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 16:27:38 2016 New Revision: 72592 URL: http://svn.reactos.org/svn/reactos?rev=72592&view=rev Log: Turn off building of the fltmgr for now while I (slowly) update it. Modified: trunk/reactos/drivers/filters/CMakeLists.txt Modified: trunk/reactos/drivers/filters/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/CMakeLists… ============================================================================== --- trunk/reactos/drivers/filters/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/CMakeLists.txt [iso-8859-1] Tue Sep 6 16:27:38 2016 @@ -1,2 +1,2 @@ -add_subdirectory(fltmgr) +#add_subdirectory(fltmgr) add_subdirectory(mountmgr)

8 years, 3 months

[gedmurphy] 72591: [FLTLIB] - On load, open a handle to fltmgr, not the target driver... - Fixup the load data we send to the fltmgr to be the same Windows layout. We need to copy this interface to...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 15:52:38 2016 New Revision: 72591 URL: http://svn.reactos.org/svn/reactos?rev=72591&view=rev Log: [FLTLIB] - On load, open a handle to fltmgr, not the target driver... - Fixup the load data we send to the fltmgr to be the same Windows layout. We need to copy this interface to allow component sharing between windows and ros. - Move IOCTLs to shared header Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt trunk/reactos/dll/win32/fltlib/fltlib.c Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] Tue Sep 6 15:52:38 2016 @@ -1,7 +1,11 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(fltlib.dll fltlib.spec ADD_IMPORTLIB) + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + includes) list(APPEND SOURCE fltlib.c Modified: trunk/reactos/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.c?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] Tue Sep 6 15:52:38 2016 @@ -17,6 +17,7 @@ #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> +#include <fltmgr_shared.h> #include "wine/debug.h" @@ -24,11 +25,6 @@ /* DATA ****************************************************************************/ WINE_DEFAULT_DEBUG_CHANNEL(fltlib); - -//MOVEME -#define IOCTL_LOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x01, 0, FILE_WRITE_DATA) //88004 -#define IOCTL_UNLOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x02, 0, FILE_WRITE_DATA) //88008 -#define IOCTL_CREATE_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x03, 0, FILE_READ_DATA) //8400c static HRESULT @@ -69,14 +65,15 @@ FilterLoadUnload(_In_z_ LPCWSTR lpFilterName, _In_ BOOL Load) { - PUNICODE_STRING FilterName; + PFILTER_NAME FilterName; HANDLE hFltMgr; + DWORD StringLength; DWORD BufferLength; DWORD dwError; /* Get a handle to the filter manager */ - hFltMgr = CreateFileW(lpFilterName, - GENERIC_READ, + hFltMgr = CreateFileW(L"\\\\.\\fltmgr", + GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -89,30 +86,31 @@ } /* Calc and allocate a buffer to hold our filter name */ - BufferLength = wcslen(lpFilterName) * sizeof(WCHAR); + StringLength = wcslen(lpFilterName) * sizeof(WCHAR); + BufferLength = StringLength + sizeof(FILTER_NAME); FilterName = RtlAllocateHeap(GetProcessHeap(), 0, - BufferLength + sizeof(UNICODE_STRING)); + BufferLength); if (FilterName == NULL) { CloseHandle(hFltMgr); return HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); } - /* Build up the filter name into a real life string */ - FilterName->Buffer = (PWCH)(FilterName + 1); - FilterName->Length = BufferLength; - FilterName->MaximumLength = BufferLength; - RtlCopyMemory(FilterName->Buffer, lpFilterName, BufferLength); + /* Build up the filter name */ + FilterName->Length = StringLength; + CopyMemory(FilterName->FilterName, lpFilterName, StringLength); /* Tell the filter manager to load the filter for us */ dwError = SendIoctl(hFltMgr, Load ? IOCTL_LOAD_FILTER : IOCTL_UNLOAD_FILTER, FilterName, - BufferLength + sizeof(UNICODE_STRING)); + BufferLength); /* Cleaup and bail*/ + RtlFreeHeap(GetProcessHeap(), 0, FilterName); CloseHandle(hFltMgr); + return HRESULT_FROM_WIN32(dwError); }

8 years, 3 months

← Newer
1
...
25
26
27
28
29
30
31
...
35
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 September 2016