Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 17457: added a genguid helper function based on genguid by Jon Wilson. Will be needed later on when building project files.
by sedwards＠svn.reactos.com 21 Aug '05

21 Aug '05

added a genguid helper function based on genguid by Jon Wilson. Will be needed later on when building project files. Added: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Added: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp --- trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-08-21 04:04:13 UTC (rev 17456) +++ trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-08-21 14:04:19 UTC (rev 17457) @@ -0,0 +1,61 @@ +/* + * Based on the genguid utility for WINE and ReactOS + * + * Copyright 2003 Jonathan Wilson + * Copyright 2005 Steven Edwards + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <objbase.h> +#include <stdio.h> + +static HRESULT (*pCoInitialize)(PVOID); +static void (*pCoUninitialize)(void); +static HRESULT (*pCoCreateGuid)(GUID*); + +void gen_guid() +{ + GUID m_guid; + HRESULT result; + char *strfmt = ""; + HMODULE olelib; + + /* Load ole32. We will need it later on */ + olelib = LoadLibraryA( "ole32.dll" ); + + if (olelib != NULL) + pCoInitialize = (HRESULT (*)(void*))GetProcAddress( olelib, "CoInitialize" ); + pCoUninitialize = (void (*)())GetProcAddress( olelib, "CoUninitialize" ); + pCoCreateGuid = (HRESULT (*)(GUID*))GetProcAddress( olelib, "CoCreateGuid" ); + + if (pCoInitialize(NULL) != S_OK) + { + printf("Unable to initalize OLE libraries\n"); + } + result = pCoCreateGuid(&m_guid); + if (result != S_OK) { + printf("Unable to create GUID\n"); + pCoUninitialize(); + } + strfmt = "%08lX-%04X-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X\r\n"; + printf(strfmt,m_guid.Data1,m_guid.Data2,m_guid.Data3,m_guid.Data4[0], + m_guid.Data4[1],m_guid.Data4[2],m_guid.Data4[3],m_guid.Data4[4],m_guid.D ata4[5], + m_guid.Data4[6],m_guid.Data4[7],m_guid.Data1,m_guid.Data2,m_guid.Data3,m _guid.Data4[0], + m_guid.Data4[1],m_guid.Data4[2],m_guid.Data4[3],m_guid.Data4[4],m_guid.D ata4[5], + m_guid.Data4[6],m_guid.Data4[7]); + pCoUninitialize(); +} _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 04:04:13 UTC (rev 17456) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 14:04:19 UTC (rev 17457) @@ -29,6 +29,8 @@ using namespace std; +void gen_guid(); + static class MSVCFactory : public Backend::Factory { public: @@ -95,6 +97,8 @@ cout << "Done." << endl << endl; cout << "Don't expect the MSVC backend to work yet. "<< endl << endl; + + gen_guid(); } void MSVCBackend::ProcessModules() _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-08-21 04:04:13 UTC (rev 17456) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-08-21 14:04:19 UTC (rev 17457) @@ -137,6 +137,7 @@ ) RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ + genguid.cpp \ msvc.cpp \ ) @@ -348,6 +349,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CFLAGS) -c $< -o $@ + $(RBUILD_MSVC_INT_)msvc.o: $(RBUILD_MSVC_BASE_)msvc.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

1 0

[sedwards] 17456: ...I hate windows and its concepts of case in filenames...
by sedwards＠svn.reactos.com 21 Aug '05

21 Aug '05

...I hate windows and its concepts of case in filenames... Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 03:24:37 UTC (rev 17455) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 04:04:13 UTC (rev 17456) @@ -25,7 +25,7 @@ #include <fstream> #include <string> -#include "MSVC.h" +#include "msvc.h" using namespace std;

1 0

[sedwards] 17455: add a more descriptive message about the state of the MSVC backend
by sedwards＠svn.reactos.com 21 Aug '05

21 Aug '05

add a more descriptive message about the state of the MSVC backend Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 01:29:56 UTC (rev 17454) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 03:24:37 UTC (rev 17455) @@ -82,39 +82,6 @@ m_devFile << " EndGlobalSection" << endl; m_devFile << "EndGlobal" << endl; -#if 0 - m_devFile << "[Project]" << endl; - - m_devFile << "FileName=" << filename << endl - << "Name=" << ProjectNode.name << endl - << "UnitCount=" << m_unitCount << endl - << "Type=1" << endl - << "Ver=1" << endl - << "ObjFiles=" << endl - << "Includes=" << endl - << "Libs=" << endl - << "PrivateResource=" << endl - << "ResourceIncludes=" << endl - << "MakeIncludes=" << endl - << "Compiler=" << endl - << "CppCompiler=" << endl - << "Linker=" << endl - << "IsCpp=1" << endl - << "Icon=" << endl - << "ExeOutput=" << endl - << "ObjectOutput=" << endl - << "OverrideOutput=0" << endl - << "OverrideOutputName=" << endl - << "HostApplication=" << endl - << "CommandLine=" << endl - << "UseCustomMakefile=1" << endl - << "CustomMakefile=" << ProjectNode.makefile << endl - << "IncludeVersionInto=0" << endl - << "SupportXPThemes=0" << endl - << "CompilerSet=0" << endl - << "CompilerSettings=0000000000000000000000" << endl; -#endif - OutputFolders(); m_devFile << endl << endl; @@ -123,23 +90,11 @@ m_devFile.close(); - // Dev-C++ needs a makefile, so use the MinGW backend to create one. + // The MSVC build still needs the mingw backend. - cout << "Creating Makefile: " << ProjectNode.makefile << endl; - - Backend *backend = Backend::Factory::Create("mingw", - ProjectNode, - configuration ); - backend->Process(); - delete backend; - cout << "Done." << endl << endl; - cout << "You may want to disable Class browsing (see below) before you open this project in Dev-C++, as the " - << "parsing required for large projects can take quite awhile." - << endl << endl - << "(Tools->Editor Options->Class browsing->Enable class browsing check box)" - << endl << endl; + cout << "Don't expect the MSVC backend to work yet. "<< endl << endl; } void MSVCBackend::ProcessModules()

1 0

[sedwards] 17454: started working on a msvc2k5 backend. Mostly a dummy atm based on the devcpp backend
by sedwards＠svn.reactos.com 21 Aug '05

21 Aug '05

started working on a msvc2k5 backend. Mostly a dummy atm based on the devcpp backend Added: trunk/reactos/tools/rbuild/backend/msvc/ Added: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Added: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Added: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-20 23:50:06 UTC (rev 17453) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-08-21 01:29:56 UTC (rev 17454) @@ -0,0 +1,266 @@ +/* + * Copyright (C) 2005 Trevor McCort + * Copyright (C) 2005 Casper S. Hornstrup + * Copyright (C) 2005 Steven Edwards + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <iostream> +#include <fstream> +#include <string> + +#include "MSVC.h" + +using namespace std; + +static class MSVCFactory : public Backend::Factory +{ + public: + + MSVCFactory() : Factory("MSVC") {} + Backend *operator() (Project &project, + Configuration& configuration) + { + return new MSVCBackend(project, configuration); + } + +} factory; + + +MSVCBackend::MSVCBackend(Project &project, + Configuration& configuration) : Backend(project, configuration) +{ + m_unitCount = 0; +} + +void MSVCBackend::Process() +{ + string filename = ProjectNode.name + ".sln"; + + cout << "Creating MSVC project: " << filename << endl; + + ProcessModules(); + + m_devFile.open(filename.c_str()); + + if(!m_devFile.is_open()) + { + cout << "Could not open file." << endl; + return; + } + m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl; + m_devFile << "# Visual C++ Express 2005" << endl; + + m_devFile << "# FIXME Project listings here" << endl; + m_devFile << "EndProject" << endl; + m_devFile << "Global" << endl; + m_devFile << " GlobalSection(SolutionConfigurationPlatforms) = preSolution" << endl; + m_devFile << " Debug|Win32 = Debug|Win32" << endl; + m_devFile << " Release|Win32 = Release|Win32" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << " GlobalSection(ProjectConfigurationPlatforms) = postSolution" << endl; + m_devFile << " #FIXME Project Listings Here" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << " GlobalSection(SolutionProperties) = preSolution" << endl; + m_devFile << " HideSolutionNode = FALSE" << endl; + m_devFile << " EndGlobalSection" << endl; + m_devFile << "EndGlobal" << endl; + +#if 0 + m_devFile << "[Project]" << endl; + + m_devFile << "FileName=" << filename << endl + << "Name=" << ProjectNode.name << endl + << "UnitCount=" << m_unitCount << endl + << "Type=1" << endl + << "Ver=1" << endl + << "ObjFiles=" << endl + << "Includes=" << endl + << "Libs=" << endl + << "PrivateResource=" << endl + << "ResourceIncludes=" << endl + << "MakeIncludes=" << endl + << "Compiler=" << endl + << "CppCompiler=" << endl + << "Linker=" << endl + << "IsCpp=1" << endl + << "Icon=" << endl + << "ExeOutput=" << endl + << "ObjectOutput=" << endl + << "OverrideOutput=0" << endl + << "OverrideOutputName=" << endl + << "HostApplication=" << endl + << "CommandLine=" << endl + << "UseCustomMakefile=1" << endl + << "CustomMakefile=" << ProjectNode.makefile << endl + << "IncludeVersionInto=0" << endl + << "SupportXPThemes=0" << endl + << "CompilerSet=0" << endl + << "CompilerSettings=0000000000000000000000" << endl; +#endif + + OutputFolders(); + + m_devFile << endl << endl; + + OutputFileUnits(); + + m_devFile.close(); + + // Dev-C++ needs a makefile, so use the MinGW backend to create one. + + cout << "Creating Makefile: " << ProjectNode.makefile << endl; + + Backend *backend = Backend::Factory::Create("mingw", + ProjectNode, + configuration ); + backend->Process(); + delete backend; + + cout << "Done." << endl << endl; + + cout << "You may want to disable Class browsing (see below) before you open this project in Dev-C++, as the " + << "parsing required for large projects can take quite awhile." + << endl << endl + << "(Tools->Editor Options->Class browsing->Enable class browsing check box)" + << endl << endl; +} + +void MSVCBackend::ProcessModules() +{ + for(size_t i = 0; i < ProjectNode.modules.size(); i++) + { + Module &module = *ProjectNode.modules[i]; + + for(size_t k = 0; k < module.non_if_data.files.size(); k++) + { + File &file = *module.non_if_data.files[k]; + + ProcessFile(file.name); + } + } +} + +static bool FileExists(string &filename) +{ + ifstream file(filename.c_str()); + + if(!file.is_open()) + return false; + + file.close(); + return true; +} + +void MSVCBackend::ProcessFile(string &filepath) +{ + // Remove the .\ at the start of the filenames + filepath.erase(0, 2); + + if(!FileExists(filepath)) + return; + + // Change the \ to / + for(size_t i = 0; i < filepath.length(); i++) + { + if(filepath[i] == '\\') + filepath[i] = '/'; + } + + // Remove the filename from the path + string folder = ""; + + size_t pos = filepath.rfind(string("/"), filepath.length() - 1); + + if(pos != string::npos) + { + folder = filepath; + folder.erase(pos, folder.length() - pos); + } + + FileUnit fileUnit; + fileUnit.filename = filepath; + fileUnit.folder = folder; + + m_fileUnits.push_back(fileUnit); + + if(folder != "") + AddFolders(folder); + + m_unitCount++; +} + +bool MSVCBackend::CheckFolderAdded(string &folder) +{ + for(size_t i = 0; i < m_folders.size(); i++) + { + if(m_folders[i] == folder) + return true; + } + + return false; +} + +void MSVCBackend::AddFolders(string &folder) +{ + // Check if this folder was already added. true if it was, false otherwise. + if(CheckFolderAdded(folder)) + return; + + m_folders.push_back(folder); + + size_t pos = folder.rfind(string("/"), folder.length() - 1); + + if(pos == string::npos) + return; + + folder.erase(pos, folder.length() - pos); + AddFolders(folder); +} + +void MSVCBackend::OutputFolders() +{ + m_devFile << "Folders="; + + for(size_t i = 0; i < m_folders.size(); i++) + { + if(i > 0) + m_devFile << ","; + + m_devFile << m_folders[i]; + } +} + +void MSVCBackend::OutputFileUnits() +{ + for(size_t i = 0; i < m_fileUnits.size(); i++) + { + m_devFile << "[Unit" << i + 1 << "]" << endl; + + + m_devFile << "FileName=" << m_fileUnits[i].filename << endl; + m_devFile << "CompileCpp=1" << endl; + m_devFile << "Folder=" << m_fileUnits[i].folder << endl; + m_devFile << "Compile=1" << endl; + m_devFile << "Link=1" << endl; + m_devFile << "Priority=1000" << endl; + m_devFile << "OverrideBuildCmd=0" << endl; + m_devFile << "BuildCmd=" << endl << endl;; + } +} _____ Added: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-08-20 23:50:06 UTC (rev 17453) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-08-21 01:29:56 UTC (rev 17454) @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2005 Trevor McCort + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __MSVC_H__ +#define __MSVC_H__ + +#include <fstream> +#include <vector> +#include <string> + +#include "../backend.h" + +class FileUnit +{ + public: + std::string filename; + std::string folder; +}; + +class MSVCBackend : public Backend +{ + public: + + MSVCBackend(Project &project, + Configuration& configuration); + virtual ~MSVCBackend() {} + + virtual void Process(); + + private: + + void ProcessModules(); + void ProcessFile(std::string &filename); + + bool CheckFolderAdded(std::string &folder); + void AddFolders(std::string &folder); + + void OutputFolders(); + void OutputFileUnits(); + + std::vector<FileUnit> m_fileUnits; + std::vector<std::string> m_folders; + + int m_unitCount; + + std::ofstream m_devFile; +}; + +#endif // __DEVCPP_H__ + _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-08-20 23:50:06 UTC (rev 17453) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-08-21 01:29:56 UTC (rev 17454) @@ -102,7 +102,24 @@ ${mkdir} $@ endif +RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc +RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP) +RBUILD_MSVC_INT = $(INTERMEDIATE_)$(RBUILD_MSVC_BASE) +RBUILD_MSVC_INT_ = $(RBUILD_MSVC_INT)$(SEP) +RBUILD_MSVC_OUT = $(OUTPUT_)$(RBUILD_MSVC_BASE) +RBUILD_MSVC_OUT_ = $(RBUILD_MSVC_OUT)$(SEP) +$(RBUILD_MSVC_INT): | $(RBUILD_BACKEND_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_MSVC_OUT): | $(RBUILD_BACKEND_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + + RBUILD_TARGET = \ $(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX) @@ -119,9 +136,14 @@ devcpp.cpp \ ) +RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ + msvc.cpp \ + ) + RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ $(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \ + $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp RBUILD_COMMON_SOURCES = \ @@ -167,6 +189,9 @@ RBUILD_BACKEND_DEVCPP_HEADERS = \ devcpp.h +RBUILD_BACKEND_MSVCCPP_HEADERS = \ + msvc.h + RBUILD_BACKEND_MINGW_HEADERS = \ mingw.h \ modulehandler.h @@ -174,6 +199,7 @@ RBUILD_BACKEND_HEADERS = \ backend.h \ $(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \ + $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) RBUILD_HEADERS = \ @@ -322,6 +348,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_MSVC_INT_)msvc.o: $(RBUILD_MSVC_BASE_)msvc.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) $(ECHO_LD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@

1 0

[navaraf] 17453: Report the PCI bus type as PCIBus instead of Internal.
by navaraf＠svn.reactos.com 20 Aug '05

20 Aug '05

Report the PCI bus type as PCIBus instead of Internal. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-08-20 19:04:38 UTC (rev 17452) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-08-20 23:50:06 UTC (rev 17453) @@ -293,7 +293,7 @@ /* Initialize resource descriptor */ memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Internal; + FullResourceDescriptor->InterfaceType = PCIBus; FullResourceDescriptor->BusNumber = 0; FullResourceDescriptor->PartialResourceList.Count = 0;

1 0

[turner] 17452: optimize 17218 by using memmove instead of memcopy and not using _tcsncmp. Suggested by thomas.
by turner＠svn.reactos.com 20 Aug '05

20 Aug '05

optimize 17218 by using memmove instead of memcopy and not using _tcsncmp. Suggested by thomas. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 18:30:25 UTC (rev 17451) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 19:04:38 UTC (rev 17452) @@ -341,8 +341,8 @@ /* remove any slashes */ while(i < _tcslen(first)) { - if(!_tcsncmp (&first[i], _T("\""), 1)) - memcpy(&first[i],&first[i + 1], _tcslen(&first[i])); + if(first[i] == _T('\"')) + memmove(&first[i],&first[i + 1], _tcslen(&first[i]) * sizeof(TCHAR)); else i++; }

1 0

[turner] 17451: Open err redirection the same as output redirection. Batch file does not need to be opened with FILE_FLAG_WRITE_THROUGH since it is read only, catch by thomas.
by turner＠svn.reactos.com 20 Aug '05

20 Aug '05

Open err redirection the same as output redirection. Batch file does not need to be opened with FILE_FLAG_WRITE_THROUGH since it is read only, catch by thomas. Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-08-20 18:07:59 UTC (rev 17450) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-08-20 18:30:25 UTC (rev 17451) @@ -221,7 +221,7 @@ SetLastError(0); hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_WRITE_THROUGH, NULL); + FILE_FLAG_SEQUENTIAL_SCAN, NULL); #ifdef _DEBUG DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 18:07:59 UTC (rev 17450) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 18:30:25 UTC (rev 17451) @@ -796,9 +796,9 @@ } out[size]=_T('\0'); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE, &sa, + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -858,10 +858,10 @@ { hFile = CreateFile (err, GENERIC_WRITE, - 0, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, (nRedirFlags & ERROR_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); if (hFile == INVALID_HANDLE_VALUE) {

1 0

[turner] 17450: Change the way batch files and output files are opened. They now allow write and delete while being excuted. This is how MS cmd is done. Thanks to Greatlord, Filip, Thomas.
by turner＠svn.reactos.com 20 Aug '05

20 Aug '05

Change the way batch files and output files are opened. They now allow write and delete while being excuted. This is how MS cmd is done. Thanks to Greatlord, Filip, Thomas. Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-08-20 17:17:44 UTC (rev 17449) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-08-20 18:07:59 UTC (rev 17450) @@ -219,9 +219,9 @@ { HANDLE hFile; SetLastError(0); - hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); + FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_WRITE_THROUGH, NULL); #ifdef _DEBUG DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 17:17:44 UTC (rev 17449) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-08-20 18:07:59 UTC (rev 17450) @@ -780,9 +780,9 @@ /* we need make sure the LastError msg is zero before calling CreateFile */ SetLastError(0); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE, &sa, + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_WRITE_THROUGH, NULL); if (hFile == INVALID_HANDLE_VALUE) {

1 0

[robertk] 17449: version info for release
by robertk＠svn.reactos.com 20 Aug '05

20 Aug '05

version info for release Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h --- branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-08-19 21:58:31 UTC (rev 17448) +++ branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-08-20 17:17:44 UTC (rev 17449) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 7 /* 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

[royce] 17448: added clean rule
by royce＠svn.reactos.com 19 Aug '05

19 Aug '05

added clean rule Modified: trunk/irc/ArchBlackmann/makefile _____ Modified: trunk/irc/ArchBlackmann/makefile --- trunk/irc/ArchBlackmann/makefile 2005-08-19 21:56:14 UTC (rev 17447) +++ trunk/irc/ArchBlackmann/makefile 2005-08-19 21:58:31 UTC (rev 17448) @@ -31,3 +31,8 @@ .cpp.o: $< $(CPP) $(CFLAGS) -c $< -o $@ + +.PHONY: clean +clean: + -@del $(TARGET) + -@del $(OBJS)

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