Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29002: - When media is changed, set VolumeDevice's DO_VERIFY_VOLUME flag so it actually gets verified. - IoVerifyVolume() actually gives two successful statuses - STATUS_SUCCESS and STATUS_WRONG_VOLUME. Respect that when processing an device ioctl. - "Inability to change CD after boot" issue is fixed.
by fireball＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: fireball Date: Tue Sep 11 14:29:03 2007 New Revision: 29002 URL: http://svn.reactos.org/svn/reactos?rev=29002&view=rev Log: - When media is changed, set VolumeDevice's DO_VERIFY_VOLUME flag so it actually gets verified. - IoVerifyVolume() actually gives two successful statuses - STATUS_SUCCESS and STATUS_WRONG_VOLUME. Respect that when processing an device ioctl. - "Inability to change CD after boot" issue is fixed. Modified: trunk/reactos/drivers/filesystems/cdfs/common.c trunk/reactos/drivers/filesystems/cdfs/create.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c Tue Sep 11 14:29:03 2007 @@ -199,6 +199,9 @@ NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + + if (NewStatus == STATUS_SUCCESS || NewStatus == STATUS_WRONG_VOLUME) + Status = STATUS_SUCCESS; } DPRINT("Returning Status %x\n", Status); Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c Tue Sep 11 14:29:03 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

[dreimer] 29001: RosBE 0.3.8 is released. Update and Clean up the Changelog and wipe the Subreleases out of the history.
by dreimer＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: dreimer Date: Tue Sep 11 12:19:39 2007 New Revision: 29001 URL: http://svn.reactos.org/svn/reactos?rev=29001&view=rev Log: RosBE 0.3.8 is released. Update and Clean up the Changelog and wipe the Subreleases out of the history. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Tue Sep 11 12:19:39 2007 @@ -1,30 +1,22 @@ -*** Oct XXth, 2007 - RosBE 0.3.8 Released +*** Sep 11th, 2007 - RosBE 0.3.8 Released -- Added DrFred's Config Tool. (Daniel Reimer) -- Added ShortCut Tool. (Daniel Reimer) -- Updated w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) -- Updated mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) -- Other small Bugfixes (Daniel Reimer) -- Updated to NSIS 2.30. (Daniel Reimer) -- Updated Binutils 2.17.50 to Build 20070806 (Daniel Reimer) +- Updated: w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) +- Updated: mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) +- Updated: to NSIS 2.30. (Daniel Reimer) +- Updated: Binutils 2.17.50 to Build 20070806 (Daniel Reimer) - Updated: GCC 4.1.3 Build 20070829 (Daniel Reimer) - -*** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) - -- Updated NASM to 0.99.02 (Daniel Reimer, David Leon) -- Updated Binutils 2.17.50 to Build 20070730 (Hervé Poussineau, David Leon, Daniel Reimer) - (Small modification by Hervé Poussineau in LD to fix Bug 1244) -- Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) -- Added Build Begin Time into Topic. (Daniel Reimer) -- Added svnversion. (Daniel Reimer) -- Updated Tools. (Daniel Reimer) +- Updated: SVN 1.44 -> 1.45. (Daniel Reimer) +- Updated: NASM to 0.99.02 (Daniel Reimer, David Leon) +- Updated: Tools. (Daniel Reimer) +- Added: DrFred's Config Tool. (Daniel Reimer) +- Added: ShortCut Tool. (Daniel Reimer) +- Added: Build Begin Time into Topic. (Daniel Reimer) +- Added: svnversion. (Daniel Reimer) +- Fixed: Double \\ Bug introduced in 0.3.7. (Daniel Reimer) +- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) +- Fixed: DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) - sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer) -- Fixed DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) - Add a new option called update to Config.cmd and add some security stuff. (Daniel Reimer) - -*** July 26th, 2007 - RosBE 0.3.7.1 Released - -- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) - All commands use the current dir now. SO you can use several SVN Source Trees now. (Daniel Reimer) *** July 22nd, 2007 - RosBE 0.3.7 Released

1 0

[hpoussin] 29000: Rename strFile/strDirectory to a more meaningful name, and move them to appropriate place
by hpoussin＠svn.reactos.org 11 Sep '07

11 Sep '07

Author: hpoussin Date: Tue Sep 11 11:14:32 2007 New Revision: 29000 URL: http://svn.reactos.org/svn/reactos?rev=29000&view=rev Log: Rename strFile/strDirectory to a more meaningful name, and move them to appropriate place Modified: trunk/reactos/tools/rbuild/backend/backend.cpp trunk/reactos/tools/rbuild/backend/backend.h trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/backend.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.cpp (original) +++ trunk/reactos/tools/rbuild/backend/backend.cpp Tue Sep 11 11:14:32 2007 @@ -79,3 +79,48 @@ Backend::~Backend() { } + +string +Backend::GetFullPath ( const FileLocation& file ) const +{ + string directory; + switch ( file.directory ) + { + case SourceDirectory: + directory = ""; + break; + case IntermediateDirectory: + directory = Environment::GetIntermediatePath (); + break; + case OutputDirectory: + directory = Environment::GetOutputPath (); + break; + case InstallDirectory: + directory = Environment::GetInstallPath (); + break; + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) + { + if ( directory.length () > 0 ) + directory += sSep; + directory += file.relative_path; + } + return directory; +} + +string +Backend::GetFullName ( const FileLocation& file ) const +{ + string directory = GetFullPath ( file ); + + if ( directory.length () > 0 ) + directory += sSep; + + return directory + file.name; +} Modified: trunk/reactos/tools/rbuild/backend/backend.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.h (original) +++ trunk/reactos/tools/rbuild/backend/backend.h Tue Sep 11 11:14:32 2007 @@ -69,6 +69,8 @@ public: virtual ~Backend(); + virtual std::string GetFullName ( const FileLocation& file ) const; + virtual std::string GetFullPath ( const FileLocation& file ) const; virtual void Process () = 0; Project& ProjectNode; Configuration& configuration; Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Tue Sep 11 11:14:32 2007 @@ -35,12 +35,12 @@ typedef set<string> set_string; string -strDirectory ( const FileLocation *file ) -{ - MingwModuleHandler::PassThruCacheDirectory ( file ); +MingwBackend::GetFullPath ( const FileLocation& file ) const +{ + MingwModuleHandler::PassThruCacheDirectory ( &file ); string directory; - switch ( file->directory ) + switch ( file.directory ) { case SourceDirectory: directory = ""; @@ -60,23 +60,24 @@ default: throw InvalidOperationException ( __FILE__, __LINE__, - "Invalid directory." ); - } - - if ( file->relative_path.length () > 0 ) + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) { if ( directory.length () > 0 ) directory += sSep; - directory += file->relative_path; + directory += file.relative_path; } return directory; } string -strFile ( const FileLocation *file ) +MingwBackend::GetFullName ( const FileLocation& file ) const { string directory; - switch ( file->directory ) + switch ( file.directory ) { case SourceDirectory: directory = ""; @@ -96,25 +97,25 @@ default: throw InvalidOperationException ( __FILE__, __LINE__, - "Invalid directory." ); - } - - if ( file->relative_path.length () > 0 ) + "Invalid directory %d.", + file.directory ); + } + + if ( file.relative_path.length () > 0 ) { if ( directory.length () > 0 ) directory += sSep; - directory += file->relative_path; + directory += file.relative_path; } if ( directory.length () > 0 ) directory += sSep; - return directory + file->name; -} - - -string -v2s ( const vector<FileLocation>& files, int wrap_at ) + return directory + file.name; +} + +string +v2s ( const Backend* backend, const vector<FileLocation>& files, int wrap_at ) { if ( !files.size() ) return ""; @@ -127,7 +128,7 @@ s += " \\\n\t\t"; else if ( s.size() ) s += " "; - s += strFile ( &file ); + s += backend->GetFullName ( file ); } return s; } @@ -587,7 +588,7 @@ { if ( dependencies.length () > 0 ) dependencies += " "; - dependencies += strFile ( module.dependency ); + dependencies += GetFullName ( *module.dependency ); } } return dependencies; @@ -1184,15 +1185,15 @@ { fprintf ( fMakefile, "%s: %s | %s\n", - strFile( &target ).c_str (), - strFile( &source ).c_str (), - strDirectory( &target ).c_str () ); + GetFullName ( target ).c_str (), + GetFullName ( source ).c_str (), + GetFullPath ( target ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - strFile( &source ).c_str (), - strFile( &target ).c_str () ); + GetFullName ( source ).c_str (), + GetFullName ( target ).c_str () ); } void @@ -1257,7 +1258,7 @@ registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "software" ) ); registry_files.push_back ( FileLocation ( InstallDirectory, system32ConfigDirectory, "system" ) ); - return v2s( registry_files, 6 ); + return v2s( this, registry_files, 6 ); } void @@ -1274,12 +1275,12 @@ "%s: %s %s $(MKHIVE_TARGET)\n", registryTargetFiles.c_str (), registrySourceFiles.c_str (), - strDirectory ( &system32 ).c_str () ); + GetFullPath ( system32 ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst.inf\n", - cSep, strDirectory ( &system32 ).c_str (), + cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile, "\n" ); @@ -1290,7 +1291,7 @@ { vector<FileLocation> vInstallTargetFiles; GetInstallTargetFiles ( vInstallTargetFiles ); - string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); + string installTargetFiles = v2s ( this, vInstallTargetFiles, 5 ); string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Tue Sep 11 11:14:32 2007 @@ -30,7 +30,7 @@ class MingwModuleHandler; extern std::string -v2s ( const std::vector<FileLocation>& files, int wrap_at ); +v2s ( const Backend* backend, const std::vector<FileLocation>& files, int wrap_at ); extern std::string v2s ( const string_list& v, int wrap_at ); @@ -54,6 +54,10 @@ Directory* intermediateDirectory; Directory* outputDirectory; Directory* installDirectory; + + std::string GetFullName ( const FileLocation& file ) const; + std::string GetFullPath ( const FileLocation& file ) const; + private: void CreateMakefile (); void CloseMakefile () const; 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 Tue Sep 11 11:14:32 2007 @@ -25,17 +25,12 @@ using std::string; using std::vector; -#define CLEAN_FILE(f) clean_files.push_back ( (f)->name.length () > 0 ? strFile ( f ) : strDirectory ( f ) ); +#define CLEAN_FILE(f) clean_files.push_back ( (f).name.length () > 0 ? backend->GetFullName ( f ) : backend->GetFullPath ( f ) ); MingwBackend* MingwModuleHandler::backend = NULL; FILE* MingwModuleHandler::fMakefile = NULL; - -extern string -strDirectory ( const FileLocation *file ); -extern string -strFile ( const FileLocation *file ); string PrefixFilename ( @@ -135,7 +130,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( target ); + CLEAN_FILE ( *target ); } return target; } @@ -149,7 +144,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( target ); + CLEAN_FILE ( *target ); } return target; } @@ -314,11 +309,11 @@ if ( extension == ".idl" || extension == ".IDL" ) { if ( (module.type == RpcServer) || (module.type == RpcClient) ) - return strFile ( GetRpcServerHeaderFilename ( file ) ) + return backend->GetFullName ( *GetRpcServerHeaderFilename ( file ) ) + " " - + strFile ( GetRpcClientHeaderFilename ( file ) ); + + backend->GetFullName ( *GetRpcClientHeaderFilename ( file ) ); else if ( module.type == IdlHeader ) - return strFile ( GetIdlHeaderFilename ( file ) ); + return backend->GetFullName ( *GetIdlHeaderFilename ( file ) ); else return ""; } @@ -336,7 +331,7 @@ for ( size_t i = 0; i < compilationUnit.files.size (); i++ ) { File& file = *compilationUnit.files[i]; - sourceFiles.push_back ( strFile ( &file.file ) ); + sourceFiles.push_back ( backend->GetFullName ( file.file ) ); } return v2s ( sourceFiles, 10 ); } @@ -381,8 +376,8 @@ "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - strFile ( &source ).c_str (), - strFile ( PassThruCacheDirectory ( &destination ) ).c_str () ); + backend->GetFullName ( source ).c_str (), + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } string @@ -393,7 +388,7 @@ if ( ReferenceObjects ( importedModule ) ) dep = GetTargetMacro ( importedModule ); else - dep = strFile ( GetImportLibraryFilename ( importedModule, NULL ) ); + dep = backend->GetFullName ( *GetImportLibraryFilename ( importedModule, NULL ) ); return dep; } @@ -434,7 +429,7 @@ for ( size_t i = 0; i < v.size (); i++ ) { const FileLocation& file = v[i]; - dependencies.push_back ( strFile ( &file ) ); + dependencies.push_back ( backend->GetFullName ( file ) ); } } @@ -524,7 +519,7 @@ if ( pclean_files ) { string_list& clean_files = *pclean_files; - CLEAN_FILE ( obj_file ); + CLEAN_FILE ( *obj_file ); } return obj_file; } @@ -580,7 +575,7 @@ fprintf ( fMakefile, "%s_install: %s\n", module.name.c_str (), - strFile ( module.install ).c_str () ); + backend->GetFullName ( *module.install ).c_str () ); } void @@ -611,7 +606,7 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += strFile ( GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ) ); + objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ) ); } return objectFilenames; } @@ -672,7 +667,7 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - parameters += "-I" + strDirectory ( include.directory );; + parameters += "-I" + backend->GetFullPath ( *include.directory );; } return parameters; } @@ -763,7 +758,7 @@ { fprintf ( fMakefile, " -I%s", - strDirectory ( GetPrecompiledHeaderFilename () ).c_str () ); + backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () ); } string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); @@ -782,7 +777,7 @@ fprintf ( fMakefile, " -I%s", - strDirectory ( includeDirectory ).c_str() ); + backend->GetFullPath ( *includeDirectory ).c_str() ); } for ( i = 0; i < data.defines.size(); i++ ) { @@ -905,7 +900,7 @@ fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - strFile ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str (), + backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str (), objectsMacro.c_str() ); } } @@ -923,7 +918,7 @@ fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - strFile ( GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); + backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -964,7 +959,7 @@ fMakefile, "%s += %s\n", objectsMacro.c_str(), - strFile ( GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ) ).c_str () ); + backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ) ).c_str () ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -985,25 +980,25 @@ const string& cc, const string& cflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); if ( extraDependencies != "" ) dependencies += " " + extraDependencies; if ( module.pch && use_pch ) - dependencies += " " + strFile ( GetPrecompiledHeaderFilename () ); + dependencies += " " + backend->GetFullName ( *GetPrecompiledHeaderFilename () ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies += " " + v2s ( rpcDependencies, 5 ); + dependencies += " " + v2s ( backend, rpcDependencies, 5 ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, "\t%s -c $< -o $@ %s\n", @@ -1017,16 +1012,16 @@ const string& cc, const string& cflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n", @@ -1039,16 +1034,16 @@ const FileLocation* sourceFile, const string& nasmflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, "\t%s -f win32 $< -o $@ %s\n", @@ -1061,7 +1056,7 @@ const FileLocation* sourceFile, const string& windresflagsMacro ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); @@ -1078,42 +1073,42 @@ fprintf ( fMakefile, "%s: %s $(WRC_TARGET) | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", windresflagsMacro.c_str (), - strFile ( sourceFile ).c_str (), - strFile ( &rciFilename ).c_str () ); + backend->GetFullName ( *sourceFile ).c_str (), + backend->GetFullName ( rciFilename ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", windresflagsMacro.c_str (), - strFile ( &rciFilename ).c_str (), - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( rciFilename ).c_str (), + backend->GetFullName ( resFilename ).c_str () ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &rciFilename ).c_str () ); + backend->GetFullName ( rciFilename ).c_str () ); fprintf ( fMakefile, "\t${windres} %s -o $@\n", - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( resFilename ).c_str () ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &resFilename ).c_str () ); + backend->GetFullName ( resFilename ).c_str () ); } else { fprintf ( fMakefile, "%s: %s $(WRC_TARGET) | %s\n", - strFile ( objectFilename ).c_str (), + backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), - strDirectory ( objectFilename ).c_str () ); + backend->GetFullPath ( *objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t${windres} $(%s) %s -o $@\n", windresflagsMacro.c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *sourceFile ).c_str () ); } } @@ -1121,41 +1116,41 @@ MingwModuleHandler::GenerateWinebuildCommands ( const FileLocation* sourceFile ) { - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); FileLocation def_file ( IntermediateDirectory, sourceFile->relative_path, basename + ".spec.def" ); - CLEAN_FILE ( &def_file ); + CLEAN_FILE ( def_file ); FileLocation stub_file ( IntermediateDirectory, sourceFile->relative_path, basename + ".stubs.c" ); - CLEAN_FILE ( &stub_file ); + CLEAN_FILE ( stub_file ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET) | %s\n", - strFile ( &def_file ).c_str (), + backend->GetFullName ( def_file ).c_str (), dependencies.c_str (), - strDirectory ( &def_file ).c_str () ); + backend->GetFullPath ( def_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --def -E %s\n", "$(Q)$(WINEBUILD_TARGET)", - strFile ( &def_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( def_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET)\n", - strFile ( &stub_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --pedll %s\n", "$(Q)$(WINEBUILD_TARGET)", - strFile ( &stub_file ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } string @@ -1189,34 +1184,34 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeaderFilename); + CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedServerFilename ( IntermediateDirectory, sourceFile->relative_path, basename + "_s.c" ); - CLEAN_FILE(&generatedServerFilename); + CLEAN_FILE ( generatedServerFilename ); fprintf ( fMakefile, "%s %s: %s $(WIDL_TARGET) | %s\n", - strFile ( &generatedServerFilename ).c_str (), - strFile ( generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedServerFilename ).c_str (), + backend->GetFullName ( *generatedHeaderFilename ).c_str (), dependencies.c_str (), - strDirectory ( &generatedServerFilename ).c_str () ); + backend->GetFullPath ( generatedServerFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s -s -S %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( generatedHeaderFilename ).c_str (), - strFile ( &generatedServerFilename ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedServerFilename ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } const FileLocation* @@ -1239,7 +1234,7 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); @@ -1252,15 +1247,15 @@ "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (), dependencies.c_str (), - strDirectory ( &EmbeddedTypeLibFilename ).c_str () ); + backend->GetFullPath ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( &EmbeddedTypeLibFilename ).c_str(), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1269,34 +1264,34 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeaderFilename); + CLEAN_FILE ( *generatedHeaderFilename ); FileLocation generatedClientFilename ( IntermediateDirectory, sourceFile->relative_path, basename + "_c.c" ); - CLEAN_FILE(&generatedClientFilename); + CLEAN_FILE ( generatedClientFilename ); fprintf ( fMakefile, "%s %s: %s $(WIDL_TARGET) | %s\n", - strFile ( &generatedClientFilename ).c_str (), - strFile ( generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedClientFilename ).c_str (), + backend->GetFullName ( *generatedHeaderFilename ).c_str (), dependencies.c_str (), - strDirectory ( &generatedClientFilename ).c_str () ); + backend->GetFullPath ( generatedClientFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s -c -C %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile ( generatedHeaderFilename ).c_str (), - strFile ( &generatedClientFilename ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeaderFilename ).c_str (), + backend->GetFullName ( generatedClientFilename ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1305,27 +1300,27 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string dependencies = strFile ( sourceFile ); + string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string basename = GetBasename ( sourceFile->name ); const FileLocation *generatedHeader = GetIdlHeaderFilename ( sourceFile ); - CLEAN_FILE(generatedHeader); + CLEAN_FILE ( *generatedHeader ); fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", - strFile( generatedHeader ).c_str (), + backend->GetFullName( *generatedHeader ).c_str (), dependencies.c_str (), - strDirectory ( generatedHeader ).c_str () ); + backend->GetFullPath ( *generatedHeader ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, "\t%s %s %s -h -H %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - strFile( generatedHeader ).c_str (), - strFile ( sourceFile ).c_str () ); + backend->GetFullName ( *generatedHeader ).c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); } void @@ -1358,7 +1353,7 @@ const string& widlflagsMacro ) { const FileLocation* sourceFile = compilationUnit.GetFilename (); - string filename = strFile ( sourceFile ); + string filename = backend->GetFullName ( *sourceFile ); string extension = GetExtension ( filename ); if ( extension == ".c" || extension == ".C" ) { @@ -1436,14 +1431,14 @@ FileLocation mapFilename ( OutputDirectory, module.output->relative_path, GetBasename ( module.output->name ) + ".map" ); - CLEAN_FILE ( &mapFilename ); + CLEAN_FILE ( mapFilename ); fprintf ( fMakefile, "\t$(ECHO_OBJDUMP)\n" ); fprintf ( fMakefile, "\t$(Q)${objdump} -d -S %s > %s\n", - mapTarget ? strFile ( mapTarget ).c_str () : "$@", - strFile ( &mapFilename ).c_str () ); + mapTarget ? backend->GetFullName ( *mapTarget ).c_str () : "$@", + backend->GetFullName ( mapFilename ).c_str () ); fprintf ( fMakefile, "else\n" ); @@ -1454,8 +1449,8 @@ "\t$(ECHO_NM)\n" ); fprintf ( fMakefile, "\t$(Q)${nm} --numeric-sort %s > %s\n", - mapTarget ? strFile ( mapTarget ).c_str () : "$@", - strFile ( &mapFilename ).c_str () ); + mapTarget ? backend->GetFullName ( *mapTarget ).c_str () : "$@", + backend->GetFullName ( mapFilename ).c_str () ); fprintf ( fMakefile, "endif\n" ); @@ -1474,7 +1469,7 @@ FileLocation nostripFilename ( OutputDirectory, module.output->relative_path, GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ) ); - CLEAN_FILE ( &nostripFilename ); + CLEAN_FILE ( nostripFilename ); OutputCopyCommand ( *module.output, nostripFilename ); @@ -1483,7 +1478,8 @@ } void -MergeStringVector ( const vector<FileLocation>& input, +MergeStringVector ( const Backend* backend, + const vector<FileLocation>& input, vector<string>& output ) { int wrap_at = 25; @@ -1499,7 +1495,7 @@ } else if ( s.size () > 0) s += " "; - s += strFile ( &input[i] ); + s += backend->GetFullName ( input[i] ); } if ( s.length () > 0 ) output.push_back ( s ); @@ -1525,7 +1521,8 @@ GetObjectsVector ( module.non_if_data, objectFiles ); vector<string> lines; - MergeStringVector ( objectFiles, + MergeStringVector ( backend, + objectFiles, lines ); for ( size_t i = 0; i < lines.size (); i++ ) { @@ -1568,7 +1565,7 @@ const string& pefixupParameters ) { string target ( GetTargetMacro ( module ) ); - string target_folder ( strDirectory ( GetTargetFilename ( module, NULL ) ) ); + string target_folder ( backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ) ); const FileLocation *definitionFilename = GetDefinitionFilename (); string linkerScriptArgument; @@ -1580,7 +1577,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", target.c_str (), - strFile ( definitionFilename ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), dependencies.c_str (), target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -1603,13 +1600,13 @@ FileLocation temp_exp ( TemporaryDirectory, "", module.name + ".temp.exp" ); - CLEAN_FILE ( &temp_exp ); + CLEAN_FILE ( temp_exp ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-exp %s %s %s\n", targetName.c_str (), - strFile ( definitionFilename ).c_str (), - strFile ( &temp_exp ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), + backend->GetFullName ( temp_exp ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); @@ -1618,7 +1615,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - strFile ( &temp_exp ).c_str (), + backend->GetFullName ( temp_exp ).c_str (), target.c_str (), objectsMacro.c_str (), libsMacro.c_str (), @@ -1631,7 +1628,7 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &temp_exp ).c_str () ); + backend->GetFullName ( temp_exp ).c_str () ); } else { @@ -1668,7 +1665,7 @@ targetMacro.c_str ()); fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), - strDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); } void @@ -1737,23 +1734,23 @@ { const FileLocation& baseHeaderFile = module.pch->file; const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); - CLEAN_FILE(pchFilename); - string dependencies = strFile ( &baseHeaderFile ); + CLEAN_FILE ( *pchFilename ); + string dependencies = backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); - dependencies += " " + v2s ( rpcDependencies, 5 ); + dependencies += " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s\n", - strFile ( pchFilename ).c_str(), + backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, "\t%s -o %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), - strFile ( pchFilename ).c_str(), + backend->GetFullName ( *pchFilename ).c_str(), cflagsMacro.c_str(), - strFile ( &baseHeaderFile ).c_str() ); + backend->GetFullName ( baseHeaderFile ).c_str() ); } GenerateObjectFileTargets ( module.non_if_data, @@ -1774,9 +1771,9 @@ fprintf ( fMakefile, "%s: %s | %s\n", - strFile ( archiveFilename ).c_str (), + backend->GetFullName ( *archiveFilename ).c_str (), objs_macro.c_str (), - strDirectory ( archiveFilename ).c_str() ); + backend->GetFullPath ( *archiveFilename ).c_str() ); if ( module.type == StaticLibrary && module.importLibrary ) { @@ -1785,7 +1782,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", module.importLibrary->dllname.c_str (), - strFile ( definitionFilename ).c_str (), + backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); } @@ -1843,7 +1840,7 @@ if ( ReferenceObjects ( module ) ) return GetObjectsMacro ( module ); else - return strFile ( GetTargetFilename ( module, NULL ) ).c_str (); + return backend->GetFullName ( *GetTargetFilename ( module, NULL ) ).c_str (); } void @@ -1938,7 +1935,7 @@ for ( size_t i = 0; i < s.size(); i++ ) fprintf ( fMakefile, " %s", - strFile ( &s[i] ).c_str () ); + backend->GetFullName ( s[i] ).c_str () ); fprintf ( fMakefile, "\n" ); } @@ -2036,12 +2033,12 @@ FileLocation proxyMakefile ( OutputDirectory, module.output->relative_path, "makefile" ); - CLEAN_FILE ( &proxyMakefile ); + CLEAN_FILE ( proxyMakefile ); } string targetMacro = GetTargetMacro ( module ); - //CLEAN_FILE ( &targetMacro ); - CLEAN_FILE ( new FileLocation ( SourceDirectory, "", targetMacro ) ); + //CLEAN_FILE ( targetMacro ); + CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) ); // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", @@ -2062,7 +2059,7 @@ if ( !ReferenceObjects ( module ) ) { const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - CLEAN_FILE ( ar_target ); + CLEAN_FILE ( *ar_target ); } GenerateObjectFileTargets ( cc, @@ -2130,11 +2127,11 @@ invoke_targets[i].c_str () ); fprintf ( fMakefile, ": %s\n", - NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str () ); + NormalizeFilename ( backend->GetFullName ( *invoke.invokeModule->output ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" ); fprintf ( fMakefile, "\t%s %s\n\n", - NormalizeFilename ( strFile ( invoke.invokeModule->output ) ).c_str (), + NormalizeFilename ( backend->GetFullName ( *invoke.invokeModule->output ) ).c_str (), invoke.GetParameters ().c_str () ); } } @@ -2190,7 +2187,7 @@ { fprintf ( fMakefile, "%s: ${%s}\n", - strFile ( &sourceFilenames[i] ).c_str (), + backend->GetFullName ( sourceFilenames[i] ).c_str (), preconditionDependenciesName.c_str ()); } fprintf ( fMakefile, "\n" ); @@ -2239,24 +2236,24 @@ fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); fprintf ( fMakefile, "%s: %s", - strFile ( library_target ).c_str (), - strFile ( defFilename ).c_str () ); + backend->GetFullName ( *library_target ).c_str (), + backend->GetFullName ( *defFilename ).c_str () ); size_t i, iend = deps.size(); for ( i = 0; i < iend; i++ ) fprintf ( fMakefile, " %s", - strFile ( &deps[i] ).c_str () ); + backend->GetFullName ( deps[i] ).c_str () ); fprintf ( fMakefile, " | %s\n", - strDirectory ( GetImportLibraryFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *GetImportLibraryFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s %s %s\n\n", module.output->name.c_str (), - strFile ( defFilename ).c_str (), - strFile ( library_target ).c_str (), + backend->GetFullName ( *defFilename ).c_str (), + backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); } @@ -2373,7 +2370,7 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", @@ -3001,7 +2998,7 @@ FileLocation junk_tmp ( TemporaryDirectory, "", module.name + ".junk.tmp" ); - CLEAN_FILE ( &junk_tmp ); + CLEAN_FILE ( junk_tmp ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); @@ -3012,23 +3009,23 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n", GetLinkerMacro ().c_str (), - strFile ( &junk_tmp ).c_str (), + backend->GetFullName ( junk_tmp ).c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () ); fprintf ( fMakefile, "\t${objcopy} -O binary %s $@\n", - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str () ); GenerateBuildMapCode ( &junk_tmp ); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str () ); } @@ -3088,9 +3085,9 @@ FileLocation junk_cpy ( TemporaryDirectory, "", module.name + ".junk.elf" ); - CLEAN_FILE ( &junk_tmp ); - CLEAN_FILE ( &junk_elf ); - CLEAN_FILE ( &junk_cpy ); + CLEAN_FILE ( junk_tmp ); + CLEAN_FILE ( junk_elf ); + CLEAN_FILE ( junk_cpy ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); @@ -3103,34 +3100,36 @@ objectsMacro.c_str (), linkDepsMacro.c_str (), payload->name.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n", module.buildtype.c_str (), - NormalizeFilename( strFile ( payload->output ) ).c_str (), - strFile ( &junk_cpy ).c_str () ); + NormalizeFilename( backend->GetFullName ( *payload->output ) ).c_str (), + backend->GetFullName ( junk_cpy ).c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n", module.buildtype.c_str (), - strFile ( &junk_cpy ).c_str (), - strFile ( &junk_tmp ).c_str () ); + backend->GetFullName ( junk_cpy ).c_str (), + backend->GetFullName ( junk_tmp ).c_str () ); fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n", module.buildtype.c_str (), linkDepsMacro.c_str (), - strFile ( &junk_tmp ).c_str (), - strFile ( &junk_elf ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str (), + backend->GetFullName ( junk_elf ).c_str () ); fprintf ( fMakefile, "\t${objcopy} $(%s_COPYFORMAT) %s $(INTERMEDIATE)$(SEP)%s\n", module.buildtype.c_str (), - strFile ( &junk_elf ).c_str (), - strFile ( module.output ) .c_str () ); + backend->GetFullName ( junk_elf ).c_str (), + backend->GetFullName ( *module.output ) .c_str () ); fprintf ( fMakefile, "\t-@${rm} %s %s %s 2>$(NUL)\n", - strFile ( &junk_tmp ).c_str (), strFile ( &junk_elf ).c_str (), strFile ( &junk_cpy ).c_str () ); + backend->GetFullName ( junk_tmp ).c_str (), + backend->GetFullName ( junk_elf ).c_str (), + backend->GetFullName ( junk_cpy ).c_str () ); } @@ -3308,36 +3307,36 @@ IsoName = "ReactOS.iso"; - string sourceFiles = v2s ( vSourceFiles, 5 ); + string sourceFiles = v2s ( backend, vSourceFiles, 5 ); // fill cdrom GetCdDirectories ( vCdDirectories, bootcdDirectory ); GetCdFiles ( vCdFiles ); string cdDirectories = "";//v2s ( vCdDirectories, 5 ); - string cdFiles = v2s ( vCdFiles, 5 ); + string cdFiles = v2s ( backend, vCdFiles, 5 ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n", module.name.c_str (), - strFile ( &isoboot ).c_str (), + backend->GetFullName ( isoboot ).c_str (), sourceFiles.c_str (), cdFiles.c_str (), cdDirectories.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", - strFile ( &reactosDff ).c_str (), - strDirectory ( &bootcdReactos ).c_str () ); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n", - strFile ( &reactosDff ).c_str (), - strFile ( &reactosInf ).c_str (), - strDirectory ( &bootcdReactos ).c_str ()); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullName ( reactosInf ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str ()); fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", - strFile ( &reactosInf ).c_str () ); + backend->GetFullName ( reactosInf ).c_str () ); OutputBootstrapfileCopyCommands ( bootcdDirectory ); OutputCdfileCopyCommands ( bootcdDirectory ); @@ -3347,8 +3346,8 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n", - strFile ( &isoboot ).c_str (), - strDirectory ( &bootcd ).c_str (), + backend->GetFullName ( isoboot ).c_str (), + backend->GetFullPath ( bootcd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile, "\n" ); @@ -3459,7 +3458,7 @@ "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst.inf\n", - cSep, strDirectory ( &reactosSystem32ConfigDirectory ).c_str (), + cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), cSep, cSep, cSep, cSep ); } @@ -3490,15 +3489,15 @@ FileLocation livecdReactos ( OutputDirectory, livecdReactosNoFixup, "" ); - CLEAN_FILE ( &livecdReactos ); + CLEAN_FILE ( livecdReactos ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", module.name.c_str (), - strFile ( &isoboot) .c_str (), - strDirectory ( &livecdReactos ).c_str () ); + backend->GetFullName ( isoboot) .c_str (), + backend->GetFullPath ( livecdReactos ).c_str () ); OutputModuleCopyCommands ( livecdDirectory, reactosDirectory ); OutputNonModuleCopyCommands ( livecdDirectory, @@ -3509,8 +3508,8 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n", - strFile( &isoboot ).c_str (), - strDirectory ( &livecd ).c_str (), + backend->GetFullName( isoboot ).c_str (), + backend->GetFullPath ( livecd ).c_str (), IsoName.c_str() ); fprintf ( fMakefile, "\n" ); @@ -3654,7 +3653,7 @@ targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - strDirectory(GetTargetFilename(module,NULL)).c_str () ); + backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );

1 0

[gedmurphy] 28999: fix the service name to match the registry key
by gedmurphy＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: gedmurphy Date: Tue Sep 11 02:28:34 2007 New Revision: 28999 URL: http://svn.reactos.org/svn/reactos?rev=28999&view=rev Log: fix the service name to match the registry key Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Tue Sep 11 02:28:34 2007 @@ -18,7 +18,7 @@ static SERVICE_STATUS_HANDLE hSStat; LPCTSTR LogFileName = _T("C:\\tcpsvcs_log.log"); -LPTSTR ServiceName = _T("Simp Tcp"); +LPTSTR ServiceName = _T("tcpsvcs"); static SERVICES Services[NUM_SERVICES] =

1 0

[ekohl] 28998: - Enumerate short and long date formats. - Use the currently selected locale id instead of LOCALE_USER_DEFAULT.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 02:16:01 2007 New Revision: 28998 URL: http://svn.reactos.org/svn/reactos?rev=28998&view=rev Log: - Enumerate short and long date formats. - Use the currently selected locale id instead of LOCALE_USER_DEFAULT. Modified: trunk/reactos/dll/cpl/intl/date.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c (original) +++ trunk/reactos/dll/cpl/intl/date.c Tue Sep 11 02:16:01 2007 @@ -35,12 +35,12 @@ /* GLOBALS ******************************************************************/ #define YEAR_STR_MAX_SIZE 4 -#define MAX_SHORT_FMT_SAMPLES 5 -#define MAX_LONG_FMT_SAMPLES 2 #define MAX_SHRT_DATE_SEPARATORS 3 #define STD_DATE_SEP _T(".") #define YEAR_DIFF (99) #define MAX_YEAR (9999) + +static HWND hwndEnum = NULL; /* FUNCTIONS ****************************************************************/ @@ -91,7 +91,7 @@ /* Setted up short date separator to registry */ static BOOL -SetShortDateSep(HWND hwndDlg) +SetShortDateSep(HWND hwndDlg, LCID lcid) { TCHAR szShortDateSep[MAX_SAMPLES_STR_SIZE]; INT nSepStrSize; @@ -119,14 +119,14 @@ } /* Save date separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, szShortDateSep); + SetLocaleInfo(lcid, LOCALE_SDATE, szShortDateSep); return TRUE; } /* Setted up short date format to registry */ static BOOL -SetShortDateFormat(HWND hwndDlg) +SetShortDateFormat(HWND hwndDlg, LCID lcid) { TCHAR szShortDateFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szShortDateSep[MAX_SAMPLES_STR_SIZE]; @@ -186,14 +186,14 @@ free(pszResultStr); /* Save short date format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, szShortDateFmt); + SetLocaleInfo(lcid, LOCALE_SSHORTDATE, szShortDateFmt); return TRUE; } /* Setted up long date format to registry */ static BOOL -SetLongDateFormat(HWND hwndDlg) +SetLongDateFormat(HWND hwndDlg, LCID lcid) { TCHAR szLongDateFmt[MAX_SAMPLES_STR_SIZE]; BOOL OpenApostFlg = FALSE; @@ -238,14 +238,14 @@ } /* Save short date format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, szLongDateFmt); + SetLocaleInfo(lcid, LOCALE_SLONGDATE, szLongDateFmt); return TRUE; } /* Init short date separator control box */ static VOID -InitShortDateSepSamples(HWND hwndDlg) +InitShortDateSepSamples(HWND hwndDlg, LCID lcid) { LPTSTR ShortDateSepSamples[MAX_SHRT_DATE_SEPARATORS] = { @@ -258,7 +258,7 @@ INT nRetCode; /* Get current short date separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDATE, szShortDateSep, MAX_SAMPLES_STR_SIZE); @@ -274,7 +274,7 @@ { SendMessageW(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_ADDSTRING, - nCBIndex, + 0, (LPARAM)ShortDateSepSamples[nCBIndex]); } @@ -289,7 +289,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_ADDSTRING, - MAX_SHRT_DATE_SEPARATORS+1, + 0, (LPARAM)szShortDateSep); SendMessageW(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_SELECTSTRING, @@ -298,24 +298,26 @@ } } +static BOOL CALLBACK +ShortDateFormatEnumProc(LPTSTR lpTimeFormatString) +{ + SendMessage(hwndEnum, + CB_ADDSTRING, + 0, + (LPARAM)lpTimeFormatString); + + return TRUE; +} + /* Init short date control box */ VOID -InitShortDateCB(HWND hwndDlg) -{ - LPTSTR ShortDateFmtSamples[MAX_SHORT_FMT_SAMPLES] = - { - _T("dd.MM.yyyy"), - _T("dd.MM.yy"), - _T("d.M.yy"), - _T("dd/MM/yy"), - _T("yyyy-MM-dd") - }; +InitShortDateCB(HWND hwndDlg, LCID lcid) +{ TCHAR szShortDateFmt[MAX_SAMPLES_STR_SIZE]; - INT nCBIndex; INT nRetCode; /* Get current short date format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SSHORTDATE, szShortDateFmt, MAX_SAMPLES_STR_SIZE); @@ -326,14 +328,9 @@ (WPARAM)0, (LPARAM)0); - /* Create standart list of date formats */ - for (nCBIndex = 0; nCBIndex < MAX_SHORT_FMT_SAMPLES; nCBIndex++) - { - SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), - CB_ADDSTRING, - nCBIndex, - (LPARAM)ShortDateFmtSamples[nCBIndex]); - } + /* Enumerate short date formats */ + hwndEnum = GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO); + EnumDateFormats(ShortDateFormatEnumProc, lcid, DATE_SHORTDATE); /* Set current item to value from registry */ nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), @@ -346,7 +343,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), CB_ADDSTRING, - MAX_SHORT_FMT_SAMPLES+1, + 0, (LPARAM)szShortDateFmt); SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), CB_SELECTSTRING, @@ -357,20 +354,13 @@ /* Init long date control box */ static VOID -InitLongDateCB(HWND hwndDlg) -{ - /* Where this data stored? */ - LPTSTR LongDateFmtSamples[MAX_LONG_FMT_SAMPLES] = - { - _T("d MMMM yyyy 'y.'"), - _T("dd MMMM yyyy 'y.'") - }; +InitLongDateCB(HWND hwndDlg, LCID lcid) +{ TCHAR szLongDateFmt[MAX_SAMPLES_STR_SIZE]; - INT nCBIndex; INT nRetCode; /* Get current long date format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SLONGDATE, szLongDateFmt, MAX_SAMPLES_STR_SIZE); @@ -381,14 +371,9 @@ (WPARAM)0, (LPARAM)0); - /* Create standart list of date formats */ - for (nCBIndex = 0; nCBIndex < MAX_LONG_FMT_SAMPLES; nCBIndex++) - { - SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), - CB_ADDSTRING, - nCBIndex, - (LPARAM)LongDateFmtSamples[nCBIndex]); - } + /* Enumerate short long formats */ + hwndEnum = GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO); + EnumDateFormats(ShortDateFormatEnumProc, lcid, DATE_LONGDATE); /* Set current item to value from registry */ nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), @@ -401,7 +386,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), CB_ADDSTRING, - MAX_LONG_FMT_SAMPLES+1, + 0, (LPARAM)szLongDateFmt); SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), CB_SELECTSTRING, @@ -412,7 +397,7 @@ /* Set up max date value to registry */ static VOID -SetMaxDate(HWND hwndDlg) +SetMaxDate(HWND hwndDlg, LCID lcid) { TCHAR szMaxDateVal[YEAR_STR_MAX_SIZE]; HWND hWndYearSpin; @@ -430,7 +415,7 @@ _itot(nSpinVal, szMaxDateVal, DECIMAL_RADIX); /* Save max date value */ - SetCalendarInfo(LOCALE_USER_DEFAULT, + SetCalendarInfo(lcid, CAL_GREGORIAN, 48 , /* CAL_ITWODIGITYEARMAX */ (LPCTSTR)&szMaxDateVal); @@ -438,11 +423,11 @@ /* Get max date value from registry set */ static INT -GetMaxDate(VOID) +GetMaxDate(LCID lcid) { INT nMaxDateVal; - GetCalendarInfo(LOCALE_USER_DEFAULT, + GetCalendarInfo(lcid, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, @@ -478,7 +463,7 @@ /* Init spin control */ static VOID -InitMinMaxDateSpin(HWND hwndDlg) +InitMinMaxDateSpin(HWND hwndDlg, LCID lcid) { TCHAR OutBuffer[YEAR_STR_MAX_SIZE]; HWND hWndYearSpin; @@ -486,14 +471,14 @@ hWndYearSpin = GetDlgItem(hwndDlg, IDC_SCR_MAX_YEAR); /* Init max date value */ - wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate()); + wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate(lcid)); SendMessage(GetDlgItem(hwndDlg, IDC_SECONDYEAR_EDIT), WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Init min date value */ - wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate()-YEAR_DIFF); + wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate(lcid) - YEAR_DIFF); SendMessage(GetDlgItem(hwndDlg, IDC_FIRSTYEAR_EDIT), WM_SETTEXT, 0, @@ -510,7 +495,7 @@ SendMessage(hWndYearSpin, UDM_SETPOS, 0, - MAKELONG(GetMaxDate(),0)); + MAKELONG(GetMaxDate(lcid),0)); } /* Update all date locale samples */ @@ -542,16 +527,19 @@ { PGLOBALDATA pGlobalData; + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; - - InitMinMaxDateSpin(hwndDlg); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + InitMinMaxDateSpin(hwndDlg, pGlobalData->lcid); UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); - InitShortDateCB(hwndDlg); - InitLongDateCB(hwndDlg); - InitShortDateSepSamples(hwndDlg); + InitShortDateCB(hwndDlg, pGlobalData->lcid); + InitLongDateCB(hwndDlg, pGlobalData->lcid); + InitShortDateSepSamples(hwndDlg, pGlobalData->lcid); /* TODO: Add other calendar types */ break; @@ -595,14 +583,14 @@ /* If push apply button */ if (lpnm->code == (UINT)PSN_APPLY) { - SetMaxDate(hwndDlg); - if(!SetShortDateSep(hwndDlg)) break; - if(!SetShortDateFormat(hwndDlg)) break; - if(!SetLongDateFormat(hwndDlg)) break; - InitShortDateCB(hwndDlg); + SetMaxDate(hwndDlg, pGlobalData->lcid); + if(!SetShortDateSep(hwndDlg, pGlobalData->lcid)) break; + if(!SetShortDateFormat(hwndDlg, pGlobalData->lcid)) break; + if(!SetLongDateFormat(hwndDlg, pGlobalData->lcid)) break; + InitShortDateCB(hwndDlg, pGlobalData->lcid); /* FIXME: */ //Sleep(15); - UpdateDateLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); + UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); } } break;

1 0

[ekohl] 28997: Add missing definitions of EnumDateFormats.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 02:13:52 2007 New Revision: 28997 URL: http://svn.reactos.org/svn/reactos?rev=28997&view=rev Log: Add missing definitions of EnumDateFormats. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h (original) +++ trunk/reactos/include/psdk/winnls.h Tue Sep 11 02:13:52 2007 @@ -637,6 +637,7 @@ typedef LPNUMBERFMTW LPNUMBERFMT; #define CompareString CompareStringW #define EnumCalendarInfo EnumCalendarInfoW +#define EnumDateFormats EnumDateFormatsW #define EnumSystemCodePages EnumSystemCodePagesW #define EnumSystemLocales EnumSystemLocalesW #define EnumTimeFormats EnumTimeFormatsW @@ -679,6 +680,7 @@ typedef LPNUMBERFMTA LPNUMBERFMT; #define CompareString CompareStringA #define EnumCalendarInfo EnumCalendarInfoA +#define EnumDateFormats EnumDateFormatsA #define EnumSystemCodePages EnumSystemCodePagesA #define EnumSystemLocales EnumSystemLocalesA #define EnumTimeFormats EnumTimeFormatsA

1 0

[ekohl] 28996: - Enumerate time formats. - The user must able to change the locale id. Move it into a global structure. - User the selected locale id instead of LOCALE_USER_DEFAULT.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 00:46:27 2007 New Revision: 28996 URL: http://svn.reactos.org/svn/reactos?rev=28996&view=rev Log: - Enumerate time formats. - The user must able to change the locale id. Move it into a global structure. - User the selected locale id instead of LOCALE_USER_DEFAULT. Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c (original) +++ trunk/reactos/dll/cpl/intl/currency.c Tue Sep 11 00:46:27 2007 @@ -301,7 +301,7 @@ static BOOL SetCurrencyDigNum(HWND hwndDlg) { - TCHAR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES][MAX_SAMPLES_STR_SIZE]= + LPTSTR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES]= { _T("0;0"), _T("3;0"), Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c (original) +++ trunk/reactos/dll/cpl/intl/date.c Tue Sep 11 00:46:27 2007 @@ -540,11 +540,15 @@ WPARAM wParam, LPARAM lParam) { + PGLOBALDATA pGlobalData; + switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + InitMinMaxDateSpin(hwndDlg); - UpdateDateLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); + UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); InitShortDateCB(hwndDlg); InitLongDateCB(hwndDlg); InitShortDateSepSamples(hwndDlg); Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Tue Sep 11 00:46:27 2007 @@ -235,6 +235,7 @@ } /* Location enumerate procedure */ +#if 0 BOOL CALLBACK LocationsEnumProc(GEOID gId) @@ -255,12 +256,14 @@ return TRUE; } +#endif /* Enumerate all system locations identifiers */ static VOID CreateLocationsList(HWND hWnd) { +#if 0 GEOID userGeoID; TCHAR loc[MAX_STR_SIZE]; @@ -280,6 +283,7 @@ CB_SELECTSTRING, (WPARAM) -1, (LPARAM)loc); +#endif } DWORD Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Tue Sep 11 00:46:27 2007 @@ -13,6 +13,11 @@ UINT idDescription; APPLET_PROC AppletProc; } APPLET, *PAPPLET; + +typedef struct _GLOBALDATA +{ + LCID lcid; +} GLOBALDATA, *PGLOBALDATA; extern HINSTANCE hApplet; extern DWORD IsUnattendedSetupEnabled; Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c (original) +++ trunk/reactos/dll/cpl/intl/misc.c Tue Sep 11 00:46:27 2007 @@ -175,7 +175,7 @@ static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LCID lcid) +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBALDATA pGlobalData) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -183,7 +183,7 @@ psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; - psp->lParam = (LPARAM)lcid; + psp->lParam = (LPARAM)pGlobalData; } @@ -194,9 +194,15 @@ { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; + PGLOBALDATA pGlobalData; TCHAR Caption[MAX_STR_SIZE]; + INT ret; LoadString(hApplet, IDS_CUSTOMIZE_TITLE, Caption, sizeof(Caption) / sizeof(TCHAR)); + + pGlobalData = (PGLOBALDATA)malloc(sizeof(GLOBALDATA)); + + pGlobalData->lcid = lcid; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -209,18 +215,22 @@ psh.nStartPage = 0; psh.ppsp = PsPage; - InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, lcid); - InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, lcid); - InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc, lcid); - InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc, lcid); + InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, pGlobalData); + InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, pGlobalData); + InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc, pGlobalData); + InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc, pGlobalData); if (IsSortPageNeeded(lcid)) { psh.nPages++; - InitPropSheetPage(&PsPage[4], IDD_SORTPAGE, SortPageProc, lcid); - } - - return (LONG)(PropertySheet(&psh) != -1); + InitPropSheetPage(&PsPage[4], IDD_SORTPAGE, SortPageProc, pGlobalData); + } + + ret = PropertySheet(&psh); + + free(pGlobalData); + + return (LONG)(ret != -1); } /* EOF */ Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c (original) +++ trunk/reactos/dll/cpl/intl/sort.c Tue Sep 11 00:46:27 2007 @@ -156,14 +156,17 @@ WPARAM wParam, LPARAM lParam) { + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - { - LCID lcid = (LCID)((LPPROPSHEETPAGE)lParam)->lParam; - - CreateSortList(GetDlgItem(hwndDlg, IDC_SORTLIST_COMBO), lcid); - } + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + CreateSortList(GetDlgItem(hwndDlg, IDC_SORTLIST_COMBO), pGlobalData->lcid); break; case WM_COMMAND: @@ -172,6 +175,28 @@ case IDC_SORTLIST_COMBO: if (HIWORD(wParam) == CBN_SELCHANGE) { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + /* Save the new LCID */ + pGlobalData->lcid = NewLcid; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -179,34 +204,9 @@ break; case WM_NOTIFY: + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { - LPNMHDR lpnm = (LPNMHDR)lParam; - - if (lpnm->code == (UINT)PSN_APPLY) - { - - LCID NewLcid; - INT iCurSel; - - iCurSel = SendDlgItemMessage(hwndDlg, - IDC_SORTLIST_COMBO, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendDlgItemMessage(hwndDlg, - IDC_SORTLIST_COMBO, - CB_GETITEMDATA, - iCurSel, - 0); - if (NewLcid == (LCID)CB_ERR) - break; -#if 0 - /* FIXME: Set locale ID */ -#endif - } + /* FIXME: Set locale ID: pGlobalData->lcid */ } break; } Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c (original) +++ trunk/reactos/dll/cpl/intl/time.c Tue Sep 11 00:46:27 2007 @@ -31,22 +31,26 @@ #include "intl.h" #include "resource.h" -/* - * TODO: - * - Enumerate available time formats (use EnumTimeFormats) - */ +static HWND hwndEnum = NULL; + +static BOOL CALLBACK +TimeFormatEnumProc(LPTSTR lpTimeFormatString) +{ + SendMessage(hwndEnum, + CB_ADDSTRING, + 0, + (LPARAM)lpTimeFormatString); + + return TRUE; +} static VOID -UpdateTimeSample(HWND hWnd) +UpdateTimeSample(HWND hWnd, LCID lcid) { - TCHAR InBuffer[80]; - TCHAR OutBuffer[80]; - - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, InBuffer, 80); - - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, InBuffer, OutBuffer, 80); - - SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)OutBuffer); + TCHAR szBuffer[80]; + + GetTimeFormat(lcid, 0, NULL, NULL, szBuffer, 80); + SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)szBuffer); } @@ -57,36 +61,41 @@ WPARAM wParam, LPARAM lParam) { - switch (uMsg) - { - case WM_INITDIALOG: - { - TCHAR Buffer[80]; - int nLen; + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + TCHAR Buffer[80]; + int nLen; + + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); /* Update the time format sample */ - UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE), pGlobalData->lcid); /* Get the time format (max. 80 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), CB_LIMITTEXT, 80, 0); - /* FIXME: add available time formats to the list */ - - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer, 80); + /* Add available time formats to the list */ + hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT); + EnumTimeFormats(TimeFormatEnumProc, pGlobalData->lcid, 0); + + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_ADDSTRING, - 0, - (LPARAM)Buffer); - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_SETCURSEL, - 0, /* index */ - 0); + CB_SELECTSTRING, + -1, + (LPARAM)Buffer); /* Get the time separator (max. 4 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_LIMITTEXT, 4, 0); - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer, 80); + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_ADDSTRING, 0, @@ -99,7 +108,7 @@ /* Get the AM symbol (max. 9 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_LIMITTEXT, 9, 0); - nLen = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer, 80); + nLen = GetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_ADDSTRING, 0, @@ -119,7 +128,7 @@ /* Get the PM symbol (max. 9 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_LIMITTEXT, 9, 0); - nLen = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer, 80); + nLen = GetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_ADDSTRING, 0, @@ -168,14 +177,14 @@ CB_GETCURSEL, 0, 0); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer); /* Set time separator */ nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_GETCURSEL, 0, 0); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer); /* Set the AM symbol */ nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), @@ -184,11 +193,11 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer); } else { - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, _T("")); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, _T("")); } /* Set the PM symbol */ @@ -198,21 +207,21 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer); } else { - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, _T("")); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, _T("")); } /* Update the time format sample */ - UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE), pGlobalData->lcid); } } break; - } - - return FALSE; + } + + return FALSE; } /* EOF */

1 0

[ekohl] 28995: - Change the currently selected locale id instead of LOCALE_USER_DEFAULT. - Let the user choose between 0 and 9 fractional digits. - Fix a typo: SendMesssgeW --> SendMessage.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 00:40:27 2007 New Revision: 28995 URL: http://svn.reactos.org/svn/reactos?rev=28995&view=rev Log: - Change the currently selected locale id instead of LOCALE_USER_DEFAULT. - Let the user choose between 0 and 9 fractional digits. - Fix a typo: SendMesssgeW --> SendMessage. Modified: trunk/reactos/dll/cpl/intl/numbers.c Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c (original) +++ trunk/reactos/dll/cpl/intl/numbers.c Tue Sep 11 00:40:27 2007 @@ -35,7 +35,7 @@ #define SAMPLE_NUMBER _T("123456789") #define SAMPLE_NEG_NUMBER _T("-123456789") #define MAX_NUM_SEP_SAMPLES 2 -#define MAX_FRAC_NUM_SAMPLES 9 +#define MAX_FRAC_NUM_SAMPLES 10 #define MAX_FIELD_SEP_SAMPLES 1 #define MAX_FIELD_DIG_SAMPLES 3 #define MAX_NEG_SIGN_SAMPLES 1 @@ -44,17 +44,34 @@ #define MAX_LIST_SEP_SAMPLES 1 #define MAX_UNITS_SYS_SAMPLES 2 +static LPTSTR lpNumSepSamples[MAX_NUM_SEP_SAMPLES] = + {_T(","), _T(".")}; +static LPTSTR lpFieldSepSamples[MAX_FIELD_SEP_SAMPLES] = + {_T(" ")}; +static LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = + {_T("0;0"), _T("3;0"), _T("3;2;0")}; +static LPTSTR lpNegSignSamples[MAX_NEG_SIGN_SAMPLES] = + {_T("-")}; +static LPTSTR lpNegNumFmtSamples[MAX_NEG_NUMBERS_SAMPLES] = + {_T("(1,1)"), _T("-1,1"), _T("- 1,1"), _T("1,1-"), _T("1,1 -")}; +static LPTSTR lpLeadNumFmtSamples[MAX_LEAD_ZEROES_SAMPLES] = + {_T(",7"), _T("0,7")}; +static LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] = + {_T(";")}; +static LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] = + {_T("Metrics"), _T("Americans")}; + + /* Init num decimal separator control box */ static VOID -InitNumDecimalSepCB(HWND hwndDlg) -{ - LPTSTR lpNumSepSamples[MAX_NUM_SEP_SAMPLES] = {_T(","), _T(".")}; +InitNumDecimalSepCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); @@ -96,7 +113,7 @@ /* Init number of fractional symbols control box */ static VOID -InitNumOfFracSymbCB(HWND hwndDlg) +InitNumOfFracSymbCB(HWND hwndDlg, LCID lcid) { TCHAR szFracNum[MAX_SAMPLES_STR_SIZE]; TCHAR szFracCount[MAX_SAMPLES_STR_SIZE]; @@ -104,7 +121,7 @@ INT nRetCode; /* Get current number of fractional symbols */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_IDIGITS, szFracNum, MAX_SAMPLES_STR_SIZE); @@ -136,15 +153,14 @@ /* Init field separator control box */ static VOID -InitNumFieldSepCB(HWND hwndDlg) -{ - LPTSTR lpFieldSepSamples[MAX_FIELD_SEP_SAMPLES] = {_T(" ")}; +InitNumFieldSepCB(HWND hwndDlg, LCID lcid) +{ TCHAR szFieldSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current field separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_STHOUSAND, szFieldSep, MAX_SAMPLES_STR_SIZE); @@ -186,22 +202,15 @@ /* Init number of digidts in field control box */ static VOID -InitFieldDigNumCB(HWND hwndDlg) -{ - LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = - { - _T("0;0"), - _T("3;0"), - _T("3;2;0") - }; - +InitFieldDigNumCB(HWND hwndDlg, LCID lcid) +{ TCHAR szFieldDigNum[MAX_SAMPLES_STR_SIZE]; LPTSTR pszFieldDigNumSmpl; INT nCBIndex; INT nRetCode; /* Get current field digits num */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SGROUPING, szFieldDigNum, MAX_SAMPLES_STR_SIZE); @@ -217,10 +226,10 @@ { pszFieldDigNumSmpl = InsSpacesFmt(SAMPLE_NUMBER, lpFieldDigNumSamples[nCBIndex]); - SendMessageW(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING), - CB_ADDSTRING, - nCBIndex, - (LPARAM)pszFieldDigNumSmpl); + SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING), + CB_ADDSTRING, + nCBIndex, + (LPARAM)pszFieldDigNumSmpl); free(pszFieldDigNumSmpl); } @@ -249,15 +258,14 @@ /* Init negative sign control box */ static VOID -InitNegSignCB(HWND hwndDlg) -{ - LPTSTR lpNegSignSamples[MAX_NEG_SIGN_SAMPLES] = {_T("-")}; +InitNegSignCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current negative sign */ - GetLocaleInfoW(LOCALE_USER_DEFAULT, + GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN, szNegSign, MAX_SAMPLES_STR_SIZE); @@ -299,17 +307,8 @@ /* Init negative numbers format control box */ static VOID -InitNegNumFmtCB(HWND hwndDlg) -{ - LPTSTR lpNegNumFmtSamples[MAX_NEG_NUMBERS_SAMPLES] = - { - _T("(1,1)"), - _T("-1,1"), - _T("- 1,1"), - _T("1,1-"), - _T("1,1 -") - }; - +InitNegNumFmtCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNegNumFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; @@ -319,7 +318,7 @@ INT nRetCode; /* Get current negative numbers format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_INEGNUMBER, szNegNumFmt, MAX_SAMPLES_STR_SIZE); @@ -331,13 +330,13 @@ (LPARAM)0); /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); /* Get current negative sign */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SNEGATIVESIGN, szNegSign, MAX_SAMPLES_STR_SIZE); @@ -371,14 +370,8 @@ /* Init leading zeroes control box */ static VOID -InitLeadingZeroesCB(HWND hwndDlg) -{ - LPTSTR lpLeadNumFmtSamples[MAX_LEAD_ZEROES_SAMPLES] = - { - _T(",7"), - _T("0,7") - }; - +InitLeadingZeroesCB(HWND hwndDlg, LCID lcid) +{ TCHAR szLeadNumFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; LPTSTR pszResultStr; @@ -386,7 +379,7 @@ INT nRetCode; /* Get current leading zeroes format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_ILZERO, szLeadNumFmt, MAX_SAMPLES_STR_SIZE); @@ -398,7 +391,7 @@ (LPARAM)0); /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); @@ -424,15 +417,15 @@ } static VOID -InitListSepCB(HWND hwndDlg) -{ - LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] = {_T(";")}; +InitListSepCB(HWND hwndDlg, + LCID lcid) +{ TCHAR szListSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current list separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SLIST, szListSep, MAX_SAMPLES_STR_SIZE); @@ -473,21 +466,15 @@ } /* Init system of units control box */ -VOID -InitUnitsSysCB(HWND hwndDlg) -{ - LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] = - { - _T("Metrics"), - _T("Americans") - }; - +static VOID +InitUnitsSysCB(HWND hwndDlg, + LCID lcid) +{ TCHAR szUnitsSys[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; - INT nRetCode; /* Get current system of units */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_IMEASURE, szUnitsSys, MAX_SAMPLES_STR_SIZE); @@ -503,26 +490,26 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), CB_ADDSTRING, - nCBIndex, + 0, //nCBIndex, (LPARAM)lpUnitsSysSamples[nCBIndex]); } /* Set current item to value from registry */ - nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), - CB_SETCURSEL, - (WPARAM)_ttoi(szUnitsSys), - (LPARAM)0); + SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), + CB_SETCURSEL, + (WPARAM)_ttoi(szUnitsSys), + (LPARAM)0); } /* Update all numbers locale samples */ static VOID UpdateNumSamples(HWND hwndDlg, - LCID lcidLocale) + LCID lcid) { TCHAR OutBuffer[MAX_FMT_SIZE]; /* Get positive number format sample */ - GetNumberFormat(lcidLocale, + GetNumberFormat(lcid, 0, SAMPLE_NUMBER, NULL, @@ -535,7 +522,7 @@ (LPARAM)OutBuffer); /* Get positive number format sample */ - GetNumberFormat(lcidLocale, + GetNumberFormat(lcid, 0, SAMPLE_NEG_NUMBER, NULL, @@ -550,7 +537,8 @@ /* Set num decimal separator */ static BOOL -SetNumDecimalSep(HWND hwndDlg) +SetNumDecimalSep(HWND hwndDlg, + LCID lcid) { TCHAR szDecimalSep[MAX_SAMPLES_STR_SIZE]; @@ -561,14 +549,15 @@ (LPARAM)szDecimalSep); /* Save decimal separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep); + SetLocaleInfo(lcid, LOCALE_SDECIMAL, szDecimalSep); return TRUE; } /* Set number of fractional symbols */ static BOOL -SetFracSymNum(HWND hwndDlg) +SetFracSymNum(HWND hwndDlg, + LCID lcid) { TCHAR szFracSymNum[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -583,14 +572,15 @@ _itot(nCurrSel, szFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, szFracSymNum); + SetLocaleInfo(lcid, LOCALE_IDIGITS, szFracSymNum); return TRUE; } /* Set field separator */ static BOOL -SetNumFieldSep(HWND hwndDlg) +SetNumFieldSep(HWND hwndDlg, + LCID lcid) { TCHAR szFieldSep[MAX_SAMPLES_STR_SIZE]; @@ -601,22 +591,16 @@ (LPARAM)szFieldSep); /* Save field separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szFieldSep); + SetLocaleInfo(lcid, LOCALE_STHOUSAND, szFieldSep); return TRUE; } /* Set number of digidts in field */ static BOOL -SetFieldDigNum(HWND hwndDlg) -{ - LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = - { - _T("0;0"), - _T("3;0"), - _T("3;2;0") - }; - +SetFieldDigNum(HWND hwndDlg, + LCID lcid) +{ INT nCurrSel; /* Get setted number of digidts in field */ @@ -626,14 +610,15 @@ (LPARAM)0); /* Save number of digidts in field */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, lpFieldDigNumSamples[nCurrSel]); + SetLocaleInfo(lcid, LOCALE_SGROUPING, lpFieldDigNumSamples[nCurrSel]); return TRUE; } /* Set negative sign */ static BOOL -SetNumNegSign(HWND hwndDlg) +SetNumNegSign(HWND hwndDlg, + LCID lcid) { TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; @@ -644,14 +629,15 @@ (LPARAM)szNegSign); /* Save negative sign */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SNEGATIVESIGN, szNegSign); + SetLocaleInfo(lcid, LOCALE_SNEGATIVESIGN, szNegSign); return TRUE; } /* Set negative sum format */ static BOOL -SetNegSumFmt(HWND hwndDlg) +SetNegSumFmt(HWND hwndDlg, + LCID lcid) { TCHAR szNegSumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -666,14 +652,15 @@ _itot(nCurrSel, szNegSumFmt,DECIMAL_RADIX); /* Save negative sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, szNegSumFmt); + SetLocaleInfo(lcid, LOCALE_INEGNUMBER, szNegSumFmt); return TRUE; } /* Set leading zero */ static BOOL -SetNumLeadZero(HWND hwndDlg) +SetNumLeadZero(HWND hwndDlg, + LCID lcid) { TCHAR szLeadZero[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -688,14 +675,15 @@ _itot(nCurrSel, szLeadZero, DECIMAL_RADIX); /* Save leading zero format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, szLeadZero); + SetLocaleInfo(lcid, LOCALE_ILZERO, szLeadZero); return TRUE; } /* Set elements list separator */ static BOOL -SetNumListSep(HWND hwndDlg) +SetNumListSep(HWND hwndDlg, + LCID lcid) { TCHAR szListSep[MAX_SAMPLES_STR_SIZE]; @@ -706,14 +694,15 @@ (LPARAM)szListSep); /* Save list separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, szListSep); + SetLocaleInfo(lcid, LOCALE_SLIST, szListSep); return TRUE; } /* Set units system */ static BOOL -SetNumUnitsSys(HWND hwndDlg) +SetNumUnitsSys(HWND hwndDlg, + LCID lcid) { TCHAR szUnitsSys[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -728,7 +717,7 @@ _itot(nCurrSel, szUnitsSys, DECIMAL_RADIX); /* Save units system */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IMEASURE, szUnitsSys); + SetLocaleInfo(lcid, LOCALE_IMEASURE, szUnitsSys); return TRUE; } @@ -736,69 +725,88 @@ /* Property page dialog callback */ INT_PTR CALLBACK NumbersPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - { - InitNumDecimalSepCB(hwndDlg); - InitNumOfFracSymbCB(hwndDlg); - InitNumFieldSepCB(hwndDlg); - InitFieldDigNumCB(hwndDlg); - InitNegSignCB(hwndDlg); - InitNegNumFmtCB(hwndDlg); - InitLeadingZeroesCB(hwndDlg); - InitListSepCB(hwndDlg); - InitUnitsSysCB(hwndDlg); - UpdateNumSamples(hwndDlg, LOCALE_USER_DEFAULT); - } - break; - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_NUMBERDSYMBOL: - case IDC_NUMBERSNDIGDEC: - case IDC_NUMBERSDIGITGRSYM: - case IDC_NUMBERSDGROUPING: - case IDC_NUMBERSNSIGNSYM: - case IDC_NUMBERSNNUMFORMAT: - case IDC_NUMBERSDISPLEADZER: - case IDC_NUMBERSLSEP: - case IDC_NUMBERSMEASSYS: - if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + InitNumDecimalSepCB(hwndDlg, pGlobalData->lcid); + InitNumOfFracSymbCB(hwndDlg, pGlobalData->lcid); + InitNumFieldSepCB(hwndDlg, pGlobalData->lcid); + InitFieldDigNumCB(hwndDlg, pGlobalData->lcid); + InitNegSignCB(hwndDlg, pGlobalData->lcid); + InitNegNumFmtCB(hwndDlg, pGlobalData->lcid); + InitLeadingZeroesCB(hwndDlg, pGlobalData->lcid); + InitListSepCB(hwndDlg, pGlobalData->lcid); + InitUnitsSysCB(hwndDlg, pGlobalData->lcid); + UpdateNumSamples(hwndDlg, pGlobalData->lcid); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) { - /* Set "Apply" button enabled */ - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case IDC_NUMBERDSYMBOL: + case IDC_NUMBERSNDIGDEC: + case IDC_NUMBERSDIGITGRSYM: + case IDC_NUMBERSDGROUPING: + case IDC_NUMBERSNSIGNSYM: + case IDC_NUMBERSNNUMFORMAT: + case IDC_NUMBERSDISPLEADZER: + case IDC_NUMBERSLSEP: + case IDC_NUMBERSMEASSYS: + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) + { + /* Set "Apply" button enabled */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } } - } - } - break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - /* If push apply button */ - if (lpnm->code == (UINT)PSN_APPLY) - { - if(!SetNumDecimalSep(hwndDlg)) break; - if (!SetFracSymNum(hwndDlg)) break; - if (!SetNumFieldSep(hwndDlg)) break; - if (!SetFieldDigNum(hwndDlg)) break; - if (!SetNumNegSign(hwndDlg)) break; - if (!SetNegSumFmt(hwndDlg)) break; - if (!SetNumLeadZero(hwndDlg)) break; - if (!SetNumListSep(hwndDlg)) break; - if (!SetNumUnitsSys(hwndDlg)) break; - - UpdateNumSamples(hwndDlg, LOCALE_USER_DEFAULT); - } - } - break; - } - return FALSE; + break; + + case WM_NOTIFY: + /* If push apply button */ + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + if (!SetNumDecimalSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetFracSymNum(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumFieldSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetFieldDigNum(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumNegSign(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNegSumFmt(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumLeadZero(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumListSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumUnitsSys(hwndDlg, pGlobalData->lcid)) + break; + + UpdateNumSamples(hwndDlg, pGlobalData->lcid); + } + break; + } + return FALSE; } /* EOF */

1 0

[cfinck] 28994: Hey everyone, here is the 0.3.3 Release :-)
by cfinck＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: cfinck Date: Mon Sep 10 21:30:41 2007 New Revision: 28994 URL: http://svn.reactos.org/svn/reactos?rev=28994&view=rev Log: Hey everyone, here is the 0.3.3 Release :-) Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Mon Sep 10 21:30:41 2007 @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 3 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

1 0

[fireball] 28993: - Separate creating partitions objects into a different function (CreatePartitionsObject()). - Slightly improve the logic of accessing the partitions list.
by fireball＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: fireball Date: Mon Sep 10 20:25:48 2007 New Revision: 28993 URL: http://svn.reactos.org/svn/reactos?rev=28993&view=rev Log: - Separate creating partitions objects into a different function (CreatePartitionsObject()). - Slightly improve the logic of accessing the partitions list. Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Mon Sep 10 20:25:48 2007 @@ -28,6 +28,12 @@ #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'DscS') #endif +typedef enum { + NotInitialized, + Initializing, + Initialized +} PARTITION_LIST_STATE; + // // Disk device data // @@ -100,10 +106,16 @@ // // DriveNotReady - inidicates that the this device is currenly not ready - // beacasue there is no media in the device. + // because there is no media in the device. // BOOLEAN DriveNotReady; + + // + // State of PartitionList initialization + // + + PARTITION_LIST_STATE PartitionListState; } DISK_DATA, *PDISK_DATA; @@ -270,6 +282,13 @@ IN PCLASS_INIT_DATA InitData ); +NTSTATUS +STDCALL +CreatePartitionDeviceObjects( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING RegistryPath + ); + VOID STDCALL UpdateDeviceObjects( @@ -628,30 +647,21 @@ CCHAR ntNameBuffer[MAXIMUM_FILENAME_LENGTH]; STRING ntNameString; UNICODE_STRING ntUnicodeString; - ULONG partitionNumber = 0; OBJECT_ATTRIBUTES objectAttributes; HANDLE handle; NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; PDEVICE_OBJECT physicalDevice; PDISK_GEOMETRY diskGeometry = NULL; - PDRIVE_LAYOUT_INFORMATION partitionList; PDEVICE_EXTENSION deviceExtension = NULL; PDEVICE_EXTENSION physicalDeviceExtension; - PDISK_DATA diskData; - ULONG bytesPerSector; - UCHAR sectorShift; UCHAR pathId = LunInfo->PathId; UCHAR targetId = LunInfo->TargetId; UCHAR lun = LunInfo->Lun; BOOLEAN writeCache; PVOID senseData = NULL; ULONG srbFlags; - ULONG dmByteSkew = 0; - PULONG dmSkew; - BOOLEAN dmActive = FALSE; ULONG timeOut = 0; - ULONG numberListElements = 0; BOOLEAN srbListInitialized = FALSE; @@ -995,19 +1005,88 @@ deviceObject->Flags &= ~DO_VERIFY_VOLUME; } - // - // Set up sector size fields. - // - // Stack variables will be used to update - // the partition device extensions. - // - // The device extension field SectorShift is - // used to calculate sectors in I/O transfers. - // - // The DiskGeometry structure is used to service - // IOCTls used by the format utility. - // - + status = CreatePartitionDeviceObjects(deviceObject, RegistryPath); + + if (NT_SUCCESS(status)) + return STATUS_SUCCESS; + + +CreateDiskDeviceObjectsExit: + + // + // Release the device since an error occurred. + // + + ScsiClassClaimDevice(PortDeviceObject, + LunInfo, + TRUE, + NULL); + + if (diskGeometry != NULL) { + ExFreePool(diskGeometry); + } + + if (senseData != NULL) { + ExFreePool(senseData); + } + + if (deviceObject != NULL) { + + if (srbListInitialized) { + ExDeleteNPagedLookasideList(&deviceExtension->SrbLookasideListHead); + } + + IoDeleteDevice(deviceObject); + } + + // + // Delete directory and return. + // + + if (!NT_SUCCESS(status)) { + ZwMakeTemporaryObject(handle); + } + + ZwClose(handle); + + return(status); + +} // end CreateDiskDeviceObjects() + + +NTSTATUS +STDCALL +CreatePartitionDeviceObjects( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING RegistryPath + ) +{ + CCHAR ntNameBuffer[MAXIMUM_FILENAME_LENGTH]; + ULONG partitionNumber = 0; + NTSTATUS status; + PDEVICE_OBJECT deviceObject = NULL; + PDISK_GEOMETRY diskGeometry = NULL; + PDRIVE_LAYOUT_INFORMATION partitionList = NULL; + PDEVICE_EXTENSION deviceExtension; + PDEVICE_EXTENSION physicalDeviceExtension; + PCLASS_INIT_DATA initData = NULL; + PDISK_DATA diskData; + PDISK_DATA physicalDiskData; + ULONG bytesPerSector; + UCHAR sectorShift; + ULONG srbFlags; + ULONG dmByteSkew = 0; + PULONG dmSkew; + BOOLEAN dmActive = FALSE; + ULONG numberListElements = 0; + + + // + // Get physical device geometry information for partition table reads. + // + + physicalDeviceExtension = PhysicalDeviceObject->DeviceExtension; + diskGeometry = physicalDeviceExtension->DiskGeometry; bytesPerSector = diskGeometry->BytesPerSector; // @@ -1023,13 +1102,14 @@ bytesPerSector = diskGeometry->BytesPerSector = 512; } - sectorShift = deviceExtension->SectorShift; + sectorShift = physicalDeviceExtension->SectorShift; // // Set pointer to disk data area that follows device extension. // - diskData = (PDISK_DATA)(deviceExtension + 1); + diskData = (PDISK_DATA)(physicalDeviceExtension + 1); + diskData->PartitionListState = Initializing; // // Determine is DM Driver is loaded on an IDE drive that is @@ -1037,8 +1117,8 @@ // an Atapi device is sharing the controller with an IDE disk. // - HalExamineMBR(deviceExtension->DeviceObject, - deviceExtension->DiskGeometry->BytesPerSector, + HalExamineMBR(PhysicalDeviceObject, + physicalDeviceExtension->DiskGeometry->BytesPerSector, (ULONG)0x54, (PVOID)&dmSkew); @@ -1050,9 +1130,9 @@ // to be skewed by *dmSkew sectors aka DMByteSkew. // - deviceExtension->DMSkew = *dmSkew; - deviceExtension->DMActive = TRUE; - deviceExtension->DMByteSkew = deviceExtension->DMSkew * bytesPerSector; + physicalDeviceExtension->DMSkew = *dmSkew; + physicalDeviceExtension->DMActive = TRUE; + physicalDeviceExtension->DMByteSkew = physicalDeviceExtension->DMSkew * bytesPerSector; // // Save away the infomation that we need, since this deviceExtension will soon be @@ -1060,7 +1140,7 @@ // dmActive = TRUE; - dmByteSkew = deviceExtension->DMByteSkew; + dmByteSkew = physicalDeviceExtension->DMByteSkew; } @@ -1068,8 +1148,8 @@ // Create objects for all the partitions on the device. // - status = IoReadPartitionTable(deviceObject, - deviceExtension->DiskGeometry->BytesPerSector, + status = IoReadPartitionTable(PhysicalDeviceObject, + physicalDeviceExtension->DiskGeometry->BytesPerSector, TRUE, (PVOID)&partitionList); @@ -1078,9 +1158,9 @@ // then fix up the partition list to make it look like there is one // zero length partition. // - + DPRINT1("IoReadPartitionTable() status: 0x%08X\n", status); if ((!NT_SUCCESS(status) || partitionList->PartitionCount == 0) && - deviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { + PhysicalDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { if (!NT_SUCCESS(status)) { @@ -1136,28 +1216,53 @@ if (!diskData->Signature) { - if (!CalculateMbrCheckSum(deviceExtension, + if (!CalculateMbrCheckSum(physicalDeviceExtension, &diskData->MbrCheckSum)) { DebugPrint((1, "SCSIDISK: Can't calculate MBR checksum for disk %x\n", - deviceExtension->DeviceNumber)); + physicalDeviceExtension->DeviceNumber)); } else { DebugPrint((2, "SCSIDISK: MBR checksum for disk %x is %x\n", - deviceExtension->DeviceNumber, + physicalDeviceExtension->DeviceNumber, diskData->MbrCheckSum)); } } - // // Check the registry and determine if the BIOS knew about this drive. If // it did then update the geometry with the BIOS information. // - UpdateGeometry(deviceExtension); + UpdateGeometry(physicalDeviceExtension); + + srbFlags = physicalDeviceExtension->SrbFlags; + + initData = ExAllocatePool(NonPagedPool, sizeof(CLASS_INIT_DATA)); + if (!initData) + { + DebugPrint((1, + "Disk.CreatePartionDeviceObjects - Allocation of initData failed\n")); + + status = STATUS_INSUFFICIENT_RESOURCES; + goto CreatePartitionDeviceObjectsExit; + } + + RtlZeroMemory(initData, sizeof(CLASS_INIT_DATA)); + + initData->InitializationDataSize = sizeof(CLASS_INIT_DATA); + initData->DeviceExtensionSize = DEVICE_EXTENSION_SIZE; + initData->DeviceType = FILE_DEVICE_DISK; + initData->DeviceCharacteristics = PhysicalDeviceObject->Characteristics; + initData->ClassError = physicalDeviceExtension->ClassError; + initData->ClassReadWriteVerification = physicalDeviceExtension->ClassReadWriteVerification; + initData->ClassFindDevices = physicalDeviceExtension->ClassFindDevices; + initData->ClassDeviceControl = physicalDeviceExtension->ClassDeviceControl; + initData->ClassShutdownFlush = physicalDeviceExtension->ClassShutdownFlush; + initData->ClassCreateClose = physicalDeviceExtension->ClassCreateClose; + initData->ClassStartIo = physicalDeviceExtension->ClassStartIo; // // Create device objects for the device partitions (if any). @@ -1178,18 +1283,18 @@ sprintf(ntNameBuffer, "\\Device\\Harddisk%lu\\Partition%lu", - *DeviceCount, + physicalDeviceExtension->DeviceNumber, partitionNumber + 1); DebugPrint((2, "CreateDiskDeviceObjects: Create device object %s\n", ntNameBuffer)); - status = ScsiClassCreateDeviceObject(DriverObject, + status = ScsiClassCreateDeviceObject(PhysicalDeviceObject->DriverObject, ntNameBuffer, - physicalDevice, + PhysicalDeviceObject, &deviceObject, - InitData); + initData); if (!NT_SUCCESS(status)) { @@ -1214,7 +1319,7 @@ deviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } - deviceObject->StackSize = (CCHAR)PortDeviceObject->StackSize + 1; + deviceObject->StackSize = (CCHAR)physicalDeviceExtension->PortDeviceObject->StackSize + 1; // // Set up device extension fields. @@ -1264,16 +1369,15 @@ // Copy port device object pointer to device extension. // - deviceExtension->PortDeviceObject = PortDeviceObject; - deviceExtension->PortNumber = (UCHAR)PortNumber; + deviceExtension->PortDeviceObject = physicalDeviceExtension->PortDeviceObject; // // Set the alignment requirements for the device based on the // host adapter requirements // - if (PortDeviceObject->AlignmentRequirement > deviceObject->AlignmentRequirement) { - deviceObject->AlignmentRequirement = PortDeviceObject->AlignmentRequirement; + if (physicalDeviceExtension->PortDeviceObject->AlignmentRequirement > deviceObject->AlignmentRequirement) { + deviceObject->AlignmentRequirement = physicalDeviceExtension->PortDeviceObject->AlignmentRequirement; } @@ -1297,8 +1401,8 @@ // Set the sense-data pointer in the device extension. // - deviceExtension->SenseData = senseData; - deviceExtension->PortCapabilities = PortCapabilities; + deviceExtension->SenseData = physicalDeviceExtension->SenseData; + deviceExtension->PortCapabilities = physicalDeviceExtension->PortCapabilities; deviceExtension->DiskGeometry = diskGeometry; diskData->PartitionOrdinal = diskData->PartitionNumber = partitionNumber + 1; diskData->PartitionType = partitionList->PartitionEntry[partitionNumber].PartitionType; @@ -1310,16 +1414,16 @@ deviceExtension->StartingOffset = partitionList->PartitionEntry[partitionNumber].StartingOffset; deviceExtension->PartitionLength = partitionList->PartitionEntry[partitionNumber].PartitionLength; diskData->HiddenSectors = partitionList->PartitionEntry[partitionNumber].HiddenSectors; - deviceExtension->PortNumber = (UCHAR)PortNumber; - deviceExtension->PathId = pathId; - deviceExtension->TargetId = targetId; - deviceExtension->Lun = lun; + deviceExtension->PortNumber = physicalDeviceExtension->PortNumber; + deviceExtension->PathId = physicalDeviceExtension->PathId; + deviceExtension->TargetId = physicalDeviceExtension->TargetId; + deviceExtension->Lun = physicalDeviceExtension->Lun; // // Check for removable media support. // - if (((PINQUIRYDATA)LunInfo->InquiryData)->RemovableMedia) { + if (PhysicalDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { deviceObject->Characteristics |= FILE_REMOVABLE_MEDIA; } @@ -1327,7 +1431,7 @@ // Set timeout value in seconds. // - deviceExtension->TimeOutValue = SCSI_DISK_TIMEOUT; + deviceExtension->TimeOutValue = physicalDeviceExtension->TimeOutValue; deviceExtension->DiskGeometry->BytesPerSector = bytesPerSector; deviceExtension->SectorShift = sectorShift; deviceExtension->DeviceObject = deviceObject; @@ -1344,54 +1448,27 @@ } else { - DebugPrint((1, - "CreateDiskDeviceObjects: IoReadPartitionTable failed\n")); +CreatePartitionDeviceObjectsExit: + + if (partitionList) { + ExFreePool(partitionList); + } + if (initData) { + ExFreePool(initData); + } + + return status; } // end if...else + + physicalDiskData = (PDISK_DATA)(physicalDeviceExtension + 1); + physicalDiskData->PartitionListState = Initialized; + return(STATUS_SUCCESS); -CreateDiskDeviceObjectsExit: - - // - // Release the device since an error occurred. - // - - ScsiClassClaimDevice(PortDeviceObject, - LunInfo, - TRUE, - NULL); - - if (diskGeometry != NULL) { - ExFreePool(diskGeometry); - } - - if (senseData != NULL) { - ExFreePool(senseData); - } - - if (deviceObject != NULL) { - - if (srbListInitialized) { - ExDeleteNPagedLookasideList(&deviceExtension->SrbLookasideListHead); - } - - IoDeleteDevice(deviceObject); - } - - // - // Delete directory and return. - // - - if (!NT_SUCCESS(status)) { - ZwMakeTemporaryObject(handle); - } - - ZwClose(handle); - - return(status); - -} // end CreateDiskDeviceObjects() + +} // end CreatePartitionDeviceObjects() NTSTATUS @@ -1937,6 +2014,12 @@ } case IOCTL_DISK_GET_DRIVE_GEOMETRY: + { + + PDEVICE_EXTENSION physicalDeviceExtension; + PDISK_DATA physicalDiskData; + BOOLEAN removable = FALSE; + BOOLEAN listInitialized = FALSE; if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof( DISK_GEOMETRY ) ) { @@ -1945,14 +2028,26 @@ break; } - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - + status = STATUS_SUCCESS; + + physicalDeviceExtension = deviceExtension->PhysicalDevice->DeviceExtension; + physicalDiskData = (PDISK_DATA)(physicalDeviceExtension + 1); + + removable = (BOOLEAN)DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA; + listInitialized = (physicalDiskData->PartitionListState == Initialized); + + if (removable || (!listInitialized)) + { // // Issue ReadCapacity to update device extension // with information for current media. // status = ScsiClassReadDriveCapacity(deviceExtension->PhysicalDevice); + + } + + if (removable) { if (!NT_SUCCESS(status)) { @@ -1970,20 +2065,33 @@ // diskData->DriveNotReady = FALSE; - } - - // - // Copy drive geometry information from device extension. - // - - RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, - deviceExtension->DiskGeometry, - sizeof(DISK_GEOMETRY)); - - status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + + } else if (NT_SUCCESS(status)) { + + // ReadDriveCapacity was allright, create Partition Objects + + if (physicalDiskData->PartitionListState == NotInitialized) { + status = CreatePartitionDeviceObjects(deviceExtension->PhysicalDevice, NULL); + } + } + + if (NT_SUCCESS(status)) { + + // + // Copy drive geometry information from device extension. + // + + RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, + deviceExtension->DiskGeometry, + sizeof(DISK_GEOMETRY)); + + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + } break; + + } case IOCTL_DISK_VERIFY:

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