Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[npwoods] 18268: Rbuild: Enhanced MSVC support

by npwoods＠svn.reactos.com

Rbuild: Enhanced MSVC support 1. Enhanced the MSVC backends so that it pulls in information from the main project 2. Fixed bugs in Path::RelativeFromDirectory() in tools\rbuild\XML.cpp With these changes, many VC projects generated by rbuild now compile without any tweaking Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -186,20 +186,28 @@ #ifdef WIN32 // this squirreliness is b/c win32 has drive letters and *nix doesn't... // not possible to do relative across different drive letters - if ( vbase[0] != vpath[0] ) - return path; + { + char path_driveletter = (path[1] == ':') ? toupper(path[0]) : 0; + char base_driveletter = (base_directory[1] == ':') ? toupper(base_directory[0]) : 0; + if ( path_driveletter != base_driveletter ) + return path; + } #endif size_t i = 0; while ( i < vbase.size() && i < vpath.size() && vbase[i] == vpath[i] ) ++i; + + // did we go through all of the path? if ( vbase.size() == vpath.size() && i == vpath.size() ) return "."; + if ( i < vbase.size() ) { // path goes above our base directory, we will need some ..'s - for ( size_t j = 0; j < i; j++ ) + for ( size_t j = i; j < vbase.size(); j++ ) vout.push_back ( ".." ); } + while ( i < vpath.size() ) vout.push_back ( vpath[i++] ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -77,12 +77,10 @@ string dsp_path = module.GetBasePath(); vector<string> c_srcs, source_files, resource_files, includes, libraries, defines; vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_MBCS" ); + // this is a define in MinGW w32api, but not Microsoft's headers defines.push_back ( "STDCALL=__stdcall" ); while ( ifs_list.size() ) @@ -107,6 +105,10 @@ const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) { + // explicitly omit win32api directories + if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) + continue; + string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() ); @@ -361,13 +363,7 @@ 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" ); + vector<string> defines2 = defines; if ( debug ) { defines2.push_back ( "_DEBUG" ); @@ -433,7 +429,7 @@ for ( i = 0; i < includes.size(); i++ ) { const string& include = includes[i]; - if ( strpbrk ( include.c_str(), "[\\\"]" ) ) + if ( strpbrk ( include.c_str(), "[\\\"]" ) || !strncmp ( include.c_str(), "../", 3 ) ) { fprintf ( OUT, " /I \"%s\"", include.c_str() ); } @@ -478,7 +474,7 @@ } fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d \"_DEBUG\"\r\n" ); fprintf ( OUT, "# ADD RSC /l 0x41d" ); - if ( wine ) + /*if ( wine )*/ { for ( i = 0; i < includes.size(); i++ ) { @@ -755,7 +751,7 @@ 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++ ) +/* for ( i = 0; i < resource_files.size(); i++ ) { const string& resource_file = resource_files[i]; fprintf ( OUT, "# Begin Source File\r\n" ); @@ -763,7 +759,7 @@ 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 Group\r\n" ); fprintf ( OUT, "# End Target\r\n" ); fprintf ( OUT, "# End Project\r\n" ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-04 15:32:04 UTC (rev 18267) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-10-05 00:27:25 UTC (rev 18268) @@ -1,408 +1,425 @@ -/* - * Copyright (C) 2002 Patrik Stridvall - * Copyright (C) 2005 Royce Mitchell III - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) -#endif//_MSC_VER - -#include <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 MSVC.NET 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 = GetExtension(module.GetTargetName()); - bool lib = (module_type == ".lib") || (module_type == ".a"); - bool dll = (module_type == ".dll"); - bool exe = (module_type == ".exe"); - // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? - - bool console = exe && (module.type == Win32CUI); - - // 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, libraries, defines; - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.non_if_data ); - - defines.push_back ( "WIN32" ); - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "WIN32" ); - defines.push_back ( "_MBCS" ); - defines.push_back ( "STDCALL=__stdcall" ); - - 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 ); - } - const vector<Library*>& libs = data.libraries; - for ( i = 0; i < libs.size(); i++ ) - { - libraries.push_back ( libs[i]->name + ".lib" ); - } - const vector<Define*>& defs = data.defines; - for ( i = 0; i < defs.size(); i++ ) - { - if ( defs[i]->value[0] ) - defines.push_back ( defs[i]->name + "=" + defs[i]->value ); - else - defines.push_back ( defs[i]->name ); - } - } - - vector<string> header_files; - - bool no_cpp = true; - bool no_msvc_headers = true; - - 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; - } - - 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, "<?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" ); - fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); - fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); - - fprintf ( OUT, "\t<Platforms>\r\n" ); - fprintf ( OUT, "\t\t<Platform\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); - fprintf ( OUT, "\t</Platforms>\r\n" ); - - int n = 0; - - std::string output_dir; - - fprintf ( OUT, "\t<Configurations>\r\n" ); - for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) - { - std::string& cfg = cfgs[icfg]; - - bool debug = !strstr ( cfg.c_str(), "Release" ); - //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); - - fprintf ( OUT, "\t\t<Configuration\r\n" ); - fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); - fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); - - fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); - bool multiple_includes = false; - for ( i = 0; i < includes.size(); i++ ) - { - const string& include = includes[i]; - if ( strcmp ( include.c_str(), "." ) ) - { - if ( multiple_includes ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", include.c_str() ); - multiple_includes = true; - } - } - fprintf ( OUT, "\"\r\n " ); - - if ( debug ) - { - defines.push_back ( "_DEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } - } - else - { - defines.push_back ( "NDEBUG" ); - if ( lib || exe ) - { - defines.push_back ( "_LIB" ); - } - else - { - defines.push_back ( "_WINDOWS" ); - defines.push_back ( "_USRDLL" ); - } - } - - fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); - for ( i = 0; i < defines.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, ";" ); - fprintf ( OUT, "%s", defines[i].c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); - fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); - fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); - fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); - - if ( lib ) - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); - } - else - { - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); - for ( i = 0; i < libraries.size(); i++ ) - { - if ( i > 0 ) - fprintf ( OUT, " " ); - fprintf ( OUT, "%s", libraries[i].c_str() ); - } - fprintf ( OUT, "\"\r\n" ); - - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() ); - fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); - fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); - - if ( debug ) - fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); - - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); - } - - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); - fprintf ( OUT, "\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); - fprintf ( OUT, "\t\t</Configuration>\r\n" ); - - n++; - } - fprintf ( OUT, "\t</Configurations>\r\n" ); - - fprintf ( OUT, "\t<Files>\r\n" ); - - // Source files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" ); - for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) - { - const string& source_file = DosSeparator(source_files[isrcfile]); - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - // Header files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" ); - for ( i = 0; i < header_files.size(); i++ ) - { - const string& header_file = header_files[i]; - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", header_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - // Resource files - fprintf ( OUT, "\t\t<Filter\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" ); - fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" ); - for ( i = 0; i < header_files.size(); i++ ) - { - const string& resource_file = resource_files[i]; - fprintf ( OUT, "\t\t\t<File\r\n" ); - fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", resource_file.c_str() ); - fprintf ( OUT, "\t\t\t</File>\r\n" ); - } - fprintf ( OUT, "\t\t</Filter>\r\n" ); - - fprintf ( OUT, "\t</Files>\r\n" ); - fprintf ( OUT, "\t<Globals>\r\n" ); - fprintf ( OUT, "\t</Globals>\r\n" ); - fprintf ( OUT, "</VisualStudioProject>\r\n" ); - fclose(OUT); -} - -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" ); - fprintf ( OUT, "\r\n" ); -} - -void -MSVCBackend::_generate_sln ( FILE* OUT ) -{ - _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 ); - _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies ); - } -// _generate_dsw_footer ( OUT ); -} - - - -/* - 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; -*/ +/* + * Copyright (C) 2002 Patrik Stridvall + * Copyright (C) 2005 Royce Mitchell III + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <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 MSVC.NET 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 = GetExtension(module.GetTargetName()); + bool lib = (module_type == ".lib") || (module_type == ".a"); + bool dll = (module_type == ".dll"); + bool exe = (module_type == ".exe"); + // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? + + bool console = exe && (module.type == Win32CUI); + + // 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, libraries, defines; + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + + // this is a define in MinGW w32api, but not Microsoft's headers + defines.push_back ( "STDCALL=__stdcall" ); + + 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++ ) + { + // explicitly omit win32api directories + if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) + continue; + + string path = Path::RelativeFromDirectory ( + incs[i]->directory, + module.GetBasePath() ); + includes.push_back ( path ); + } + const vector<Library*>& libs = data.libraries; + for ( i = 0; i < libs.size(); i++ ) + { + libraries.push_back ( libs[i]->name + ".lib" ); + } + const vector<Define*>& defs = data.defines; + for ( i = 0; i < defs.size(); i++ ) + { + if ( defs[i]->value[0] ) + defines.push_back ( defs[i]->name + "=" + defs[i]->value ); + else + defines.push_back ( defs[i]->name ); + } + } + + vector<string> header_files; + + bool no_cpp = true; + bool no_msvc_headers = true; + + 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; + } + + 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, "<?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" ); + fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() ); + fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" ); + + fprintf ( OUT, "\t<Platforms>\r\n" ); + fprintf ( OUT, "\t\t<Platform\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); + fprintf ( OUT, "\t</Platforms>\r\n" ); + + int n = 0; + + std::string output_dir; + + fprintf ( OUT, "\t<Configurations>\r\n" ); + for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) + { + std::string& cfg = cfgs[icfg]; + + bool debug = !strstr ( cfg.c_str(), "Release" ); + //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); + + fprintf ( OUT, "\t\t<Configuration\r\n" ); + fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); + fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug ? 0 : 2 ); + + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + bool multiple_includes = false; + for ( i = 0; i < includes.size(); i++ ) + { + const string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"\r\n " ); + + if ( debug ) + { + defines.push_back ( "_DEBUG" ); + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + } + else + { + defines.push_back ( "NDEBUG" ); + if ( lib || exe ) + { + defines.push_back ( "_LIB" ); + } + else + { + defines.push_back ( "_WINDOWS" ); + defines.push_back ( "_USRDLL" ); + } + } + + fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" ); + for ( i = 0; i < defines.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", defines[i].c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" ); + fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" ); + + if ( lib ) + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); + } + else + { + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); + for ( i = 0; i < libraries.size(); i++ ) + { + if ( i > 0 ) + fprintf ( OUT, " " ); + fprintf ( OUT, "%s", libraries[i].c_str() ); + } + fprintf ( OUT, "\"\r\n" ); + + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 ); + fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" ); + + if ( debug ) + fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); + + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); + } + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\"" ); + multiple_includes = false; + for ( i = 0; i < includes.size(); i++ ) + { + const string& include = includes[i]; + if ( strcmp ( include.c_str(), "." ) ) + { + if ( multiple_includes ) + fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + multiple_includes = true; + } + } + fprintf ( OUT, "\"/>\r\n " ); + + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" ); + fprintf ( OUT, "\t\t</Configuration>\r\n" ); + + n++; + } + fprintf ( OUT, "\t</Configurations>\r\n" ); + + fprintf ( OUT, "\t<Files>\r\n" ); + + // Source files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" ); + for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) + { + const string& source_file = DosSeparator(source_files[isrcfile]); + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + // Header files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" ); + for ( i = 0; i < header_files.size(); i++ ) + { + const string& header_file = header_files[i]; + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", header_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + // Resource files + fprintf ( OUT, "\t\t<Filter\r\n" ); + fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" ); + fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" ); + for ( i = 0; i < header_files.size(); i++ ) + { + const string& resource_file = resource_files[i]; + fprintf ( OUT, "\t\t\t<File\r\n" ); + fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", resource_file.c_str() ); + fprintf ( OUT, "\t\t\t</File>\r\n" ); + } + fprintf ( OUT, "\t\t</Filter>\r\n" ); + + fprintf ( OUT, "\t</Files>\r\n" ); + fprintf ( OUT, "\t<Globals>\r\n" ); + fprintf ( OUT, "\t</Globals>\r\n" ); + fprintf ( OUT, "</VisualStudioProject>\r\n" ); + fclose(OUT); +} + +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" ); + fprintf ( OUT, "\r\n" ); +} + +void +MSVCBackend::_generate_sln ( FILE* OUT ) +{ + _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 ); + _generate_dsw_project ( OUT, module, vcproj_file, module.dependencies ); + } +// _generate_dsw_footer ( OUT ); +} + + + +/* + 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; +*/

19 years, 2 months

[turner] 18267: Better way to fix 868. Check the last error instead of checking before hand. Thanks to billgMS for point this out.

by turner＠svn.reactos.com

Better way to fix 868. Check the last error instead of checking before hand. Thanks to billgMS for point this out. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-10-04 14:56:38 UTC (rev 18266) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-10-04 15:32:04 UTC (rev 18267) @@ -571,7 +571,8 @@ STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" -STRING_MD_ERROR, "A subdirectory or file ass already exists.\n" +STRING_MD_ERROR, "A subdirectory or file already exists.\n" +STRING_MD_ERROR2, "The path to the new folder does not exist.\n" STRING_CMD_ERROR1, "Can't redirect input from file %s\n" STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3, "Can't redirect to file %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-10-04 14:56:38 UTC (rev 18266) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-10-04 15:32:04 UTC (rev 18267) @@ -472,6 +472,9 @@ if (!dir) { ConErrResPuts (STRING_ERROR_REQ_PARAM_MISSING); + nErrorLevel = 1; + if(p != NULL) + freep (p); return 1; } @@ -479,16 +482,20 @@ if (_tcslen (dir) >= 2 && dir[_tcslen (dir) - 1] == _T('\\')) dir[_tcslen(dir) - 1] = _T('\0'); - if(IsExistingDirectory(dir) || IsExistingFile(dir)) - { - ConErrResPuts(STRING_MD_ERROR); - freep(p); - nErrorLevel = 1; - return 1; - } if (!CreateDirectory (dir, NULL)) { - ErrorMessage (GetLastError(), _T("MD")); + if(GetLastError() == ERROR_ALREADY_EXISTS) + { + ConErrResPuts(STRING_MD_ERROR); + } + else if(GetLastError() == ERROR_PATH_NOT_FOUND) + { + ConErrResPuts(STRING_MD_ERROR2); + } + else + { + ErrorMessage (GetLastError(), _T("MD")); + } nErrorLevel = 1; freep (p); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-10-04 14:56:38 UTC (rev 18266) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-10-04 15:32:04 UTC (rev 18267) @@ -221,6 +221,7 @@ #define STRING_SYNTAX_COMMAND_INCORRECT 723 #define STRING_RMDIR_HELP2 724 #define STRING_MD_ERROR 725 +#define STRING_MD_ERROR2 726 /* These strings are language independent (cmd.rc) */

19 years, 2 months

[turner] 18266: Check to see if a folder or file is already there when makign a folder. Set correct errorlevel when fail to create folder. fixes bug 868.

by turner＠svn.reactos.com

Check to see if a folder or file is already there when makign a folder. Set correct errorlevel when fail to create folder. fixes bug 868. Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-10-04 14:31:11 UTC (rev 18265) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-10-04 14:56:38 UTC (rev 18266) @@ -571,6 +571,7 @@ STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" +STRING_MD_ERROR, "A subdirectory or file ass already exists.\n" STRING_CMD_ERROR1, "Can't redirect input from file %s\n" STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3, "Can't redirect to file %s\n" _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-10-04 14:31:11 UTC (rev 18265) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-10-04 14:56:38 UTC (rev 18266) @@ -433,7 +433,7 @@ LPTSTR place; /* used to search for the \ when no space is used */ LPTSTR *p = NULL; INT argc; - + nErrorLevel = 0; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_MKDIR_HELP); @@ -479,10 +479,17 @@ if (_tcslen (dir) >= 2 && dir[_tcslen (dir) - 1] == _T('\\')) dir[_tcslen(dir) - 1] = _T('\0'); + if(IsExistingDirectory(dir) || IsExistingFile(dir)) + { + ConErrResPuts(STRING_MD_ERROR); + freep(p); + nErrorLevel = 1; + return 1; + } if (!CreateDirectory (dir, NULL)) { ErrorMessage (GetLastError(), _T("MD")); - + nErrorLevel = 1; freep (p); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-10-04 14:31:11 UTC (rev 18265) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-10-04 14:56:38 UTC (rev 18266) @@ -220,6 +220,7 @@ #define STRING_EXPECTED_NUMBER_OR_VARIABLE 722 #define STRING_SYNTAX_COMMAND_INCORRECT 723 #define STRING_RMDIR_HELP2 724 +#define STRING_MD_ERROR 725 /* These strings are language independent (cmd.rc) */

19 years, 2 months

[mf] 18265: activate execution from command bar

by mf＠svn.reactos.com

activate execution from command bar Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-04 14:06:33 UTC (rev 18264) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-04 14:31:11 UTC (rev 18265) @@ -387,7 +387,7 @@ ExecuteDialog dlg = {{0}, 0}; if (DialogBoxParam(g_Globals._hInstance, MAKEINTRESOURCE(IDD_EXECUTE), _hwnd, ExecuteDialog::WndProc, (LPARAM)&dlg) == IDOK) { - CONTEXT("ShellExecute()"); + CONTEXT("ID_EXECUTE - ShellExecute()"); HINSTANCE hinst = ShellExecute(_hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); @@ -430,7 +430,8 @@ break; case IDW_COMMANDBAR: - //@todo execute command in command bar + if (code == 1) + ExecuteCommandbar(NULL); break; default: @@ -441,6 +442,36 @@ } +void MainFrameBase::ExecuteCommandbar(LPCTSTR dir) +{ + TCHAR cmd[BUFFER_LEN]; + + if (GetWindowText(_hcommandedit, cmd, BUFFER_LEN)) { + CONTEXT("ExecuteCommandbar - ShellExecute()"); + + // remove command prompt from 'cmd' string + LPCTSTR p = cmd; + + if (*p == '>') + ++p; + + while(*p == ' ') + ++p; + + if (dir) { + // remove "file://" from directory URL + if (!_tcsnicmp(dir, TEXT("file://"), 7)) + dir += 7; + } + + HINSTANCE hinst = ShellExecute(_hwnd, NULL, p, NULL, dir, SW_SHOWNORMAL); + + if ((int)hinst <= 32) + display_error(_hwnd, GetLastError()); + } +} + + int MainFrameBase::Notify(int id, NMHDR* pnmh) { switch(pnmh->code) { @@ -1121,6 +1152,20 @@ MainFrameBase::Create(NULL, false); break; + case IDW_COMMANDBAR: + if (code == 1) { + TCHAR url[BUFFER_LEN]; + LPCTSTR dir; + + if (GetWindowText(_haddressedit, url, BUFFER_LEN)) + dir = url; + else + dir = NULL; + + ExecuteCommandbar(dir); + } + break; + ///@todo There are even more menu items! default: @@ -1488,6 +1533,11 @@ MainFrameBase::Create(_url, true); break; + case IDW_COMMANDBAR: + if (code == 1) + ExecuteCommandbar(_url); + break; + default: return super::Command(id, code); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-04 14:06:33 UTC (rev 18264) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-04 14:31:11 UTC (rev 18265) @@ -81,6 +81,8 @@ void FillBookmarks(); virtual bool go_to(LPCTSTR url, bool new_window); + + void ExecuteCommandbar(LPCTSTR dir); };

19 years, 2 months

[mf] 18264: "execute" menu entry

by mf＠svn.reactos.com

"execute" menu entry Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-fr.rc Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ro.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc Property changes on: trunk/reactos/subsys/system/explorer ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *.chm *.lib + *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *.chm *.lib wine-explorer old _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -33,6 +33,8 @@ BEGIN POPUP "&Soubor" BEGIN + MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&UkonÞit", ID_FILE_EXIT END POPUP "&ZobrazenÝ" @@ -105,6 +107,8 @@ BEGIN POPUP "&Soubor" BEGIN + MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&UkonÞit", ID_FILE_EXIT END POPUP "&ZobrazenÝ" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -33,7 +33,9 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Schliessen", ID_FILE_EXIT + MENUITEM "&Ausf³hren...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_FILE_EXIT END POPUP "&Ansicht" BEGIN @@ -72,6 +74,8 @@ BEGIN POPUP "&Datei" BEGIN + MENUITEM "&Ausf³hren...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Schliessen", ID_FILE_EXIT END POPUP "&Ansicht" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -30,7 +30,9 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&Close", ID_FILE_EXIT + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&View" BEGIN @@ -102,6 +104,8 @@ BEGIN POPUP "&File" BEGIN + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Close", ID_FILE_EXIT END POPUP "&View" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -30,6 +30,8 @@ BEGIN POPUP "&Archivo" BEGIN + MENUITEM "E&jecutar...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Salir", ID_FILE_EXIT END POPUP "&Ver" @@ -102,6 +104,8 @@ BEGIN POPUP "&Archivo" BEGIN + MENUITEM "E&jecutar...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "S&alir", ID_FILE_EXIT END POPUP "&Ver" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-fr.rc --- trunk/reactos/subsys/system/explorer/explorer-fr.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-fr.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -74,6 +74,8 @@ BEGIN POPUP "&Fichier" BEGIN + MENUITEM "E&xÚcuter...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Fermer", ID_FILE_EXIT END POPUP "&Affichage" @@ -113,6 +115,8 @@ BEGIN POPUP "&Fichier" BEGIN + MENUITEM "E&xÚcuter...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Fermer", ID_FILE_EXIT END POPUP "&Affichage" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/explorer-ro.rc --- trunk/reactos/subsys/system/explorer/explorer-ro.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-ro.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -33,6 +33,8 @@ BEGIN POPUP "&Fi?ier" BEGIN + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Ie?ire", ID_FILE_EXIT END POPUP "&Prezentare" @@ -72,6 +74,8 @@ BEGIN POPUP "&Fi?ier" BEGIN + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Ie?ire", ID_FILE_EXIT END POPUP "&Prezentare" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc --- trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -44,6 +44,8 @@ BEGIN POPUP "&ÈÓÚÙ" BEGIN + MENUITEM "&ÃÓ´¾±?Þ?³...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "?&¹§¯õ", ID_FILE_EXIT END POPUP "&?Þõ" @@ -96,6 +98,8 @@ BEGIN POPUP "&ÈÓÚÙ" BEGIN + MENUITEM "&ÃÓ´¾±?Þ?³...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "?&¹§¯õ", ID_FILE_EXIT END POPUP "&?Þõ" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc --- trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-04 13:47:22 UTC (rev 18263) +++ trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-04 14:06:33 UTC (rev 18264) @@ -68,6 +68,8 @@ BEGIN POPUP "&Arkiv" BEGIN + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Avsluta", ID_FILE_EXIT END POPUP "&Visa" @@ -140,6 +142,8 @@ BEGIN POPUP "&Arkiv" BEGIN + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM SEPARATOR MENUITEM "&Avsluta", ID_FILE_EXIT END POPUP "&Visa"

19 years, 2 months

[mf] 18263: set EOL-style

by mf＠svn.reactos.com

set EOL-style Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-fr.rc Modified: trunk/reactos/subsys/system/explorer/explorer-pt.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ro.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc Modified: trunk/reactos/subsys/system/explorer/explorer.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 13:45:19 UTC (rev 18262) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 13:47:22 UTC (rev 18263) @@ -1,397 +1,397 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -// Czech resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) -#ifdef _WIN32 -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "&UkonÞit", ID_FILE_EXIT - END - POPUP "&ZobrazenÝ" - BEGIN - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH - MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&Okno" - BEGIN - MENUITEM "&NovÚ Okno", ID_WINDOW_NEW - MENUITEM "&Kaskßdovat\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ - MENUITEM "U&spo°ßdat svisle\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT - MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE - END - POPUP "&Nßstroje" - BEGIN - MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS - END - POPUP "&Pomoc" - BEGIN - MENUITEM "&Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O p&r¨zkumnÝku...", ID_ABOUT_EXPLORER - MENUITEM "&O OS...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&NastavenÝ...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Sprßvce ·loh...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&O Exploreru...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Otev°Ýt ovlßdßnÝ hlasitosti", ID_TRAY_VOLUME - MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Zobrazit skrytÚ ikony", ID_SHOW_HIDDEN_ICONS - MENUITEM "Z&obrazit ikonu tlaÞÝtka", ID_SHOW_ICON_BUTTON - MENUITEM "&Nastavit upozornýnÝ...", ID_CONFIG_NOTIFYAREA - MENUITEM "N&astavit datum a Þas...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&O pr¨zkunÝku...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "&UkonÞit", ID_FILE_EXIT - END - POPUP "&ZobrazenÝ" - BEGIN - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Status liÜta", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH - MENUITEM "Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Nßstroje" - BEGIN - MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS - END - POPUP "&Pomoc" - BEGIN - MENUITEM "Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O &pr¨zkumnÝku...", ID_ABOUT_EXPLORER - MENUITEM "O &OS...", ID_ABOUT_WINDOWS - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Spustit" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&Spustit",1,158,6,47,14 - PUSHBUTTON "&ZruÜit",2,158,23,47,14 - PUSHBUTTON "&Pomoc",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Hledat program v nabÝdce Start" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filter:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Vyhledat",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Vlastnosti plochy" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "ProsÝm zvolte si zp¨sob zarovnßnÝ ikon:",IDC_STATIC,7,7, - 166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Zobrazit verzi",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Vlastnosti panelu ·loh" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "&Zobrazit Þas",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&Skr²t neaktivnÝ ikony",ID_HIDE_INACTIVE_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&UpozornýnÝ...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Vlastnosti nabÝdky Start" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "NastavenÝ ikon v oblasti upozor?ovßnÝ" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 - CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 - CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "&Nastavit",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&ZruÜit",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "Volba MDI / SDI m¾du" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "ProsÝm zvolte si Vßmi up°ednost?ovan² zp¨sob zobrazenÝ oken pr¨zkumnÝka:", - IDC_STATIC,7,7,160,8 - CONTROL "&MDI (Mnoho dokumentov² interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 - CONTROL "&SDI (Jedno dokumentov² interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,62,115,10 - CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 - CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Open Subfolders in s&eparate windows", - IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 - LTEXT "Toto nastavenÝ bude pou×ito jako implicitnÝ pro vÜechny okna pr¨zkumnÝka.", - IDC_STATIC,7,111,174,22 - DEFPUSHBUTTON "&Nastavit",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "&ZruÜit",IDCANCEL,106,136,50,14 -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "Reactos pr¨zkumnÝk" - IDS_START "Start" - IDS_LOGOFF "Odhlßsit se..." - IDS_SHUTDOWN "Vypnout..." - IDS_LAUNCH "Spustit..." - IDS_START_HELP "Pomoc" - IDS_SEARCH_FILES "Hledat..." - IDS_DOCUMENTS "Dokumenty" - IDS_FAVORITES "OblÝbenÚ" - IDS_PROGRAMS "Programy" - IDS_SETTINGS "NastavenÝ" - IDS_EXPLORE "Prozkoumat" - IDS_EMPTY "(PrßzdnÚ)" - IDS_RECENT "NedßvnÚ dokumenty" - IDS_ADMIN "Administrace" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "NabÝdka Start" - IDS_MINIMIZE_ALL "minimalizovat vÜechna okna" - IDS_DESKTOP_NUM "Plocha %d" - IDS_VOLUME "Hlasitost" - IDS_ITEMS_CUR "souÞasnÚ polo×ky" - IDS_ITEMS_CONFIGURED "nastavenÝ" - IDS_ITEMS_VISIBLE "viditelnÚ" - IDS_ITEMS_HIDDEN "skrytÚ" - IDS_NOTIFY_SHOW "zobrazit" - IDS_NOTIFY_HIDE "skr²t" - IDS_NOTIFY_AUTOHIDE "skr²vat automaticky" - IDS_SHOW_HIDDEN_ICONS "Zobrazit skrytÚ ikony" - IDS_HIDE_ICONS "Skr²t ikony" - IDS_TERMINATE "UkonÞit ReactOS pr¨zkumnÝk" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "SÝì" - IDS_CONNECTIONS "SÝØovÚ spojenÝ" - IDS_DRIVES "Disky" - IDS_SEARCH_COMPUTER "Hledat..." - IDS_SETTINGS_MENU "NastavenÝ" - IDS_CONTROL_PANEL "OvlßdacÝ panel" - IDS_PRINTERS "Tiskßrny" - IDS_BROWSE "ProhlÝ×et soubory" - IDS_SEARCH_PRG "Search Program..." - IDS_ALL_USERS "VÜichni u×ivatelÚ\\" - IDS_SEARCH "Hledat" - IDS_ABOUT_EXPLORER "&O pr¨zkumnÝku..." - IDS_LAUNCH_MANY_PROGRAMS - "Spustili jste vÝce ne× jeden program.\nJste si jisti, ×e je chcete spustit vÜechny?" - IDS_DESKTOPBAR_SETTINGS "NastavenÝ plochy" - IDS_DESKTOP "Plocha" - IDS_TASKBAR "Panel ·loh" -END - -#endif // Czech resources -/////////////////////////////////////////////////////////////////////// ////// - - -/////////////////////////////////////////////////////////////////////// ////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -/////////////////////////////////////////////////////////////////////// ////// - - - -#ifndef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/////////////////////////////////////////////////////////////////////// ////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "resource.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Czech resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) +#ifdef _WIN32 +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&UkonÞit", ID_FILE_EXIT + END + POPUP "&ZobrazenÝ" + BEGIN + MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR + MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Okno" + BEGIN + MENUITEM "&NovÚ Okno", ID_WINDOW_NEW + MENUITEM "&Kaskßdovat\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ + MENUITEM "U&spo°ßdat svisle\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE + END + POPUP "&Nßstroje" + BEGIN + MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS + END + POPUP "&Pomoc" + BEGIN + MENUITEM "&Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ + MENUITEM "O p&r¨zkumnÝku...", ID_ABOUT_EXPLORER + MENUITEM "&O OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&NastavenÝ...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Sprßvce ·loh...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&O Exploreru...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Otev°Ýt ovlßdßnÝ hlasitosti", ID_TRAY_VOLUME + MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zobrazit skrytÚ ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "Z&obrazit ikonu tlaÞÝtka", ID_SHOW_ICON_BUTTON + MENUITEM "&Nastavit upozornýnÝ...", ID_CONFIG_NOTIFYAREA + MENUITEM "N&astavit datum a Þas...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&O pr¨zkunÝku...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU PRELOAD DISCARDABLE +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&UkonÞit", ID_FILE_EXIT + END + POPUP "&ZobrazenÝ" + BEGIN + MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR + MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status liÜta", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Nßstroje" + BEGIN + MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS + END + POPUP "&Pomoc" + BEGIN + MENUITEM "Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ + MENUITEM "O &pr¨zkumnÝku...", ID_ABOUT_EXPLORER + MENUITEM "O &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Spustit" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&Spustit",1,158,6,47,14 + PUSHBUTTON "&ZruÜit",2,158,23,47,14 + PUSHBUTTON "&Pomoc",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Hledat program v nabÝdce Start" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Vyhledat",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti plochy" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "ProsÝm zvolte si zp¨sob zarovnßnÝ ikon:",IDC_STATIC,7,7, + 166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Zobrazit verzi",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti panelu ·loh" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "&Zobrazit Þas",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Skr²t neaktivnÝ ikony",ID_HIDE_INACTIVE_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&UpozornýnÝ...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti nabÝdky Start" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "NastavenÝ ikon v oblasti upozor?ovßnÝ" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 + CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&Nastavit",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&ZruÜit",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Volba MDI / SDI m¾du" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "ProsÝm zvolte si Vßmi up°ednost?ovan² zp¨sob zobrazenÝ oken pr¨zkumnÝka:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Mnoho dokumentov² interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 + CONTROL "&SDI (Jedno dokumentov² interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,115,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Toto nastavenÝ bude pou×ito jako implicitnÝ pro vÜechny okna pr¨zkumnÝka.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&Nastavit",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&ZruÜit",IDCANCEL,106,136,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos pr¨zkumnÝk" + IDS_START "Start" + IDS_LOGOFF "Odhlßsit se..." + IDS_SHUTDOWN "Vypnout..." + IDS_LAUNCH "Spustit..." + IDS_START_HELP "Pomoc" + IDS_SEARCH_FILES "Hledat..." + IDS_DOCUMENTS "Dokumenty" + IDS_FAVORITES "OblÝbenÚ" + IDS_PROGRAMS "Programy" + IDS_SETTINGS "NastavenÝ" + IDS_EXPLORE "Prozkoumat" + IDS_EMPTY "(PrßzdnÚ)" + IDS_RECENT "NedßvnÚ dokumenty" + IDS_ADMIN "Administrace" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "NabÝdka Start" + IDS_MINIMIZE_ALL "minimalizovat vÜechna okna" + IDS_DESKTOP_NUM "Plocha %d" + IDS_VOLUME "Hlasitost" + IDS_ITEMS_CUR "souÞasnÚ polo×ky" + IDS_ITEMS_CONFIGURED "nastavenÝ" + IDS_ITEMS_VISIBLE "viditelnÚ" + IDS_ITEMS_HIDDEN "skrytÚ" + IDS_NOTIFY_SHOW "zobrazit" + IDS_NOTIFY_HIDE "skr²t" + IDS_NOTIFY_AUTOHIDE "skr²vat automaticky" + IDS_SHOW_HIDDEN_ICONS "Zobrazit skrytÚ ikony" + IDS_HIDE_ICONS "Skr²t ikony" + IDS_TERMINATE "UkonÞit ReactOS pr¨zkumnÝk" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "SÝì" + IDS_CONNECTIONS "SÝØovÚ spojenÝ" + IDS_DRIVES "Disky" + IDS_SEARCH_COMPUTER "Hledat..." + IDS_SETTINGS_MENU "NastavenÝ" + IDS_CONTROL_PANEL "OvlßdacÝ panel" + IDS_PRINTERS "Tiskßrny" + IDS_BROWSE "ProhlÝ×et soubory" + IDS_SEARCH_PRG "Search Program..." + IDS_ALL_USERS "VÜichni u×ivatelÚ\\" + IDS_SEARCH "Hledat" + IDS_ABOUT_EXPLORER "&O pr¨zkumnÝku..." + IDS_LAUNCH_MANY_PROGRAMS + "Spustili jste vÝce ne× jeden program.\nJste si jisti, ×e je chcete spustit vÜechny?" + IDS_DESKTOPBAR_SETTINGS "NastavenÝ plochy" + IDS_DESKTOP "Plocha" + IDS_TASKBAR "Panel ·loh" +END + +#endif // Czech resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""resource.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + Property changes on: trunk/reactos/subsys/system/explorer/explorer-cz.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 13:45:19 UTC (rev 18262) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 13:47:22 UTC (rev 18263) @@ -1,401 +1,401 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Schliessen", ID_FILE_EXIT - END - POPUP "&Ansicht" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualisieren\tF5", ID_REFRESH - MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&Fenster" - BEGIN - MENUITEM "Neues &Fenster", ID_WINDOW_NEW - MENUITEM "?ber&lappend\tUmschalt+F5", ID_WINDOW_CASCADE - MENUITEM "&Untereinander", ID_WINDOW_TILE_HORZ - MENUITEM "&Nebeneinander\tUmschalt+F4", ID_WINDOW_TILE_VERT - MENUITEM "au&tomatisch anordnen", ID_WINDOW_AUTOSORT - MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE - END - POPUP "&Extras" - BEGIN - MENUITEM "&Optionen", ID_TOOLS_OPTIONS - END - POPUP "&Hilfe" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&?ber ReactOS Explorer...", ID_ABOUT_EXPLORER - MENUITEM "?ber React&OS...", ID_ABOUT_WINDOWS - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Schliessen", ID_FILE_EXIT - END - POPUP "&Ansicht" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Aktualisieren\tF5", ID_REFRESH - MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Extras" - BEGIN - MENUITEM "&Optionen", ID_TOOLS_OPTIONS - END - POPUP "&Hilfe" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Einstellungen...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Task Manager...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Zeige versteckte Icons", ID_SHOW_HIDDEN_ICONS - MENUITEM "Zeige Icon-&Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Konfiguriere Benachrichtigungen...", ID_CONFIG_NOTIFYAREA - MENUITEM "Einstellen von &Datum/Zeit...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Íffne &Lautstõrkeregler", ID_TRAY_VOLUME - MENUITEM "Editieren der Audio-&Einstellungen", ID_VOLUME_PROPERTIES - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ausf³hren" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "Befehls&zeile:",-1,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,3,18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "Als &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 3,45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "A&bbrechen",2,158,23,47,14 - PUSHBUTTON "&Hilfe",254,158,43,47,14 -END - -IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?ber ReactOS Explorer" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 - LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 - LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 - LTEXT "",IDC_WIN_VERSION,91,58,98,22 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 204 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop-Einstellungen" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Bitte wõhlen Sie den gew³nschten Platzierungs-Algorithmus f³r die Desktop-Icons aus:", - IDC_STATIC,7,7,197,23 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,35,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,35,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,35,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,35,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,83,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,83,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,83,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,83,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | [truncated at 1000 lines; 5143 more skipped]

19 years, 2 months

[turner] 18262: Add errorlevel for set /A

by turner＠svn.reactos.com

Add errorlevel for set /A Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-10-04 13:43:15 UTC (rev 18261) +++ trunk/reactos/subsys/system/cmd/set.c 2005-10-04 13:45:19 UTC (rev 18262) @@ -69,7 +69,7 @@ /* remove escapes */ if ( param[0] ) for ( i = 0; param[i+1]; i++ ) { - if ( param[i] == '^' ) + if ( param[i] == _T('^') ) { memmove ( &param[i], &param[i+1], _tcslen(&param[i]) * sizeof(TCHAR) ); } @@ -105,8 +105,14 @@ /* the /A does *NOT* have to be followed by a whitespace */ if ( !_tcsnicmp (param, _T("/A"), 2) ) { + BOOL Success = seta_eval ( skip_ws(param+2) ); + if(!Success) + { + /*might seem random but this is what windows xp does */ + nErrorLevel = 9165; + } /* TODO FIXME - what are we supposed to return? */ - return seta_eval ( skip_ws(param+2) ); + return Success; } p = _tcschr (param, _T('='));

19 years, 2 months

[mf] 18261: remove remaining winefile resources

by mf＠svn.reactos.com

remove remaining winefile resources Modified: trunk/reactos/subsys/system/explorer/explorer-cn.rc Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc Modified: trunk/reactos/subsys/system/explorer/explorer-pt.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc Modified: trunk/reactos/subsys/system/explorer/resource.h _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cn.rc (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -68,116 +68,6 @@ END END -IDM_WINEFILE MENU FIXED IMPURE -BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "&Otev°Ýt\tEnter", 101 - MENUITEM "&P°esunout...\tF7", 106 - MENUITEM "&KopÝrovat...\tF8", 107 - MENUITEM "&Ve schrßnce...\tF9", 118 - MENUITEM "&Smazat\tDel", 108 - MENUITEM "P°&ejmenovat...", 109 - MENUITEM "&Vlastnosti...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "Ko&mprimovat...", 119 - MENUITEM "Dekomp&rimovat...", 120 - MENUITEM SEPARATOR - MENUITEM "Sp&ustit...", ID_EXECUTE - MENUITEM "&Tisknout...", 102 - MENUITEM "&Asociovat...", 103 - MENUITEM SEPARATOR - MENUITEM "Vytvo°it adresß°...", ID_EXECUTE - MENUITEM "&Hledat...", 104 - MENUITEM "&Vybrat soubory...", 116 - MENUITEM SEPARATOR - MENUITEM "UkonÞit\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disk" - BEGIN - MENUITEM "&KopÝrovat disk...", 201 - MENUITEM "&Jmenovka disku...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formßtovat disk...", 203 - MENUITEM SEPARATOR - MENUITEM "&Pipojit sÝØov² disk", 252 - MENUITEM "&Odpojit sÝØov² disk", 253 - MENUITEM SEPARATOR - MENUITEM "&SdÝlet jako...", 254 - MENUITEM "&ZruÜit sdÝlenÝ...", 255 - MENUITEM SEPARATOR - MENUITEM "Z&volit disk...", 251 - END - POPUP "&Adresß°e" - BEGIN - MENUITEM "&DalÜÝ ·rove?\t+", 301 - MENUITEM "&Rozbalit strom\t*", 302 - MENUITEM "R&ozbalit vÜe\tCtrl+*", 303 - MENUITEM "&Sbalit strom\t-", 304 - MENUITEM SEPARATOR - MENUITEM "O&znaÞit potomky", 505 - END - POPUP "&ZobrazenÝ" - BEGIN - MENUITEM "&Strom a adresß°e", 413 - MENUITEM "&Jen strom", 411 - MENUITEM "J&en adresß°e", 412 - MENUITEM SEPARATOR - MENUITEM "&Rozdýlit", 414 - MENUITEM SEPARATOR - MENUITEM "&JmÚno", ID_VIEW_NAME - MENUITEM "&VÜechny detaily", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "?ßst&eÞnÚ detaily...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "T°Ýdit podle jmÚ&na", 404 - MENUITEM "T°Ýdit podle &druhu", 405 - MENUITEM "T°Ýdit podle ve&likosti", 406 - MENUITEM "T°Ýdit podle &data", 407 - MENUITEM SEPARATOR - MENUITEM "&T°Ýdit podle...", 409 - END - POPUP "&NastavenÝ" - BEGIN - MENUITEM "&PotvtrzovßnÝ...", 65535 - MENUITEM "PÝ&smo...", 65535 - MENUITEM "&Upravit liÜtu nßstroj¨...", 65535 - MENUITEM SEPARATOR - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "S&ymbol po býhu", 65535 - MENUITEM "&Ulo×it zmýny p°i ukonÞenÝ", 511 - END - POPUP "&ZabezpeÞenÝ" - BEGIN - MENUITEM "&P°Ýstup...", 605 - MENUITEM "&LogovßnÝ...", 606 - MENUITEM "&VlastnÝk...", 607 - END - POPUP "&Okno" - BEGIN - MENUITEM "&NovÚ okno", ID_WINDOW_NEW - MENUITEM "&Kaskßdovat\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ - MENUITEM "U&spo°ßdat svisle\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT - MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE - MENUITEM "&Aktualizovat\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&TÚmata nßpovýdy\tF1", ID_HELP - MENUITEM "&Hledat v nßpovýdý...\tF1", ID_HELP - MENUITEM "&Jak pou×Ývat nßpovýdu\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Informace o Winefile...", ID_ABOUT_WINEFILE - END -END - IDM_DESKTOPBAR MENU DISCARDABLE BEGIN POPUP "" @@ -366,7 +256,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Volba MDI / SDI m¾du" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "ProsÝm zvolte si Vßmi up°ednost?ovan² zp¨sob zobrazenÝ oken pr¨zkumnÝka:", IDC_STATIC,7,7,160,8 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -29,120 +29,11 @@ // Menu // -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "Í&ffnen\tEingabetaste", 101 - MENUITEM "&Verschieben...\tF7", 106 - MENUITEM "&Kopieren...\tF8", 107 - MENUITEM "&In Zwischenablage...\tF9", 118 - MENUITEM "&L÷schen\tEntf", 108 - MENUITEM "&Umbenennen...", 109 - MENUITEM "&Eigenschaften...\tAlt+Eingabetaste", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "K&omprimieren...", 119 - MENUITEM "Deko&mprimieren...", 120 - MENUITEM SEPARATOR - MENUITEM "&Ausf³hren...", ID_EXECUTE - MENUITEM "&Drucken...", 102 - MENUITEM "Zuord&nen...", 103 - MENUITEM SEPARATOR - MENUITEM "Ver&zeichnis erstellen...", ID_EXECUTE - MENUITEM "&Suchen...", 104 - MENUITEM "Dateien aus&wõhlen...", 116 - MENUITEM SEPARATOR - MENUITEM "&Beenden\tAlt+X", ID_FILE_EXIT - END - POPUP "Da&tentrõger" - BEGIN - MENUITEM "Datentrõger &kopieren...", 201 - MENUITEM "Datentrõger &benennen...", 202 - MENUITEM SEPARATOR - MENUITEM "Datentrõger &formatieren...", 203 - MENUITEM SEPARATOR - MENUITEM "Netzwerklaufwerk &verbinden...", 252 - MENUITEM "Netzwerklaufwerk &trennen...", 253 - MENUITEM SEPARATOR - MENUITEM "F&reigeben als...", 254 - MENUITEM "Freigabe been&den...", 255 - MENUITEM SEPARATOR - MENUITEM "Laufwerk aus&wõhlen...", 251 - END - POPUP "&Verzeichnisse" - BEGIN - MENUITEM "&Nõchste Ebene einblenden\t+", 301 - MENUITEM "&Zweig einblenden\t*", 302 - MENUITEM "Alle &Ebenen einblenden\tStrg+*", 303 - MENUITEM "Zweig &ausblenden\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Verzweigungen kennzeichnen", 505 - END - POPUP "&Ansicht" - BEGIN - MENUITEM "Struktur &und Verzeichnis", 413 - MENUITEM "Nur St&ruktur", 411 - MENUITEM "Nur &Verzeichnis", 412 - MENUITEM SEPARATOR - MENUITEM "&Teilen", 414 - MENUITEM SEPARATOR - MENUITEM "&Name", ID_VIEW_NAME - MENUITEM "A&lle Dateiangaben", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Bestimmte Dateiangaben...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "Nach N&ame", 404 - MENUITEM "Nach T&yp", 405 - MENUITEM "Nach &Gr÷?e", 406 - MENUITEM "Nach &Datum", 407 - MENUITEM SEPARATOR - MENUITEM "Angaben ausw&õhlen...", 409 - END - POPUP "&Optionen" - BEGIN - MENUITEM "&Bestõtigen...", 65535 - MENUITEM "Schrift&art...", 65535 - MENUITEM "Symbolleiste &definieren...", 65535 - MENUITEM SEPARATOR - MENUITEM "Sy&mbolleiste", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Statusleiste", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "Vollb&ild\tStrg+Umschalt+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart", 65535 - MENUITEM "&Einstellungen beim Beenden speichern", 511 - END - POPUP "&Sicherheit" - BEGIN - MENUITEM "&Berechtigungen...", 605 - MENUITEM "?ber&wachen...", 606 - MENUITEM "Besi&tzer...", 607 - END - POPUP "&Fenster" - BEGIN - MENUITEM "Neues &Fenster", ID_WINDOW_NEW - MENUITEM "?ber&lappend\tUmschalt+F5", ID_WINDOW_CASCADE - MENUITEM "&Untereinander", ID_WINDOW_TILE_HORZ - MENUITEM "&Nebeneinander\tUmschalt+F4", ID_WINDOW_TILE_VERT - MENUITEM "au&tomatisch anordnen", ID_WINDOW_AUTOSORT - MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE - MENUITEM "&Aktualisieren\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Hilfethemen\tF1", ID_HELP - MENUITEM "&Suchen...\tF1", ID_HELP - MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Info about ReactOS Explorer...", ID_ABOUT_WINEFILE - END -END - IDM_MDIFRAME MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Beenden", ID_FILE_EXIT + MENUITEM "&Schliessen", ID_FILE_EXIT END POPUP "&Ansicht" BEGIN @@ -181,7 +72,7 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Beenden", ID_FILE_EXIT + MENUITEM "&Schliessen", ID_FILE_EXIT END POPUP "&Ansicht" BEGIN @@ -334,7 +225,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Auswahl des Explorerfenster-Modus" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Please select your prefered explorer user interface:", IDC_STATIC,7,7,160,8 @@ -358,7 +249,7 @@ WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Konfiguration der Benachrichtigungs-Icons" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 @@ -390,7 +281,7 @@ WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Programmsuche im Startmenu" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Filter:",IDC_STATIC,7,9,18,8 EDITTEXT IDC_FILTER,34,7,96,14,ES_AUTOHSCROLL _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -30,7 +30,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", ID_FILE_EXIT + MENUITEM "&Close", ID_FILE_EXIT END POPUP "&View" BEGIN @@ -102,7 +102,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", ID_FILE_EXIT + MENUITEM "&Close", ID_FILE_EXIT END POPUP "&View" BEGIN @@ -126,117 +126,7 @@ END END -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Open\tEnter", 101 - MENUITEM "&Move...\tF7", 106 - MENUITEM "&Copy...\tF8", 107 - MENUITEM "&In Clipboard...\tF9", 118 - MENUITEM "&Delete\tDel", 108 - MENUITEM "Re&name...", 109 - MENUITEM "Propert&ies...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&ompress...", 119 - MENUITEM "Dec&ompress...", 120 - MENUITEM SEPARATOR - MENUITEM "&Run...", ID_EXECUTE - MENUITEM "&Print...", 102 - MENUITEM "Associate...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&eate Directory...", ID_EXECUTE - MENUITEM "Searc&h...", 104 - MENUITEM "&Select Files...", 116 - MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disk" - BEGIN - MENUITEM "&Copy Disk...", 201 - MENUITEM "&Label Disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Format Disk...", 203 - MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive", 252 - MENUITEM "&Disconnect Network Drive", 253 - MENUITEM SEPARATOR - MENUITEM "Share as...", 254 - MENUITEM "&Remove Share...", 255 - MENUITEM SEPARATOR - MENUITEM "&Select Drive...", 251 - END - POPUP "&Directories" - BEGIN - MENUITEM "&Next Level\t+", 301 - MENUITEM "Expand &Tree\t*", 302 - MENUITEM "Expand &all\tCtrl+*", 303 - MENUITEM "Collapse &Tree\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Mark Childs", 505 - END - POPUP "&View" - BEGIN - MENUITEM "T&ree and Directory", 413 - MENUITEM "Tr&ee Only", 411 - MENUITEM "Directory &Only", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", 414 - MENUITEM SEPARATOR - MENUITEM "&Name", ID_VIEW_NAME - MENUITEM "&All File Details", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Partial Details...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sort by Name", 404 - MENUITEM "Sort &by Type", 405 - MENUITEM "Sort by Si&ze", 406 - MENUITEM "Sort by &Date", 407 - MENUITEM SEPARATOR - MENUITEM "Sort by &...", 409 - END - POPUP "&Options" - BEGIN - MENUITEM "&Confirmation...", 65535 - MENUITEM "&Font...", 65535 - MENUITEM "Customize Tool&bar...", 65535 - MENUITEM SEPARATOR - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol after Running", 65535 - MENUITEM "&Save Changes on Exit", 511 - END - POPUP "&Security" - BEGIN - MENUITEM "&Access...", 605 - MENUITEM "&Logging...", 606 - MENUITEM "&Owner...", 607 - END - POPUP "&Window" - BEGIN - MENUITEM "New &Window", ID_WINDOW_NEW - MENUITEM "Cascading\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - MENUITEM "&Refresh\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Help Topics\tF1", ID_HELP - MENUITEM "Help &Search...\tF1", ID_HELP - MENUITEM "&Using Help\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info about &Winefile...", ID_ABOUT_WINEFILE - END -END - //////////////////////////////////////////////////////////////////////// ///// // // Dialog @@ -364,7 +254,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Choose Explorer window mode" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Please select your prefered explorer user interface:", IDC_STATIC,7,7,160,8 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -126,117 +126,7 @@ END END -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&en el Portapapeles...\tF9", 118 - MENUITEM "&Eliminar\tDel", 108 - MENUITEM "Re&nombrar...", 109 - MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "Desc&omprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "&Ejecutar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "Asociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&ear Directorio...", ID_EXECUTE - MENUITEM "Busca&r...", 104 - MENUITEM "&Seleccionar Archivos...", 116 - MENUITEM SEPARATOR - MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "&Copiar Disco...", 201 - MENUITEM "&Etiqueta del Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formateart Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar a &Unidad de Red", 252 - MENUITEM "&Desconectar Unidad de Red", 253 - MENUITEM SEPARATOR - MENUITEM "Guardar como...", 254 - MENUITEM "&Eliminar Guardado...", 255 - MENUITEM SEPARATOR - MENUITEM "&Seleccionar Unidad...", 251 - END - POPUP "&Directorios" - BEGIN - MENUITEM "&Siguiente Nivel\t+", 301 - MENUITEM "Expandir &Arbol\t*", 302 - MENUITEM "Expandir &Todo\tStrg+*", 303 - MENUITEM "Contraer &Arbol\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Marcar Hijos", 505 - END - POPUP "&Ver" - BEGIN - MENUITEM "A&rbol y Directorio", 413 - MENUITEM "Solo Arb&ol", 411 - MENUITEM "S&olo Directorio", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", 414 - MENUITEM SEPARATOR - MENUITEM "&Nombre", ID_VIEW_NAME - MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ordenar por Nombre", 404 - MENUITEM "Ordenar &por Tipo", 405 - MENUITEM "Ord&enar por Tama±o", 406 - MENUITEM "Or&denar por Fecha", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opciones" - BEGIN - MENUITEM "&Confirmacion...", 65535 - MENUITEM "&Fuente...", 65535 - MENUITEM "Personalizar la &Barra de Herramientas...", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&SÝmbolo despuÚs de ejecutar", 65535 - MENUITEM "&Guardar cambios al salir", 511 - END - POPUP "&Seguridad" - BEGIN - MENUITEM "&Aceso...", 605 - MENUITEM "&Entrada...", 606 - MENUITEM "&Propietario...", 607 - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Temas de Ayuda\tF1", ID_HELP - MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP - MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE - END -END - //////////////////////////////////////////////////////////////////////// ///// // // Dialog @@ -364,7 +254,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Elegir modo MDI / SDI" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", IDC_STATIC,7,7,170,18 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/explorer-pt.rc --- trunk/reactos/subsys/system/explorer/explorer-pt.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-pt.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -67,122 +67,6 @@ //////////////////////////////////////////////////////////////////////// ///// // -// Menu -// - -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Ficheiro" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&Na Clipboard\tF9", 118 - MENUITEM "&Apagar\tDel", 108 - MENUITEM "Re&nomear...", 109 - MENUITEM "Propriedades\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "Comprimir", 119 - MENUITEM "Descomprimir", 120 - MENUITEM SEPARATOR - MENUITEM "Executar...", ID_EXECUTE - MENUITEM "Imprimir", 102 - MENUITEM "Associar", 103 - MENUITEM SEPARATOR - MENUITEM "Criar Direct¾rio...", ID_EXECUTE - MENUITEM "Procurar...", 104 - MENUITEM "Seleccionar Ficheiros...", 116 - MENUITEM SEPARATOR - MENUITEM "Sair\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "Copiar Disco...", 201 - MENUITEM "Rotular Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "Formatar Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar Drive de Rede", 252 - MENUITEM "Disconectar Drive de Rede", 253 - MENUITEM SEPARATOR - MENUITEM "Partilhar como...", 254 - MENUITEM "Remover Partilha...", 255 - MENUITEM SEPARATOR - MENUITEM "Seleccionar Drive...", 251 - END - POPUP "&Directories" - BEGIN - MENUITEM "Pr¾ximo NÝvel\t+", 301 - MENUITEM "Expandir Arvore\t*", 302 - MENUITEM "Expandir Tudo\tStrg+*", 303 - MENUITEM "Fechar ?rvore\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Mark Childs", 505 - END - POPUP "&View" - BEGIN - MENUITEM "?rvore e Direct¾rio", 413 - MENUITEM "S¾ ?rvores", 411 - MENUITEM "S¾ Direct¾rio", 412 - MENUITEM SEPARATOR - MENUITEM "Partir", 414 - MENUITEM SEPARATOR - MENUITEM "Nome", ID_VIEW_NAME - MENUITEM "&All File Details", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Partial Details...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "Ordenar por Nome", 404 - MENUITEM "Ordenar por Tipo", 405 - MENUITEM "Ordenar por Tamanho", 406 - MENUITEM "Ordenar por Data", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opþ§es" - BEGIN - MENUITEM "&ConfirmaþÒo", 65535 - MENUITEM "&Fonte", 65535 - MENUITEM "Customizar Barra de Ferramentas", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Drives", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR - MENUITEM "Barra de Estado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "EcrÒ Cheio\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart", 65535 - MENUITEM "&Einstellungen beim Beenden speichern", 511 - END - POPUP "&Seguranþa" - BEGIN - MENUITEM "&Acesso", 605 - MENUITEM "&Entrar", 606 - MENUITEM "&Dono", 607 - END - POPUP "&Janela" - BEGIN - MENUITEM "Nova Janela", ID_WINDOW_NEW - MENUITEM "Cascata\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arranjar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Arranjar SÝmbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "T¾picos da Ajuda\tF1", ID_HELP - MENUITEM "Procurar Ajuda...\tF1", ID_HELP - MENUITEM "Usar Ajuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &Winefile...", ID_ABOUT_WINEFILE - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// // Dialog // _____ Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc --- trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -129,117 +129,7 @@ END END -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&ÈÓÚÙ" - BEGIN - MENUITEM "&??Û¹?³\tEnter", 101 - MENUITEM "¤Õ&ÕýÕ±?Þ?³...\tF7", 106 - MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8", 107 - MENUITEM "? ß¾¶Õ ¯ßý&ÕÝÓ...\tF9", 118 - MENUITEM "&ËõÓÙÞ?³\tDel", 108 - MENUITEM "¤Õ&ÕÞýÕÝ¯ÔÓ?³...", 109 - MENUITEM "ÐÔ¯Ú±&?ÔÓ...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "ÃÓ´ÓÛ¯&ÔÓ?³...", 119 - MENUITEM "ðÓ&±´ÓÛ¯ÔÓ?³...", 120 - MENUITEM SEPARATOR - MENUITEM "&ÃÓ´¾±Û...", ID_EXECUTE - MENUITEM "&¤Õ¸Ó?³...", 102 - MENUITEM "?ß·ÕõÕÝÞ?³...", 103 - MENUITEM SEPARATOR - MENUITEM "Ð¯þõÓ?&³ ´Ó´Û¾...", ID_EXECUTE - MENUITEM "¤¯&Þ±Û...", 104 - MENUITEM "?&¹ßÓ?³ ¶ÓÚÙ...", 116 - MENUITEM SEPARATOR - MENUITEM "?¹§¯&õ\tAlt+X", ID_FILE_EXIT - END - POPUP "&?Þ±Û" - BEGIN - MENUITEM "&?¯´Þ¯ÔÓ?³ õÞ±Û...", 201 - MENUITEM "&?Õ?ÛÓ õÞ±ÛÓ...", 202 - MENUITEM SEPARATOR - MENUITEM "&È¯ýÓ?Þ¯ÔÓ?³ õÞ±Û...", 203 - MENUITEM SEPARATOR - MENUITEM "¤¯õÛÙ?¸Þ?³ &±Õ?ÕÔ¯Ú õÞ±Û", 252 - MENUITEM "&??ÛÙ?¸Þ?³ ±Õ?ÕÔ¯Ú õÞ±Û", 253 - MENUITEM SEPARATOR - MENUITEM "??Û¹?³ õ¯±?¾´...", 254 - MENUITEM "&ÃÓÛ¹?³ õ¯±?¾´...", 255 - MENUITEM SEPARATOR - MENUITEM "&?¹ßÓ?³ õÞ±Û...", 251 - END - POPUP "&¤Ó´ÛÞ" - BEGIN - MENUITEM "&ÐÙÕõ¾?¨ÞÚ ¾¯ÔÕÝ³\t+", 301 - MENUITEM "ðÓþÔÕÝ¾?³ &õÕÕÔ¯\t*", 302 - MENUITEM "ðÓþÔÕÝ¾?³ &Ô±©\tCtrl+*", 303 - MENUITEM "ÐÔÕÝ¾?³ &õÕÕÔ¯\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&??ýÕ?Þ?³ ÔÙ¯µÕÝÞ ", 505 - END - POPUP "&?Þõ" - BEGIN - MENUITEM "?&ÕÕÔ¯ Þ ´Ó´ÛÞ", 413 - MENUITEM "Ê¯&Ù³Û¯ õÕÕÔ¯", 411 - MENUITEM "Ê¯Ù³Û¯ &´Ó´ÛÓ", 412 - MENUITEM SEPARATOR - MENUITEM "ðÓþõ&ÕÙÞ?³", 414 - MENUITEM SEPARATOR - MENUITEM "&?ý ", ID_VIEW_NAME - MENUITEM "&?±Õ ´¯õ¯ßÝ¯±?Þ ¯ ¶ÓÚÙÕ", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&ÎÓ±?Þ¸Ý¹Õ ´¯õ¯ßÝ¯±?Þ...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ð¯?Þ¯ÔÓ?³ ´¯ ÞýÕÝÞ", 404 - MENUITEM "Ð¯?Þ¯ÔÓ?³ &´¯ ?Þ´¾", 405 - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ Ó&þýÕ¾", 406 - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &õÓ?Õ", 407 - MENUITEM SEPARATOR - MENUITEM "Ð¯?Þ¯ÔÓ?³ ´¯ &...", 409 - END - POPUP "&?Ó±?¯ÚÛÞ" - BEGIN - MENUITEM "&¤¯õ?ÕÔµÕõÕÝÞÕ...", 65535 - MENUITEM "&ÏÞ¶?...", 65535 - MENUITEM "?Ó±?¯Þ?³ ´ÓÝÕÙ³ &ÞÝ±?¾ýÕÝ?¯Ô...", 65535 - MENUITEM SEPARATOR - MENUITEM "&¤ÓÝÕÙ³ ÞÝ±?¾ýÕÝ?¯Ô", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&?Þ±ÛÞ", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&?þßÓÝÝ¯Õ", ID_VIEW_SIDE_BAR - MENUITEM "&Ð?¯ÛÓ ±¯±?¯ ÝÞ ", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "? ´¯&ÙÝ¹Ú ²ÛÓÝ\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&?ß¯ÝÓ¸Þ?³ ´¯±ÙÕ Ô¹´¯ÙÝÕÝÞ ", 65535 - MENUITEM "&Ð¯§ÓÝÞ?³ ÞþýÕÝÕÝÞ Þ Ô¹Ú?Þ", 511 - END - POPUP "&?Õþ¯´Ó±Ý¯±?³" - BEGIN - MENUITEM "&?¯±?¾´...", 605 - MENUITEM "&ðÕÒÞ±?Ó÷Þ ...", 606 - MENUITEM "&?ÙÓõÕÙÕ÷...", 607 - END - POPUP "&?ÛÝ¯" - BEGIN - MENUITEM "?¯Ô¯Õ &¯ÛÝ¯", ID_WINDOW_NEW - MENUITEM "ðÓ±´¯Ù¯µÞ?³ ÛÓ±ÛÓõ¯ý\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "¤ÙÞ?Û¯Ú &Ò¯Þþ¯Ý?ÓÙ³Ý¯", ID_WINDOW_TILE_HORZ - MENUITEM "¤ÙÞ?Û¯Ú &ÔÕ?ÞÛÓÙ³Ý¯\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ë´¯ õ¯¸Þ?³ ÓÔ?¯ýÓ?Þ¸Õ±ÛÞ", ID_WINDOW_AUTOSORT - MENUITEM "Ë´¯ õ¯¸Þ?³ &þÝÓ¸ÛÞ", ID_WINDOW_ARRANGE - MENUITEM "&?ßÝ¯ÔÞ?³\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&?¹þ¯Ô ±´ÓÔÛÞ\tF1", ID_HELP - MENUITEM "¤¯Þ±Û &±´ÓÔÛÞ...\tF1", ID_HELP - MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´ÓÔÛÞ\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "?Ý¶¯ýÓ÷Þ ¯ &Winefile...", ID_ABOUT_WINEFILE - END -END - //////////////////////////////////////////////////////////////////////// ///// // // Dialog @@ -334,7 +224,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "?¹ßÕÞ?Õ ÕµÞý MDI / SDI" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "?¹ßÕÞ?Õ ÝÓÞß¯ÙÕÕ ´Õõ´¯¸?Þ?ÕÙ³Ý¹Ú õÙ ÔÓ±\nÔÞõ ´¯Ô¯õÝÞÛÓ:", IDC_STATIC,7,7,171,17 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc --- trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-04 13:43:15 UTC (rev 18261) @@ -103,116 +103,6 @@ END END -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Arkiv" - BEGIN - MENUITEM "&Íppna\tEnter", 101 - MENUITEM "&Flytta...\tF7", 106 - MENUITEM "&Kopiera...\tF8", 107 - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 - MENUITEM "&Byt namn...", 109 - MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 - MENUITEM SEPARATOR - MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 - MENUITEM "Associera...", 103 - MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", ID_EXECUTE - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 - MENUITEM SEPARATOR - MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disk" - BEGIN - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", 203 - MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", 252 - MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 - MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 - MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 - END - POPUP "&Mappar" - BEGIN - MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 - MENUITEM "Ut÷ka &alla\tCtrl+*", 303 - MENUITEM "Kollapsa &trõd\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Markera undermappar", 505 - END - POPUP "&Visa" - BEGIN - MENUITEM "&Trõd och mapp", 413 - MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 - MENUITEM SEPARATOR - MENUITEM "De&la", 414 - MENUITEM SEPARATOR - MENUITEM "&Namn", ID_VIEW_NAME - MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", 404 - MENUITEM "Sortera efter t&yp", 405 - MENUITEM "Sortera efter st&orlek", 406 - MENUITEM "Sortera efter &datum", 407 - MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", 409 - END - POPUP "&Instõllningar" - BEGIN - MENUITEM "&Bekrõftelse...", 65535 - MENUITEM "&Teckensnitt...", 65535 - MENUITEM "&Konfigurera verktygsfõlt...", 65535 - MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR - MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol efter k÷rning", 65535 - MENUITEM "&Spara õndringar vid stõngning", 511 - END - POPUP "&Sõkerhet" - BEGIN - MENUITEM "&?tkomst...", 605 - MENUITEM "&Loggning...", 606 - MENUITEM "&?gare...", 607 - END - POPUP "&F÷nster" - BEGIN - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ - MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP - MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP - MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE - END -END - IDM_DESKTOPBAR MENU DISCARDABLE BEGIN POPUP "" @@ -401,7 +291,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Võlj MDI / SDI Lõge" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Võlj det grõnssnitt du f÷redrar:",IDC_STATIC,7,7,160,8 CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2005-10-04 12:57:04 UTC (rev 18260) +++ trunk/reactos/subsys/system/explorer/resource.h 2005-10-04 13:43:15 UTC (rev 18261) @@ -62,7 +62,6 @@ #define IDR_MAINFRAME 109 #define IDM_MDIFRAME 110 #define ID_EXECUTE 111 -#define IDM_WINEFILE 112 #define IDM_SDIFRAME 113 #define IDI_LOGOFF 124 #define IDI_FOLDERARROW 125 @@ -166,7 +165,6 @@ #define IDC_SDI 1031 #define IDC_SEPARATE_SUBFOLDERS 1034 #define ID_REFRESH 1704 -#define ID_ABOUT_WINEFILE 1705 #define IDS_VERSION_STR 5000 #define IDS_EXPLORER_VERSION_STR 5001 #define IDC_FILETREE 10001

19 years, 2 months

[npwoods] 18260: Notepad: Fixed a bug when opening files with no characters other than byte order marks

by npwoods＠svn.reactos.com

Notepad: Fixed a bug when opening files with no characters other than byte order marks Modified: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-10-04 12:41:08 UTC (rev 18259) +++ trunk/reactos/subsys/system/notepad/text.c 2005-10-04 12:57:04 UTC (rev 18260) @@ -130,16 +130,27 @@ else goto done; - dwCharCount = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, NULL, 0); - if (dwCharCount == 0) - goto done; + if ((dwSize - dwPos) > 0) + { + dwCharCount = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, NULL, 0); + if (dwCharCount == 0) + goto done; + } + else + { + /* special case for files with no characters (other than BOMs) */ + dwCharCount = 0; + } pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); if (!pszAllocText) goto done; - if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) - goto done; + if ((dwSize - dwPos) > 0) + { + if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + goto done; + } pszAllocText[dwCharCount] = '\0'; pszText = pszAllocText;

19 years, 2 months

[npwoods] 18259: Regedit: Stopgap fix to build error just introduced; need to go through Regedit and TCHAR-ize it

by npwoods＠svn.reactos.com

Regedit: Stopgap fix to build error just introduced; need to go through Regedit and TCHAR-ize it Modified: trunk/reactos/subsys/system/regedit/regedit.c _____ Modified: trunk/reactos/subsys/system/regedit/regedit.c --- trunk/reactos/subsys/system/regedit/regedit.c 2005-10-04 12:02:34 UTC (rev 18258) +++ trunk/reactos/subsys/system/regedit/regedit.c 2005-10-04 12:41:08 UTC (rev 18259) @@ -194,6 +194,10 @@ } case ACTION_EXPORT: { CHAR filename[MAX_PATH]; + LPCTSTR pszFilename; +#ifdef UNICODE + WCHAR filename_wide[MAX_PATH]; +#endif filename[0] = '\0'; get_file_name(&s, filename); @@ -203,13 +207,21 @@ exit(1); } +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_wide, + sizeof(filename_wide) / sizeof(filename_wide[0])); + pszFilename = filename_wide; +#else + pszFilename = filename; +#endif + if (s[0]) { CHAR reg_key_name[KEY_MAX_LEN]; get_file_name(&s, reg_key_name); - export_registry_key(filename, reg_key_name); + export_registry_key(pszFilename, reg_key_name); } else { - export_registry_key(filename, NULL); + export_registry_key(pszFilename, NULL); } break; }

19 years, 2 months

← Newer
1
...
63
64
65
66
67
68
69
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005