Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[hpoussin] 32284: Add RtlTimeToSecondsSince1970() prototype
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:49:21 2008 New Revision: 32284 URL: http://svn.reactos.org/svn/reactos?rev=32284&view=rev Log: Add RtlTimeToSecondsSince1970() prototype Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Feb 11 15:49:21 2008 @@ -3052,6 +3052,14 @@ NTSYSAPI VOID NTAPI +RtlTimeToSecondsSince1970( + PLARGE_INTEGER Time, + OUT PULONG SecondsSince1970 +); + +NTSYSAPI +VOID +NTAPI RtlTimeToTimeFields( PLARGE_INTEGER Time, PTIME_FIELDS TimeFields

1 0

[hpoussin] 32283: Bring back ext2 code from branch It does not compile yet
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 15:10:35 2008 New Revision: 32283 URL: http://svn.reactos.org/svn/reactos?rev=32283&view=rev Log: Bring back ext2 code from branch It does not compile yet Added: trunk/reactos/drivers/filesystems/ext2/ - copied from r32282, branches/ext2/reactos/drivers/fs/ext2/ trunk/reactos/drivers/filesystems/fs_rec/ext2.c (props changed) - copied unchanged from r32282, branches/ext2/reactos/drivers/fs/fs_rec/ext2.c trunk/reactos/include/reactos/libs/fslib/ext2lib.h (props changed) - copied unchanged from r32282, branches/ext2/reactos/include/fslib/ext2lib.h trunk/reactos/lib/fslib/ext2lib/ - copied from r32282, branches/ext2/reactos/lib/fslib/ext2lib/ Removed: trunk/reactos/drivers/filesystems/ext2/makefile trunk/reactos/drivers/filesystems/ext2/src/.cvsignore trunk/reactos/lib/fslib/ext2lib/.cvsignore trunk/reactos/lib/fslib/ext2lib/Makefile Modified: trunk/reactos/drivers/filesystems/ext2/ext2fs.rc (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/errmsg.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2_fs.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/ext2metadata.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/protos.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/resource.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/inc/struct.h (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/cleanup.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/close.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/create.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/ext2.rc (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/ext2init.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/fastio.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/flush.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/io.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/metadata.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/misc.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/read.c (props changed) trunk/reactos/drivers/filesystems/ext2/src/shutdown.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/volinfo.c (contents, props changed) trunk/reactos/drivers/filesystems/ext2/src/write.c (contents, props changed) trunk/reactos/drivers/filesystems/fs_rec/blockdev.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/cdfs.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fat.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h (props changed) trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rc (props changed) trunk/reactos/drivers/filesystems/fs_rec/ntfs.c (props changed) trunk/reactos/drivers/filesystems/fs_rec/udfs.c (props changed) trunk/reactos/lib/fslib/ext2lib/Badblock.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Bitmap.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Bitmap.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Disk.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Disk.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Group.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Inode.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Memory.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Mke2fs.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Mke2fs.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Super.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/Uuid.c (contents, props changed) trunk/reactos/lib/fslib/ext2lib/ext2_fs.h (contents, props changed) trunk/reactos/lib/fslib/ext2lib/types.h (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/ext2/ext2fs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… Modified: trunk/reactos/drivers/filesystems/ext2/inc/errmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2metadata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Removed: trunk/reactos/drivers/filesystems/ext2/makefile URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/drivers/fs/ext2/ma… Removed: trunk/reactos/drivers/filesystems/ext2/src/.cvsignore URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/drivers/fs/ext2/sr… Modified: trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… Removed: trunk/reactos/lib/fslib/ext2lib/.cvsignore URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/lib/fslib/ext2lib/… Modified: trunk/reactos/lib/fslib/ext2lib/Badblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Badblock… Modified: trunk/reactos/lib/fslib/ext2lib/Bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Bitmap.c… Modified: trunk/reactos/lib/fslib/ext2lib/Bitmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Bitmap.h… Modified: trunk/reactos/lib/fslib/ext2lib/Disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.c?r… Modified: trunk/reactos/lib/fslib/ext2lib/Disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Disk.h?r… Modified: trunk/reactos/lib/fslib/ext2lib/Group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Group.c?… Modified: trunk/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Inode.c?… Removed: trunk/reactos/lib/fslib/ext2lib/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ext2/reactos/lib/fslib/ext2lib/… Modified: trunk/reactos/lib/fslib/ext2lib/Memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Memory.c… Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.h… Modified: trunk/reactos/lib/fslib/ext2lib/Super.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Super.c?… Modified: trunk/reactos/lib/fslib/ext2lib/Uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Uuid.c?r… Modified: trunk/reactos/lib/fslib/ext2lib/ext2_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/ext2_fs.… Modified: trunk/reactos/lib/fslib/ext2lib/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/types.h?…

1 0

[pschweitzer] 32282: Deleted ext2 driver Another one will be merged
by pschweitzer＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: pschweitzer Date: Mon Feb 11 14:29:54 2008 New Revision: 32282 URL: http://svn.reactos.org/svn/reactos?rev=32282&view=rev Log: Deleted ext2 driver Another one will be merged Removed: trunk/rosapps/ext2/ Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=32282… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Mon Feb 11 14:29:54 2008 @@ -28,11 +28,7 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> </directory> - + <directory name="fontview"> <xi:include href="fontview/fontview.rbuild" /> </directory>

1 0

[hpoussin] 32281: Use Rule class to generate instructions for .idl files
by hpoussin＠svn.reactos.org 11 Feb '08

11 Feb '08

Author: hpoussin Date: Mon Feb 11 13:55:33 2008 New Revision: 32281 URL: http://svn.reactos.org/svn/reactos?rev=32281&view=rev Log: Use Rule class to generate instructions for .idl files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 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 Mon Feb 11 13:55:33 2008 @@ -1282,6 +1282,33 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule widlHeaderRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).h", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlServerRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h -s -S $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_s.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlClientRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h -c -C $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_c.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlProxyRule ( "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h -p -P $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.h", + "$(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext)_p.c", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); +Rule widlTlbRule ( "$(OUTPUT)\\$(source_dir)\\$(module_name).tlb: $(source) $(module_rbuild) $(WIDL_TARGET) | $(INTERMEDIATE)\\$(source_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)\\$(source_dir)\\$(source_name_noext).tlb $(source)\n", + "$(INTERMEDIATE)\\$(source_dir)\\", NULL ); void MingwModuleHandler::GenerateGccCommand ( @@ -1324,12 +1351,6 @@ delete pchFilename; } -const std::string& -MingwModuleHandler::GetWidlFlags ( const CompilationUnit& compilationUnit ) -{ - return compilationUnit.GetSwitches (); -} - string MingwModuleHandler::GetPropertyValue ( const Module& module, const std::string& name ) { @@ -1350,44 +1371,6 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } -void -MingwModuleHandler::GenerateWidlCommandsServer ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedServerFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_s.c" ); - CLEAN_FILE ( generatedServerFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedServerFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.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 (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedServerFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - /* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcClientHeaderFilename ( const FileLocation *base ) const @@ -1418,165 +1401,6 @@ { string newname = GetBasename ( base->name ) + ".h"; return new FileLocation ( IntermediateDirectory, "include/reactos" , newname ); -} - -void -MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - FileLocation EmbeddedTypeLibFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + ".tlb" ); - - fprintf ( fMakefile, - "%s: %s $(WIDL_TARGET) | %s\n", - GetTargetMacro ( module ).c_str (), - dependencies.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 (), - backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), - backend->GetFullName ( sourceFile ).c_str () ); -} - -void -MingwModuleHandler::GenerateWidlCommandsClient ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcClientHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedClientFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_c.c" ); - CLEAN_FILE ( generatedClientFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedClientFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.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 (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedClientFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - -void -MingwModuleHandler::GenerateWidlCommandsProxy ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeaderFilename = GetRpcProxyHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeaderFilename ); - - FileLocation generatedProxyFilename ( IntermediateDirectory, - sourceFile.relative_path, - basename + "_p.c" ); - CLEAN_FILE ( generatedProxyFilename ); - - fprintf ( fMakefile, - "%s %s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName ( generatedProxyFilename ).c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( generatedProxyFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); - fprintf ( fMakefile, - "\t%s %s %s -h -H %s -p -P %s %s\n", - "$(Q)$(WIDL_TARGET)", - GetWidlFlags ( compilationUnit ).c_str (), - widlflagsMacro.c_str (), - backend->GetFullName ( *generatedHeaderFilename ).c_str (), - backend->GetFullName ( generatedProxyFilename ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeaderFilename; -} - -void -MingwModuleHandler::GenerateWidlCommandsIdlHeader ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - const FileLocation& sourceFile = compilationUnit.GetFilename (); - string dependencies = backend->GetFullName ( sourceFile ); - dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - - string basename = GetBasename ( sourceFile.name ); - - const FileLocation *generatedHeader = GetIdlHeaderFilename ( &sourceFile ); - CLEAN_FILE ( *generatedHeader ); - - fprintf ( fMakefile, - "%s: %s $(WIDL_TARGET) | %s\n", - backend->GetFullName( *generatedHeader ).c_str (), - dependencies.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 (), - backend->GetFullName ( *generatedHeader ).c_str (), - backend->GetFullName ( sourceFile ).c_str () ); - - delete generatedHeader; -} - -void -MingwModuleHandler::GenerateWidlCommands ( - const CompilationUnit& compilationUnit, - const string& widlflagsMacro ) -{ - if ( module.type == RpcServer ) - GenerateWidlCommandsServer ( compilationUnit, - widlflagsMacro ); - else if ( module.type == RpcClient ) - GenerateWidlCommandsClient ( compilationUnit, - widlflagsMacro ); - else if ( module.type == RpcProxy ) - GenerateWidlCommandsProxy ( compilationUnit, - widlflagsMacro ); - else if ( module.type == EmbeddedTypeLib ) - GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, - widlflagsMacro ); - else // applies also for other module.types which include idl files - GenerateWidlCommandsIdlHeader ( compilationUnit, - widlflagsMacro ); } void @@ -1607,6 +1431,11 @@ { HostDontCare, TypeDontCare, ".rc", &windresRule }, { HostDontCare, TypeDontCare, ".mc", &wmcRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, + { HostDontCare, RpcServer, ".idl", &widlServerRule }, + { HostDontCare, RpcClient, ".idl", &widlClientRule }, + { HostDontCare, RpcProxy, ".idl", &widlProxyRule }, + { HostDontCare, EmbeddedTypeLib, ".idl", &widlTlbRule }, + { HostDontCare, TypeDontCare, ".idl", &widlHeaderRule }, }; size_t i; Rule *customRule = NULL; @@ -1653,17 +1482,13 @@ cc, cflagsMacro ); } - else if ( extension == ".idl" ) - { - GenerateWidlCommands ( compilationUnit, - widlflagsMacro ); - if ( (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) - { - GenerateGccCommand ( &sourceFile, + else if ( extension == ".idl" && + (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) + { + GenerateGccCommand ( &sourceFile, GetExtraDependencies ( &sourceFile ), cc, cflagsMacro ); - } } else if ( !customRule ) { Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Feb 11 13:55:33 2008 @@ -155,24 +155,6 @@ const std::string& extraDependencies, const std::string& cc, const std::string& cflagsMacro ); - const std::string& GetWidlFlags ( const CompilationUnit& compilationUnit ); - void GenerateWidlCommandsServer ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsClient ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsProxy ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsIdlHeader ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommandsEmbeddedTypeLib ( - const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); - void GenerateWidlCommands ( const CompilationUnit& compilationUnit, - const std::string& widlflagsMacro ); void GenerateCommands ( const CompilationUnit& compilationUnit, const std::string& extraDependencies, const std::string& cc,

1 0

[greatlrd] 32280: fix a typo
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Mon Feb 11 00:01:18 2008 New Revision: 32280 URL: http://svn.reactos.org/svn/reactos?rev=32280&view=rev Log: fix a typo Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Mon Feb 11 00:01:18 2008 @@ -562,7 +562,6 @@ VT_ILLEGALMASKED = 0xfff, VT_TYPEMASK = 0xfff }; - #endif #endif typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE; typedef PVOID KSDEVICE_HEADER, KSOBJECT_HEADER;

1 0

[cwittich] 32279: translate some GreatLordish comments into something more similar to English
by cwittich＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: cwittich Date: Sun Feb 10 23:45:56 2008 New Revision: 32279 URL: http://svn.reactos.org/svn/reactos?rev=32279&view=rev Log: translate some GreatLordish comments into something more similar to English Modified: trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Sun Feb 10 23:45:56 2008 @@ -35,7 +35,7 @@ DdDeleteDirectDrawObject(&ddgbl); /* - are it any more I forget to release ? + anything else to release? */ /* release the linked interface */ Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sun Feb 10 23:45:56 2008 @@ -77,8 +77,8 @@ * <FILLMEIN>. * * @param pUnkOuter -* Alwas set to NULL other wise will DirectDrawCreate fail it return -* errror code CLASS_E_NOAGGREGATION +* Always set to NULL otherwise DirectDrawCreate will fail and return +* error code CLASS_E_NOAGGREGATION * * @return <FILLMEIN>. * @@ -94,14 +94,14 @@ { HRESULT retVal = DDERR_GENERIC; /* - remove this when UML digram are in place - this api is finish and is working as it should + remove this when UML diagram is in place + this api is finished and is working as it should */ DX_WINDBG_trace(); _SEH_TRY { - /* check see if pUnkOuter is null or not */ + /* check if pUnkOuter is null or not */ if (pUnkOuter) { retVal = CLASS_E_NOAGGREGATION; @@ -131,8 +131,8 @@ * <FILLMEIN>. * * @param pUnkOuter -* Alwas set to NULL other wise will DirectDrawCreateEx fail it return -* errror code CLASS_E_NOAGGREGATION +* Always set to NULL otherwise DirectDrawCreateEx will fail and return +* error code CLASS_E_NOAGGREGATION * * @return <FILLMEIN>. * @@ -148,8 +148,8 @@ { HRESULT retVal = DDERR_GENERIC; /* - remove this when UML digram are in place - this api is finish and is working as it should + remove this when UML diagram is in place + this api is finished and is working as it should */ DX_WINDBG_trace(); @@ -249,17 +249,17 @@ RegCloseKey(hKey); } - /* Call the user supplyed callback function */ + /* Call the user supplied callback function */ rc = lpCallback(NULL, strMsg, "display", lpContext, NULL); - /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices now */ + /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices */ if(rc == DDENUMRET_CANCEL) { retVal = DD_OK; } else { - // not finish + // not finished retVal = DDERR_UNSUPPORTED; } } @@ -295,11 +295,10 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ Display_d/hh/Display_d/d3d_21ac30ea-9803-401e-b541-6b08af79653d.xml.asp - for more info about this command - - summuer the msdn - - The buffer start with D3DHAL_DP2COMMAND struct afer that it follow either one struct or no struct at at all + for more info about this command see msdn documentation + + The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or + no struct at at all example for command D3DDP2OP_VIEWPORTINFO then lpCmd will look like this @@ -311,9 +310,9 @@ | D3DHAL_DP2VIEWPORTINFO | 0x04 - xxxx | --------------------------------------- - to calc end of the lpCmd buffer in this exmaple + to calculate the end of the lpCmd buffer in this exmaple D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO); - now you got number of bytes but we need add the size of D3DHAL_DP2COMMAND + now you got number of bytes but we need to add the size of D3DHAL_DP2COMMAND to get this right. the end should be sizeof(D3DHAL_DP2COMMAND) + ( D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)); to get the xxxx end positions. @@ -338,12 +337,12 @@ * } D3DHAL_DP2COMMAND, *LPD3DHAL_DP2COMMAND; * * lpCmd->bCommand -* only accpect D3DDP2OP_VIEWPORTINFO, and undocument command 0x0D -* rest of the command will be return error code for. +* only accept D3DDP2OP_VIEWPORTINFO, and undocumented command 0x0D +* anything else will result in an error * Command 0x0D * dp2command->bReserved -* is how big struect we got in wStateCount or how many wStateCount we got +* is the size of the struct we got in wStateCount or how many wStateCount we got * do not known more about it, no info in msdn about it either. * * Command D3DDP2OP_VIEWPORTINFO @@ -378,7 +377,7 @@ switch (dp2command->bCommand) { - /* check for vaild command, only 3 command is vaild */ + /* check for vaild command, only 3 commands are vaild */ case D3DDP2OP_VIEWPORTINFO: *(PBYTE)lpRetCmd += ((dp2command->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)) + sizeof(D3DHAL_DP2COMMAND)); break;

1 0

[greatlrd] 32278: This header work now to build ksfilter, it is some linking issue now for ksfilter
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 23:22:16 2008 New Revision: 32278 URL: http://svn.reactos.org/svn/reactos?rev=32278&view=rev Log: This header work now to build ksfilter, it is some linking issue now for ksfilter Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 23:22:16 2008 @@ -511,7 +511,7 @@ KSEVENTS_ERESOURCE } KSEVENTS_LOCKTYPE; - #if !defined(__wtypes_h__) + #if !defined(__WIDL_WTYPES_H) enum VARENUM { VT_EMPTY = 0, @@ -562,6 +562,7 @@ VT_ILLEGALMASKED = 0xfff, VT_TYPEMASK = 0xfff }; + #endif #endif typedef struct _KSDEVICE KSDEVICE, *PKSDEVICE; typedef PVOID KSDEVICE_HEADER, KSOBJECT_HEADER; @@ -2203,7 +2204,11 @@ #if !defined(_WIN64) PVOID Alignment; #endif - } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + }; + + typedef struct KSAUTOMATION_TABLE_ KSAUTOMATION_TABLE; + typedef struct KSAUTOMATION_TABLE_ *PKSAUTOMATION_TABLE; + #define DEFINE_KSAUTOMATION_TABLE(table) const KSAUTOMATION_TABLE table = struct _KSDEVICE_DISPATCH @@ -3489,25 +3494,25 @@ #define KsDiscard(Object,Pointer) KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE) - void _inline + void __inline KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Filter,EventEntry); } - void _inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) + void __inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Pin,EventEntry); } - void _inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, + void __inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Filter, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - void _inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, + void __inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL,IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); @@ -3589,7 +3594,11 @@ KsReleaseControl((PVOID) Pin); } - #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + #if defined(_UNKNOWN_H_) || defined(__IUnknown_FWD_DEFINED__) + + #ifndef PUNKNOWN + typedef IUnknown *PUNKNOWN; + #endif KSDDKAPI NTSTATUS NTAPI KsPinGetReferenceClockInterface(IN PKSPIN Pin,

1 0

[fireball] 32277: - Revert 32276, since the include guard convention has been changed by 32274.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 23:09:06 2008 New Revision: 32277 URL: http://svn.reactos.org/svn/reactos?rev=32277&view=rev Log: - Revert 32276, since the include guard convention has been changed by 32274. Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 23:09:06 2008 @@ -1,5 +1,5 @@ -#ifndef _UNKNOWN_H_ -#define _UNKNOWN_H_ +#ifndef __unknwn_h__ +#define __unknwn_h__ #ifdef __cplusplus extern "C" { @@ -51,5 +51,6 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType ); + #endif

1 0

[greatlrd] 32276: fix unknown.h back as it was correct fix is to fix ksfilter
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 23:02:26 2008 New Revision: 32276 URL: http://svn.reactos.org/svn/reactos?rev=32276&view=rev Log: fix unknown.h back as it was correct fix is to fix ksfilter Modified: trunk/reactos/include/ddk/unknown.h Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h (original) +++ trunk/reactos/include/ddk/unknown.h Sun Feb 10 23:02:26 2008 @@ -1,5 +1,5 @@ -#ifndef __unknwn_h__ -#define __unknwn_h__ +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ #ifdef __cplusplus extern "C" { @@ -51,6 +51,5 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType ); - #endif

1 0

[hpoussin] 32275: Try to fix build
by hpoussin＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: hpoussin Date: Sun Feb 10 23:00:45 2008 New Revision: 32275 URL: http://svn.reactos.org/svn/reactos?rev=32275&view=rev Log: Try to fix build Modified: trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl (original) +++ trunk/reactos/include/psdk/msxml2.idl Sun Feb 10 23:00:45 2008 @@ -50,7 +50,7 @@ cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __xmldom_h__") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -67,7 +67,7 @@ NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif /* __xmldom_h__ */") [ local,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008