Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 17827: started working on generation of msvc2kX project files. THESE ARE NOT CORRECT. Right now its just a copy of the existing msvc6 generation code. It will generate a *.sln and *.vcproj files however they are still in the old format.
by sedwards＠svn.reactos.com 13 Sep '05

13 Sep '05

started working on generation of msvc2kX project files. THESE ARE NOT CORRECT. Right now its just a copy of the existing msvc6 generation code. It will generate a *.sln and *.vcproj files however they are still in the old format. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Added: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-09-12 21:48:21 UTC (rev 17826) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2005-09-13 03:46:22 UTC (rev 17827) @@ -30,8 +30,6 @@ using namespace std; -char get_key(char *valid,char *prompt); //FIXME -bool spawn_new(const string& cmd); //FIXME void gen_guid(); static class MSVCFactory : public Backend::Factory @@ -56,59 +54,36 @@ void MSVCBackend::Process() { - //bool exec = false; - //const char rbuild_mingw[] = "output-i386\\tools\\rbuild\\rbuild.exe mingw"; - - string filename = ProjectNode.name + ".dsw"; + string filename_dsw = ProjectNode.name + ".dsw"; + string filename_sln = ProjectNode.name + ".sln"; - printf ( "Creating MSVC workspace: %s\n", filename.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.c_str(), "wb" ); + m_dswFile = fopen ( filename_dsw.c_str(), "wb" ); + m_slnFile = fopen ( filename_sln.c_str(), "wb" ); if ( !m_dswFile ) { - printf ( "Could not create file '%s'.\n", filename.c_str() ); + printf ( "Could not create file '%s'.\n", filename_dsw.c_str() ); return; } _generate_wine_dsw ( m_dswFile ); -#if 0 - 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; - m_devFile << endl << endl; -#endif + if ( !m_slnFile ) + { + printf ( "Could not create file '%s'.\n", filename_sln.c_str() ); + return; + } + _generate_sln ( m_slnFile ); + fclose ( m_dswFile ); + fclose ( m_slnFile ); - // The MSVC build still needs the mingw backend. - //ProcessModules(); - printf ( "Done.\n" ); - - /*cout << "Don't expect the MSVC backend to work yet. "<< endl << endl; - - if(get_key("yn","Would you like to configure for a Mingw build as well? (y/n)") == 'y') - { - exec = spawn_new(rbuild_mingw); - if (!exec) - printf("\nError invoking rbuild\n"); - }*/ } void MSVCBackend::ProcessModules() @@ -118,7 +93,8 @@ Module &module = *ProjectNode.modules[i]; this->_generate_dsp ( module ); - gen_guid(); + this->_generate_vcproj ( module ); +// gen_guid(); /*for(size_t k = 0; k < module.non_if_data.files.size(); k++) { @@ -222,39 +198,18 @@ #endif } - -char get_key(char *valid,char *prompt) +std::string +MSVCBackend::DspFileName ( const Module& module ) const { - int ch,okay; - - while (1) { - if (prompt) printf("%s ",prompt); - fflush(stdout); - while (ch = getchar(), ch == ' ' || ch == '\t'); - if (ch == EOF) exit(1); - if (!strchr(valid,okay = ch)) okay = 0; - while (ch = getchar(), ch != '\n' && ch != EOF); - if (ch == EOF) exit(1); - if (okay) return okay; - printf("Invalid input.\n"); - } + return DosSeparator( + ReplaceExtension ( module.GetPath(), ".dsp" ) + ); } -bool spawn_new( const string& cmd ) -{ - string command = ssprintf ( - "%s", - cmd.c_str (), - NUL, - NUL ); - int exitcode = system ( command.c_str () ); - return (exitcode == 0); -} - std::string -MSVCBackend::DspFileName ( const Module& module ) const +MSVCBackend::VcprojFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.GetPath(), ".dsp" ) + ReplaceExtension ( module.GetPath(), ".vcproj" ) ); } _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-09-12 21:48:21 UTC (rev 17826) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2005-09-13 03:46:22 UTC (rev 17827) @@ -54,6 +54,7 @@ void OutputFileUnits(); std::string DspFileName ( const Module& module ) const; + std::string VcprojFileName ( const Module& module ) const; std::vector<FileUnit> m_fileUnits; std::vector<std::string> m_folders; @@ -61,13 +62,12 @@ int m_unitCount; FILE* m_dswFile; + FILE* m_slnFile; // functions in msvcmaker.cpp: void _generate_dsp ( const Module& module ); - void _generate_dsw_header ( FILE* OUT ); - void _generate_dsw_project ( FILE* OUT, const Module& module, @@ -75,9 +75,14 @@ const std::vector<Dependency*>& dependencies ); void _generate_dsw_footer ( FILE* OUT ); + void _generate_wine_dsw ( FILE* OUT ); - void _generate_wine_dsw ( FILE* OUT ); + // functions in vcprojmaker.cpp: + void _generate_vcproj ( const Module& module ); + + void _generate_sln_header ( FILE* OUT ); + void _generate_sln ( FILE* OUT ); }; -#endif // __DEVCPP_H__ +#endif // __MSVC_H__ _____ Added: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-09-12 21:48:21 UTC (rev 17826) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-09-13 03:46:22 UTC (rev 17827) @@ -0,0 +1,856 @@ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <string> +#include <vector> + +#include <stdio.h> + +#include "msvc.h" + +using std::string; +using std::vector; + +void +MSVCBackend::_generate_vcproj ( const Module& module ) +{ + size_t i; + // TODO FIXME wine hack? + const bool wine = false; + + string vcproj_file = VcprojFileName(module); + printf ( "Creating MSVC2K5 project: '%s'\n", vcproj_file.c_str() ); + FILE* OUT = fopen ( vcproj_file.c_str(), "wb" ); + + vector<string> imports; + for ( i = 0; i < module.non_if_data.libraries.size(); i++ ) + { + imports.push_back ( module.non_if_data.libraries[i]->name ); + } + + string module_type = Right(module.GetTargetName(),3); + bool lib = (module_type == "lib"); + bool dll = (module_type == "dll"); + bool exe = (module_type == "exe"); + // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? + + bool console = exe; // FIXME: Not always correct + + // TODO FIXME - not sure if the count here is right... + int parts = 0; + const char* p = strpbrk ( vcproj_file.c_str(), "/\\" ); + while ( p ) + { + ++parts; + p = strpbrk ( p+1, "/\\" ); + } + string msvc_wine_dir = ".."; + while ( --parts ) + msvc_wine_dir += "\\.."; + + string wine_include_dir = msvc_wine_dir + "\\include"; + + //$progress_current++; + //$output->progress("$dsp_file (file $progress_current of $progress_max)"); + + // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? + string vcproj_path = module.GetBasePath(); + vector<string> c_srcs, source_files, resource_files, includes; + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + // TODO FIXME - refactor needed - we're discarding if conditions + for ( i = 0; i < data.ifs.size(); i++ ) + ifs_list.push_back ( &data.ifs[i]->data ); + const vector<File*>& files = data.files; + for ( i = 0; i < files.size(); i++ ) + { + // TODO FIXME - do we want the full path of the file here? + string file = string(".") + &files[i]->name[vcproj_path.size()]; + + source_files.push_back ( file ); + if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) + c_srcs.push_back ( file ); + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) + resource_files.push_back ( file ); + } + const vector<Include*>& incs = data.includes; + for ( i = 0; i < incs.size(); i++ ) + { + string path = Path::RelativeFromDirectory ( + incs[i]->directory, + module.GetBasePath() ); + includes.push_back ( path ); + } + } + // TODO FIXME - we don't include header files in our build system + //my @header_files = @{module->{header_files}}; + vector<string> header_files; + + // TODO FIXME - wine hack? + /*if (module.name !~ /^wine(?:_unicode|build|runtests|test)?$/ && + module.name !~ /^(?:gdi32)_.+?$/ && + Right ( module.name, 5 ) == "_test" ) + { + source_files.push_back ( module.name + ".spec" ); + @source_files = sort(@source_files); + }*/ + + bool no_cpp = true; + bool no_msvc_headers = true; + // TODO FIXME - wine hack? + /*if (module.name =~ /^wine(?:runtests|test)$/ + || Right ( module.name, 5 ) == "_test" ) + { + no_msvc_headers = false; + }*/ + + std::vector<std::string> cfgs; + + cfgs.push_back ( module.name + " - Win32" ); + + if (!no_cpp) + { + std::vector<std::string> _cfgs; + for ( i = 0; i < cfgs.size(); i++ ) + { + _cfgs.push_back ( cfgs[i] + " C" ); + _cfgs.push_back ( cfgs[i] + " C++" ); + } + cfgs.resize(0); + cfgs = _cfgs; + } + + // TODO FIXME - wine hack? + /*if (!no_release) + { + std::vector<std::string> _cfgs; + for ( i = 0; i < cfgs.size(); i++ ) + { + _cfgs.push_back ( cfgs[i] + " Debug" ); + _cfgs.push_back ( cfgs[i] + " Release" ); + } + cfgs.resize(0); + cfgs = _cfgs; + }*/ + + if (!no_msvc_headers) + { + std::vector<std::string> _cfgs; + for ( i = 0; i < cfgs.size(); i++ ) + { + _cfgs.push_back ( cfgs[i] + " MSVC Headers" ); + _cfgs.push_back ( cfgs[i] + " Wine Headers" ); + } + cfgs.resize(0); + cfgs = _cfgs; + } + + string default_cfg = cfgs.back(); + + fprintf ( OUT, "# Microsoft Developer Studio Project File - Name=\"%s\" - Package Owner=<4>\r\n", module.name.c_str() ); + fprintf ( OUT, "# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n" ); + fprintf ( OUT, "# ** DO NOT EDIT **\r\n" ); + fprintf ( OUT, "\r\n" ); + + if ( lib ) + { + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Static Library\" 0x0104\r\n" ); + } + else if ( dll ) + { + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Dynamic-Link Library\" 0x0102\r\n" ); + } + else + { + fprintf ( OUT, "# TARGTYPE \"Win32 (x86) Console Application\" 0x0103\r\n" ); + } + fprintf ( OUT, "\r\n" ); + + fprintf ( OUT, "CFG=%s\r\n", default_cfg.c_str() ); + fprintf ( OUT, "!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n" ); + fprintf ( OUT, "!MESSAGE use the Export Makefile command and run\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\".\r\n", module.name.c_str() ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE You can specify a configuration when running NMAKE\r\n" ); + fprintf ( OUT, "!MESSAGE by defining the macro CFG on the command line. For example:\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE NMAKE /f \"%s.mak\" CFG=\"%s\"\r\n", module.name.c_str(), default_cfg.c_str() ); + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "!MESSAGE Possible choices for configuration are:\r\n" ); + fprintf ( OUT, "!MESSAGE \r\n" ); + for ( i = 0; i < cfgs.size(); i++ ) + { + const string& cfg = cfgs[i]; + if ( lib ) + { + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Static Library\")\r\n", cfg.c_str() ); + } + else if ( dll ) + { + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Dynamic-Link Library\")\r\n", cfg.c_str() ); + } + else + { + fprintf ( OUT, "!MESSAGE \"%s\" (based on \"Win32 (x86) Console Application\")\r\n", cfg.c_str() ); + } + } + fprintf ( OUT, "!MESSAGE \r\n" ); + fprintf ( OUT, "\r\n" ); + + fprintf ( OUT, "# Begin Project\r\n" ); + fprintf ( OUT, "# PROP AllowPerConfigDependencies 0\r\n" ); + fprintf ( OUT, "# PROP Scc_ProjName \"\"\r\n" ); + fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" ); + fprintf ( OUT, "CPP=cl.exe\r\n" ); + if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" ); + fprintf ( OUT, "RSC=rc.exe\r\n" ); + + int n = 0; + + std::string output_dir; + for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) + { + std::string& cfg = cfgs[icfg]; + if ( icfg ) + { + if ( n == 0 ) + { + fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); + } + else + { + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); + } + } + + bool debug = !strstr ( cfg.c_str(), "Release" ); + bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); + + fprintf ( OUT, "# PROP BASE Use_MFC 0\r\n" ); + + if ( debug ) + { + fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 1\r\n" ); + } + else + { + fprintf ( OUT, "# PROP BASE Use_Debug_Libraries 0\r\n" ); + } + + output_dir = Replace(cfg,module.name + " - ",""); + output_dir = Replace(output_dir," ","_"); + output_dir = Replace(output_dir,"C++","Cxx"); + // TODO FIXME - wine hack? + //if ( output_prefix_dir.size() ) + // output_dir = output_prefix_dir + "\\" + output_dir; + + fprintf ( OUT, "# PROP BASE Output_Dir \"%s\"\r\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP BASE Intermediate_Dir \"%s\"\r\n", output_dir.c_str() ); + + fprintf ( OUT, "# PROP BASE Target_Dir \"\"\r\n" ); + + fprintf ( OUT, "# PROP Use_MFC 0\r\n" ); + if ( debug ) + { + fprintf ( OUT, "# PROP Use_Debug_Libraries 1\r\n" ); + } + else + { + fprintf ( OUT, "# PROP Use_Debug_Libraries 0\r\n" ); + } + fprintf ( OUT, "# PROP Output_Dir \"%s\"\r\n", output_dir.c_str() ); + fprintf ( OUT, "# PROP Intermediate_Dir \"%s\"\r\n", output_dir.c_str() ); + + if ( dll ) fprintf ( OUT, "# PROP Ignore_Export_Lib 0\r\n" ); + fprintf ( OUT, "# PROP Target_Dir \"\"\r\n" ); + + vector<string> defines; + defines.push_back ( "WINVER=0x0501" ); + defines.push_back ( "_WIN32_WINNT=0x0501" ); + defines.push_back ( "_WIN32_IE=0x0600" ); + defines.push_back ( "WIN32" ); + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "WIN32" ); + defines.push_back ( "_MBCS" ); + if ( debug ) + { + defines.push_back ( "_DEBUG" ); + if ( lib || exe ) + { + fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od" ); + defines.push_back ( "_LIB" ); + } + else + { + fprintf ( OUT, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" ); + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + // TODO FIXME - wine hack? + //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" ); + } + } + else + { + defines.push_back ( "NDEBUG" ); + if ( lib || exe ) + { + fprintf ( OUT, "# ADD BASE CPP /nologo /W3 /GX /O2" ); + defines.push_back ( "_LIB" ); + } + else + { + fprintf ( OUT, "# ADD BASE CPP /nologo /MT /W3 /GX /O2" ); + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + // TODO FIXME - wine hack? + //defines.push_back ( string("\U") + module.name + "\E_EXPORTS" ); + } + } + + for ( i = 0; i < defines.size(); i++ ) + { + fprintf ( OUT, " /D \"%s\"", defines[i].c_str() ); + } + if ( lib || exe ) fprintf ( OUT, " /YX" ); + fprintf ( OUT, " /FD" ); + if ( debug ) + { + fprintf ( OUT, " /GZ" ); + if ( lib || exe ) fprintf ( OUT, " " ); + } + fprintf ( OUT, " /c" ); + fprintf ( OUT, "\r\n" ); + + vector<string> defines2; + defines2.push_back ( "WINVER=0x0501" ); + defines2.push_back ( "_WIN32_WINNT=0x0501" ); + defines2.push_back ( "_WIN32_IE=0x0600" ); + defines2.push_back ( "WIN32" ); + defines2.push_back ( "_WINDOWS" ); + defines2.push_back ( "_MBCS" ); + if ( debug ) + { + defines2.push_back ( "_DEBUG" ); + if(lib) + { + fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" ); + defines2.push_back ( "_LIB" ); + } + else + { + fprintf ( OUT, "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od" ); + defines2.push_back ( "_USRDLL" ); + } + } + else + { + defines2.push_back ( "NDEBUG" ); + if(lib) + { + fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" ); + defines2.push_back ( "_LIB" ); + } + else + { + fprintf ( OUT, "# ADD CPP /nologo /MT /W3 /GX /O2" ); + defines2.push_back ( "_USRDLL" ); + } + } + + // TODO FIXME - wine hack? + if ( wine ) + { + // TODO FIXME - wine hack? + //defines2.push_back ( string("_\U") + module.name + "\E_" ); + // TODO FIXME - wine hack? + /*if ( module.name !~ /^(?:wine(?:build|test)|.*?_test)$/ ) + defines2.push_back ( "__WINESRC__" );*/ + if ( msvc_headers ) + defines2.push_back ( "__WINE_USE_NATIVE_HEADERS" ); + string output_dir2 = Replace(output_dir,"\\","\\\\"); + defines2.push_back ( ssprintf("__WINETEST_OUTPUT_DIR=\\\"%s\\\"",output_dir.c_str()) ); + defines2.push_back ( "__i386__" ); + defines2.push_back ( "_X86_" ); + + // TODO FIXME - wine hacks? + /*if(module.name =~ /^gdi32_(?:enhmfdrv|mfdrv)$/) { + push @includes, ".." ); + } + + if ( strstr ( module.name.c_str(), "_test" ) + { + include.push_back ( msvc_wine_dir + "\\" + output_dir ); + } + + if (!msvc_headers || module.name == "winetest") + { + includes.push_back ( wine_include_dir ); + }*/ + } + + //if ( wine ) + { + for ( i = 0; i < includes.size(); i++ ) + { + const string& include = includes[i]; + if ( strpbrk ( include.c_str(), "[\\\"]" ) ) + { + fprintf ( OUT, " /I \"%s\"", include.c_str() ); + } + else + { + fprintf ( OUT, " /I %s", include.c_str() ); + } + } + } + + fprintf ( OUT, " /I \".\"" ); + for ( i = 0; i < defines2.size(); i++ ) + { + const string& define = defines2[i]; + if ( strpbrk ( define.c_str(), "[\\\"]" ) ) + { + fprintf ( OUT, " /D \"%s\"", define.c_str() ); + } + else + { + fprintf ( OUT, " /D %s", define.c_str() ); + } + } + if ( wine ) fprintf ( OUT, " /D inline=__inline" ); + if ( 0 && wine ) fprintf ( OUT, " /D \"__STDC__\"" ); + + fprintf ( OUT, lib ? " /YX" : " /FR" ); + fprintf ( OUT, " /FD" ); + if ( debug ) fprintf ( OUT, " /GZ" ); + if ( debug && lib ) fprintf ( OUT, " " ); + fprintf ( OUT, " /c" ); + if ( !no_cpp ) fprintf ( OUT, " /TP" ); + fprintf ( OUT, "\r\n" ); + + if ( debug ) + { + if ( dll ) + { + fprintf ( OUT, "# SUBTRACT CPP /X /YX\r\n" ); + fprintf ( OUT, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" ); + fprintf ( OUT, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n" ); + } + fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" ); + fprintf ( OUT, "# ADD RSC /l 0x41d" ); + if ( wine ) + { + for ( i = 0; i < includes.size(); i++ ) + { + fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); + } + } + fprintf ( OUT, " /d \"_DEBUG\"\r\n" ); + } + else + { + if ( dll ) + { + fprintf ( OUT, "# SUBTRACT CPP /YX\r\n" ); + fprintf ( OUT, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" ); + fprintf ( OUT, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n" ); + } + fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"NDEBUG\"\r\n" ); + fprintf ( OUT, "# ADD RSC /l 0x41d" ); + if ( wine ) + { + for ( i = 0; i < includes.size(); i++ ) + fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); + } + fprintf ( OUT, "/d \"NDEBUG\"\r\n" ); + } + fprintf ( OUT, "BSC32=bscmake.exe\r\n" ); + fprintf ( OUT, "# ADD BASE BSC32 /nologo\r\n" ); + fprintf ( OUT, "# ADD BSC32 /nologo\r\n" ); + + if ( exe || dll ) + { + fprintf ( OUT, "LINK32=link.exe\r\n" ); + fprintf ( OUT, "# ADD BASE LINK32 " ); + vector<string> libraries; + libraries.push_back ( "kernel32.lib" ); + libraries.push_back ( "user32.lib" ); + libraries.push_back ( "gdi32.lib" ); + libraries.push_back ( "winspool.lib" ); + libraries.push_back ( "comdlg32.lib" ); + libraries.push_back ( "advapi32.lib" ); + libraries.push_back ( "shell32.lib" ); + libraries.push_back ( "ole32.lib" ); + libraries.push_back ( "oleaut32.lib" ); + libraries.push_back ( "uuid.lib" ); + libraries.push_back ( "odbc32.lib" ); + libraries.push_back ( "odbccp32.lib" ); + for ( i = 0; i < libraries.size(); i++ ) + { + fprintf ( OUT, "%s ", libraries[i].c_str() ); + } + fprintf ( OUT, " /nologo" ); + if ( dll ) fprintf ( OUT, " /dll" ); + if ( console ) fprintf ( OUT, " /subsystem:console" ); + if ( debug ) fprintf ( OUT, " /debug" ); + fprintf ( OUT, " /machine:I386" ); + if ( debug ) fprintf ( OUT, " /pdbtype:sept" ); + fprintf ( OUT, "\r\n" ); + + fprintf ( OUT, "# ADD LINK32" ); + fprintf ( OUT, " /nologo" ); + // TODO FIXME - do we need their kludge? + //if ( module.name == "ntdll" ) fprintf ( OUT, " libcmt.lib" ); // FIXME: Kludge + for ( i = 0; i < imports.size(); i++ ) + { + const string& import = imports[i]; + if ( import != "msvcrt" ) + fprintf ( OUT, " %s.lib", import.c_str() ); + } + if ( dll ) fprintf ( OUT, " /dll" ); + if ( console ) fprintf ( OUT, " /subsystem:console" ); + if ( debug ) fprintf ( OUT, " /debug" ); + fprintf ( OUT, " /machine:I386" ); + // TODO FIXME - do we need their kludge? + //if ( module.name == "ntdll" ) fprintf ( OUT, " /nodefaultlib" ); // FIXME: Kludge + if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() ); + if ( debug ) fprintf ( OUT, " /pdbtype:sept" ); + fprintf ( OUT, "\r\n" ); + } + else + { + fprintf ( OUT, "LIB32=link.exe -lib\r\n" ); + fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" ); + fprintf ( OUT, "# ADD LIB32 /nologo\r\n" ); + } + + n++; + } + + if ( cfgs.size() != 0 ) + { + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ENDIF \r\n" ); + fprintf ( OUT, "\r\n" ); + } +#if 0 + if ( module.name == "winebuild" ) + { + fprintf ( OUT, "# Begin Special Build Tool\r\n" ); + fprintf ( OUT, "SOURCE=\"$(InputPath)\"\r\n" ); + fprintf ( OUT, "PostBuild_Desc=Copying wine.dll and wine_unicode.dll ...\r\n" ); + fprintf ( OUT, "PostBuild_Cmds=" ); + fprintf ( OUT, "copy ..\\..\\library\\%s\\wine.dll $(OutDir)\t", + output_dir.c_str() ); + fprintf ( OUT, "copy ..\\..\\unicode\\%s\\wine_unicode.dll $(OutDir)\r\n", + output_dir.c_str() ); + fprintf ( OUT, "# End Special Build Tool\r\n" ); + } +#endif + fprintf ( OUT, "# Begin Target\r\n" ); + fprintf ( OUT, "\r\n" ); + for ( i = 0; i < cfgs.size(); i++ ) + { + fprintf ( OUT, "# Name \"%s\"\r\n", cfgs[i].c_str() ); + } + + fprintf ( OUT, "# Begin Group \"Source Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n" ); + + for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) + { + string source_file = DosSeparator(source_files[isrcfile]); + + if ( strncmp ( source_file.c_str(), ".\\", 2 ) ) + { + source_file = string(".\\") + source_file; + } +#if 0 + if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) ) + { + string basename = string ( source_file.c_str(), source_file.size() - 5 ); + + // TODO FIXME - not sure what this is doing? wine hack maybe? + //if ( basename !~ /\..{1,3}$/; ) basename += string(".dll"); + string dbg_c_file = basename + ".dbg.c"; + + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=%s\r\n", dbg_c_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); + } +#endif + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + + fprintf ( OUT, "SOURCE=%s\r\n", source_file.c_str() ); + + if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) ) + { +#if 0 + string basename = string ( source_file.c_str(), source_file.size() - 5 ); + + string spec_file = source_file; + string def_file = basename + ".def"; + + // TODO FIXME - not sure what this is doing? wine hack maybe? + //if ( basename !~ /\..{1,3}$/; ) basename += ".dll"; + string dbg_file = basename + ".dbg"; + string dbg_c_file = basename + ".dbg.c"; + + string srcdir = "."; // FIXME: Is this really always correct? + + fprintf ( OUT, "# Begin Custom Build\r\n" ); + fprintf ( OUT, "InputPath=%s\r\n", spec_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "BuildCmds= \\\r\n" ); + fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe --def %s > %s \\\r\n", + output_dir.c_str(), + spec_file.c_str(), + def_file.c_str() ); + + if ( module.name == "ntdll" ) + { + int n = 0; + for ( i = 0; i < c_srcs.size(); i++ ) + { + const string& c_src = c_srcs[i]; + if(n++ > 0) + { + fprintf ( OUT, "\techo %s >> %s \\\r\n", c_src.c_str(), dbg_file.c_str() ); + } + else + { + fprintf ( OUT, "\techo %s > %s \\\r\n", c_src.c_str(), dbg_file.c_str() ); + } + } + fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe", + output_dir.c_str() ); + fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n", + dbg_c_file.c_str(), + srcdir.c_str(), + dbg_file.c_str() ); + } + else + { + string sc_srcs; + for ( i = 0; i < c_srcs.size(); i++ ) + { + const string& c_src = c_srcs[i]; + if ( !strcmp ( &c_src[c_src.size()-2], ".c" ) ) + { + if ( sc_srcs.size() ) + sc_srcs += " "; + sc_srcs += c_src; + } + } + + fprintf ( OUT, "\t..\\..\\tools\\winebuild\\%s\\winebuild.exe", + output_dir.c_str() ); + fprintf ( OUT, " -o %s --debug -C%s %s \\\r\n", + dbg_c_file.c_str(), + srcdir.c_str(), + sc_srcs.c_str() ); + } + + fprintf ( OUT, "\t\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", def_file.c_str() ); + fprintf ( OUT, " $(BuildCmds)\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", dbg_c_file.c_str() ); + fprintf ( OUT, " $(BuildCmds)\r\n" ); + fprintf ( OUT, "# End Custom Build\r\n" ); +#endif + } + /*else if ( source_file =~ /([^\\]*?\.h)$/ ) + { + my $h_file = $1; + + foreach my $cfg (@cfgs) { + if($#cfgs == 0) { + # Nothing + } elsif($n == 0) { + fprintf ( OUT, "!IF \"$(CFG)\" == \"$cfg\"\r\n" ); + fprintf ( OUT, "\r\n" ); + } else { + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"$cfg\"\r\n" ); + fprintf ( OUT, "\r\n" ); + } + + $output_dir = $cfg; + $output_dir =~ s/^$project - //; + $output_dir =~ s/ /_/g; + $output_dir =~ s/C\+\+/Cxx/g; + if($output_prefix_dir) { + $output_dir = "$output_prefix_dir\\$output_dir" ); + } + + fprintf ( OUT, "# Begin Custom Build\r\n" ); + fprintf ( OUT, "OutDir=%s\r\n", output_dir.c_str() ); + fprintf ( OUT, "InputPath=%s\r\n", source_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "\"$(OutDir)\\wine\\%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", h_file.c_str() ); + fprintf ( OUT, "\tcopy \"$(InputPath)\" \"$(OutDir)\\wine\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# End Custom Build\r\n" ); + } + + if ( cfgs.size() != 0) + { + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ENDIF \r\n" ); + fprintf ( OUT, "\r\n" ); + } + }*/ + + fprintf ( OUT, "# End Source File\r\n" ); + } + fprintf ( OUT, "# End Group\r\n" ); + fprintf ( OUT, "# Begin Group \"Header Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n" ); + for ( i = 0; i < header_files.size(); i++ ) + { + const string& header_file = header_files[i]; + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=.\\%s\r\n", header_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); + } + fprintf ( OUT, "# End Group\r\n" ); + + + + fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" ); + for ( i = 0; i < resource_files.size(); i++ ) + { + const string& resource_file = resource_files[i]; + fprintf ( OUT, "# Begin Source File\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str() ); + fprintf ( OUT, "# End Source File\r\n" ); + } + fprintf ( OUT, "# End Group\r\n" ); + + fprintf ( OUT, "# End Target\r\n" ); + fprintf ( OUT, "# End Project\r\n" ); + + fclose(OUT); +} + +#if 0 + +void +MSVCBackend::_generate_dsw_project ( + FILE* OUT, + const Module& module, + std::string dsp_file, + const std::vector<Dependency*>& dependencies ) +{ + dsp_file = DosSeparator ( std::string(".\\") + dsp_file ); + + // TODO FIXME - must they be sorted? + //@dependencies = sort(@dependencies); + + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<5>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<4>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + for ( size_t i = 0; i < dependencies.size(); i++ ) + { + Dependency& dependency = *dependencies[i]; + fprintf ( OUT, " Begin Project Dependency\r\n" ); + fprintf ( OUT, " Project_Dep_Name %s\r\n", dependency.module.name.c_str() ); + fprintf ( OUT, " End Project Dependency\r\n" ); + } + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); +} + +void +MSVCBackend::_generate_dsw_footer ( FILE* OUT ) +{ + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Global:\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<5>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<3>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "####################################################################### ########\r\n" ); + fprintf ( OUT, "\r\n" ); [truncated at 1000 lines; 73 more skipped]

1 0

[hpoussin] 17826: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
by hpoussin＠svn.reactos.com 12 Sep '05

12 Sep '05

Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Added Finnish resources. Added: trunk/reactos/lib/setupapi/Fi.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Fi.rc --- trunk/reactos/lib/setupapi/Fi.rc 2005-09-12 21:46:09 UTC (rev 17825) +++ trunk/reactos/lib/setupapi/Fi.rc 2005-09-12 21:48:21 UTC (rev 17826) @@ -0,0 +1,34 @@ +/* + * Finnish resources for SETUPAPI + * + * Copyright 2005 Kimmo Myllyvirta + * + * 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 + */ + +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopioidaan Tiedostoja..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Peruuta", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Lõhde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kohde:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-09-12 21:46:09 UTC (rev 17825) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-09-12 21:48:21 UTC (rev 17826) @@ -29,6 +29,7 @@ #include "De.rc" #include "En.rc" #include "Es.rc" +#include "Fi.rc" #include "Fr.rc" #include "It.rc" #include "Ja.rc"

1 0

[royce] 17825: security audit of explorer code...
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

security audit of explorer code... strcpy -> lstrcpyn strncpy -> lstrcpyn [v]sprintf -> [v]snprintf moved common Shell::get_path() subclass implementations into Shell::get_path_base() and made function overflow-proof make other non-common subclass implementations of get_path overflow-proof Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.c Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.h Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.h Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.h Modified: trunk/reactos/subsys/system/explorer/shell/regfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/regfs.h Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.h Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/winfs.h Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h Modified: trunk/reactos/subsys/system/explorer/utility/utility.h Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -150,7 +150,7 @@ _thread.Stop(); TCHAR buffer[1024]; - GetWindowText(GetDlgItem(_hwnd, IDC_FILTER), buffer, 1024); + GetWindowText(GetDlgItem(_hwnd, IDC_FILTER), buffer, COUNTOF(buffer)); #ifndef __WINE__ ///@todo _tcslwr() for Wine _tcslwr(buffer); #endif @@ -191,7 +191,7 @@ if (SUCCEEDED(hr)) { TCHAR entry_path[MAX_PATH]; - entry->get_path(entry_path); + entry->get_path(entry_path, COUNTOF(entry_path)); String menu_path; @@ -231,8 +231,8 @@ String lwr_name = cache_entry._entry->_display_name; #ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)lwr_path.c_str()); - _tcslwr((LPTSTR)lwr_name.c_str()); + _tcslwr(&lwr_path.at(0)); + _tcslwr(&lwr_name.at(0)); #endif if (_lwr_filter.empty()) _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -183,7 +183,7 @@ const FileTypeInfo& FileTypeManager::operator[](String ext) { #ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)ext.c_str()); + _tcslwr(&ext.at(0)); #endif iterator found = find(ext); @@ -230,7 +230,7 @@ if (type._neverShowExt && !dont_hide_ext) { int len = ext - entry->_data.cFileName; entry->_display_name = (LPTSTR) malloc((len+1)*sizeof(TCHAR)); - _tcsncpy(entry->_display_name, entry->_data.cFileName, len); + lstrcpyn(entry->_display_name, entry->_data.cFileName, len); entry->_display_name[len] = TEXT('\0'); } @@ -416,7 +416,7 @@ CachePair key(path, idx); #ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)key.first.c_str()); + _tcslwr(&key.first.at(0)); #endif PathIdxMap::iterator found = _pathIdxMap.find(key); _____ Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.c --- trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.c 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.c 2005-09-12 21:46:09 UTC (rev 17825) @@ -108,7 +108,7 @@ struct COPYDATA_STRUCT* cds = (struct COPYDATA_STRUCT*) data->lpData; *phwnd = cds->_hwnd; - strncpy(buffer, cds->_path, size); + lstrcpyn(buffer, cds->_path, size); return cds->_len; } else _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -325,7 +325,7 @@ ICON_ID icon_id = ICID_NONE; - if (get_path(path) && _tcsncmp(path,TEXT("::{"),3)) + if (get_path(path, COUNTOF(path)) && _tcsncmp(path,TEXT("::{"),3)) icon_id = g_Globals._icon_cache.extract(path); if (icon_id == ICID_NONE) { @@ -392,7 +392,7 @@ { TCHAR cmd[MAX_PATH]; - if (!get_path(cmd)) + if (!get_path(cmd, COUNTOF(cmd))) return FALSE; // add path to the recent file list @@ -453,7 +453,7 @@ { TCHAR path[MAX_PATH]; /* - if (!get_path(path)) + if (!get_path(path, COUNTOF(path))) return E_FAIL; ShellPath shell_path(path); @@ -479,7 +479,7 @@ if (!_up) return E_INVALIDARG; - if (!_up->get_path(path)) + if (!_up->get_path(path, COUNTOF(path))) return E_FAIL; ShellPath shell_path(path); @@ -505,7 +505,108 @@ return hr; } + // get full path of specified directory entry +bool Entry::get_path_base ( PTSTR path, size_t path_count, ENTRY_TYPE etype ) const +{ + int level = 0; + size_t len = 0; + size_t l = 0; + LPCTSTR name = NULL; + TCHAR buffer[MAX_PATH]; + if ( !path || 0 == path_count ) + return false; + + const Entry* entry; + if ( path_count > 1 ) + { + for(entry=this; entry; level++) { + l = 0; + + if (entry->_etype == etype) { + name = entry->_data.cFileName; + + for(LPCTSTR s=name; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) + ++l; + + if (!entry->_up) + break; + } else { + if (entry->get_path(buffer, COUNTOF(buffer))) { + l = _tcslen(buffer); + name = buffer; + + /* special handling of drive names */ + if (l>0 && buffer[l-1]=='\\' && path[0]=='\\') + --l; + + if ( len+l >= path_count ) + { + if ( l + 1 > path_count ) + len = 0; + else + len = path_count - l - 1; + } + memmove(path+l, path, len*sizeof(TCHAR)); + if ( l+1 >= path_count ) + l = path_count - 1; + memcpy(path, name, l*sizeof(TCHAR)); + len += l; + } + + entry = NULL; + break; + } + + if (l > 0) { + if ( len+l+1 >= path_count ) + { + /* compare to 2 here because of terminator plus the '\\' we prepend */ + if ( l + 2 > path_count ) + len = 0; + else + len = path_count - l - 2; + } + memmove(path+l+1, path, len*sizeof(TCHAR)); + /* compare to 2 here because of terminator plus the '\\' we prepend */ + if ( l+2 >= path_count ) + l = path_count - 2; + memcpy(path+1, name, l*sizeof(TCHAR)); + len += l+1; + + if ( etype == ET_WINDOWS && entry->_up && !(entry->_up->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) // a NTFS stream? + path[0] = TEXT(':'); + else + path[0] = TEXT('\\'); + } + + entry = entry->_up; + } + + if (entry) { + if ( len+l >= path_count ) + { + if ( l + 1 > path_count ) + len = 0; + else + len = path_count - l - 1; + } + memmove(path+l, path, len*sizeof(TCHAR)); + if ( l+1 >= path_count ) + l = path_count - 1; + memcpy(path, name, l*sizeof(TCHAR)); + len += l; + } + + if ( !level && (len+1 < path_count) ) + path[len++] = TEXT('\\'); + } + + path[len] = TEXT('\0'); + + return true; +} + // recursively free all child entries void Entry::free_subentries() { _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.h --- trunk/reactos/subsys/system/explorer/shell/entries.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/entries.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -108,11 +108,14 @@ virtual void read_directory(int scan_flags=SCAN_ALL) {} virtual const void* get_next_path_component(const void*) const {return NULL;} virtual Entry* find_entry(const void*) {return NULL;} - virtual bool get_path(PTSTR path) const = 0; + virtual bool get_path(PTSTR path, size_t path_count) const = 0; virtual ShellPath create_absolute_pidl() const {return (LPCITEMIDLIST)NULL;} virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); virtual HRESULT do_context_menu(HWND hwnd, const POINT& pos, CtxMenuInterfaces& cm_ifs); + +protected: + bool get_path_base(PTSTR path, size_t path_count, ENTRY_TYPE etype) const; }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.cpp --- trunk/reactos/subsys/system/explorer/shell/fatfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/fatfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -244,67 +244,9 @@ // get full path of specified directory entry -bool FATEntry::get_path(PTSTR path) const +bool FATEntry::get_path(PTSTR path, size_t path_count) const { - int level = 0; - int len = 0; - int l = 0; - LPCTSTR name = NULL; - TCHAR buffer[MAX_PATH]; - - const Entry* entry; - for(entry=this; entry; level++) { - l = 0; - - if (entry->_etype == ET_FAT) { - name = entry->_data.cFileName; - - for(LPCTSTR s=name; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) - ++l; - - if (!entry->_up) - break; - } else { - if (entry->get_path(buffer)) { - l = _tcslen(buffer); - name = buffer; - - /* special handling of drive names */ - if (l>0 && buffer[l-1]=='\\' && path[0]=='\\') - --l; - - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - entry = NULL; - break; - } - - if (l > 0) { - memmove(path+l+1, path, len*sizeof(TCHAR)); - memcpy(path+1, name, l*sizeof(TCHAR)); - len += l+1; - - path[0] = TEXT('\\'); - } - - entry = entry->_up; - } - - if (entry) { - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - if (!level) - path[len++] = TEXT('\\'); - - path[len] = TEXT('\0'); - - return true; + return get_path_base ( path, path_count, ET_FAT ); } ShellPath FATEntry::create_absolute_pidl() const @@ -315,7 +257,7 @@ /* prepend root path if the drive is currently actually mounted in the file system -> return working PIDL TCHAR path[MAX_PATH]; - if (get_path(path)) + if (get_path(path, COUNTOF(path))) return ShellPath(path); return ShellPath(); _____ Modified: trunk/reactos/subsys/system/explorer/shell/fatfs.h --- trunk/reactos/subsys/system/explorer/shell/fatfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/fatfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -34,7 +34,7 @@ protected: FATEntry() : Entry(ET_FAT) {} - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; virtual ShellPath create_absolute_pidl() const; DWORD _cluster; _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -280,7 +280,7 @@ _right->set_header(); } - entry->get_path(_path); + entry->get_path(_path, COUNTOF(_path)); } if (_hwnd) // only change window title if the window already exists @@ -453,7 +453,7 @@ TCHAR path[MAX_PATH]; if (_left && _left->_cur) { - _left->_cur->get_path(path); + _left->_cur->get_path(path, COUNTOF(path)); SetCurrentDirectory(path); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -1608,7 +1608,7 @@ TCHAR path[MAX_PATH]; - if (shell_entry->get_path(path)) { + if (shell_entry->get_path(path,COUNTOF(path))) { String url; if (path[0] == ':') _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -237,12 +237,12 @@ } else { info->type.string_ptr = TEXT(""); } - wcscpyn(p, info->name.string_ptr, _MAX_PATH); + lstrcpynW(p, info->name.string_ptr, _MAX_PATH); #else WideCharToMultiByte(CP_ACP, 0, info->name.string_ptr, info->name.string_len, p, MAX_PATH, 0, 0); #endif - lstrcpy(w32fd.cFileName, p); + lstrcpyn(w32fd.cFileName, p, sizeof(w32fd.cFileName) / sizeof(0[w32fd.cFileName])); const LPCWSTR* tname = NTDLL::s_ObjectTypes; OBJECT_TYPE type = UNKNOWN_OBJECT_TYPE; @@ -379,67 +379,9 @@ // get full path of specified directory entry -bool NtObjEntry::get_path(PTSTR path) const +bool NtObjEntry::get_path(PTSTR path, size_t path_count) const { - int level = 0; - int len = 0; - int l = 0; - LPCTSTR name = NULL; - TCHAR buffer[MAX_PATH]; - - const Entry* entry; - for(entry=this; entry; level++) { - l = 0; - - if (entry->_etype == ET_NTOBJS) { - name = entry->_data.cFileName; - - for(LPCTSTR s=name; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) - ++l; - - if (!entry->_up) - break; - } else { - if (entry->get_path(buffer)) { - l = _tcslen(buffer); - name = buffer; - - /* special handling of drive names */ - if (l>0 && buffer[l-1]=='\\' && path[0]=='\\') - --l; - - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - entry = NULL; - break; - } - - if (l > 0) { - memmove(path+l+1, path, len*sizeof(TCHAR)); - memcpy(path+1, name, l*sizeof(TCHAR)); - len += l+1; - - path[0] = TEXT('\\'); - } - - entry = entry->_up; - } - - if (entry) { - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - if (!level) - path[len++] = TEXT('\\'); - - path[len] = TEXT('\0'); - - return true; + return get_path_base ( path, path_count, ET_NTOBJS ); } BOOL NtObjEntry::launch_entry(HWND hwnd, UINT nCmdShow) _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.h --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -91,7 +91,7 @@ protected: NtObjEntry(OBJECT_TYPE type) : Entry(ET_NTOBJS), _type(type) {} - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow); }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/regfs.cpp --- trunk/reactos/subsys/system/explorer/shell/regfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/regfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -223,67 +223,9 @@ // get full path of specified registry entry -bool RegEntry::get_path(PTSTR path) const +bool RegEntry::get_path(PTSTR path, size_t path_count) const { - int level = 0; - int len = 0; - int l = 0; - LPCTSTR name = NULL; - TCHAR buffer[MAX_PATH]; - - const Entry* entry; - for(entry=this; entry; level++) { - l = 0; - - if (entry->_etype == ET_REGISTRY) { - name = entry->_data.cFileName; - - for(LPCTSTR s=name; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) - ++l; - - if (!entry->_up) - break; - } else { - if (entry->get_path(buffer)) { - l = _tcslen(buffer); - name = buffer; - - /* special handling of drive names */ - if (l>0 && buffer[l-1]=='\\' && path[0]=='\\') - --l; - - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - entry = NULL; - break; - } - - if (l > 0) { - memmove(path+l+1, path, len*sizeof(TCHAR)); - memcpy(path+1, name, l*sizeof(TCHAR)); - len += l+1; - - path[0] = TEXT('\\'); - } - - entry = entry->_up; - } - - if (entry) { - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - if (!level) - path[len++] = TEXT('\\'); - - path[len] = TEXT('\0'); - - return true; + return get_path_base ( path, path_count, ET_REGISTRY ); } BOOL RegEntry::launch_entry(HWND hwnd, UINT nCmdShow) _____ Modified: trunk/reactos/subsys/system/explorer/shell/regfs.h --- trunk/reactos/subsys/system/explorer/shell/regfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/regfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -34,7 +34,7 @@ protected: RegEntry() : Entry(ET_REGISTRY) {} - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow); }; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -626,7 +626,7 @@ TCHAR path[MAX_PATH]; - if (shell_entry->get_path(path)) { + if (shell_entry->get_path(path, COUNTOF(path))) { String url; if (path[0] == ':') _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -126,8 +126,10 @@ // get full path of a shell entry -bool ShellEntry::get_path(PTSTR path) const +bool ShellEntry::get_path(PTSTR path, size_t path_count) const { + if ( !path || 0 == path_count ) + return false; /* path[0] = TEXT('\0'); @@ -138,7 +140,7 @@ LPCTSTR ret = fs_path; if (ret) { - _tcscpy(path, ret); + lstrcpyn(path, ret, path_count); return true; } else return false; @@ -146,10 +148,13 @@ // get full path of a shell folder -bool ShellDirectory::get_path(PTSTR path) const +bool ShellDirectory::get_path(PTSTR path, size_t path_count) const { CONTEXT("ShellDirectory::get_path()"); + if ( !path || 0 == path_count ) + return false; + path[0] = TEXT('\0'); if (_folder.empty()) @@ -163,7 +168,7 @@ if (!(attribs & SFGAO_FILESYSTEM)) return false; - if (FAILED(path_from_pidl(get_parent_folder(), &*_pidl, path, MAX_PATH))) + if (FAILED(path_from_pidl(get_parent_folder(), &*_pidl, path, path_count))) return false; return true; @@ -235,11 +240,12 @@ TCHAR buffer[MAX_PATH]; - if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer) && _tcsncmp(buffer,TEXT("::{"),3)) { + if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer, COUNTOF(buffer)) && _tcsncmp(buffer,TEXT("::{"),3)) { Entry* entry = NULL; // eliminate useless GCC warning by initializing entry LPTSTR p = buffer + _tcslen(buffer); + // TODO FIXME - this can overflow lstrcpy(p, TEXT("\\*")); WIN32_FIND_DATA w32fd; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h --- trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -32,7 +32,7 @@ ShellEntry(Entry* parent, LPITEMIDLIST shell_path) : Entry(parent, ET_SHELL), _pidl(shell_path) {} ShellEntry(Entry* parent, const ShellPath& shell_path) : Entry(parent, ET_SHELL), _pidl(shell_path) {} - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; virtual ShellPath create_absolute_pidl() const; virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); @@ -103,7 +103,7 @@ virtual const void* get_next_path_component(const void*) const; virtual Entry* find_entry(const void*); - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; int extract_icons(); _____ Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.cpp --- trunk/reactos/subsys/system/explorer/shell/unixfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/unixfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -156,40 +156,68 @@ // get full path of specified directory entry -void UnixEntry::get_path(PTSTR path) const +bool UnixEntry::get_path(PTSTR path, size_t path_count) const { int level = 0; - int len = 0; + size_t len = 0; - for(const Entry* entry=this; entry; level++) { - LPCTSTR name = entry->_data.cFileName; - int l = 0; + if ( !path || 0 == path_count ) + return false; - for(LPCTSTR s=name; *s && *s!=TEXT('/'); s++) - ++l; + if ( path_count > 1 ) + { + for(const Entry* entry=this; entry; level++) { + LPCTSTR name = entry->_data.cFileName; + size_t l = 0; - if (entry->_up) { - if (l > 0) { - memmove(path+l+1, path, len*sizeof(TCHAR)); - memcpy(path+1, name, l*sizeof(TCHAR)); - len += l+1; + for(LPCTSTR s=name; *s && *s!=TEXT('/'); s++) + ++l; - path[0] = TEXT('/'); + if (entry->_up) { + if (l > 0) { + if ( len+l+1 >= path_count ) + { + /* compare to 2 here because of terminator plus the '\\' we prepend */ + if ( l + 2 > path_count ) + len = 0; + else + len = path_count - l - 2; + } + memmove(path+l+1, path, len*sizeof(TCHAR)); + /* compare to 2 here because of terminator plus the '\\' we prepend */ + if ( l+2 >= path_count ) + l = path_count - 2; + memcpy(path+1, name, l*sizeof(TCHAR)); + len += l+1; + + path[0] = TEXT('/'); + } + + entry = entry->_up; + } else { + if ( len+l >= path_count ) + { + if ( l + 1 > path_count ) + len = 0; + else + len = path_count - l - 1; + } + memmove(path+l, path, len*sizeof(TCHAR)); + if ( l+1 >= path_count ) + l = path_count - 1; + memcpy(path, name, l*sizeof(TCHAR)); + len += l; + break; } + } - entry = entry->_up; - } else { - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - break; - } + if ( !level && (len+1 < path_count) ) + path[len++] = TEXT('/'); } - if (!level) - path[len++] = TEXT('/'); + path[len] = TEXT('\0'); - path[len] = TEXT('\0'); + return true; } #endif // __WINE__ _____ Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.h --- trunk/reactos/subsys/system/explorer/shell/unixfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/unixfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -35,7 +35,7 @@ protected: UnixEntry() : Entry(ET_UNIX) {} - virtual void get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; }; struct UnixDirectory : public UnixEntry, public Directory _____ Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp --- trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -229,70 +229,9 @@ // get full path of specified directory entry -bool WinEntry::get_path(PTSTR path) const +bool WinEntry::get_path(PTSTR path, size_t path_count) const { - int level = 0; - int len = 0; - int l = 0; - LPCTSTR name = NULL; - TCHAR buffer[MAX_PATH]; - - const Entry* entry; - for(entry=this; entry; level++) { - l = 0; - - if (entry->_etype == ET_WINDOWS) { - name = entry->_data.cFileName; - - for(LPCTSTR s=name; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) - ++l; - - if (!entry->_up) - break; - } else { - if (entry->get_path(buffer)) { - l = _tcslen(buffer); - name = buffer; - - /* special handling of drive names */ - if (l>0 && buffer[l-1]=='\\' && path[0]=='\\') - --l; - - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - entry = NULL; - break; - } - - if (l > 0) { - memmove(path+l+1, path, len*sizeof(TCHAR)); - memcpy(path+1, name, l*sizeof(TCHAR)); - len += l+1; - - if (entry->_up && !(entry->_up->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) // a NTFS stream? - path[0] = TEXT(':'); - else - path[0] = TEXT('\\'); - } - - entry = entry->_up; - } - - if (entry) { - memmove(path+l, path, len*sizeof(TCHAR)); - memcpy(path, name, l*sizeof(TCHAR)); - len += l; - } - - if (!level) - path[len++] = TEXT('\\'); - - path[len] = TEXT('\0'); - - return true; + return get_path_base ( path, path_count, ET_WINDOWS ); } ShellPath WinEntry::create_absolute_pidl() const @@ -301,7 +240,7 @@ TCHAR path[MAX_PATH]; - if (get_path(path)) + if (get_path(path, COUNTOF(path))) return ShellPath(path); return ShellPath(); _____ Modified: trunk/reactos/subsys/system/explorer/shell/winfs.h --- trunk/reactos/subsys/system/explorer/shell/winfs.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/shell/winfs.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -34,7 +34,7 @@ protected: WinEntry() : Entry(ET_WINDOWS) {} - virtual bool get_path(PTSTR path) const; + virtual bool get_path(PTSTR path, size_t path_count) const; virtual ShellPath create_absolute_pidl() const; }; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -395,7 +395,7 @@ ShellDirectory new_dir(dir._folder, static_cast<ShellEntry*>(entry)->_pidl, hwnd); new_folder._bookmarks.import_IE_favorites(new_dir, hwnd); } else { - entry->get_path(path); + entry->get_path(path, COUNTOF(path)); ShellDirectory new_dir(GetDesktopFolder(), path, hwnd); new_folder._bookmarks.import_IE_favorites(new_dir, hwnd); } @@ -406,7 +406,7 @@ bookmark._name = DecodeXMLString(name); - entry->get_path(path); + entry->get_path(path, COUNTOF(path)); _tsplitpath(path, NULL, NULL, NULL, ext); if (!_tcsicmp(ext, TEXT(".url"))) { _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -249,7 +249,7 @@ _tcscat(ignore_path, ignore_dir); _tcscat(ignore_name, ignore_ext); - dir.get_path(dir_path); + dir.get_path(dir_path, COUNTOF(dir_path)); if (_tcsicmp(trim_path_slash(dir_path), trim_path_slash(ignore_path))) *ignore_name = '\0'; @@ -1286,7 +1286,7 @@ else { TCHAR path[MAX_PATH]; - if (entry->get_path(path)) + if (entry->get_path(path, COUNTOF(path))) new_folders.push_back(path); } _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp --- trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-09-12 21:46:09 UTC (rev 17825) @@ -44,7 +44,7 @@ // helper functions for string copying -LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count) +/*LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count) { LPCSTR s; LPSTR d = dest; @@ -64,7 +64,7 @@ count--; return dest; -} +}*/ String COMException::toString() const _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h --- trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -85,7 +85,7 @@ LocalFree(pBuf); } else { TCHAR buffer[128]; - _stprintf(buffer, TEXT("unknown Exception: 0x%08lX"), _hr); + _sntprintf(buffer, COUNTOF(buffer), TEXT("unknown Exception: 0x%08lX"), _hr); _msg = buffer; } } @@ -769,14 +769,14 @@ #ifdef UNICODE #define StrRet StrRetW -#define tcscpyn wcscpyn +//#define tcscpyn wcscpyn #else #define StrRet StrRetA -#define tcscpyn strcpyn +//#define tcscpyn strcpyn #endif -extern LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count); -extern LPWSTR wcscpyn(LPWSTR dest, LPCWSTR source, size_t count); +//extern LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count); +//extern LPWSTR wcscpyn(LPWSTR dest, LPCWSTR source, size_t count); /// easy retrieval of multi byte strings out of STRRET structures struct StrRetA : public STRRET @@ -795,11 +795,11 @@ break; case STRRET_OFFSET: - strcpyn(b, (LPCSTR)&shiid+UNION_MEMBER(uOffset), l); + lstrcpynA(b, (LPCSTR)&shiid+UNION_MEMBER(uOffset), l); break; case STRRET_CSTR: - strcpyn(b, UNION_MEMBER(cStr), l); + lstrcpynA(b, UNION_MEMBER(cStr), l); } } }; @@ -817,7 +817,7 @@ { switch(uType) { case STRRET_WSTR: - wcscpyn(b, UNION_MEMBER(pOleStr), l); + lstrcpynW(b, UNION_MEMBER(pOleStr), l); break; case STRRET_OFFSET: _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.h --- trunk/reactos/subsys/system/explorer/utility/utility.h 2005-09-12 20:07:29 UTC (rev 17824) +++ trunk/reactos/subsys/system/explorer/utility/utility.h 2005-09-12 21:46:09 UTC (rev 17825) @@ -804,7 +804,7 @@ TCHAR b[BUFFER_LEN]; [truncated at 1000 lines; 86 more skipped]

1 0

[royce] 17824: msvc6 warning fix - cast return value of SHAlloc()
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

msvc6 warning fix - cast return value of SHAlloc() Modified: trunk/reactos/lib/shell32/shell32_main.h _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-09-12 20:04:49 UTC (rev 17823) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-09-12 20:07:29 UTC (rev 17824) @@ -179,7 +179,7 @@ }; inline static void __SHCloneStrA(char ** target,const char * source) { - *target = SHAlloc(strlen(source)+1); + *target = (char*)SHAlloc(strlen(source)+1); strcpy(*target, source); } @@ -192,7 +192,7 @@ inline static void __SHCloneStrW(WCHAR ** target, const WCHAR * source) { - *target = SHAlloc( (strlenW(source)+1) * sizeof(WCHAR) ); + *target = (WCHAR*)SHAlloc( (strlenW(source)+1) * sizeof(WCHAR) ); strcpyW(*target, source); }

1 0

[royce] 17823: msvc6 warning fix - cast return value of SHAlloc()
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

msvc6 warning fix - cast return value of SHAlloc() Modified: trunk/reactos/lib/shell32/brsfolder.c _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-09-12 19:58:34 UTC (rev 17822) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-09-12 20:04:49 UTC (rev 17823) @@ -269,7 +269,7 @@ tvi.cChildren= pEnumIL ? 1 : 0; tvi.mask |= TVIF_CHILDREN; - lptvid = SHAlloc( sizeof(TV_ITEMDATA) ); + lptvid = (LPTV_ITEMDATA)SHAlloc( sizeof(TV_ITEMDATA) ); if (!lptvid) return NULL;

1 0

[royce] 17822: fix breakage - sorry
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

fix breakage - sorry Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-09-12 19:50:16 UTC (rev 17821) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-09-12 19:58:34 UTC (rev 17822) @@ -276,7 +276,7 @@ TCHAR * tmpPath; TCHAR szCurrent[MAX_PATH]; TCHAR szMsg[RC_STRING_MAX_SIZE]; - UINT i; + INT i; /* Filter out special cases first */ @@ -329,7 +329,7 @@ /* Remove " */ i = 0; - while(i < _tcslen(szPath)) + while(i < (INT)_tcslen(szPath)) { if(szPath[i] == _T('\"')) memmove(&szPath[i],&szPath[i + 1], _tcslen(&szPath[i]) * sizeof(TCHAR));

1 0

[greatlrd] 17821: DoCommand()
by greatlrd＠svn.reactos.com 12 Sep '05

12 Sep '05

DoCommand() Remove one more hardcode buffer size. Remove limit command to MAX_PATH. No check for limit command line- Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-12 17:10:00 UTC (rev 17820) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-12 19:50:16 UTC (rev 17821) @@ -532,17 +532,26 @@ static VOID DoCommand (LPTSTR line) { - TCHAR com[CMDLINE_LENGTH]; /* the first word in the command */ - LPTSTR cp = com; + TCHAR *com = NULL; /* the first word in the command */ + TCHAR *cp = NULL; LPTSTR cstart; LPTSTR rest; /* pointer to the rest of the command line */ INT cl; LPCOMMAND cmdptr; + #ifdef _DEBUG DebugPrintf (_T("DoCommand: (\'%s\')\n"), line); #endif /* DEBUG */ + com = malloc( (_tcslen(line) +512)*sizeof(TCHAR) ); + if (com == NULL) + { + error_out_of_memory(); + return; + } + + cp = com; /* Skip over initial white space */ while (_istspace (*line)) line++; @@ -574,12 +583,15 @@ /* Terminate first word */ *cp = _T('\0'); - /* commands are limited to MAX_PATH */ + /* Do not limit commands to MAX_PATH */ + /* if(_tcslen(com) > MAX_PATH) { error_bad_command(); + free(com); return; } + */ /* Skip over whitespace to rest of line */ while (_istspace (*rest)) @@ -627,6 +639,7 @@ } } } + free(com); }

1 0

[gvg] 17820: Bletch <npwoods@mess.org>
by gvg＠svn.reactos.com 12 Sep '05

12 Sep '05

Bletch <npwoods(a)mess.org> - Implements the Encoding field when you save, allowing the user to save as ANSI, Unicode or UTF-8 - Invoking 'Save As' after saving or loading a file will default to the earlier filename (minor changes by GvG, so mistakes are mine). Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad_res.h _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-09-12 16:06:53 UTC (rev 17819) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-09-12 17:10:00 UTC (rev 17820) @@ -94,6 +94,17 @@ PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP } +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 26 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Encoding" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Encoding:",0x155,5,2,41,12 +} + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ @@ -125,5 +136,8 @@ STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task. \nClose one or more applications to increase the amount of \nfree \ memory." - +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" } _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-12 16:06:53 UTC (rev 17819) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-12 17:10:00 UTC (rev 17820) @@ -139,8 +139,14 @@ { HANDLE hFile; DWORD dwNumWrite; - LPSTR pTemp; + LPWSTR pTemp; + LPVOID pConverted; DWORD size; + BYTE bom[3]; + int iBomSize = 0; + int iCodePage = -1; + int iNewSize; + int i; hFile = CreateFile(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -150,23 +156,82 @@ return; } - size = GetWindowTextLengthA(Globals.hEdit) + 1; - pTemp = HeapAlloc(GetProcessHeap(), 0, size); + size = GetWindowTextLengthW(Globals.hEdit) + 1; + pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*pTemp)); if (!pTemp) { - CloseHandle(hFile); + CloseHandle(hFile); ShowLastError(); return; } - size = GetWindowTextA(Globals.hEdit, pTemp, size); + size = GetWindowTextW(Globals.hEdit, pTemp, size); - if (!WriteFile(hFile, pTemp, size, &dwNumWrite, NULL)) + switch(Globals.iEncoding) + { + case ENCODING_ANSI: + iCodePage = CP_ACP; + break; + + case ENCODING_UNICODE: + pConverted = pTemp; + iBomSize = 2; + bom[0] = 0xFF; + bom[1] = 0xFE; + break; + + case ENCODING_UNICODE_BE: + pConverted = pTemp; + iBomSize = 2; + bom[0] = 0xFE; + bom[1] = 0xFF; + + /* flip the endianness */ + for (i = 0; i < size; i++) + { + pTemp[i] = ((pTemp[i] & 0x00FF) << 8) + | ((pTemp[i] & 0xFF00) >> 8); + } + break; + + case ENCODING_UTF8: + iCodePage = CP_UTF8; + iBomSize = 3; + bom[0] = 0xEF; + bom[1] = 0xBB; + bom[2] = 0xBF; + break; + } + + if (iCodePage >= 0) + { + iNewSize = WideCharToMultiByte(iCodePage, 0, pTemp, size, NULL, 0, NULL, NULL); + pConverted = HeapAlloc(GetProcessHeap(), 0, iNewSize); + if (!pConverted) + { + HeapFree(GetProcessHeap(), 0, pTemp); + CloseHandle(hFile); + ShowLastError(); + return; + } + WideCharToMultiByte(iCodePage, 0, pTemp, size, pConverted, iNewSize, NULL, NULL); + } + else + { + iNewSize = size * sizeof(WCHAR); + } + + if ((iBomSize > 0) && !WriteFile(hFile, bom, iBomSize, &dwNumWrite, NULL)) ShowLastError(); + else if (!WriteFile(hFile, pConverted, iNewSize, &dwNumWrite, NULL)) + ShowLastError(); else SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, pTemp); + + if (iCodePage >= 0) + HeapFree(GetProcessHeap(), 0, pConverted); } /** @@ -208,44 +273,48 @@ { HANDLE hFile; LPSTR pTemp; + LPWSTR pTemp2 = NULL; DWORD size; DWORD dwNumRead; + LPWSTR p; + LPBYTE p2; + int iCodePage; + int iNewSize; /* Close any files and prompt to save changes */ if (!DoCloseFile()) - return; + return; hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { - ShowLastError(); - return; + ShowLastError(); + return; } size = GetFileSize(hFile, NULL); if (size == INVALID_FILE_SIZE) { - CloseHandle(hFile); - ShowLastError(); - return; + CloseHandle(hFile); + ShowLastError(); + return; } - size++; - pTemp = HeapAlloc(GetProcessHeap(), 0, size); + pTemp = HeapAlloc(GetProcessHeap(), 0, size + sizeof(WCHAR)); if (!pTemp) { - CloseHandle(hFile); - ShowLastError(); - return; + CloseHandle(hFile); + ShowLastError(); + return; } if (!ReadFile(hFile, pTemp, size, &dwNumRead, NULL)) { - CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); - ShowLastError(); - return; + CloseHandle(hFile); + HeapFree(GetProcessHeap(), 0, pTemp); + ShowLastError(); + return; } CloseHandle(hFile); @@ -253,15 +322,55 @@ if (IsTextUnicode(pTemp, dwNumRead, NULL)) { - LPWSTR p = (LPWSTR)pTemp; - /* We need to strip BOM Unicode character, SetWindowTextW won't do it for us. */ - if (*p == 0xFEFF || *p == 0xFFFE) p++; - SetWindowTextW(Globals.hEdit, p); + p = (LPWSTR)pTemp; + p[dwNumRead / 2] = 0; + + /* We need to strip BOM Unicode character, SetWindowTextW won't do it for us. */ + if (*p == 0xFEFF) + { + Globals.iEncoding = ENCODING_UNICODE_BE; + p++; + } + else if (*p == 0xFFFE) + { + Globals.iEncoding = ENCODING_UNICODE; + p++; + } } else - SetWindowTextA(Globals.hEdit, pTemp); + { + p2 = pTemp; + if ((p2[0] == 0xEF) && (p2[1] == 0xBB) && (p2[2] == 0xBF)) + { + iCodePage = CP_UTF8; + Globals.iEncoding = ENCODING_UTF8; + p2 += 3; + dwNumRead -= 3; + } + else + { + iCodePage = CP_ACP; + Globals.iEncoding = ENCODING_ANSI; + } + iNewSize = MultiByteToWideChar(iCodePage, 0, p2, dwNumRead, NULL, 0); + pTemp2 = HeapAlloc(GetProcessHeap(), 0, (iNewSize + 1) * sizeof(*pTemp2)); + if (!pTemp2) + { + CloseHandle(hFile); + HeapFree(GetProcessHeap(), 0, pTemp); + ShowLastError(); + return; + } + MultiByteToWideChar(iCodePage, 0, p2, dwNumRead, pTemp2, iNewSize); + pTemp2[iNewSize] = 0; + p = pTemp2; + } + SetWindowTextW(Globals.hEdit, p); + HeapFree(GetProcessHeap(), 0, pTemp); + if (pTemp2) + HeapFree(GetProcessHeap(), 0, pTemp2); SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); @@ -286,15 +395,18 @@ VOID DIALOG_FileOpen(VOID) { OPENFILENAME openfilename; + WCHAR szDir[MAX_PATH]; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&openfilename, sizeof(openfilename)); GetCurrentDirectory(SIZEOF(szDir), szDir); - lstrcpy(szPath, txt_files); + if (Globals.szFileName[0] == 0) + lstrcpy(szPath, txt_files); + else + lstrcpy(szPath, Globals.szFileName); openfilename.lStructSize = sizeof(openfilename); openfilename.hwndOwner = Globals.hMainWnd; @@ -325,18 +437,59 @@ DoSaveFile(); } +static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + WCHAR szText[128]; + HWND hCombo; + OFNOTIFY *pNotify; + + switch(msg) + { + case WM_INITDIALOG: + hCombo = GetDlgItem(hDlg, ID_ENCODING); + + LoadString(Globals.hInstance, STRING_ANSI, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + LoadString(Globals.hInstance, STRING_UNICODE, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + LoadString(Globals.hInstance, STRING_UNICODE_BE, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + LoadString(Globals.hInstance, STRING_UTF8, szText, SIZEOF(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + + SendMessage(hCombo, CB_SETCURSEL, Globals.iEncoding, 0); + break; + + case WM_NOTIFY: + if (((NMHDR *) lParam)->code == CDN_FILEOK) + { + pNotify = (OFNOTIFY *) lParam; + hCombo = GetDlgItem(hDlg, ID_ENCODING); + Globals.iEncoding = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + } + break; + } + return 0; +} + VOID DIALOG_FileSaveAs(VOID) { OPENFILENAME saveas; + WCHAR szDir[MAX_PATH]; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&saveas, sizeof(saveas)); GetCurrentDirectory(SIZEOF(szDir), szDir); - lstrcpy(szPath, txt_files); + if (Globals.szFileName[0] == 0) + lstrcpy(szPath, txt_files); + else + lstrcpy(szPath, Globals.szFileName); saveas.lStructSize = sizeof(OPENFILENAME); saveas.hwndOwner = Globals.hMainWnd; @@ -346,8 +499,10 @@ saveas.nMaxFile = SIZEOF(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | - OFN_HIDEREADONLY; + OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; saveas.lpstrDefExt = szDefaultExt; + saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING); + saveas.lpfnHook = DIALOG_FileSaveAs_Hook; if (GetSaveFileName(&saveas)) { SetFileName(szPath); @@ -423,14 +578,14 @@ cHeightPels = GetDeviceCaps(printer.hDC, VERTRES); /* Get the file text */ - size = GetWindowTextLength(Globals.hEdit) + 1; + size = GetWindowTextLengthW(Globals.hEdit) + 1; pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!pTemp) { ShowLastError(); return; } - size = GetWindowText(Globals.hEdit, pTemp, size); + size = GetWindowTextW(Globals.hEdit, pTemp, size); border = 150; for (copycount=1; copycount <= printer.nCopies; copycount++) { @@ -700,8 +855,8 @@ return TRUE; } - default: - break; + default: + break; } break; _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-12 16:06:53 UTC (rev 17819) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-12 17:10:00 UTC (rev 17820) @@ -25,6 +25,11 @@ #define MAX_STRING_LEN 255 +#define ENCODING_ANSI 0 +#define ENCODING_UNICODE 1 +#define ENCODING_UNICODE_BE 2 +#define ENCODING_UTF8 3 + typedef struct { HANDLE hInstance; @@ -44,6 +49,7 @@ WCHAR szMarginRight[MAX_PATH]; WCHAR szHeader[MAX_PATH]; WCHAR szFooter[MAX_PATH]; + int iEncoding; FINDREPLACE find; } NOTEPAD_GLOBALS; _____ Modified: trunk/reactos/subsys/system/notepad/notepad_res.h --- trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-12 16:06:53 UTC (rev 17819) +++ trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-12 17:10:00 UTC (rev 17820) @@ -22,6 +22,8 @@ #define MAIN_MENU 0x201 #define DIALOG_PAGESETUP 0x202 #define ID_ACCEL 0x203 +#define DIALOG_ENCODING 0x204 +#define ID_ENCODING 0x205 /* Commands */ #define CMD_NEW 0x100 @@ -76,3 +78,9 @@ #define STRING_NOTFOUND 0x17B #define STRING_OUT_OF_MEMORY 0x17C + +#define STRING_ANSI 0x17D +#define STRING_UNICODE 0x17E +#define STRING_UNICODE_BE 0x17F +#define STRING_UTF8 0x180 +

1 0

[royce] 17819: msvc6 compatibility and small performance improvement in filename completion
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

msvc6 compatibility and small performance improvement in filename completion Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/filecomp.c Modified: trunk/reactos/subsys/system/cmd/history.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/precomp.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -148,9 +148,9 @@ #define NT_SUCCESS(StatCode) ((NTSTATUS)(StatCode) >= 0) #endif -typedef NTSTATUS (STDCALL *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS, +typedef NTSTATUS (WINAPI *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); -typedef NTSTATUS (STDCALL *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG); +typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG); BOOL bExit = FALSE; /* indicates EXIT was typed */ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */ @@ -356,7 +356,7 @@ } else { - INT i = 0; + UINT i = 0; BOOL bInside = FALSE; rest[0] = _T('\0'); full[0] = _T('\0'); @@ -1392,12 +1392,10 @@ #ifdef _DEBUG - INT x; - DebugPrintf (_T("[command args:\n")); - for (x = 0; x < argc; x++) + for (i = 0; i < argc; i++) { - DebugPrintf (_T("%d. %s\n"), x, argv[x]); + DebugPrintf (_T("%d. %s\n"), i, argv[i]); } DebugPrintf (_T("]\n")); #endif _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-12 16:06:53 UTC (rev 17819) @@ -224,11 +224,11 @@ /* Prototypes for FILECOMP.C */ #ifdef FEATURE_UNIX_FILENAME_COMPLETION -VOID CompleteFilename (LPTSTR, INT); +VOID CompleteFilename (LPTSTR, UINT); INT ShowCompletionMatches (LPTSTR, INT); #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION -VOID CompleteFilename (LPTSTR, BOOL, LPTSTR, INT); +VOID CompleteFilename (LPTSTR, BOOL, LPTSTR, UINT); #endif _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -138,6 +138,7 @@ WORD wLastKey = 0; TCHAR ch; BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + TCHAR szPath[MAX_PATH]; /* get screen size */ GetScreenSize (&maxx, &maxy); @@ -366,8 +367,7 @@ /* used to later see if we went down to the next line */ tempscreen = charcount; - TCHAR szPath[MAX_PATH]; - szPath[0]=_T('\0'); + szPath[0]=_T('\0'); /* str is the whole things that is on the current line that is and and out. arg 2 is weather it goes back @@ -404,7 +404,7 @@ if(((charcount + orgx) / maxx) + orgy > maxy - 1) orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); } - SetCursorXY((orgx + current) % maxx, orgy + (orgx + current) / maxx); + SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); GetCursorXY(&curx, &cury); #endif _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/color.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -94,12 +94,12 @@ } else if ( (_tcscmp(&rest[0], _T("a")) >=0 ) && (_tcscmp(&rest[0], _T("f")) <=0 ) ) { - SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10) - _T('a') ); + SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10 - _T('a')) ); return 0; } else if ( (_tcscmp(&rest[0], _T("A")) >=0 ) && (_tcscmp(&rest[0], _T("F")) <=0 ) ) { - SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10) - _T('A') ); + SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10 - _T('A')) ); return 0; } ConErrResPuts(STRING_COLOR_ERROR2); _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/del.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -130,7 +130,7 @@ HANDLE file; DWORD temp; - LONG BufferSize = 65536; +#define BufferSize 65536 BYTE buffer[BufferSize]; LONGLONG i; LARGE_INTEGER FileSize; @@ -150,7 +150,7 @@ WriteFile (file, buffer, BufferSize, &temp, NULL); ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize.QuadPart,szDeleteWipe); } - WriteFile (file, buffer, FileSize.QuadPart - i, &temp, NULL); + WriteFile (file, buffer, (DWORD)(FileSize.QuadPart - i), &temp, NULL); ConOutPrintf (_T("100%% %s\n"),szDeleteWipe); CloseHandle (file); } _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -199,8 +199,8 @@ } DIRFINDLISTNODE, *PDIRFINDLISTNODE; -typedef BOOL STDCALL -(*PGETFREEDISKSPACEEX)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); +typedef BOOL +(WINAPI *PGETFREEDISKSPACEEX)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); /* Globally save the # of dirs, files and bytes, @@ -1294,7 +1294,7 @@ { /* Calculate the lines that will be printed */ // iLines = ceil((float)dwCount/(float)iColumns); - iLines = dwCount / iColumns; + iLines = (USHORT)(dwCount / iColumns); for (i = 0;i < iLines;i++) { @@ -1982,22 +1982,25 @@ /* <Debug :> Uncomment this to show the final state of switch flags*/ #ifdef _DEBUG - ConOutPrintf("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - ConOutPrintf("(B) Bare format : %i\n", stFlags.bBareFormat ); - ConOutPrintf("(C) Thousand : %i\n", stFlags.bTSeperator ); - ConOutPrintf("(W) Wide list : %i\n", stFlags.bWideList ); - ConOutPrintf("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); - ConOutPrintf("(L) Lowercase : %i\n", stFlags.bLowerCase ); - ConOutPrintf("(N) New : %i\n", stFlags.bNewLongList ); - ConOutPrintf("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); - for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - ConOutPrintf(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); - ConOutPrintf("(P) Pause : %i\n", stFlags.bPause ); - ConOutPrintf("(Q) Owner : %i\n", stFlags.bUser ); - ConOutPrintf("(S) Recursive : %i\n", stFlags.bRecursive ); - ConOutPrintf("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); - ConOutPrintf("(X) Short names : %i\n", stFlags.bShortName ); - ConOutPrintf("Parameter : %s\n", param ); + { + int i; + ConOutPrintf(_T("Attributes mask/value %x/%x\n"),stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); + ConOutPrintf(_T("(B) Bare format : %i\n"), stFlags.bBareFormat ); + ConOutPrintf(_T("(C) Thousand : %i\n"), stFlags.bTSeperator ); + ConOutPrintf(_T("(W) Wide list : %i\n"), stFlags.bWideList ); + ConOutPrintf(_T("(D) Wide list sort by column : %i\n"), stFlags.bWideListColSort ); + ConOutPrintf(_T("(L) Lowercase : %i\n"), stFlags.bLowerCase ); + ConOutPrintf(_T("(N) New : %i\n"), stFlags.bNewLongList ); + ConOutPrintf(_T("(O) Order : %i\n"), stFlags.stOrderBy.sCriteriaCount ); + for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) + ConOutPrintf(_T(" Order Criteria [%i]: %i (Reversed: %i)\n"),i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); + ConOutPrintf(_T("(P) Pause : %i\n"), stFlags.bPause ); + ConOutPrintf(_T("(Q) Owner : %i\n"), stFlags.bUser ); + ConOutPrintf(_T("(S) Recursive : %i\n"), stFlags.bRecursive ); + ConOutPrintf(_T("(T) Time field : %i\n"), stFlags.stTimeField.eTimeField ); + ConOutPrintf(_T("(X) Short names : %i\n"), stFlags.bShortName ); + ConOutPrintf(_T("Parameter : %s\n"), param ); + } #endif /* print the header */ _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -33,7 +33,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - INT i = 0; + UINT i = 0; #ifdef _DEBUG DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -25,7 +25,7 @@ #ifdef FEATURE_UNIX_FILENAME_COMPLETION -VOID CompleteFilename (LPTSTR str, INT charcount) +VOID CompleteFilename (LPTSTR str, UINT charcount) { WIN32_FIND_DATA file; HANDLE hFile; @@ -376,7 +376,7 @@ /* number of quotes in the string */ INT nQuotes = 0; /* used in for loops */ - INT i; + UINT i; /* Char number to break the string at */ INT PBreak = 0; INT SBreak = 0; @@ -509,7 +509,7 @@ return ret; } -VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, INT cusor) +VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) { /* Length of string before we complete it */ INT StartLength; @@ -534,16 +534,17 @@ /* Number of files */ INT FileListSize = 0; /* Used for loops */ - INT i; + UINT i; /* Editable string of what was passed in */ TCHAR str[MAX_PATH]; /* Keeps track of what element was last selected */ static INT Sel; BOOL NeededQuote = FALSE; - strOut[0] = _T('\0'); BOOL ShowAll = TRUE; - TCHAR * line = strIN; + + strOut[0] = _T('\0'); + while (_istspace (*line)) line++; if(!_tcsncmp (line, _T("rd "), 3) || !_tcsncmp (line, _T("cd "), 3)) @@ -708,14 +709,9 @@ /* insert the quoation and move things around */ if(szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1) { - /* add another char or you will lose a null char ending */ - _tcsncat(szPrefix,&szPrefix[_tcslen(szPrefix) - 1],1); - for(i = _tcslen(szPrefix) - 1; i > LastSpace; i--) - { - szPrefix[i] = szPrefix[i - 1]; - } + memmove ( &szPrefix[LastSpace+1], &szPrefix[LastSpace], (_tcslen(szPrefix)-LastSpace+1) * sizeof(TCHAR) ); - if(LastSpace + 1 == _tcslen(szPrefix)) + if((UINT)(LastSpace + 1) == _tcslen(szPrefix)) { _tcscat(szPrefix,_T("\"")); } _____ Modified: trunk/reactos/subsys/system/cmd/history.c --- trunk/reactos/subsys/system/cmd/history.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/history.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -193,8 +193,8 @@ if (item==NULL || item==Top || item==Bottom) { #ifdef _DEBUG - DebugPrintf(_T("del in " __FILE__ ": retrning\n" - "item is 0x%08x (Bottom is0x%08x)\n"), + DebugPrintf(_T("del in ") _T(__FILE__) _T(": retrning\n") + _T("item is 0x%08x (Bottom is0x%08x)\n"), item, Bottom); #endif return; _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-09-12 16:06:53 UTC (rev 17819) @@ -276,7 +276,7 @@ TCHAR * tmpPath; TCHAR szCurrent[MAX_PATH]; TCHAR szMsg[RC_STRING_MAX_SIZE]; - INT i; + UINT i; /* Filter out special cases first */ _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2005-09-12 14:55:55 UTC (rev 17818) +++ trunk/reactos/subsys/system/cmd/precomp.h 2005-09-12 16:06:53 UTC (rev 17819) @@ -1,6 +1,5 @@ #include <windows.h> #include <winnt.h> -#include <winternl.h> #include <shellapi.h> #include <tchar.h> @@ -14,6 +13,9 @@ #include <math.h> #include <time.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include "cmd.h" #include "config.h" #include "batch.h"

1 0

[royce] 17818: io.h only exists for win32 - sorry *nix users
by royce＠svn.reactos.com 12 Sep '05

12 Sep '05

io.h only exists for win32 - sorry *nix users Modified: trunk/reactos/tools/winebuild/main.c _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-09-12 14:33:57 UTC (rev 17817) +++ trunk/reactos/tools/winebuild/main.c 2005-09-12 14:55:55 UTC (rev 17818) @@ -26,7 +26,9 @@ #include <assert.h> #include <stdio.h> +#ifdef WIN32 #include <io.h> /* unlink() */ +#endif//WIN32 #include <signal.h> #include <errno.h> #include <string.h>

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