Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[hpoussin] 28578: Remove psdk dependency, as it is automatically added

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 26 23:06:31 2007 New Revision: 28578 URL: http://svn.reactos.org/svn/reactos?rev=28578&view=rev Log: Remove psdk dependency, as it is automatically added Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Sun Aug 26 23:06:31 2007 @@ -5,7 +5,6 @@ <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> - <dependency>psdk</dependency> <file>cpu_features.c</file> <file>CRTfmode.c</file> <file>CRTglob.c</file> @@ -25,7 +24,6 @@ <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> - <dependency>psdk</dependency> <file>binmode.c</file> <file>crt1.c</file> <file>main.c</file> @@ -33,7 +31,6 @@ <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> - <dependency>psdk</dependency> <file>wbinmode.c</file> <file>wcrt1.c</file> <file>wmain.c</file>

17 years, 4 months

[dreimer] 28577: In biiig steps to 0.3.8.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 26 22:39:33 2007 New Revision: 28577 URL: http://svn.reactos.org/svn/reactos?rev=28577&view=rev Log: In biiig steps to 0.3.8. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/readme.pdf trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh trunk/tools/RosBE-Windows/RosBE.nsi 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 Sun Aug 26 22:39:33 2007 @@ -4,6 +4,10 @@ - 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: GCC 4.1.3 Build 20070826 (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sun Aug 26 22:39:33 2007 @@ -11,12 +11,12 @@ The ReactOS Build Environment v0.3.8 contains the following packages: -binutils-2.17.50-200706XX -mingw-runtime-3.12 -w32api-3.9 +binutils-2.17.50-20070806 +mingw-runtime-3.13 +w32api-3.10 mingw32-make-3.81-2 -nasm-0.98.39-win32 -mingw-4.1.3-200706XX-prerelease +nasm-0.99.02-win32 +mingw-4.1.3-20070826-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Aug 26 22:39:33 2007 @@ -15,7 +15,7 @@ :: Config Tool. :: color 0A -set _VER=0.3.7.2 +set _VER=0.3.8 set ROSBEBASEDIR=%~dp0 for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i set _ROSSOURCEDIRBASE=%CD% Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh Sun Aug 26 22:39:33 2007 @@ -1,4 +1,4 @@ -Section "-MinGW, GCC v4.1.3 and NASM 0.98.39" SEC01 +Section "-MinGW, GCC v4.1.3 and NASM 0.99.02" SEC01 SetOutPath "$INSTDIR\4.1.3\" SetOverwrite try File /r Components\4.1.3\*.* Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sun Aug 26 22:39:33 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "0.3.7.2" +!define PRODUCT_VERSION "0.3.8.0" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.3.7.2" +VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.3.7.2" +VIProductVersion "0.3.8.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -185,10 +185,12 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" Delete /REBOOTOK "$INSTDIR\RAddr.cmd" -;; Delete /REBOOTOK "$INSTDIR\options.exe" + Delete /REBOOTOK "$INSTDIR\options.exe" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt" + Delete /REBOOTOK "$INSTDIR\scut.cmd" + Delete /REBOOTOK "$INSTDIR\srclist.xml" Delete /REBOOTOK "$INSTDIR\README.txt" Delete /REBOOTOK "$INSTDIR\readme.pdf" Delete /REBOOTOK "$INSTDIR\reactos.ico"

17 years, 4 months

[janderwald] 28576: - if partition cannot be selected, let user create partition themselves - autopartitioning still needs to be done See issue #2593 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 26 22:19:23 2007 New Revision: 28576 URL: http://svn.reactos.org/svn/reactos?rev=28576&view=rev Log: - if partition cannot be selected, let user create partition themselves - autopartitioning still needs to be done See issue #2593 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Aug 26 22:19:23 2007 @@ -1387,10 +1387,10 @@ if (IsUnattendedSetup) { - SelectPartition(PartitionList, - UnattendDestinationDiskNumber, - UnattendDestinationPartitionNumber); - return(SELECT_FILE_SYSTEM_PAGE); + if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) + { + return(SELECT_FILE_SYSTEM_PAGE); + } } while(TRUE) Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sun Aug 26 22:19:23 2007 @@ -1543,7 +1543,7 @@ } -VOID +DWORD SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber) { PDISKENTRY DiskEntry; @@ -1554,7 +1554,7 @@ /* Check for empty disks */ if (IsListEmpty (&List->DiskListHead)) - return; + return FALSE; /* Check for first usable entry on next disk */ Entry1 = List->CurrentDisk->ListEntry.Flink; @@ -1575,16 +1575,17 @@ { List->CurrentDisk = DiskEntry; List->CurrentPartition = PartEntry; - DrawPartitionList (List); - return; + DrawPartitionList (List); + return TRUE; } } Entry2 = Entry2->Flink; } - return; + return FALSE; } Entry1 = Entry1->Flink; } + return FALSE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h (original) +++ trunk/reactos/base/setup/usetup/partlist.h Sun Aug 26 22:19:23 2007 @@ -188,7 +188,7 @@ VOID DrawPartitionList (PPARTLIST List); -VOID +DWORD SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber); BOOL

17 years, 4 months

[fireball] 28575: - Fix boot (thx hpoussin for hint).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 26 22:18:48 2007 New Revision: 28575 URL: http://svn.reactos.org/svn/reactos?rev=28575&view=rev Log: - Fix boot (thx hpoussin for hint). Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sun Aug 26 22:18:48 2007 @@ -142,7 +142,7 @@ { /* Check if it's not the SYSTEM hive that we already initialized */ if ((MdBlock->BasePage) != - ((ULONG_PTR)KeLoaderBlock->RegistryBase >> PAGE_SHIFT)) + (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) { /* Hardware hive break out */ break; @@ -156,7 +156,7 @@ /* We need a hardware hive */ ASSERT(MdBlock); *Length = MdBlock->PageCount << PAGE_SHIFT; - return (PVOID)(MdBlock->BasePage << PAGE_SHIFT); + return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); } VOID

17 years, 4 months

[hpoussin] 28574: Try to fix infinite loop in "make depends"

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 26 16:52:14 2007 New Revision: 28574 URL: http://svn.reactos.org/svn/reactos?rev=28574&view=rev Log: Try to fix infinite loop in "make depends" Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28574&r1=2857… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Aug 26 16:52:14 2007 @@ -624,6 +624,6 @@ clean: makefile_auto_clean .PHONY: depends -depends: - @-$(rm) $(ROS_AUTOMAKE) - @$(MAKE) $(filter-out depends, $(MAKECMDGOALS)) +depends: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw

17 years, 4 months

[hpoussin] 28573: Fix {module}_depends targets

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 26 16:31:12 2007 New Revision: 28573 URL: http://svn.reactos.org/svn/reactos?rev=28573&view=rev Log: Fix {module}_depends targets Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 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 Sun Aug 26 16:31:12 2007 @@ -615,7 +615,7 @@ fprintf ( fMakefile, "\t$(ECHO_RBUILD)\n" ); fprintf ( fMakefile, - "\t$(Q)$(RBUILD_TARGET) -dm%s mingw\n", + "\t$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) -dm%s mingw\n", module.name.c_str () ); }

17 years, 4 months

[hpoussin] 28572: Transform psdk into a real dependency, instead of a target only created after rbuild. Fixes case where compilation wasn't stopping if rbuild was failing/crashing

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 26 16:06:28 2007 New Revision: 28572 URL: http://svn.reactos.org/svn/reactos?rev=28572&view=rev Log: Transform psdk into a real dependency, instead of a target only created after rbuild. Fixes case where compilation wasn't stopping if rbuild was failing/crashing Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28572&r1=2857… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Aug 26 16:06:28 2007 @@ -420,7 +420,6 @@ ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw - @$(MAKE) psdk world: all bootcd livecd @@ -626,5 +625,5 @@ .PHONY: depends depends: - @-$(rm) makefile.auto + @-$(rm) $(ROS_AUTOMAKE) @$(MAKE) $(filter-out depends, $(MAKECMDGOALS)) 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 Sun Aug 26 16:06:28 2007 @@ -2193,6 +2193,11 @@ && module.name != "hostzlib" ) dependencies.push_back ( "$(INIT)" ); + + if ( module.type != BuildTool + && module.name != "psdk" ) + + dependencies.push_back ( "$(PSDK_TARGET)" ); } void

17 years, 4 months

[greatlrd] 28571: patch from Gregor Brunmar (gregor dot brunmar at home dot se) * Added folder support for msvc+solution generation in rbuild * map up pch .h file as include file in vc project files.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 26 13:57:30 2007 New Revision: 28571 URL: http://svn.reactos.org/svn/reactos?rev=28571&view=rev Log: patch from Gregor Brunmar (gregor dot brunmar at home dot se) * Added folder support for msvc+solution generation in rbuild * map up pch .h file as include file in vc project files. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Aug 26 13:57:30 2007 @@ -83,7 +83,7 @@ // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? string dsp_path = module.GetBasePath(); - vector<string> c_srcs, source_files, resource_files, includes, libraries; + vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); @@ -108,6 +108,8 @@ source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) c_srcs.push_back ( file ); + if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) + header_files.push_back ( file ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); } @@ -144,7 +146,7 @@ } // TODO FIXME - we don't include header files in our build system //my @header_files = @{module->{header_files}}; - vector<string> header_files; + //vector<string> header_files; // TODO FIXME - wine hack? /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ && Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Aug 26 13:57:30 2007 @@ -41,6 +41,14 @@ #undef OUT #endif//OUT +struct SortFilesAscending +{ + bool operator()(const string& rhs, const string& lhs) + { + return rhs < lhs; + } +}; + MSVCConfiguration::MSVCConfiguration ( const OptimizationType optimization, const HeadersType headers, const std::string &name ) { this->optimization = optimization; @@ -124,7 +132,7 @@ bool include_idl = false; string vcproj_path = module.GetBasePath(); - vector<string> source_files, resource_files, includes, includes_ros, libraries; + vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); @@ -154,6 +162,8 @@ if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); + else if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) + header_files.push_back ( file ); else source_files.push_back ( file ); } @@ -210,8 +220,6 @@ baseaddr = prop.value; } } - - vector<string> header_files; string include_string; @@ -372,6 +380,11 @@ if ( pos != string::npos ) pch_path.erase(0, pos+1); fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); + + // Only include from the same module + pos = pch_path.find("../"); + if (pos == string::npos && std::find(header_files.begin(), header_files.end(), pch_path) == header_files.end()) + header_files.push_back(pch_path); } else { @@ -583,11 +596,54 @@ fprintf ( OUT, "\t\t<Filter\r\n" ); fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S\">\r\n" ); + + std::sort(source_files.begin(), source_files.end(), SortFilesAscending()); + vector<string> last_folder; + vector<string> split_path; + string indent_tab("\t\t\t"); + for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { string source_file = DosSeparator(source_files[isrcfile]); - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); + + Path::Split(split_path, source_file, false); + size_t same_folder_index = 0; + for ( size_t ifolder = 0; ifolder < last_folder.size(); ifolder++ ) + { + if ( ifolder < split_path.size() && last_folder[ifolder] == split_path[ifolder] ) + ++same_folder_index; + else + break; + } + + if ( same_folder_index < split_path.size() ) + { + if ( split_path.size() > last_folder.size() ) + { + for ( size_t ifolder = last_folder.size(); ifolder < split_path.size(); ifolder++ ) + indent_tab.push_back('\t'); + } + else if ( split_path.size() < last_folder.size() ) + { + indent_tab.resize( split_path.size() + 3 ); + } + + for ( size_t ifolder = last_folder.size(); ifolder > same_folder_index; ifolder-- ) + { + fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); + } + + for ( size_t ifolder = same_folder_index; ifolder < split_path.size(); ifolder++ ) + { + fprintf ( OUT, "%s<Filter\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); + fprintf ( OUT, "%sName=\"%s\">\r\n", indent_tab.c_str(), split_path[ifolder].c_str() ); + } + + last_folder = split_path; + } + + fprintf ( OUT, "%s<File\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\tRelativePath=\"%s\">\r\n", indent_tab.c_str(), source_file.c_str() ); for ( size_t iconfig = 0; iconfig < m_configurations.size(); iconfig++ ) { @@ -596,24 +652,24 @@ if (( isrcfile == 0 ) && ( module.pch != NULL )) { /* little hack to speed up PCH */ - fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); - fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, "%s\t<FileConfiguration\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\tName=\"", indent_tab.c_str() ); fprintf ( OUT, config.name.c_str() ); fprintf ( OUT, "|Win32\">\r\n" ); - fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tUsePrecompiledHeader=\"1\"/>\r\n" ); - fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + fprintf ( OUT, "%s\t\t<Tool\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\t\tName=\"VCCLCompilerTool\"\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\t\tUsePrecompiledHeader=\"1\"/>\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t</FileConfiguration>\r\n", indent_tab.c_str() ); } //if (configuration.VSProjectVersion < "8.00") { if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))) { - fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); - fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, "%s\t<FileConfiguration\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\tName=\"", indent_tab.c_str() ); fprintf ( OUT, config.name.c_str() ); fprintf ( OUT, "|Win32\">\r\n" ); - fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + fprintf ( OUT, "%s\t\t<Tool\r\n", indent_tab.c_str() ); if (source_file.find(".idl") != string::npos) { string src = source_file.substr (0, source_file.find(".idl")); @@ -621,43 +677,50 @@ if ( src.find (".\\") != string::npos ) src.erase (0, 2); - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "%s\t\t\tName=\"VCCustomBuildTool\"\r\n", indent_tab.c_str() ); if ( module.type == RpcClient ) { - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /cstub %s_c.c /header %s_c.h /server none "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + fprintf ( OUT, "%s\t\t\tCommandLine=\"midl.exe /cstub %s_c.c /header %s_c.h /server none "$(InputPath)" /out "$(IntDir)"", indent_tab.c_str(), src.c_str (), src.c_str () ); fprintf ( OUT, "
"); fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s_c.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); } else { - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"midl.exe /sstub %s_s.c /header %s_s.h /client none "$(InputPath)" /out "$(IntDir)"", src.c_str (), src.c_str () ); + fprintf ( OUT, "%s\t\t\tCommandLine=\"midl.exe /sstub %s_s.c /header %s_s.h /client none "$(InputPath)" /out "$(IntDir)"", indent_tab.c_str(), src.c_str (), src.c_str () ); fprintf ( OUT, "
"); fprintf ( OUT, "cl.exe /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32_WINNT=0x502" /D "_UNICODE" /D "UNICODE" /Gm /EHsc /RTC1 /MDd /Fo"$(IntDir)\\%s.obj" /W3 /c /Wp64 /ZI /TC "$(IntDir)\\%s_s.c" /nologo /errorReport:prompt", src.c_str (), src.c_str () ); } fprintf ( OUT, "
"); fprintf ( OUT, "lib.exe /OUT:"$(OutDir)\\%s.lib" "$(IntDir)\\%s.obj"
\"\r\n", module.name.c_str (), src.c_str () ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(IntDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "%s\t\t\tOutputs=\"$(IntDir)\\$(InputName).obj\"/>\r\n", indent_tab.c_str() ); } else if ((source_file.find(".asm") != string::npos)) { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n"); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "%s\t\t\tName=\"VCCustomBuildTool\"\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n", indent_tab.c_str() ); } else if ((tolower(source_file.at(source_file.size() - 1)) == 's')) { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "%s\t\t\tName=\"VCCustomBuildTool\"\r\n", indent_tab.c_str() ); + fprintf ( OUT, "%s\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n", indent_tab.c_str(), include_string.c_str() ); + fprintf ( OUT, "%s\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n", indent_tab.c_str() ); } - fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + fprintf ( OUT, "%s\t</FileConfiguration>\r\n", indent_tab.c_str() ); } //} } - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } + fprintf ( OUT, "%s</File>\r\n", indent_tab.c_str() ); + } + + for ( size_t ifolder = last_folder.size(); ifolder > 0; ifolder-- ) + { + indent_tab.resize( ifolder + 3 ); + fprintf ( OUT, "%s</Filter>\r\n", indent_tab.c_str() ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); // Header files

17 years, 4 months

[amunger] 28570: NtQueryInformationProcess: Return STATUS_INFO_LENGTH_MISMATCH where appropriate, and return the needed length in any case. "ntdll_winetest info" now has 5 failures.

by amunger＠svn.reactos.org

Author: amunger Date: Sun Aug 26 11:51:51 2007 New Revision: 28570 URL: http://svn.reactos.org/svn/reactos?rev=28570&view=rev Log: NtQueryInformationProcess: Return STATUS_INFO_LENGTH_MISMATCH where appropriate, and return the needed length in any case. "ntdll_winetest info" now has 5 failures. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sun Aug 26 11:51:51 2007 @@ -117,6 +117,14 @@ /* Basic process information */ case ProcessBasicInformation: + /* Set return length */ + Length = sizeof(PROCESS_BASIC_INFORMATION); + + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY { @@ -130,8 +138,6 @@ (ULONG)Process->InheritedFromUniqueProcessId; ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; - /* Set return length */ - Length = sizeof(PROCESS_BASIC_INFORMATION); } _SEH_HANDLE { @@ -144,11 +150,28 @@ /* Quote limits and I/O Counters: not implemented */ case ProcessQuotaLimits: case ProcessIoCounters: + + Length = sizeof(IO_COUNTERS); + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + Status = STATUS_NOT_IMPLEMENTED; break; /* Timing */ case ProcessTimes: + + /* Set the return length */ + Length = sizeof(KERNEL_USER_TIMES); + + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY @@ -160,9 +183,6 @@ ProcessTime->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; ProcessTime->ExitTime = Process->ExitTime; - - /* Set the return length */ - Length = sizeof(KERNEL_USER_TIMES); } _SEH_HANDLE { @@ -202,6 +222,15 @@ case ProcessHandleCount: + /* Set the return length*/ + Length = sizeof(ULONG); + + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + /* Count the number of handles this process has */ HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); @@ -210,9 +239,6 @@ { /* Return the count of handles */ *(PULONG)ProcessInformation = HandleCount; - - /* Set the return length*/ - Length = sizeof(ULONG); } _SEH_HANDLE { @@ -249,6 +275,15 @@ /* Virtual Memory Statistics */ case ProcessVmCounters: + + /* Set the return length */ + Length = sizeof(VM_COUNTERS); + + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for write safety */ _SEH_TRY @@ -266,8 +301,6 @@ VmCounters->PagefileUsage = Process->QuotaUsage[2]; VmCounters->PeakPagefileUsage = Process->QuotaPeak[2]; - /* Set the return length */ - Length = sizeof(VM_COUNTERS); } _SEH_HANDLE {

17 years, 4 months

[amunger] 28569: NtQuerySystemInformation: Do not blindly zero the buffer with the size sent in by the caller. This fixes the stack smash "ntdll_winetest info" was seeing. Thanks to arty for catching it. Remove the nested SEH. "ntdll_winetest info" now has 16 failures.

by amunger＠svn.reactos.org

Author: amunger Date: Sun Aug 26 11:39:29 2007 New Revision: 28569 URL: http://svn.reactos.org/svn/reactos?rev=28569&view=rev Log: NtQuerySystemInformation: Do not blindly zero the buffer with the size sent in by the caller. This fixes the stack smash "ntdll_winetest info" was seeing. Thanks to arty for catching it. Remove the nested SEH. "ntdll_winetest info" now has 16 failures. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Sun Aug 26 11:39:29 2007 @@ -501,6 +501,7 @@ { return (STATUS_INFO_LENGTH_MISMATCH); } + RtlZeroMemory(Sbi, Size); Sbi->Reserved = 0; Sbi->TimerResolution = KeMaximumIncrement; Sbi->PageSize = PAGE_SIZE; @@ -722,6 +723,7 @@ { _SEH_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } + RtlZeroMemory(Spi, Size); syspr = PsGetNextProcess(NULL); pr = syspr; @@ -1819,9 +1821,6 @@ ProbeForWriteUlong(UnsafeResultLength); } - /* Clear user buffer. */ - RtlZeroMemory(SystemInformation, Length); - /* * Check the request is valid. */ @@ -1842,15 +1841,7 @@ { if (PreviousMode != KernelMode) { - _SEH_TRY - { *UnsafeResultLength = ResultLength; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - FStatus = _SEH_GetExceptionCode(); - } - _SEH_END; } else {

17 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007