Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29012: Cleanup GetDirectory(), GetFilename() and GetExtension() usage
by hpoussin＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: hpoussin Date: Wed Sep 12 11:04:32 2007 New Revision: 29012 URL: http://svn.reactos.org/svn/reactos?rev=29012&view=rev Log: Cleanup GetDirectory(), GetFilename() and GetExtension() usage Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/testsupportcode.cpp trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Wed Sep 12 11:04:32 2007 @@ -26,6 +26,18 @@ using std::string; using std::vector; using std::map; + +static std::string +GetExtension ( const std::string& filename ) +{ + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) index = 0; + string tmp = filename.substr( index, filename.size() - index ); + size_t ext_index = tmp.find_last_of( '.' ); + if (ext_index != string::npos) + return filename.substr ( index + ext_index, filename.size() ); + return ""; +} SourceFile::SourceFile ( AutomaticDependency* automaticDependency, const Module& module, @@ -409,17 +421,6 @@ return false; } -string -AutomaticDependency::GetFilename ( const string& filename ) -{ - size_t index = filename.find_last_of ( cSep ); - if (index == string::npos) - return filename; - else - return filename.substr ( index + 1, - filename.length () - index - 1); -} - void AutomaticDependency::GetIncludeDirectories ( vector<Include*>& includes, const Module& module, Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Wed Sep 12 11:04:32 2007 @@ -101,6 +101,18 @@ } } +static std::string +GetExtension ( const std::string& filename ) +{ + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) index = 0; + string tmp = filename.substr( index, filename.size() - index ); + size_t ext_index = tmp.find_last_of( '.' ); + if (ext_index != string::npos) + return filename.substr ( index + ext_index, filename.size() ); + return ""; +} + static bool FileExists(string &filename) { ifstream file(filename.c_str()); @@ -342,7 +354,7 @@ string path_basedir = module.GetPathToBaseDir (); string intenv = Environment::GetIntermediatePath (); string outenv = Environment::GetOutputPath (); - string module_type = GetExtension(module.output->name); + string module_type = GetExtension(*module.output); string cbproj_path = module.output->relative_path; string CompilerVar; string baseaddr; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Sep 12 11:04:32 2007 @@ -266,7 +266,7 @@ { string filename = file->name; - string extension = GetExtension ( filename ); + string extension = GetExtension ( *file ); if ( extension == ".spec" || extension == ".SPEC" ) { string basename = GetBasename ( filename ); @@ -305,7 +305,7 @@ MingwModuleHandler::GetExtraDependencies ( const FileLocation *file ) const { - string extension = GetExtension ( file->name ); + string extension = GetExtension ( *file ); if ( extension == ".idl" || extension == ".IDL" ) { if ( (module.type == RpcServer) || (module.type == RpcClient) ) @@ -349,7 +349,7 @@ bool MingwModuleHandler::IsGeneratedFile ( const File& file ) const { - string extension = GetExtension ( file.file.name ); + string extension = GetExtension ( file.file ); return ( extension == ".spec" || extension == ".SPEC" ); } @@ -486,10 +486,9 @@ const FileLocation* sourceFile, string_list* pclean_files ) const { - string sourceFilename = sourceFile->name; DirectoryLocation destination_directory; string newExtension; - string extension = GetExtension ( sourceFilename ); + string extension = GetExtension ( *sourceFile ); if ( extension == ".rc" || extension == ".RC" ) newExtension = ".coff"; else if ( extension == ".spec" || extension == ".SPEC" ) @@ -1353,8 +1352,7 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string filename = backend->GetFullName ( *sourceFile ); - string extension = GetExtension ( filename ); + string extension = GetExtension ( *sourceFile ); if ( extension == ".c" || extension == ".C" ) { GenerateGccCommand ( sourceFile, @@ -1419,7 +1417,7 @@ __LINE__, "Unsupported filename extension '%s' in file '%s'", extension.c_str (), - filename.c_str () ); + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1465,10 +1463,9 @@ fprintf ( fMakefile, "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" ); - string filename = module.output->name; FileLocation nostripFilename ( OutputDirectory, module.output->relative_path, - GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ) ); + GetBasename ( module.output->name ) + ".nostrip" + GetExtension ( *module.output ) ); CLEAN_FILE ( nostripFilename ); OutputCopyCommand ( *module.output, nostripFilename ); @@ -1881,7 +1878,7 @@ { CompilationUnit& compilationUnit = *library.importedModule->non_if_data.compilationUnits[j]; const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( sourceFile->name ); + string extension = GetExtension ( *sourceFile ); if ( extension == ".idl" || extension == ".IDL" ) { string basename = GetBasename ( sourceFile->name ); @@ -1921,7 +1918,7 @@ { CompilationUnit& compilationUnit = *compilationUnits[i]; const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( sourceFile->name ); + string extension = GetExtension ( *sourceFile ); if ( extension == ".spec" || extension == ".SPEC" ) GetSpecObjectDependencies ( s, sourceFile ); } @@ -2300,7 +2297,7 @@ { CompilationUnit& compilationUnit = *compilationUnits[i]; const FileLocation* sourceFile = compilationUnit.GetFilename (); - string extension = GetExtension ( sourceFile->name ); + string extension = GetExtension ( *sourceFile ); if ( extension == ".spec" || extension == ".SPEC" ) GetSpecObjectDependencies ( dependencies, sourceFile ); if ( extension == ".idl" || extension == ".IDL" ) Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Wed Sep 12 11:04:32 2007 @@ -83,7 +83,7 @@ { size_t i; - string module_type = GetExtension(module.output->name); + string module_type = GetExtension(*module.output); vector<string> source_files, resource_files, includes, libraries; vector<string> header_files, common_defines, compiler_flags; vector<string> vars, values; Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Wed Sep 12 11:04:32 2007 @@ -56,7 +56,7 @@ imports.push_back ( module.non_if_data.libraries[i]->name ); } - string module_type = GetExtension(module.output->name); + string module_type = GetExtension(*module.output); bool lib = (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe") || (module_type == ".scr"); Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Sep 12 11:04:32 2007 @@ -98,7 +98,7 @@ FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); vector<string> imports; - string module_type = GetExtension(module.output->name); + string module_type = GetExtension(*module.output); bool lib = (module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe") || (module_type == ".scr"); Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Wed Sep 12 11:04:32 2007 @@ -67,7 +67,7 @@ if ( files.size () != 1 ) return false; File* file = files[0]; - string extension = GetExtension ( file->file.name ); + string extension = GetExtension ( file->file ); return ( extension == ".spec" || extension == ".SPEC" ); } @@ -78,7 +78,7 @@ for ( i = 0; i < files.size (); i++ ) { File& file = *files[i]; - string fileExtension = GetExtension ( file.file.name ); + string fileExtension = GetExtension ( file.file ); if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) return true; } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Sep 12 11:04:32 2007 @@ -137,7 +137,7 @@ return FixSeparator(path + cSep + att_value); } -string +static string GetExtension ( const string& filename ) { size_t index = filename.find_last_of ( '/' ); @@ -150,23 +150,9 @@ } string -GetDirectory ( const string& filename ) -{ - size_t index = filename.find_last_of ( cSep ); - if ( index == string::npos ) - return ""; - else - return filename.substr ( 0, index ); -} - -string -GetFilename ( const string& filename ) -{ - size_t index = filename.find_last_of ( cSep ); - if ( index == string::npos ) - return filename; - else - return filename.substr ( index + 1, filename.length () - index ); +GetExtension ( const FileLocation& file ) +{ + return GetExtension ( file.name ); } string Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Wed Sep 12 11:04:32 2007 @@ -775,7 +775,6 @@ AutomaticDependency ( const Project& project ); ~AutomaticDependency (); - std::string GetFilename ( const std::string& filename ); bool LocateIncludedFile ( const FileLocation& directory, const std::string& includedFilename, std::string& resolvedFilename ); @@ -1030,13 +1029,7 @@ const std::string& att_value ); extern std::string -GetExtension ( const std::string& filename ); - -extern std::string -GetDirectory ( const std::string& filename ); - -extern std::string -GetFilename ( const std::string& filename ); +GetExtension ( const FileLocation& file ); extern std::string NormalizeFilename ( const std::string& filename ); Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp Wed Sep 12 11:04:32 2007 @@ -23,6 +23,16 @@ using std::string; using std::vector; +static std::string +GetFilename ( const std::string& filename ) +{ + size_t index = filename.find_last_of ( cSep ); + if ( index == string::npos ) + return filename; + else + return filename.substr ( index + 1, filename.length () - index ); +} + TestSupportCode::TestSupportCode ( const Project& project ) : project ( project ) { Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Wed Sep 12 11:04:32 2007 @@ -37,7 +37,7 @@ bool WineResource::IsSpecFile ( const File& file ) { - string extension = GetExtension ( file.file.name ); + string extension = GetExtension ( file.file ); if ( extension == ".spec" || extension == ".SPEC" ) return true; return false; @@ -58,7 +58,7 @@ bool WineResource::IsResourceFile ( const File& file ) { - string extension = GetExtension ( file.file.name ); + string extension = GetExtension ( file.file ); if ( extension == ".rc" || extension == ".RC" ) return true; return false;

1 0

[silverblade] 29011: Modified WINE's winmm.dll to support loading of user-installable drivers from the registry 'Drivers' and 'Drivers32' keys, as Windows does. Also silenced the beep-MIDI driver (which is supported by winmm! - but doesn't seem to do much, at least under vmware.) Added some Drivers32 entries to be loaded by default, to the hivesft.inf file.
by silverblade＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: silverblade Date: Wed Sep 12 04:29:07 2007 New Revision: 29011 URL: http://svn.reactos.org/svn/reactos?rev=29011&view=rev Log: Modified WINE's winmm.dll to support loading of user-installable drivers from the registry 'Drivers' and 'Drivers32' keys, as Windows does. Also silenced the beep-MIDI driver (which is supported by winmm! - but doesn't seem to do much, at least under vmware.) Added some Drivers32 entries to be loaded by default, to the hivesft.inf file. Added: trunk/reactos/dll/win32/winmm/registry.c Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/winmm/lolvldrv.c trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winmm/winmm.rbuild Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Wed Sep 12 04:29:07 2007 @@ -24,6 +24,12 @@ ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\loaddll.exe","GlobalFlag",0x00000000,"0x00000002" ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\soffice.exe","GlobalFlag",0x00000000,"0x00000002" ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" + +; MME - TODO: Should not require full paths! +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"c:\reactos\system32\midimap.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"c:\reactos\system32\msacm32.dll" +;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wave",0x00000000,"sndblst.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midi",0x00000000,"c:\reactos\system32\beepmidi.dll" ; Mesa OpenGL Driver HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers","DefaultDriver",0x00000000,"Mesa" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Sep 12 04:29:07 2007 @@ -251,6 +251,7 @@ dll\win32\wshirda\wshirda.dll 1 dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 +dll\win32\beepmidi\beepmidi.dll 1 ; Drivers Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c Wed Sep 12 04:29:07 2007 @@ -51,8 +51,8 @@ #include <mmddk.h> #include <mmsystem.h> -#define DPRINT printf -//#define DPRINT // +/*#define DPRINT printf*/ +#define DPRINT FakePrintf /* A few MIDI command categories */ #define MIDI_NOTE_OFF 0x80 Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c Wed Sep 12 04:29:07 2007 @@ -620,7 +620,7 @@ /************************************************************************** * MMDRV_Install [internal] */ -static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) +BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) { int i, count = 0; LPWINE_MM_DRIVER lpDrv = &MMDrvs[MMDrvsHi]; @@ -723,6 +723,8 @@ */ BOOL MMDRV_Init(void) { +/* Redundant code, keeping this for reference only (for now) */ +#if 0 HKEY hKey; char driver_buffer[256]; char mapper_buffer[256]; @@ -743,13 +745,21 @@ strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); } - // AG: TESTING: - ret |= MMDRV_Install("mmdrv.dll", "mmdrv.dll", FALSE); + ret |= MMDRV_Install("beepmidi.dll", "beepmidi.dll", FALSE); ret |= MMDRV_Install("wavemapper", WINE_DEFAULT_WINMM_MAPPER, TRUE); ret |= MMDRV_Install("midimapper", WINE_DEFAULT_WINMM_MIDI, TRUE); return ret; - +#else + INT driver_count = 0; + + driver_count += LoadRegistryMMEDrivers(NT_MME_DRIVERS_KEY); + driver_count += LoadRegistryMMEDrivers(NT_MME_DRIVERS32_KEY); + + /* Explorer doesn't like us failing */ + return TRUE; +// return ( driver_count > 0 ); +#endif } /****************************************************************** Added: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c (added) +++ trunk/reactos/dll/win32/winmm/registry.c Wed Sep 12 04:29:07 2007 @@ -1,0 +1,134 @@ +/* + MME User-Mode Driver Support + (c) Andrew Greenwood, 2007. + + This is intended for use with WINE's winmm.dll to allow it to find + and load appropriate drivers from the correct (Windows) registry keys. + + By default, WINE's winmm.dll will look in: + HKEY_CURRENT_USER\Software\Wine\Drivers + + Here it determines the driver to load based on a value called "Audio". + + Windows NT stores a list of drivers in: + HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32 + + TODO: Handle system.ini +*/ + +#include <windows.h> +#include "winemm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winmm); + +BOOL LoadRegistryMMEDrivers(char* key) +{ + INT driver_count = 0; + INT driver_index = 0; + HKEY drivers_key; + BOOL ret; + + DWORD value_name_length = 256; + char value_name[value_name_length]; + + DWORD value_data_length = 256; + char value_data[value_data_length]; + + DWORD value_type; + + if ( RegOpenKeyA(HKEY_LOCAL_MACHINE, key, &drivers_key) != ERROR_SUCCESS ) + { + TRACE("ERROR: Could not open: HKEY_LOCAL_MACHINE\\%s\n", key); + return 0; + } + + while ( RegEnumValue(drivers_key, + driver_index, + value_name, + &value_name_length, + NULL, + &value_type, + value_data, + &value_data_length) == ERROR_SUCCESS ) + { + BOOL valid_driver = FALSE; + BOOL is_mapper = FALSE; + + if ( value_type == REG_SZ ) + { + /* We look for mappers first so they don't match + something else later on! */ + + if ( ! stricmp("wavemapper", value_name) ) + { + TRACE("Found a Wave-mapper: %s\n", value_data); + valid_driver = TRUE; + is_mapper = TRUE; + driver_count ++; + } + else if ( ! stricmp("midimapper", value_name) ) + { + TRACE("Found a MIDI-mapper: %s\n", value_data); + valid_driver = TRUE; + is_mapper = TRUE; + driver_count ++; + } + else if ( ! strnicmp("wave", value_name, 4) ) + { + TRACE("Found a Wave driver: %s\n", value_data); + valid_driver = TRUE; + driver_count ++; + } + else if ( ! strnicmp("midi", value_name, 4) ) + { + TRACE("Found a MIDI driver: %s\n", value_data); + valid_driver = TRUE; + driver_count ++; + } + else if ( ! strnicmp("mixer", value_name, 5) ) + { + TRACE("Found a mixer driver: %s\n", value_data); + valid_driver = TRUE; + driver_count ++; + } + else if ( ! strnicmp("aux", value_name, 4) ) + { + TRACE("Found an aux driver: %s\n", value_data); + valid_driver = TRUE; + driver_count ++; + } + else + { + TRACE("Not supported: %s\n", value_data); + } + + /* If we have a valid driver now, we get it "installed" in + winmm itself so it can be used */ + + if ( valid_driver ) + { + if ( ! MMDRV_Install(value_name, value_data, is_mapper) ) + { + TRACE("FAILED when initializing %s\n", value_data); + } + } + } + else + { + TRACE("Invalid data format\n"); + } + + /* Reinitialize */ + value_name_length = 256; + value_data_length = 256; + memset(value_name, 0, value_name_length); + memset(value_data, 0, value_data_length); + + driver_index ++; + } + + TRACE("Found a total of %d drivers\n", driver_count); + + return driver_count; +} Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h (original) +++ trunk/reactos/dll/win32/winmm/winemm.h Wed Sep 12 04:29:07 2007 @@ -315,3 +315,14 @@ */ #define WINE_GDF_EXIST 0x80000000 #define WINE_GDF_16BIT 0x10000000 + +/* Modification to take into account Windows NT's registry format */ + +#define NT_MME_DRIVERS32_KEY \ + "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" + +#define NT_MME_DRIVERS_KEY \ + "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers" + +INT LoadRegistryMMEDrivers(char* key); +BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper); Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild Wed Sep 12 04:29:07 2007 @@ -27,7 +27,8 @@ <file>playsound.c</file> <file>time.c</file> <file>winmm.c</file> + <file>registry.c</file> <file>winmm_res.rc</file> <file>winmm.spec</file> </module> -</group> +</group>

1 0

[gedmurphy] 29010: make the apps icon a bit neater
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Wed Sep 12 01:56:25 2007 New Revision: 29010 URL: http://svn.reactos.org/svn/reactos?rev=29010&view=rev Log: make the apps icon a bit neater Modified: trunk/reactos/base/shell/explorer/res/apps.ico Modified: trunk/reactos/base/shell/explorer/res/apps.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ap… ============================================================================== Binary files - no diff available.

1 0

[fireball] 29009: - Disable NHF dialog for VMWare SCSI controller's driver (if user clicks "Yes", drivers are installed but currently unsupported by ReactOS).
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 20:28:03 2007 New Revision: 29009 URL: http://svn.reactos.org/svn/reactos?rev=29009&view=rev Log: - Disable NHF dialog for VMWare SCSI controller's driver (if user clicks "Yes", drivers are installed but currently unsupported by ReactOS). Modified: branches/ros-branch-0_3_3-new/reactos/media/inf/machine.inf Modified: branches/ros-branch-0_3_3-new/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/me… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/media/inf/machine.inf (original) +++ branches/ros-branch-0_3_3-new/reactos/media/inf/machine.inf Tue Sep 11 20:28:03 2007 @@ -42,6 +42,7 @@ %*PNP0C0C.DeviceDesc% = NO_DRV,*PNP0C0C %*PNP0C0E.DeviceDesc% = NO_DRV,*PNP0C0E %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F +"VMware SCSI card" = NO_DRV,PCI\VEN_104B&DEV_1040 %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600

1 0

[fireball] 29008: - Import new, unchanged vmwinst from trunk.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 17:09:33 2007 New Revision: 29008 URL: http://svn.reactos.org/svn/reactos?rev=29008&view=rev Log: - Import new, unchanged vmwinst from trunk. Added: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/ - copied from r29006, trunk/reactos/base/setup/vmwinst/

1 0

[fireball] 29007: - Delete old vmwinst.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 17:08:06 2007 New Revision: 29007 URL: http://svn.reactos.org/svn/reactos?rev=29007&view=rev Log: - Delete old vmwinst. Removed: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/

1 0

[gedmurphy] 29006: delete comments
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 17:06:20 2007 New Revision: 29006 URL: http://svn.reactos.org/svn/reactos?rev=29006&view=rev Log: delete comments Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c Tue Sep 11 17:06:20 2007 @@ -37,17 +37,6 @@ return INVALID_SOCKET; } -/* note: consider allowing a maximum number of connections - * A number of threads can be allocated and worker threads will - * only be spawned if a free space is available - -typedef struct _WORKER_THREAD { - DWORD num; - BOOL available; - HANDLE hThread; -} WORKER_THREAD; - -*/ static VOID AcceptConnections(SOCKET ListeningSocket, @@ -62,13 +51,13 @@ INT nAddrSize = sizeof(Client); DWORD ThreadID; TCHAR buf[256]; - INT TimeOut = 2000; // 2 seconds + INT TimeOut = 2000; /* set timeout values */ TimeVal.tv_sec = TimeOut / 1000; TimeVal.tv_usec = TimeOut % 1000; - while (! bShutDown) // (i<MAX_CLIENTS && !bShutDown) + while (!bShutDown) { INT SelRet = 0;

1 0

[gedmurphy] 29005: - Send the SERVICE_STATUS_HANDLE to the SCM so SetServiceStatus has something to work with - Add control code to stop, pause and resume services and forward it onto the service control handler
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 16:59:38 2007 New Revision: 29005 URL: http://svn.reactos.org/svn/reactos?rev=29005&view=rev Log: - Send the SERVICE_STATUS_HANDLE to the SCM so SetServiceStatus has something to work with - Add control code to stop, pause and resume services and forward it onto the service control handler Modified: trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue Sep 11 16:59:38 2007 @@ -21,7 +21,7 @@ handle_t BindingHandle = NULL; -static VOID +VOID HandleBind(VOID) { LPWSTR pszStringBinding; @@ -1987,38 +1987,6 @@ return TRUE; } -/********************************************************************** - * SetServiceStatus - * - * @implemented - */ -BOOL STDCALL -SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, - LPSERVICE_STATUS lpServiceStatus) -{ - DWORD dwError; - - DPRINT("SetServiceStatus() called\n"); - DPRINT("ThreadId %lu, data addr %p called\n", hServiceStatus, lpServiceStatus); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrSetServiceStatus(BindingHandle, - (unsigned long)hServiceStatus, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("SetServiceStatus() done (ret %lu\n", dwError); - - return TRUE; -} - /********************************************************************** * StartServiceA Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Tue Sep 11 16:59:38 2007 @@ -20,9 +20,11 @@ /* TYPES *********************************************************************/ +VOID HandleBind(VOID); + typedef struct _ACTIVE_SERVICE { - DWORD ThreadId; + SERVICE_STATUS_HANDLE hServiceStatus; UNICODE_STRING ServiceName; union { @@ -40,6 +42,7 @@ /* GLOBALS *******************************************************************/ +extern handle_t BindingHandle; static DWORD dwActiveServiceCount = 0; static PACTIVE_SERVICE lpActiveServices = NULL; @@ -64,25 +67,6 @@ return NULL; } -/* -static PACTIVE_SERVICE -ScLookupServiceByThreadId(DWORD ThreadId) -{ - DWORD i; - - for (i = 0; i < dwActiveServiceCount; i++) - { - if (lpActiveServices[i].ThreadId == ThreadId) - { - return &lpActiveServices[i]; - } - } - - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - - return NULL; -} -*/ static DWORD WINAPI ScServiceMainStub(LPVOID Context) @@ -213,7 +197,6 @@ ScConnectControlPipe(HANDLE *hPipe) { DWORD dwBytesWritten; - DWORD dwProcessId; DWORD dwState; if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) @@ -243,14 +226,14 @@ return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } - dwProcessId = GetCurrentProcessId(); + /* HACK: send the SERVICE_STATUS_HANDLE handle */ WriteFile(*hPipe, - &dwProcessId, - sizeof(DWORD), + (DWORD *)&lpActiveServices->hServiceStatus, + sizeof(SERVICE_STATUS_HANDLE), &dwBytesWritten, NULL); - DPRINT("Sent process id %lu\n", dwProcessId); + DPRINT("Sent SERVICE_STATUS_HANDLE handle %lu\n", lpActiveServices->hServiceStatus); return ERROR_SUCCESS; } @@ -262,6 +245,7 @@ { PACTIVE_SERVICE lpService; HANDLE ThreadHandle; + DWORD ThreadId; DPRINT("ScStartService() called\n"); DPRINT("Size: %lu\n", ControlPacket->dwSize); @@ -281,17 +265,56 @@ ControlPacket->szArguments, ControlPacket->dwSize * sizeof(WCHAR)); + /* invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL, 0, ScServiceMainStub, lpService, CREATE_SUSPENDED, - &lpService->ThreadId); + &ThreadId); if (ThreadHandle == NULL) return ERROR_SERVICE_NO_THREAD; ResumeThread(ThreadHandle); CloseHandle(ThreadHandle); + + return ERROR_SUCCESS; +} + + +static DWORD +ScControlService(PSCM_CONTROL_PACKET ControlPacket) +{ + PACTIVE_SERVICE lpService; + + DPRINT("ScControlService() called\n"); + DPRINT("Size: %lu\n", ControlPacket->dwSize); + DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + + lpService = ScLookupServiceByServiceName(&ControlPacket->szArguments[0]); + if (lpService == NULL) + return ERROR_SERVICE_DOES_NOT_EXIST; + + if (lpService->HandlerFunction) + { + DPRINT("Calling HandlerFunction with %lu\n", ControlPacket->dwControl); + (lpService->HandlerFunction)(ControlPacket->dwControl); + } + else if (lpService->HandlerFunctionEx) + { + DPRINT("Calling HandlerFunctionEx with %lu\n", ControlPacket->dwControl); + /* FIXME: send correct params */ + (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); + } + + if (ControlPacket->dwControl == SERVICE_CONTROL_STOP) + { + HeapFree(GetProcessHeap(), + 0, + lpService->Arguments); + } + + DPRINT("ScControlService() done\n"); return ERROR_SUCCESS; } @@ -333,19 +356,20 @@ switch (ControlPacket->dwControl) { case SERVICE_CONTROL_START: - DPRINT("Start command\n"); + DPRINT("Start command - recieved SERVICE_CONTROL_START\n"); if (ScStartService(ControlPacket) == ERROR_SUCCESS) dwRunningServices++; break; case SERVICE_CONTROL_STOP: - DPRINT("Stop command\n"); - dwRunningServices--; + DPRINT("Stop command - recieved SERVICE_CONTROL_STOP\n"); + if (ScControlService(ControlPacket) == ERROR_SUCCESS) + dwRunningServices--; break; default: - DPRINT1("Unknown command %lu", ControlPacket->dwControl); - break; + DPRINT("Unknown command %lu", ControlPacket->dwControl); + continue; } if (dwRunningServices == 0) @@ -409,7 +433,9 @@ Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL; - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hServiceStatus); + + return Service->hServiceStatus; } @@ -456,6 +482,7 @@ { PACTIVE_SERVICE Service; + /* FIXME: WinXP can start services with incorrect names */ Service = ScLookupServiceByServiceName(lpServiceName); if (Service == NULL) { @@ -466,7 +493,9 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext; - return (SERVICE_STATUS_HANDLE)Service->ThreadId; + DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hServiceStatus); + + return Service->hServiceStatus; } @@ -487,6 +516,39 @@ /********************************************************************** + * SetServiceStatus + * + * @implemented + */ +BOOL STDCALL +SetServiceStatus(SERVICE_STATUS_HANDLE hServiceStatus, + LPSERVICE_STATUS lpServiceStatus) +{ + DWORD dwError; + + DPRINT("SetServiceStatus() called\n"); + DPRINT("hServiceStatus %lu\n", hServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrSetServiceStatus(BindingHandle, + (unsigned long)hServiceStatus, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("SetServiceStatus() done (ret %lu)\n", dwError); + + return TRUE; +} + + +/********************************************************************** * StartServiceCtrlDispatcherA * * @unimplemented @@ -522,6 +584,7 @@ RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncA = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = FALSE; } @@ -599,6 +662,7 @@ RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); lpActiveServices[i].Main.lpFuncW = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].hServiceStatus = (SERVICE_STATUS_HANDLE)&lpActiveServices[i]; lpActiveServices[i].bUnicode = TRUE; }

1 0

[gedmurphy] 29004: - store the SERVICE_STATUS_HANDLE and use it for setting service status - add functionality for controlling services
by gedmurphy＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: gedmurphy Date: Tue Sep 11 16:56:22 2007 New Revision: 29004 URL: http://svn.reactos.org/svn/reactos?rev=29004&view=rev Log: - store the SERVICE_STATUS_HANDLE and use it for setting service status - add functionality for controlling services Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Tue Sep 11 16:56:22 2007 @@ -27,6 +27,7 @@ /* FUNCTIONS *****************************************************************/ + PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName) { @@ -115,13 +116,13 @@ PSERVICE -ScmGetServiceEntryByThreadId(ULONG ThreadId) +ScmGetServiceEntryByServiceStatusHandle(ULONG Handle) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; - DPRINT("ScmGetServiceEntryByThreadId() called\n"); - DPRINT("Finding ThreadId %lu\n", ThreadId); + DPRINT("ScmGetServiceEntryByServiceStatusHandle() called\n"); + DPRINT("looking for %lu\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) @@ -129,10 +130,10 @@ CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - DPRINT("Found threadId %lu\n", CurrentService->ThreadId); - if (CurrentService->ThreadId == ThreadId) - { - DPRINT("Found service: '%S'\n", CurrentService->lpDisplayName); + + if (CurrentService->hServiceStatus == Handle) + { + DPRINT1("Found service: '%S'\n", CurrentService->lpDisplayName); return CurrentService; } @@ -567,21 +568,27 @@ { PSCM_CONTROL_PACKET ControlPacket; DWORD Count; + DWORD TotalLength; DPRINT("ScmControlService() called\n"); - ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET)); + TotalLength = wcslen(Service->lpServiceName) + 1; + + ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; ControlPacket->dwControl = dwControl; + + ControlPacket->dwSize = TotalLength; + wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); /* Send the start command */ WriteFile(Service->ControlPipeHandle, ControlPacket, - sizeof(SCM_CONTROL_PACKET), + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)), &Count, NULL); @@ -591,6 +598,10 @@ HeapFree(GetProcessHeap(), 0, ControlPacket); + + RtlCopyMemory(lpServiceStatus, + &Service->Status, + sizeof(SERVICE_STATUS)); DPRINT("ScmControlService) done\n"); @@ -609,7 +620,7 @@ PWSTR Ptr; DWORD Count; - DPRINT("ScmSendStartCommand() called\n"); + DPRINT1("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1; @@ -776,14 +787,13 @@ if (ConnectNamedPipe(Service->ControlPipeHandle, NULL) ? TRUE : (dwError = GetLastError()) == ERROR_PIPE_CONNECTED) { - DWORD dwProcessId = 0; DWORD dwRead = 0; DPRINT("Control pipe connected!\n"); - /* Read thread id from pipe */ + /* Read SERVICE_STATUS_HANDLE from pipe */ if (!ReadFile(Service->ControlPipeHandle, - (LPVOID)&dwProcessId, + (LPVOID)&Service->hServiceStatus, sizeof(DWORD), &dwRead, NULL)) @@ -794,7 +804,8 @@ } else { - DPRINT("Received process id %lu\n", dwProcessId); + DPRINT("Received service status %lu\n", Service->hServiceStatus); + DPRINT("calling ScmSendStartCommand on %S\n", Service->lpDisplayName); /* Send start command */ dwError = ScmSendStartCommand(Service, lpArgs); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Tue Sep 11 16:56:22 2007 @@ -717,7 +717,7 @@ if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; - lpService = ScmGetServiceEntryByThreadId((ULONG)hServiceStatus); + lpService = ScmGetServiceEntryByServiceStatusHandle((ULONG)hServiceStatus); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Tue Sep 11 16:56:22 2007 @@ -41,6 +41,7 @@ BOOL bDeleted; DWORD dwResumeCount; + SERVICE_STATUS_HANDLE hServiceStatus; SERVICE_STATUS Status; DWORD dwStartType; DWORD dwErrorControl; @@ -104,7 +105,7 @@ PSERVICE ScmGetServiceEntryByName(LPWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); -PSERVICE ScmGetServiceEntryByThreadId(ULONG ThreadId); +PSERVICE ScmGetServiceEntryByServiceStatusHandle(ULONG ThreadId); DWORD ScmCreateNewServiceRecord(LPWSTR lpServiceName, PSERVICE *lpServiceRecord); DWORD ScmMarkServiceForDelete(PSERVICE pService);

1 0

[fireball] 29003: - Merge 29002.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 16:31:30 2007 New Revision: 29003 URL: http://svn.reactos.org/svn/reactos?rev=29003&view=rev Log: - Merge 29002. Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c (original) +++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/common.c Tue Sep 11 16:31:30 2007 @@ -199,6 +199,9 @@ NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); DPRINT1("IoVerifyVolume() retuned (Status %lx)\n", NewStatus); + + if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME) + Status = STATUS_SUCCESS; } DPRINT("Returning Status %x\n", Status); Modified: branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c (original) +++ branches/ros-branch-0_3_3-new/reactos/drivers/filesystems/cdfs/create.c Tue Sep 11 16:31:30 2007 @@ -141,6 +141,10 @@ DPRINT ("Status %lx\n", Status); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED) + { + DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME; + } DPRINT1 ("Status %lx\n", Status); return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs