Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[royce] 18629: msvc6+PSDK fixes
by royce＠svn.reactos.com 20 Oct '05

20 Oct '05

msvc6+PSDK fixes Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-20 14:02:38 UTC (rev 18628) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-20 14:05:27 UTC (rev 18629) @@ -31,6 +31,10 @@ using std::string; using std::vector; +#ifdef OUT +#undef OUT +#endif//OUT + void MSVCBackend::_generate_dsp ( const Module& module ) { _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 14:02:38 UTC (rev 18628) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 14:05:27 UTC (rev 18629) @@ -31,6 +31,10 @@ using std::string; using std::vector; +#ifdef OUT +#undef OUT +#endif//OUT + void MSVCBackend::_generate_vcproj ( const Module& module ) {

1 0

[hpoussin] 18628: Add more RTL8139 compatible cards.
by hpoussin＠svn.reactos.com 20 Oct '05

20 Oct '05

Add more RTL8139 compatible cards. Modified: trunk/reactos/media/inf/inf.xml Deleted: trunk/reactos/media/inf/netamd.inf Added: trunk/reactos/media/inf/netrtsnt.inf _____ Modified: trunk/reactos/media/inf/inf.xml --- trunk/reactos/media/inf/inf.xml 2005-10-20 13:59:37 UTC (rev 18627) +++ trunk/reactos/media/inf/inf.xml 2005-10-20 14:02:38 UTC (rev 18628) @@ -5,8 +5,8 @@ <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> _____ Deleted: trunk/reactos/media/inf/netamd.inf --- trunk/reactos/media/inf/netamd.inf 2005-10-20 13:59:37 UTC (rev 18627) +++ trunk/reactos/media/inf/netamd.inf 2005-10-20 14:02:38 UTC (rev 18628) @@ -1,61 +0,0 @@ -; NETAMD.INF - -; Installation file for PCI network cards with VendorID=1022 (AMD) - -[Version] -Signature = "$Windows NT$" -;Signature = "$ReactOS$" -LayoutFile = layout.inf -Class = Net -ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} -Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 - -[DestinationDirs] -DefaultDestDir = 12 - -[Manufacturer] -%AMDMfg% = AMDMfg - -[AMDMfg] -%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 - -;----------------------------- 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" - -AMDMfg = "Advanced Micro Devices (AMD)" -PCNET.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]" _____ Added: trunk/reactos/media/inf/netrtsnt.inf --- trunk/reactos/media/inf/netrtsnt.inf 2005-10-20 13:59:37 UTC (rev 18627) +++ trunk/reactos/media/inf/netrtsnt.inf 2005-10-20 14:02:38 UTC (rev 18628) @@ -0,0 +1,105 @@ +; 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+"

1 0

[royce] 18627: fix msvc6 template warning
by royce＠svn.reactos.com 20 Oct '05

20 Oct '05

fix msvc6 template warning fix writing to uninitialized pointer Modified: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp --- trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-10-20 12:42:09 UTC (rev 18626) +++ trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-10-20 13:59:37 UTC (rev 18627) @@ -20,7 +20,7 @@ * */ - +#include "../../pch.h" #include "msvc.h" #include <string> @@ -45,7 +45,7 @@ GUID m_guid; HRESULT result; bool good_guid = false; - char* guid; + static char guid[38]; // Load ole32. We will need it later on HMODULE olelib = LoadLibrary ( "ole32.dll" );

1 0

[cwittich] 18626: create more correct solution files for different versions of MS Visual Studio
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

create more correct solution files for different versions of MS Visual Studio Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 11:46:56 UTC (rev 18625) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 12:42:09 UTC (rev 18626) @@ -441,8 +441,14 @@ vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); - fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); - fprintf ( OUT, "\tEndProjectSection\r\n" ); + + //FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies + //NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead + if (configuration.VSProjectVersion == "7.10") { + fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); + fprintf ( OUT, "\tEndProjectSection\r\n" ); + } + fprintf ( OUT, "EndProject\r\n" ); } @@ -467,10 +473,21 @@ fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" ); - fprintf ( OUT, "EndGlobal\r\n" ); + + if (configuration.VSProjectVersion == "7.00") { + fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" ); + fprintf ( OUT, "\tEndGlobalSection\r\n" ); + } - fprintf ( OUT, "\r\n" ); + if (configuration.VSProjectVersion == "8.00") { + fprintf ( OUT, "\tGlobalSection(SolutionProperties) = preSolution\r\n" ); + fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" ); + fprintf ( OUT, "\tEndGlobalSection\r\n" ); + } + + fprintf ( OUT, "EndGlobal\r\n" ); + fprintf ( OUT, "\r\n" ); }

1 0

[cwittich] 18625: forgot to commit rbuild.h
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

forgot to commit rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 11:21:23 UTC (rev 18624) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 11:46:56 UTC (rev 18625) @@ -214,6 +214,7 @@ const XMLElement& node; std::string xmlbuildFile; std::string name; + std::string guid; std::string extension; std::string entrypoint; std::string baseaddress;

1 0

[cwittich] 18624: fix vcprojmaker to add the correct GUIDs
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

fix vcprojmaker to add the correct GUIDs implemented Debug/Release configurations to make Alex happy Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 09:43:49 UTC (rev 18623) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-10-20 11:21:23 UTC (rev 18624) @@ -31,8 +31,6 @@ using namespace std; -void gen_guid(); - static class MSVCFactory : public Backend::Factory { public: @@ -93,10 +91,11 @@ { Module &module = *ProjectNode.modules[i]; + module.guid = _gen_guid(); this->_generate_dsp ( module ); this->_generate_vcproj ( module ); -// gen_guid(); + /*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/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 09:43:49 UTC (rev 18623) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 11:21:23 UTC (rev 18624) @@ -86,7 +86,7 @@ const std::string &replace_str); void _generate_vcproj ( const Module& module ); - + void _generate_sln_header ( FILE* OUT ); void _generate_sln_footer ( FILE* OUT ); void _generate_sln ( FILE* OUT ); @@ -97,6 +97,9 @@ std::string sln_guid, std::string vcproj_guid, const std::vector<Dependency*>& dependencies ); + void _generate_sln_configurations ( + FILE* OUT, + std::string vcproj_guid ); }; _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 09:43:49 UTC (rev 18623) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 11:21:23 UTC (rev 18624) @@ -140,7 +140,8 @@ std::vector<std::string> cfgs; - cfgs.push_back ( module.name + " - Win32" ); + cfgs.push_back ( "Debug" ); + cfgs.push_back ( "Release" ); if (!no_cpp) { @@ -177,6 +178,7 @@ fprintf ( OUT, "\tVersion=\"%s\"\r\n", configuration.VSProjectVersion.c_str() ); fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); + fprintf ( OUT, "\tProjectGUID=\"%s\"\r\n", module.guid.c_str() ); fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); fprintf ( OUT, "\t<Platforms>\r\n" ); @@ -436,12 +438,11 @@ std::string vcproj_guid, const std::vector<Dependency*>& dependencies ) { - - vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); + vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); - fprintf ( OUT, " ProjectSection(ProjectDependencies) = postProject\r\n" ); - fprintf ( OUT, " EndProjectSection\r\n" ); + fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); + fprintf ( OUT, "\tEndProjectSection\r\n" ); fprintf ( OUT, "EndProject\r\n" ); } @@ -449,17 +450,23 @@ void MSVCBackend::_generate_sln_footer ( FILE* OUT ) { - fprintf ( OUT, "Global\r\n" ); - - fprintf ( OUT, " GlobalSection(SolutionConfiguration) = preSolution\r\n" ); - fprintf ( OUT, " Debug = Debug\r\n" ); - fprintf ( OUT, " Release = Release\r\n" ); - fprintf ( OUT, " EndGlobalSection\r\n" ); - - fprintf ( OUT, " GlobalSection(ExtensibilityGlobals) = postSolution\r\n" ); - fprintf ( OUT, " EndGlobalSection\r\n" ); - fprintf ( OUT, " GlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); - fprintf ( OUT, " EndGlobalSection\r\n" ); + fprintf ( OUT, "Global\r\n" ); + fprintf ( OUT, "\tGlobalSection(SolutionConfiguration) = preSolution\r\n" ); + fprintf ( OUT, "\t\tDebug = Debug\r\n" ); + fprintf ( OUT, "\t\tRelease = Release\r\n" ); + fprintf ( OUT, "\tEndGlobalSection\r\n" ); + fprintf ( OUT, "\tGlobalSection(ProjectConfiguration) = postSolution\r\n" ); + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + std::string guid = module.guid; + _generate_sln_configurations ( OUT, guid.c_str() ); + } + fprintf ( OUT, "\tEndGlobalSection\r\n" ); + fprintf ( OUT, "\tGlobalSection(ExtensibilityGlobals) = postSolution\r\n" ); + fprintf ( OUT, "\tEndGlobalSection\r\n" ); + fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); + fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "EndGlobal\r\n" ); @@ -468,20 +475,29 @@ void +MSVCBackend::_generate_sln_configurations ( FILE* OUT, std::string vcproj_guid ) +{ + fprintf ( OUT, "\t\t%s.Debug.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Debug.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Debug.Release.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() ); + fprintf ( OUT, "\t\t%s.Debug.Release.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() ); +} + +void MSVCBackend::_generate_sln ( FILE* OUT ) { string sln_guid = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; + vector<string> guids; _generate_sln_header(OUT); // TODO FIXME - is it necessary to sort them? for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - + std::string vcproj_file = VcprojFileName ( module ); - std::string vcproj_guid = _gen_guid(); - _generate_sln_project ( OUT, module, vcproj_file, sln_guid, vcproj_guid, module.dependencies ); - } - _generate_sln_footer ( OUT ); + _generate_sln_project ( OUT, module, vcproj_file, sln_guid, module.guid, module.dependencies ); + } + _generate_sln_footer ( OUT ); }

1 0

[cwittich] 18623: fix creation of shlwapi vcproject file
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

fix creation of shlwapi vcproject file Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 08:46:55 UTC (rev 18622) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 09:43:49 UTC (rev 18623) @@ -80,8 +80,13 @@ // functions in vcprojmaker.cpp: std::string _gen_guid(); + std::string _replace_str( + std::string string1, + const std::string &find_str, + const std::string &replace_str); + void _generate_vcproj ( const Module& module ); - + void _generate_sln_header ( FILE* OUT ); void _generate_sln_footer ( FILE* OUT ); void _generate_sln ( FILE* OUT ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 08:46:55 UTC (rev 18622) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 09:43:49 UTC (rev 18623) @@ -255,6 +255,8 @@ { if ( i > 0 ) fprintf ( OUT, ";" ); + + defines[i] = _replace_str(defines[i], "\"","""); fprintf ( OUT, "%s", defines[i].c_str() ); } fprintf ( OUT, "\"\r\n" ); @@ -387,6 +389,21 @@ fclose(OUT); } +std::string +MSVCBackend::_replace_str(std::string string1, const std::string &find_str, const std::string &replace_str) +{ + std::string::size_type pos = string1.find(find_str, 0); + int intLen = find_str.length(); + + while(std::string::npos != pos) + { + string1.replace(pos, intLen, replace_str); + pos = string1.find(find_str, intLen + pos); + } + + return string1; +} + void MSVCBackend::_generate_sln_header ( FILE* OUT ) {

1 0

[cwittich] 18622: fix for creating *.sln file
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

fix for creating *.sln file Modified: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp --- trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-10-20 06:40:58 UTC (rev 18621) +++ trunk/reactos/tools/rbuild/backend/msvc/genguid.cpp 2005-10-20 08:46:55 UTC (rev 18622) @@ -20,6 +20,12 @@ * */ + +#include "msvc.h" +#include <string> + +using std::string; + #ifdef _WIN32 #include <objbase.h> #include <stdio.h> @@ -32,12 +38,15 @@ static CoUninitializeFunc *pCoUninitialize = NULL; static CoCreateGuidFunc *pCoCreateGuid = NULL; -void gen_guid() + +std::string +MSVCBackend::_gen_guid() { GUID m_guid; HRESULT result; bool good_guid = false; - + char* guid; + // Load ole32. We will need it later on HMODULE olelib = LoadLibrary ( "ole32.dll" ); if ( olelib != NULL ) @@ -67,16 +76,20 @@ { // TODO FIXME - fall-back to random #'s } - const char* 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], + const char* strfmt = "%08lX-%04X-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X"; + sprintf(guid, 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]); + + return guid; } -#else /* Linux, etc */ -void gen_guid() +#else /* Linux, etc */ + +std::string +MSVCBackend::_gen_guid() { } #endif /* WIN32/Linux */ _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 06:40:58 UTC (rev 18621) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-10-20 08:46:55 UTC (rev 18622) @@ -78,10 +78,21 @@ void _generate_wine_dsw ( FILE* OUT ); // functions in vcprojmaker.cpp: + + std::string _gen_guid(); void _generate_vcproj ( const Module& module ); void _generate_sln_header ( FILE* OUT ); + void _generate_sln_footer ( FILE* OUT ); void _generate_sln ( FILE* OUT ); + void _generate_sln_project ( + FILE* OUT, + const Module& module, + std::string dsp_file, + std::string sln_guid, + std::string vcproj_guid, + const std::vector<Dependency*>& dependencies ); + }; #endif // __MSVC_H__ _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 06:40:58 UTC (rev 18621) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 08:46:55 UTC (rev 18622) @@ -409,9 +409,52 @@ fprintf ( OUT, "\r\n" ); } + void +MSVCBackend::_generate_sln_project ( + FILE* OUT, + const Module& module, + std::string vcproj_file, + std::string sln_guid, + std::string vcproj_guid, + const std::vector<Dependency*>& dependencies ) +{ + + vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); + + fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); + fprintf ( OUT, " ProjectSection(ProjectDependencies) = postProject\r\n" ); + fprintf ( OUT, " EndProjectSection\r\n" ); + fprintf ( OUT, "EndProject\r\n" ); +} + + +void +MSVCBackend::_generate_sln_footer ( FILE* OUT ) +{ + fprintf ( OUT, "Global\r\n" ); + + fprintf ( OUT, " GlobalSection(SolutionConfiguration) = preSolution\r\n" ); + fprintf ( OUT, " Debug = Debug\r\n" ); + fprintf ( OUT, " Release = Release\r\n" ); + fprintf ( OUT, " EndGlobalSection\r\n" ); + + fprintf ( OUT, " GlobalSection(ExtensibilityGlobals) = postSolution\r\n" ); + fprintf ( OUT, " EndGlobalSection\r\n" ); + fprintf ( OUT, " GlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); + fprintf ( OUT, " EndGlobalSection\r\n" ); + fprintf ( OUT, "EndGlobal\r\n" ); + + + fprintf ( OUT, "\r\n" ); +} + + +void MSVCBackend::_generate_sln ( FILE* OUT ) { + string sln_guid = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; + _generate_sln_header(OUT); // TODO FIXME - is it necessary to sort them? for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) @@ -419,31 +462,9 @@ Module& module = *ProjectNode.modules[i]; std::string vcproj_file = VcprojFileName ( module ); - _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies ); + std::string vcproj_guid = _gen_guid(); + _generate_sln_project ( OUT, module, vcproj_file, sln_guid, vcproj_guid, module.dependencies ); } -// _generate_dsw_footer ( OUT ); + _generate_sln_footer ( OUT ); } - - -/* - m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl; - m_devFile << "# Visual Studio 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; - - m_devFile << endl << endl; -*/

1 0

[cwittich] 18621: added new cmdline switch to rbuild: -vs{version}
by cwittich＠svn.reactos.com 20 Oct '05

20 Oct '05

added new cmdline switch to rbuild: -vs{version} to select the version of MS VS project files to generate default is now 7.10 (VS 2003) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 01:24:49 UTC (rev 18620) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-20 06:40:58 UTC (rev 18621) @@ -171,7 +171,11 @@ fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" ); fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" ); - fprintf ( OUT, "\tVersion=\"7.00\"\r\n" ); + + if (configuration.VSProjectVersion.empty()) + configuration.VSProjectVersion = MS_VS_DEF_VERSION; + + fprintf ( OUT, "\tVersion=\"%s\"\r\n", configuration.VSProjectVersion.c_str() ); fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); @@ -386,8 +390,22 @@ void MSVCBackend::_generate_sln_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version 9.00\r\n" ); - fprintf ( OUT, "# Visual C++ Express 2005\r\n" ); + if (configuration.VSProjectVersion.empty()) + configuration.VSProjectVersion = MS_VS_DEF_VERSION; + + string version; + + if (configuration.VSProjectVersion == "7.00") + version = "7.00"; + + if (configuration.VSProjectVersion == "7.10") + version = "8.00"; + + if (configuration.VSProjectVersion == "8.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" ); fprintf ( OUT, "\r\n" ); } @@ -410,7 +428,7 @@ /* m_devFile << "Microsoft Visual Studio Solution File, Format Version 9.00" << endl; - m_devFile << "# Visual C++ Express 2005" << endl; + m_devFile << "# Visual Studio 2005" << endl; m_devFile << "# FIXME Project listings here" << endl; m_devFile << "EndProject" << endl; _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-20 01:24:49 UTC (rev 18620) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-20 06:40:58 UTC (rev 18621) @@ -61,7 +61,42 @@ return true; } + bool +ParseVCProjectSwitch ( char switchChar2, + char* switchStart ) +{ + switch ( switchChar2 ) + { + case 's': + if ( strlen ( switchStart ) <= 3 ) + { + printf ( "Switch -dm requires a module name\n" ); + return false; + } + configuration.VSProjectVersion = string(&switchStart[3]); + + if (configuration.VSProjectVersion.at(0) == '{') { + printf ( "Error: invalid char {\n" ); + return false; + } + + if (configuration.VSProjectVersion.length() == 1) //7,8 + configuration.VSProjectVersion.append(".00"); + + if (configuration.VSProjectVersion.length() == 3) //7.1 + configuration.VSProjectVersion.append("0"); + + break; + default: + printf ( "Unknown switch -d%c\n", + switchChar2 ); + return false; + } + return true; +} + +bool ParseMakeSwitch ( char switchChar2 ) { switch ( switchChar2 ) @@ -101,7 +136,11 @@ switch ( switchChar ) { case 'v': - configuration.Verbose = true; + if (switchChar2 == 's') + return ParseVCProjectSwitch ( switchChar2, + argv[index] ); + else + configuration.Verbose = true; break; case 'c': configuration.CleanAsYouGo = true; @@ -163,11 +202,12 @@ printf ( " not generate the directories.\n" ); printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); printf ( " tree.\n" ); + printf ( " -vs{version} Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); - printf ( " devcpp DevC++\n\n" ); - printf ( " msvc Generates dsp files for MSVC" ); + printf ( " devcpp DevC++\n" ); + printf ( " msvc MS Visual Studio\n" ); return 1; } try _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 01:24:49 UTC (rev 18620) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-10-20 06:40:58 UTC (rev 18621) @@ -57,6 +57,8 @@ #define SBAD_SEP "\\" #endif +#define MS_VS_DEF_VERSION "7.10" + class Project; class IfableData; class Module; @@ -95,6 +97,7 @@ bool AutomaticDependencies; bool CheckDependenciesForModuleOnly; std::string CheckDependenciesForModuleOnlyModule; + std::string VSProjectVersion; bool MakeHandlesInstallDirectories; bool GenerateProxyMakefilesInSourceTree; };

1 0

[jimtabor] 18620: Testing MPlayerC.exe, start implementing GetMenuBarInfo. It looks simple enough.
by jimtabor＠svn.reactos.com 20 Oct '05

20 Oct '05

Testing MPlayerC.exe, start implementing GetMenuBarInfo. It looks simple enough. Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-10-19 23:45:55 UTC (rev 18619) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-10-20 01:24:49 UTC (rev 18620) @@ -1630,6 +1630,26 @@ { UNIMPLEMENTED + switch (idObject) + { + case OBJID_CLIENT: + { + DPRINT1("OBJID_CLIENT, idItem = %d\n",idItem); + break; + } + case OBJID_MENU: + { + DPRINT1("OBJID_MENU, idItem = %d\n",idItem); + break; + } + case OBJID_SYSMENU: + { + DPRINT1("OBJID_SYSMENU, idItem = %d\n",idItem); + break; + } + default: + DPRINT1("Unknown idObject = %d, idItem = %d\n",idObject,idItem); + } return 0; }

1 0

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