Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[amunger] 18639: One liner from Alex_Ionescu that fixes svn hanging during checkout or update.

by amunger＠svn.reactos.com

One liner from Alex_Ionescu that fixes svn hanging during checkout or update. Modified: trunk/reactos/lib/advapi32/sec/misc.c _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-10-20 16:49:00 UTC (rev 18638) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-10-20 17:48:19 UTC (rev 18639) @@ -1203,7 +1203,7 @@ ppsidOwner = NULL; } if ((SecurityInfo & GROUP_SECURITY_INFORMATION) && - *ppsidGroup != NULL) + (ppsidGroup) && (*ppsidGroup)) { *ppsidGroup = NULL; }

18 years, 12 months

[royce] 18638: we do still need to generate dsw files for msvc6

by royce＠svn.reactos.com

we do still need to generate dsw files for msvc6 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-10-20 16:13:20 UTC (rev 18637) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 16:49:00 UTC (rev 18638) @@ -53,8 +53,11 @@ void MSVCBackend::Process() { - - string filename_sln = ProjectNode.name + ".sln"; + string filename_sln ( ProjectNode.name ); + if ( configuration.VSProjectVersion == "6.00" ) + filename_sln += ".dsw"; + else + filename_sln += ".sln"; printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); ProcessModules(); @@ -66,7 +69,11 @@ return; } - _generate_sln ( m_slnFile ); + if ( configuration.VSProjectVersion == "6.00" ) + _generate_wine_dsw ( m_slnFile ); + else + _generate_sln ( m_slnFile ); + fclose ( m_slnFile ); printf ( "Done.\n" ); }

18 years, 12 months

[cwittich] 18637: simplify MSVCBackend::Process code

by cwittich＠svn.reactos.com

simplify MSVCBackend::Process code 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-10-20 16:04:35 UTC (rev 18636) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 16:13:20 UTC (rev 18637) @@ -54,39 +54,20 @@ void MSVCBackend::Process() { - string filename_dsw = ProjectNode.name + ".dsw"; string filename_sln = ProjectNode.name + ".sln"; - - if (configuration.VSProjectVersion == "6.00") - printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str() ); - else - printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); + printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); ProcessModules(); + m_slnFile = fopen ( filename_sln.c_str(), "wb" ); - if (configuration.VSProjectVersion == "6.00") { - m_dswFile = fopen ( filename_dsw.c_str(), "wb" ); - - if ( !m_dswFile ) - { - printf ( "Could not create file '%s'.\n", filename_dsw.c_str() ); - return; - } - _generate_wine_dsw ( m_dswFile ); - fclose ( m_dswFile ); + if ( !m_slnFile ) + { + printf ( "Could not create file '%s'.\n", filename_sln.c_str() ); + return; } - else { - m_slnFile = fopen ( filename_sln.c_str(), "wb" ); - - if ( !m_slnFile ) - { - printf ( "Could not create file '%s'.\n", filename_sln.c_str() ); - return; - } - _generate_sln ( m_slnFile ); - fclose ( m_slnFile ); - } + _generate_sln ( m_slnFile ); + fclose ( m_slnFile ); printf ( "Done.\n" ); }

18 years, 12 months

[hpoussin] 18636: Revert r18628, as we don't have any RTL8139 driver in ReactOS repository

by hpoussin＠svn.reactos.com

Revert r18628, as we don't have any RTL8139 driver in ReactOS repository Modified: trunk/reactos/media/inf/inf.xml Added: trunk/reactos/media/inf/netamd.inf Deleted: trunk/reactos/media/inf/netrtsnt.inf _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-10-20 15:50:02 UTC (rev 18635) +++ trunk/reactos/media/inf/inf.xml 2005-10-20 16:04:35 UTC (rev 18636) @@ -1,12 +1,13 @@ <group> <installfile base="inf">acpi.inf</installfile> <installfile base="inf">cdrom.inf</installfile> +<installfile base="inf">hdc.inf</installfile> <installfile base="inf">layout.inf</installfile> <installfile base="inf">machine.inf</installfile> <installfile base="inf">mouse.inf</installfile> <installfile base="inf">NET_NIC.inf</installfile> +<installfile base="inf">netamd.inf</installfile> <installfile base="inf">netisa.inf</installfile> -<installfile base="inf">netrtsnt.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> <installfile base="inf">syssetup.inf</installfile> _____ Copied: trunk/reactos/media/inf/netamd.inf (from rev 18627, trunk/reactos/media/inf/netamd.inf) _____ Deleted: trunk/reactos/media/inf/netrtsnt.inf --- trunk/reactos/media/inf/netrtsnt.inf 2005-10-20 15:50:02 UTC (rev 18635) +++ trunk/reactos/media/inf/netrtsnt.inf 2005-10-20 16:04:35 UTC (rev 18636) @@ -1,105 +0,0 @@ -; NETRTSNT.INF - -; Installation file for PCI network cards RTL8139 compatibles - -[Version] -Signature = "$Windows NT$" -;Signature = "$ReactOS$" -LayoutFile = layout.inf -Class = Net -ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} -Provider = %ReactOS% -DriverVer = 10/08/2005,1.00 - -[DestinationDirs] -DefaultDestDir = 12 - -[Manufacturer] -%AbocomMfg% = AbocomMfg -%AddtronMfg% = AddtronMfg -%AMDMfg% = AMDMfg -%CompaqMfg% = CompaqMfg -%DLinkMfg% = DLinkMfg -%PepperconMfg% = PepperconMfg -%RealtekMfg% = RealtekMfg - -[AbocomMfg] -%PCI\VEN_13D1&DEV_AB06.DeviceDesc% = PCNet_Inst,PCI\VEN_13D1&DEV_AB06 - -[AddtronMfg] -%PCI\VEN_4033&DEV_1360.DeviceDesc% = PCNet_Inst,PCI\VEN_4033&DEV_1360 - -[AMDMfg] -%PCI\VEN_1022&DEV_2000.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 - -[CompaqMfg] -%PCI\VEN_021B&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_021B&DEV_8139 - -[DLinkMfg] -%PCI\VEN_1186&DEV_1300.DeviceDesc% = PCNet_Inst,PCI\VEN_1186&DEV_1300 - -[PepperconMfg] -%PCI\VEN_1743&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_1743&DEV_8139 - -[RealtekMfg] -%PCI\VEN_10EC&DEV_8138.DeviceDesc% = PCNet_Inst,PCI\VEN_10EC&DEV_8138 -%PCI\VEN_10EC&DEV_8139.DeviceDesc% = PCNet_Inst,PCI\VEN_10EC&DEV_8139 - -;----------------------------- PCNET DRIVER ----------------------------- - -[PCNet_Inst.NT] -AddReg = PCNet_AddReg.NT -CopyFiles = PCNet_CopyFiles.NT - -[PCNet_AddReg.NT] -HKR,,BUS_TO_SCAN,,"ALL" -HKR,,BUSTIMER,,"0" -HKR,,BUSTYPE,,"5" -HKR,,EXTPHY,,"0" -HKR,,FDUP,,"0" -HKR,,LED0,,"10000" -HKR,,LED1,,"10000" -HKR,,LED2,,"10000" -HKR,,LED3,,"10000" -HKR,,MPMODE,,"0" -HKR,,TP,,"1" - -[PCNet_CopyFiles.NT] -pcnet.sys - -[PCNet_Inst.NT.Services] -AddService = PCNet, 0x00000002, PCNet_Service_Inst - -[PCNet_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 0 -ServiceBinary = %12%\pcnet.sys -LoadOrderGroup = NDIS - -;-------------------------------- STRINGS ------------------------------- - -[Strings] -ReactOS = "ReactOS Team" - -AbocomMfg = "Abocom Systems Inc" -PCI\VEN_13D1&DEV_AB06.DeviceDesc = "RTL8139 [FE2000VX] CardBus Fast Ethernet Attached Port Adapter" - -AddtronMfg = "Addtron Technology Co, Inc." -PCI\VEN_4033&DEV_1360.DeviceDesc = "RTL8139 Ethernet" - -AMDMfg = "Advanced Micro Devices (AMD)" -PCI\VEN_1022&DEV_2000.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]" - -CompaqMfg = "Compaq Computer Corporation" -PCI\VEN_021B&DEV_8139.DeviceDesc = "HNE-300 (RealTek RTL8139c) [iPaq Networking]" - -DLinkMfg = "D-Link System Inc" -PCI\VEN_1186&DEV_1300.DeviceDesc = "RTL8139 Ethernet" - -PepperconMfg = "Peppercon AG" -PCI\VEN_1743&DEV_8139.DeviceDesc = "ROL/F-100 Fast Ethernet Adapter with ROL" - -RealtekMfg = "Realtek Semiconductor Co., Ltd." -PCI\VEN_10EC&DEV_8138.DeviceDesc = "RT8139 (B/C) Cardbus Fast Ethernet Adapter" -PCI\VEN_10EC&DEV_8139.DeviceDesc = "RTL-8139/8139C/8139C+"

18 years, 12 months

[weiden] 18635: use the ansi entry point by default

by weiden＠svn.reactos.com

use the ansi entry point by default Modified: trunk/reactos/tools/rbuild/module.cpp _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-10-20 15:28:35 UTC (rev 18634) +++ trunk/reactos/tools/rbuild/module.cpp 2005-10-20 15:50:02 UTC (rev 18635) @@ -264,6 +264,8 @@ att->value ); } } + else + isUnicode = false; att = moduleNode.GetAttribute ( "entrypoint", false ); if ( att != NULL )

18 years, 12 months

[cwittich] 18634: fix compile problems with msvc6

by cwittich＠svn.reactos.com

fix compile problems with msvc6 Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/ssprintf.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-10-20 15:17:38 UTC (rev 18633) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-10-20 15:28:35 UTC (rev 18634) @@ -17,7 +17,7 @@ */ #include "pch.h" -#ifdef _MSC_VER +#ifndef MAX_PATH #define MAX_PATH _MAX_PATH #endif _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-10-20 15:17:38 UTC (rev 18633) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-10-20 15:28:35 UTC (rev 18634) @@ -317,7 +317,7 @@ else if ( frac < -0.5 ) e--; - result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type); + result = numberf(f,__n/pow(10.0L,(long double)e),'f',size-4, precision, type); if (result < 0) return false; f += exp_sign; @@ -510,7 +510,7 @@ else if ( frac < -0.5 ) e--; - result = wnumberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type); + result = wnumberf(f,__n/pow(10.0L,(long double) e),L'f',size-4, precision, type); if (result < 0) return false; f += exp_sign;

18 years, 12 months

[weiden] 18633: add a 'unicode' property to modules (not yet supported by mingw, need to add a library for unicode builds some day)

by weiden＠svn.reactos.com

add a 'unicode' property to modules (not yet supported by mingw, need to add a library for unicode builds some day) Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-10-20 15:04:55 UTC (rev 18632) +++ trunk/reactos/tools/rbuild/module.cpp 2005-10-20 15:17:38 UTC (rev 18633) @@ -248,6 +248,23 @@ else extension = GetDefaultModuleExtension (); + att = moduleNode.GetAttribute ( "unicode", false ); + if ( att != NULL ) + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + isUnicode = true; + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + isUnicode = false; + else + { + throw InvalidAttributeValueException ( + moduleNode.location, + "unicode", + att->value ); + } + } + att = moduleNode.GetAttribute ( "entrypoint", false ); if ( att != NULL ) entrypoint = att->value; @@ -680,9 +697,15 @@ return "_DllMain@12"; case Win32CUI: case Test: - return "_mainCRTStartup"; + if ( isUnicode ) + return "_wmainCRTStartup"; + else + return "_mainCRTStartup"; case Win32GUI: - return "_WinMainCRTStartup"; + if ( isUnicode ) + return "_wWinMainCRTStartup"; + else + return "_WinMainCRTStartup"; case KernelModeDriver: return "_DriverEntry@8"; case BuildTool: _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 15:04:55 UTC (rev 18632) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 15:17:38 UTC (rev 18633) @@ -222,6 +222,7 @@ ModuleType type; ImportLibrary* importLibrary; bool mangledSymbols; + bool isUnicode; Bootstrap* bootstrap; IfableData non_if_data; std::vector<Invoke*> invocations;

18 years, 12 months

[cwittich] 18632: add targets for creating MSVC project files to Makefile

by cwittich＠svn.reactos.com

add targets for creating MSVC project files to Makefile fix bug in msvc backend: VS.NET project files are not destroyed anymore when creating VC6 project files Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-10-20 14:27:02 UTC (rev 18631) +++ trunk/reactos/Makefile 2005-10-20 15:04:55 UTC (rev 18632) @@ -321,6 +321,26 @@ $(ECHO_WMC) $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) +.PHONY: msvc6 +msvc6: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc + +.PHONY: msvc7 +msvc7: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc + +.PHONY: msvc71 +msvc71: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc + +.PHONY: msvc8 +msvc8: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc + .PHONY: makefile_auto_clean makefile_auto_clean: -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 14:27:02 UTC (rev 18631) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 15:04:55 UTC (rev 18632) @@ -53,35 +53,40 @@ void MSVCBackend::Process() { + string filename_dsw = ProjectNode.name + ".dsw"; string filename_sln = ProjectNode.name + ".sln"; + + if (configuration.VSProjectVersion == "6.00") + printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str() ); + else + printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); - printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str() ); - printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); - ProcessModules(); - m_dswFile = fopen ( filename_dsw.c_str(), "wb" ); - m_slnFile = fopen ( filename_sln.c_str(), "wb" ); + if (configuration.VSProjectVersion == "6.00") { + m_dswFile = fopen ( filename_dsw.c_str(), "wb" ); - if ( !m_dswFile ) - { - printf ( "Could not create file '%s'.\n", filename_dsw.c_str() ); - return; + if ( !m_dswFile ) + { + printf ( "Could not create file '%s'.\n", filename_dsw.c_str() ); + return; + } + _generate_wine_dsw ( m_dswFile ); + fclose ( m_dswFile ); } - _generate_wine_dsw ( m_dswFile ); - - - if ( !m_slnFile ) - { - printf ( "Could not create file '%s'.\n", filename_sln.c_str() ); - return; + else { + m_slnFile = fopen ( filename_sln.c_str(), "wb" ); + + if ( !m_slnFile ) + { + printf ( "Could not create file '%s'.\n", filename_sln.c_str() ); + return; + } + _generate_sln ( m_slnFile ); + fclose ( m_slnFile ); } - _generate_sln ( m_slnFile ); - fclose ( m_dswFile ); - fclose ( m_slnFile ); - printf ( "Done.\n" ); }

18 years, 12 months

[cwittich] 18631: create only the project files specified on cmdline

by cwittich＠svn.reactos.com

create only the project files specified on cmdline Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 14:10:23 UTC (rev 18630) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 14:27:02 UTC (rev 18631) @@ -92,10 +92,13 @@ Module &module = *ProjectNode.modules[i]; module.guid = _gen_guid(); - this->_generate_dsp ( module ); - this->_generate_vcproj ( module ); + if (configuration.VSProjectVersion == "6.00") + this->_generate_dsp ( module ); + else + this->_generate_vcproj ( module ); + /*for(size_t k = 0; k < module.non_if_data.files.size(); k++) { File &file = *module.non_if_data.files[k]; _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 14:10:23 UTC (rev 18630) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 14:27:02 UTC (rev 18631) @@ -419,13 +419,13 @@ string version; if (configuration.VSProjectVersion == "7.00") - version = "7.00"; + version = "7.00"; if (configuration.VSProjectVersion == "7.10") - version = "8.00"; + version = "8.00"; if (configuration.VSProjectVersion == "8.00") - version = "9.00"; + version = "9.00"; fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", version.c_str() ); fprintf ( OUT, "# Visual Studio 2005\r\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-20 14:10:23 UTC (rev 18630) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-20 14:27:02 UTC (rev 18631) @@ -189,8 +189,7 @@ if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); - printf ( " rbuild [switches] buildsystem\n" ); - printf ( " rbuild msvc\n" ); + printf ( " rbuild [switches] buildsystem\n\n" ); printf ( "Switches:\n" ); printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" );

18 years, 12 months

[royce] 18630: msvc6+psdk fix

by royce＠svn.reactos.com

msvc6+psdk fix Modified: trunk/reactos/tools/rbuild/pch.h _____ Modified: trunk/reactos/tools/rbuild/pch.h --- trunk/reactos/tools/rbuild/pch.h 2005-10-20 14:05:27 UTC (rev 18629) +++ trunk/reactos/tools/rbuild/pch.h 2005-10-20 14:10:23 UTC (rev 18630) @@ -27,11 +27,15 @@ #include <map> #include <set> +#ifdef WIN32 +#include <windows.h> +#ifndef MAX_PATH +#define MAX_PATH _MAX_PATH +#endif//MAX_PATH +#endif//WIN32 + #include <stdarg.h> -#ifdef _MSC_VER -#define MAX_PATH _MAX_PATH -#endif #ifndef WIN32 #include <string.h>

18 years, 12 months

← Newer
1
...
26
27
28
29
30
31
32
...
74
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 October 2005