Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[hbirr] 15869: - Fixed the inline assembler in DIB_16BPP_ColorFill.

by hbirr＠svn.reactos.com

- Fixed the inline assembler in DIB_16BPP_ColorFill. - Calculated the color value outside of the loop in DIB_16BPP_ColorFill. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-12 10:18:51 UTC (rev 15868) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-12 10:23:04 UTC (rev 15869) @@ -454,32 +454,29 @@ ULONG delta = DestSurface->lDelta; ULONG width = (DestRect->right - DestRect->left) ; PULONG pos = (PULONG) (DestSurface->pvScan0 + DestRect->top * delta + (DestRect->left<<1)); + color = (color<<16)|(color&0xffff); /* If the color value is "abcd", put "abcdabcd" into color */ for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) { + int d0, d1, d2; __asm__ __volatile__ ( " cld\n" - " mov %0, %%eax\n" - " mov %%eax, %%ecx\n" - " shl $16, %%eax\n" - " andl $0xffff, %%ecx\n" /* If the pixel value is "abcd", put "abcdabcd" in %eax */ - " or %%ecx, %%eax\n" " test $0x03, %%edi\n" /* Align to fullword boundary */ " jz .FL1\n" " stosw\n" - " dec %1\n" + " dec %4\n" " jz .FL2\n" ".FL1:\n" - " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ + " mov %4,%%ecx\n" /* Setup count of fullwords to fill */ " shr $1,%%ecx\n" " rep stosl\n" /* The actual fill */ - " test $0x01, %1\n" /* One left to do at the right side? */ + " test $0x01, %4\n" /* One left to do at the right side? */ " jz .FL2\n" " stosw\n" ".FL2:\n" - : /* no output */ - : "r"(color), "r"(width), "D"(pos) - : "%eax", "%ecx"); + : "=&A" (d0), "=&r" (d1), "=&D" (d2) + : "0"(color), "1"(width), "2"(pos) + : "%ecx"); pos =(PULONG)((ULONG_PTR)pos + delta); } #else /* _M_IX86 */

19 years, 6 months

[chorns] 15868: Support module_depends target

by chorns＠svn.reactos.com

Support module_depends target Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/Makefile 2005-06-12 10:18:51 UTC (rev 15868) @@ -50,11 +50,12 @@ # # ROS_RBUILDFLAGS # Pass parameters to rbuild. -# -v Be verbose. -# -c Clean as you go. Delete generated files as soon as they are not needed anymore. -# -d Disable automatic dependencies. -# -mi Let make handle creation of install directories. Rbuild will not generate the directories. -# -ps Generate proxy makefiles in source tree instead of the output tree. +# -v Be verbose. +# -c Clean as you go. Delete generated files as soon as they are not needed anymore. +# -dd Disable automatic dependencies. +# -dm{module} Check only automatic dependencies for this module. +# -mi Let make handle creation of install directories. Rbuild will not generate the directories. +# -ps Generate proxy makefiles in source tree instead of the output tree. .PHONY: all .PHONY: clean _____ Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp --- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -281,10 +281,10 @@ } void -AutomaticDependency::Process () +AutomaticDependency::ParseFiles () { for ( size_t i = 0; i < project.modules.size (); i++ ) - ProcessModule ( *project.modules[i] ); + ParseFiles ( *project.modules[i] ); } void @@ -301,17 +301,17 @@ } void -AutomaticDependency::ProcessModule ( Module& module ) +AutomaticDependency::ParseFiles ( Module& module ) { vector<File*> files; GetModuleFiles ( module, files ); for ( size_t i = 0; i < files.size (); i++ ) - ProcessFile ( module, *files[i] ); + ParseFile ( module, *files[i] ); } void -AutomaticDependency::ProcessFile ( Module& module, - const File& file ) +AutomaticDependency::ParseFile ( Module& module, + const File& file ) { string normalizedFilename = NormalizeFilename ( file.name ); RetrieveFromCacheOrParse ( module, @@ -412,34 +412,54 @@ void AutomaticDependency::CheckAutomaticDependencies ( bool verbose ) { - struct utimbuf timebuf; + ParseFiles (); for ( size_t mi = 0; mi < project.modules.size (); mi++ ) { - vector<File*> files; - GetModuleFiles ( *project.modules[mi], files ); - for ( size_t fi = 0; fi < files.size (); fi++ ) + Module& module = *project.modules[mi]; + CheckAutomaticDependencies ( module, verbose, false ); + } +} + +void +AutomaticDependency::CheckAutomaticDependencies ( Module& module, + bool verbose ) +{ + CheckAutomaticDependencies ( module, verbose, true ); +} + +void +AutomaticDependency::CheckAutomaticDependencies ( Module& module, + bool verbose, + bool parseFiles ) +{ + if ( parseFiles ) + ParseFiles ( module ); + + struct utimbuf timebuf; + vector<File*> files; + GetModuleFiles ( module, files ); + for ( size_t fi = 0; fi < files.size (); fi++ ) + { + File& file = *files[fi]; + string normalizedFilename = NormalizeFilename ( file.name ); + + SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename ); + if ( sourceFile != NULL ) { - File& file = *files[fi]; - string normalizedFilename = NormalizeFilename ( file.name ); - - SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename ); - if ( sourceFile != NULL ) + CheckAutomaticDependenciesForFile ( sourceFile ); + assert ( sourceFile->youngestLastWriteTime != 0 ); + if ( sourceFile->youngestLastWriteTime > sourceFile->lastWriteTime ) { - CheckAutomaticDependenciesForFile ( sourceFile ); - assert ( sourceFile->youngestLastWriteTime != 0 ); - if ( sourceFile->youngestLastWriteTime > sourceFile->lastWriteTime ) + if ( verbose ) { - if ( verbose ) - { - printf ( "Marking %s for rebuild due to younger file %s\n", - sourceFile->filename.c_str (), - sourceFile->youngestFile->filename.c_str () ); - } - timebuf.actime = sourceFile->youngestLastWriteTime; - timebuf.modtime = sourceFile->youngestLastWriteTime; - utime ( sourceFile->filename.c_str (), - &timebuf ); + printf ( "Marking %s for rebuild due to younger file %s\n", + sourceFile->filename.c_str (), + sourceFile->youngestFile->filename.c_str () ); } + timebuf.actime = sourceFile->youngestLastWriteTime; + timebuf.modtime = sourceFile->youngestLastWriteTime; + utime ( sourceFile->filename.c_str (), + &timebuf ); } } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -293,15 +293,47 @@ h.GenerateInvocations (); h.GenerateCleanTarget (); h.GenerateInstallTarget (); + h.GenerateDependsTarget (); delete v[i]; } printf ( "done\n" ); } - + void MingwBackend::Process () { + if ( configuration.CheckDependenciesForModuleOnly ) + CheckAutomaticDependenciesForModuleOnly (); + else + ProcessNormal (); +} + +void +MingwBackend::CheckAutomaticDependenciesForModuleOnly () +{ + if ( configuration.AutomaticDependencies ) + { + Module* module = ProjectNode.LocateModule ( configuration.CheckDependenciesForModuleOnlyModule ); + if ( module == NULL ) + { + printf ( "Module '%s' does not exist\n", + configuration.CheckDependenciesForModuleOnlyModule.c_str () ); + return; + } + + printf ( "Checking automatic dependencies for module '%s'...", + module->name.c_str () ); + AutomaticDependency automaticDependency ( ProjectNode ); + automaticDependency.CheckAutomaticDependencies ( *module, + configuration.Verbose ); + printf ( "done\n" ); + } +} + +void +MingwBackend::ProcessNormal () +{ DetectCompiler (); DetectNetwideAssembler (); DetectPipeSupport (); @@ -671,7 +703,6 @@ { printf ( "Checking automatic dependencies..." ); AutomaticDependency automaticDependency ( ProjectNode ); - automaticDependency.Process (); automaticDependency.CheckAutomaticDependencies ( configuration.Verbose ); printf ( "done\n" ); } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-06-12 10:18:51 UTC (rev 15868) @@ -94,6 +94,8 @@ void DetectPipeSupport (); void DetectPCHSupport (); void ProcessModules (); + void CheckAutomaticDependenciesForModuleOnly (); + void ProcessNormal (); std::string GetNonModuleInstallDirectories ( const std::string& installDirectory ); std::string GetInstallDirectories ( const std::string& installDirectory ); void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -467,6 +467,22 @@ normalizedTargetFilename.c_str() ); } +void +MingwModuleHandler::GenerateDependsTarget () const +{ + fprintf ( fMakefile, + ".PHONY: %s_depends\n", + module.name.c_str() ); + fprintf ( fMakefile, + "%s_depends: $(RBUILD_TARGET)\n", + module.name.c_str () ); + fprintf ( fMakefile, + "\t$(ECHO_RBUILD)\n" ); + fprintf ( fMakefile, + "\t$(Q)$(RBUILD_TARGET) -dm%s mingw\n", + module.name.c_str () ); +} + string MingwModuleHandler::GetObjectFilenames () { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-06-12 10:18:51 UTC (rev 15868) @@ -61,6 +61,7 @@ void GenerateInvocations () const; void GenerateCleanTarget () const; void GenerateInstallTarget () const; + void GenerateDependsTarget () const; static bool ReferenceObjects ( const Module& module ); protected: virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -8,6 +8,7 @@ Verbose = false; CleanAsYouGo = false; AutomaticDependencies = true; + CheckDependenciesForModuleOnly = false; MakeHandlesInstallDirectories = false; GenerateProxyMakefilesInSourceTree = false; } _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -1,5 +1,3 @@ -// rbuild.cpp - #include "pch.h" #include <typeinfo> @@ -21,6 +19,32 @@ static Configuration configuration; bool +ParseAutomaticDependencySwitch ( char switchChar2, + char* switchStart ) +{ + switch ( switchChar2 ) + { + case 'd': + configuration.AutomaticDependencies = false; + break; + case 'm': + if ( strlen ( switchStart ) <= 3 ) + { + printf ( "Switch -dm requires a module name\n" ); + return false; + } + configuration.CheckDependenciesForModuleOnly = true; + configuration.CheckDependenciesForModuleOnlyModule = string(&switchStart[3]); + break; + default: + printf ( "Unknown switch -d%c\n", + switchChar2 ); + return false; + } + return true; +} + +bool ParseMakeSwitch ( char switchChar2 ) { switch ( switchChar2 ) @@ -29,7 +53,7 @@ configuration.MakeHandlesInstallDirectories = true; break; default: - printf ( "Unknown switch -m%c", + printf ( "Unknown switch -m%c\n", switchChar2 ); return false; } @@ -45,7 +69,7 @@ configuration.GenerateProxyMakefilesInSourceTree = true; break; default: - printf ( "Unknown switch -p%c", + printf ( "Unknown switch -p%c\n", switchChar2 ); return false; } @@ -66,8 +90,8 @@ configuration.CleanAsYouGo = true; break; case 'd': - configuration.AutomaticDependencies = false; - break; + return ParseAutomaticDependencySwitch ( switchChar2, + argv[index] ); case 'r': RootXmlFile = string(&argv[index][2]); break; @@ -76,7 +100,7 @@ case 'p': return ParseProxyMakefileSwitch ( switchChar2 ); default: - printf ( "Unknown switch -%c", + printf ( "Unknown switch -%c\n", switchChar ); return false; } @@ -109,14 +133,18 @@ if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); - printf ( " rbuild [switches] buildsystem\n\n" ); + printf ( " rbuild [switches] buildsystem\n" ); printf ( "Switches:\n" ); - printf ( " -v Be verbose.\n" ); - printf ( " -c Clean as you go. Delete generated files as soon as they are not needed anymore.\n" ); - printf ( " -d Disable automatic dependencies.\n" ); - printf ( " -rfile.xml Name of the root xml file. Default is ReactOS.xml.\n" ); - printf ( " -mi Let make handle creation of install directories. Rbuild will not generate the directories.\n" ); - printf ( " -ps Generate proxy makefiles in source tree instead of the output tree.\n" ); + printf ( " -v Be verbose.\n" ); + printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); + printf ( " needed anymore.\n" ); + printf ( " -dd Disable automatic dependencies.\n" ); + printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); + printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -mi Let make handle creation of install directories. Rbuild will\n" ); + printf ( " not generate the directories.\n" ); + printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); + printf ( " tree.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-06-12 10:18:51 UTC (rev 15868) @@ -76,6 +76,8 @@ bool Verbose; bool CleanAsYouGo; bool AutomaticDependencies; + bool CheckDependenciesForModuleOnly; + std::string CheckDependenciesForModuleOnlyModule; bool MakeHandlesInstallDirectories; bool GenerateProxyMakefilesInSourceTree; }; @@ -571,7 +573,6 @@ AutomaticDependency ( const Project& project ); ~AutomaticDependency (); - void Process (); std::string GetFilename ( const std::string& filename ); bool LocateIncludedFile ( const std::string& directory, const std::string& includedFilename, @@ -586,13 +587,19 @@ SourceFile* parentSourceFile ); SourceFile* RetrieveFromCache ( const std::string& filename ); void CheckAutomaticDependencies ( bool verbose ); + void CheckAutomaticDependencies ( Module& module, + bool verbose ); + void CheckAutomaticDependencies ( Module& module, + bool verbose, + bool parseFiles ); void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile ); private: void GetModuleFiles ( Module& module, std::vector<File*>& files ) const; - void ProcessModule ( Module& module ); - void ProcessFile ( Module& module, - const File& file ); + void ParseFiles (); + void ParseFiles ( Module& module ); + void ParseFile ( Module& module, + const File& file ); std::map<std::string, SourceFile*> sourcefile_map; }; _____ Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp --- trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-06-12 10:14:37 UTC (rev 15867) +++ trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-06-12 10:18:51 UTC (rev 15868) @@ -36,7 +36,7 @@ { const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); AutomaticDependency automaticDependency ( project ); - automaticDependency.Process (); + automaticDependency.ParseFiles (); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); const SourceFile* include = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile_include.h" ); IS_NOT_NULL( include ); @@ -49,7 +49,7 @@ { const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" ); AutomaticDependency automaticDependency ( project ); - automaticDependency.Process (); + automaticDependency.ParseFiles (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); const SourceFile* header1 = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); IS_NOT_NULL( header1 );

19 years, 6 months

[mf] 15867: - standardize resource scripts: align code and remove tabs

by mf＠svn.reactos.com

- standardize resource scripts: align code and remove tabs - ifdef __WINE__ for ID_ABOUT_WINE Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.rc Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-12 09:36:25 UTC (rev 15866) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-12 10:14:37 UTC (rev 15867) @@ -28,123 +28,123 @@ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&Arkiv" { - MENUITEM "&Íppna\tEnter", ID_ACTIVATE - MENUITEM "&Flytta...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiera...\tF8", ID_FILE_COPY - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", ID_FILE_DELETE - MENUITEM "&Byt namn...", 109 + POPUP "&Arkiv" { + MENUITEM "&Íppna\tEnter", ID_ACTIVATE + MENUITEM "&Flytta...\tF7", ID_FILE_MOVE + MENUITEM "&Kopiera...\tF8", ID_FILE_COPY + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", ID_FILE_DELETE + MENUITEM "&Byt namn...", 109 MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 MENUITEM SEPARATOR MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 + MENUITEM "&Skriv ut...", 102 MENUITEM "Associera...", 103 MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", 111 - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 - MENUITEM SEPARATOR + MENUITEM "Skapa mapp...", 111 + MENUITEM "&S÷k...", 104 + MENUITEM "&Võlj filer...", 116 + MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "&Avsluta\tAlt+X" , ID_FILE_EXIT + MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT #else - MENUITEM "&Avsluta", ID_FILE_EXIT + MENUITEM "&Avsluta", ID_FILE_EXIT #endif - } + } - POPUP "&Disk" { - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 + POPUP "&Disk" { + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", ID_FORMAT_DISK + MENUITEM "&Formatera disk...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ + MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ #endif - MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 + MENUITEM "Anslut &Nõtverksenhet", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Koppla ifrÕn Nõtverksenhet", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 - } + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 + MENUITEM SEPARATOR + MENUITEM "&Võlj enhet...", 251 + } - POPUP "&Trõd" { + POPUP "&Trõd" { MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 + 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 - } + MENUITEM "&Markera undermappar", 505 + } - POPUP "&Visa" { - MENUITEM "&Trõd och mapp", 413 + POPUP "&Visa" { + MENUITEM "&Trõd och mapp", 413 MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 + MENUITEM "Bara &mapp", 412 MENUITEM SEPARATOR - MENUITEM "De&la", ID_VIEW_SPLIT + MENUITEM "De&la", ID_VIEW_SPLIT 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", ID_VIEW_SORT_NAME - MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE - MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE - MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE + MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", ID_VIEW_FILTER - } + MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME + MENUITEM "Sortera efter t&yp", ID_VIEW_SORT_TYPE + MENUITEM "Sortera efter st&orlek", ID_VIEW_SORT_SIZE + MENUITEM "Sortera efter &datum", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Sortera efter &...", ID_VIEW_FILTER + } - POPUP "&Instõllningar" { - MENUITEM "&Bekrõftelse...", 501 - MENUITEM "&Teckensnitt...", ID_SELECT_FONT - MENUITEM "&Konfigurera verktygsfõlt...", 512 + POPUP "&Instõllningar" { + MENUITEM "&Bekrõftelse...", 501 + MENUITEM "&Teckensnitt...", ID_SELECT_FONT + MENUITEM "&Konfigurera verktygsfõlt...", 512 MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif - MENUITEM SEPARATOR - MENUITEM "&Minimera vid k÷rning" , 504 + MENUITEM SEPARATOR + MENUITEM "&Minimera vid k÷rning", 504 MENUITEM "&Spara õndringar vid stõngning", 511 - } + } + POPUP "&Sõkerhet" { + MENUITEM "&?tkomst...", 605 + MENUITEM "&Loggning...", 606 + MENUITEM "&?gare...", 607 + } - POPUP "&Sõkerhet" { - MENUITEM "&?tkomst..." , 605 - MENUITEM "&Loggning..." , 606 - MENUITEM "&?gare..." , 607 - } - - POPUP "&F÷nster" { - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + POPUP "&F÷nster" { + 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 #ifndef _NO_EXTENSIONS - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT #endif - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH - } + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH + } - - POPUP "&?" { - 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 - MENUITEM "Info about &Wine..." , ID_ABOUT_WINE - } + POPUP "&?" { + 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 +#ifdef __WINE__ + MENUITEM "Info about &Wine...", ID_ABOUT_WINE +#endif + } } @@ -153,13 +153,13 @@ CAPTION "K÷r" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjõlp" , 254, 158, 43, 47, 14 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Som &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 + PUSHBUTTON "&Hjõlp", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 @@ -167,43 +167,43 @@ CAPTION "Võlj mÕl" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&S÷kvõg:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Blõddra" , 254, 158, 43, 47, 14 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&S÷kvõg:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 + PUSHBUTTON "&Blõddra", 254, 158, 43, 47, 14 } STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." + IDS_FONT_SEL_DLG_NAME "Verkstõll teckensnittsinstõllningar" + IDS_FONT_SEL_ERROR "Ett fel uppstog nõr ett nytt teckensnitt valdes." } STRINGTABLE { - IDS_WINEFILE "Winefile" - IDS_ERROR "Fel" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Skrivbord" - IDS_SHELL "Skal" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ej implementerat õnnu" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" + IDS_WINEFILE "Winefile" + IDS_ERROR "Fel" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Skrivbord" + IDS_SHELL "Skal" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ej implementerat õnnu" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "Namn" - IDS_COL_SIZE "Storlek" - IDS_COL_CDATE "CDatum" - IDS_COL_ADATE "ADatum" - IDS_COL_MDATE "MDatum" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Lõnkar" - IDS_COL_ATTR "Attribut" - IDS_COL_SEC "Sõkerhet" + IDS_COL_NAME "Namn" + IDS_COL_SIZE "Storlek" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Lõnkar" + IDS_COL_ATTR "Attribut" + IDS_COL_SEC "Sõkerhet" } _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-06-12 09:36:25 UTC (rev 15866) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-06-12 10:14:37 UTC (rev 15867) @@ -27,122 +27,124 @@ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&Soubor" { - MENUITEM "&Otev°Ýt\tEnter" , ID_ACTIVATE - MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE - MENUITEM "&KopÝrovat...\tF8" , ID_FILE_COPY - MENUITEM "&Ve schrßnce...\tF9" , 118 - MENUITEM "&Smazat\tDel" , ID_FILE_DELETE - MENUITEM "P°&ejmenovat..." , 109 - MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprese..." , 119 - MENUITEM "&Dekomprese..." , 120 - MENUITEM SEPARATOR - MENUITEM "&Spustit..." , ID_EXECUTE - MENUITEM "&Tisknout..." , 102 - MENUITEM "Asociovat..." , 103 - MENUITEM SEPARATOR - MENUITEM "V&ytvo°it adresß°..." , 111 - MENUITEM "&Hledat..." , 104 - MENUITEM "&Zvolit voubory..." , 116 - MENUITEM SEPARATOR + POPUP "&Soubor" { + MENUITEM "&Otev°Ýt\tEnter", ID_ACTIVATE + MENUITEM "&P°esunout...\tF7", ID_FILE_MOVE + MENUITEM "&KopÝrovat...\tF8", ID_FILE_COPY + MENUITEM "&Ve schrßnce...\tF9", 118 + MENUITEM "&Smazat\tDel", ID_FILE_DELETE + MENUITEM "P°&ejmenovat...", 109 + MENUITEM "V&lastnosti...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprese...", 119 + MENUITEM "&Dekomprese...", 120 + MENUITEM SEPARATOR + MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM "&Tisknout...", 102 + MENUITEM "Asociovat...", 103 + MENUITEM SEPARATOR + MENUITEM "V&ytvo°it adresß°...", 111 + MENUITEM "&Hledat...", 104 + MENUITEM "&Zvolit voubory...", 116 + MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "K&onec\tAlt+X" , ID_FILE_EXIT + MENUITEM "K&onec\tAlt+X", ID_FILE_EXIT #else - MENUITEM "K&onec", ID_FILE_EXIT + MENUITEM "K&onec", ID_FILE_EXIT #endif - } + } - POPUP "&Disk" { - MENUITEM "&KopÝrovat disk..." , 201 - MENUITEM "&Jmenovka disk..." , 202 - MENUITEM SEPARATOR - MENUITEM "&Formßtovat disk..." , ID_FORMAT_DISK + POPUP "&Disk" { + MENUITEM "&KopÝrovat disk...", 201 + MENUITEM "&Jmenovka disk...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formßtovat disk...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ + MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ #endif - MENUITEM SEPARATOR - MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "SdÝlet jako..." , 254 - MENUITEM "&Odstranit sdÝlenÝ..." , 255 - MENUITEM SEPARATOR - MENUITEM "&Zvolit za°ÝzenÝ..." , 251 - } + MENUITEM SEPARATOR + MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "SdÝlet jako...", 254 + MENUITEM "&Odstranit sdÝlenÝ...", 255 + MENUITEM SEPARATOR + MENUITEM "&Zvolit za°ÝzenÝ...", 251 + } - POPUP "&Adresß°e" { - MENUITEM "&DalÜÝ ·rove?\t+" , 301 - MENUITEM "Rozbalit &strom\t*" , 302 - MENUITEM "Rozbalit &vÜe\tStrg+*" , 303 - MENUITEM "Sbalit &strom\t-" , 304 - MENUITEM SEPARATOR - MENUITEM "&OznaÞit potomky" , 505 - } + POPUP "&Adresß°e" { + MENUITEM "&DalÜÝ ·rove?\t+", 301 + MENUITEM "Rozbalit &strom\t*", 302 + MENUITEM "Rozbalit &vÜe\tStrg+*", 303 + MENUITEM "Sbalit &strom\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&OznaÞit potomky", 505 + } - POPUP "&ZobrazenÝ" { - MENUITEM "&Strom a adresß°e" , 413 - MENUITEM "&Jen strom" , 411 - MENUITEM "Jen &adresß°e" , 412 - MENUITEM SEPARATOR - MENUITEM "&Rozdýlit" , ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&JmÚno" , ID_VIEW_NAME - MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "?ß&steÞnÚ detaily..." , ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&T°Ýdit podle jmÚna" , ID_VIEW_SORT_NAME - MENUITEM "T°Ýdit &podle typu" , ID_VIEW_SORT_TYPE - MENUITEM "T°Ýdit podle &velikosti" , ID_VIEW_SORT_SIZE - MENUITEM "T°Ýdit podle &data" , ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "T°Ýdit podle &..." , ID_VIEW_FILTER - } + POPUP "&ZobrazenÝ" { + MENUITEM "&Strom a adresß°e", 413 + MENUITEM "&Jen strom", 411 + MENUITEM "Jen &adresß°e", 412 + MENUITEM SEPARATOR + MENUITEM "&Rozdýlit", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&JmÚno", ID_VIEW_NAME + MENUITEM "&Detaily vÜech soubor¨", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "?ß&steÞnÚ detaily...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&T°Ýdit podle jmÚna", ID_VIEW_SORT_NAME + MENUITEM "T°Ýdit &podle typu", ID_VIEW_SORT_TYPE + MENUITEM "T°Ýdit podle &velikosti", ID_VIEW_SORT_SIZE + MENUITEM "T°Ýdit podle &data", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "T°Ýdit podle &...", ID_VIEW_FILTER + } - POPUP "&NastavenÝ" { - MENUITEM "&PotvrzovßnÝ..." , 501 - MENUITEM "&PÝsmo..." , ID_SELECT_FONT - MENUITEM "Upravit panel &nßstroj¨..." , 512 - MENUITEM SEPARATOR - MENUITEM "&Panel nßstroj¨" , ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Panel za°ÝenÝ" , ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Stavov² °ßdek" , ID_VIEW_STATUSBAR, CHECKED + POPUP "&NastavenÝ" { + MENUITEM "&PotvrzovßnÝ...", 501 + MENUITEM "&PÝsmo...", ID_SELECT_FONT + MENUITEM "Upravit panel &nßstroj¨...", 512 + MENUITEM SEPARATOR + MENUITEM "&Panel nßstroj¨", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Panel za°ÝenÝ", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Stavov² °ßdek", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "&Celaß obrazovka\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN + MENUITEM "&Celaß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif - MENUITEM SEPARATOR - MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , 504 - MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ" , 511 - } + MENUITEM SEPARATOR + MENUITEM "&Minimalizovat p°i spuÜtýnÝ", 504 + MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ",511 + } - POPUP "&ZabezpeÞenÝ" { - MENUITEM "&P°Ýstup..." , 605 - MENUITEM "&LogovßnÝ..." , 606 - MENUITEM "&VlastnÝk..." , 607 - } + POPUP "&ZabezpeÞenÝ" { + MENUITEM "&P°Ýstup...", 605 + MENUITEM "&LogovßnÝ...", 606 + MENUITEM "&VlastnÝk...", 607 + } - POPUP "&Okno" { - MENUITEM "NovÚ &okno" , ID_WINDOW_NEW - MENUITEM "KaskßdovßnÝ\tCtrl+F5" , ID_WINDOW_CASCADE - MENUITEM "Uspo°ßdat &horizontßlný" , ID_WINDOW_TILE_HORZ - MENUITEM "Uspo°ßdat &vertikßlný\tCtrl+F4" , ID_WINDOW_TILE_VERT + POPUP "&Okno" { + MENUITEM "NovÚ &okno", ID_WINDOW_NEW + MENUITEM "KaskßdovßnÝ\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Uspo°ßdat &horizontßlný", ID_WINDOW_TILE_HORZ + MENUITEM "Uspo°ßdat &vertikßlný\tCtrl+F4",ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "Zarovnat automaticky" , ID_WINDOW_AUTOSORT + MENUITEM "Zarovnat automaticky", ID_WINDOW_AUTOSORT #endif - MENUITEM "Zarovnat &symboly" , ID_WINDOW_ARRANGE - MENUITEM "&Aktualizovat\tF5" , ID_REFRESH - } + MENUITEM "Zarovnat &symboly", ID_WINDOW_ARRANGE + MENUITEM "&Aktualizovat\tF5", ID_REFRESH + } - POPUP "&?" { - MENUITEM "&TÚmata nßpovýdy\tF1" , ID_HELP - MENUITEM "HledßnÝ 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 - MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE - } + POPUP "&?" { + MENUITEM "&TÚmata nßpovýdy\tF1", ID_HELP + MENUITEM "HledßnÝ 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 +#ifdef __WINE__ + MENUITEM "Informace o &Wine...", ID_ABOUT_WINE +#endif + } } @@ -151,13 +153,13 @@ CAPTION "Spustit" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&P°Ýkaz:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &Symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc" , 254, 158, 43, 47, 14 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&P°Ýkaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Jako &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit", 2, 158, 23, 47, 14 + PUSHBUTTON "&Pomoc", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 @@ -165,43 +167,43 @@ CAPTION "Zvolte cÝl" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Cesta:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Prochßzet" , 254, 158, 43, 47, 14 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Cesta:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit", 2, 158, 23, 47, 14 + PUSHBUTTON "&Prochßzet", 254, 158, 43, 47, 14 } STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "AplikovßnÝ nastavenÝ pÝsma" - IDS_FONT_SEL_ERROR "Chyba p°i volbý novÚho pÝsma." + IDS_FONT_SEL_DLG_NAME "AplikovßnÝ nastavenÝ pÝsma" + IDS_FONT_SEL_ERROR "Chyba p°i volbý novÚho pÝsma." } STRINGTABLE { - IDS_WINEFILE "Winefile" - IDS_ERROR "Chyba" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Plocha" - IDS_SHELL "P°Ýkazov² °ßdek" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "ZatÝm neimplementovßno" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" + IDS_WINEFILE "Winefile" + IDS_ERROR "Chyba" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Plocha" + IDS_SHELL "P°Ýkazov² °ßdek" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "ZatÝm neimplementovßno" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "JmÚno" - IDS_COL_SIZE "Velikost" - IDS_COL_CDATE "Datum vytvo°enÝ" - IDS_COL_ADATE "Datum poslednÝho p°Ýstupu" - IDS_COL_MDATE "Datum poslednÝ modifikace" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Linky" - IDS_COL_ATTR "Atributy" - IDS_COL_SEC "ZabezpeÞenÝ" + IDS_COL_NAME "JmÚno" + IDS_COL_SIZE "Velikost" + IDS_COL_CDATE "Datum vytvo°enÝ" + IDS_COL_ADATE "Datum poslednÝho p°Ýstupu" + IDS_COL_MDATE "Datum poslednÝ modifikace" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Linky" + IDS_COL_ATTR "Atributy" + IDS_COL_SEC "ZabezpeÞenÝ" } _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-06-12 09:36:25 UTC (rev 15866) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-06-12 10:14:37 UTC (rev 15867) @@ -29,118 +29,120 @@ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&Datei" { - MENUITEM "Í&ffnen\tEingabetaste" , ID_ACTIVATE - MENUITEM "&Verschieben...\tF7" , ID_FILE_MOVE - MENUITEM "&Kopieren...\tF8" , ID_FILE_COPY - MENUITEM "&In Zwischenablage...\tF9" , 118 - MENUITEM "&L÷schen\tEntf" , ID_FILE_DELETE - 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..." , 111 - MENUITEM "&Suchen..." , 104 - MENUITEM "Dateien aus&wõhlen..." , 116 - MENUITEM SEPARATOR - MENUITEM "&Beenden\tAlt+X" , ID_FILE_EXIT - } + POPUP "&Datei" { + MENUITEM "Í&ffnen\tEingabetaste", ID_ACTIVATE + MENUITEM "&Verschieben...\tF7", ID_FILE_MOVE + MENUITEM "&Kopieren...\tF8", ID_FILE_COPY + MENUITEM "&In Zwischenablage...\tF9", 118 + MENUITEM "&L÷schen\tEntf", ID_FILE_DELETE + 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...", 111 + MENUITEM "&Suchen...", 104 + MENUITEM "Dateien aus&wõhlen...", 116 + MENUITEM SEPARATOR + MENUITEM "&Beenden\tAlt+X", ID_FILE_EXIT + } - POPUP "Da&tentrõger" { - MENUITEM "Datentrõger &kopieren..." , 201 - MENUITEM "Datentrõger &benennen..." , 202 - MENUITEM SEPARATOR - MENUITEM "Datentrõger &formatieren..." , ID_FORMAT_DISK + POPUP "Da&tentrõger" { + MENUITEM "Datentrõger &kopieren...", 201 + MENUITEM "Datentrõger &benennen...", 202 + MENUITEM SEPARATOR + MENUITEM "Datentrõger &formatieren...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "...", -1 /*TODO*/ + MENUITEM "...", -1 /*TODO*/ #endif - MENUITEM SEPARATOR - MENUITEM "Netzwerklaufwerk &verbinden..." , ID_CONNECT_NETWORK_DRIVE - MENUITEM "Netzwerklaufwerk &trennen..." , ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "F&reigeben als..." , 254 - MENUITEM "Freigabe been&den..." , 255 - MENUITEM SEPARATOR - MENUITEM "Laufwerk aus&wõhlen..." , 251 - } + MENUITEM SEPARATOR + MENUITEM "Netzwerklaufwerk &verbinden...",ID_CONNECT_NETWORK_DRIVE + MENUITEM "Netzwerklaufwerk &trennen...",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "F&reigeben als...", 254 + MENUITEM "Freigabe been&den...", 255 + MENUITEM SEPARATOR + MENUITEM "Laufwerk aus&wõhlen...", 251 + } - POPUP "&Verzeichnisse" { - 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 - } + POPUP "&Verzeichnisse" { + 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 + } - POPUP "&Ansicht" { - MENUITEM "Struktur &und Verzeichnis" , 413 - MENUITEM "Nur St&ruktur" , 411 - MENUITEM "Nur &Verzeichnis" , 412 - MENUITEM SEPARATOR - MENUITEM "&Teilen" , ID_VIEW_SPLIT - 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" , ID_VIEW_SORT_NAME - MENUITEM "Nach T&yp" , ID_VIEW_SORT_TYPE - MENUITEM "Nach &Gr÷?e" , ID_VIEW_SORT_SIZE - MENUITEM "Nach &Datum" , ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Angaben ausw&õhlen..." , ID_VIEW_FILTER - } + POPUP "&Ansicht" { + MENUITEM "Struktur &und Verzeichnis", 413 + MENUITEM "Nur St&ruktur", 411 + MENUITEM "Nur &Verzeichnis", 412 + MENUITEM SEPARATOR + MENUITEM "&Teilen", ID_VIEW_SPLIT + 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", ID_VIEW_SORT_NAME + MENUITEM "Nach T&yp", ID_VIEW_SORT_TYPE + MENUITEM "Nach &Gr÷?e", ID_VIEW_SORT_SIZE + MENUITEM "Nach &Datum", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Angaben ausw&õhlen...", ID_VIEW_FILTER + } - POPUP "&Optionen" { - MENUITEM "&Bestõtigen..." , 501 - MENUITEM "Schrift&art..." , ID_SELECT_FONT - MENUITEM "Symbolleiste &definieren..." , 512 - MENUITEM SEPARATOR - MENUITEM "Sy&mbolleiste" , ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Lauf&werkleiste" , ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Statusleiste" , ID_VIEW_STATUSBAR, CHECKED + POPUP "&Optionen" { + MENUITEM "&Bestõtigen...", 501 + MENUITEM "Schrift&art...", ID_SELECT_FONT + MENUITEM "Symbolleiste &definieren...", 512 + MENUITEM SEPARATOR + MENUITEM "Sy&mbolleiste", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Statusleiste", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "Vollb&ild\tStrg+Umschalt+S" , ID_VIEW_FULLSCREEN + MENUITEM "Vollb&ild\tStrg+Umschalt+S", ID_VIEW_FULLSCREEN #endif - MENUITEM SEPARATOR - MENUITEM "&Symbol nach Programmstart" , 504 - MENUITEM "&Einstellungen beim Beenden speichern" , 511 - } + MENUITEM SEPARATOR + MENUITEM "&Symbol nach Programmstart", 504 + MENUITEM "&Einstellungen beim Beenden speichern", 511 + } - POPUP "&Sicherheit" { - MENUITEM "&Berechtigungen..." , 605 - MENUITEM "?ber&wachen..." , 606 - MENUITEM "Besi&tzer..." , 607 - } + POPUP "&Sicherheit" { + MENUITEM "&Berechtigungen...", 605 + MENUITEM "?ber&wachen...", 606 + MENUITEM "Besi&tzer...", 607 + } - POPUP "&Fenster" { - 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 + POPUP "&Fenster" { + 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 #ifndef _NO_EXTENSIONS - MENUITEM "au&tomatisch anordnen" , ID_WINDOW_AUTOSORT + MENUITEM "au&tomatisch anordnen", ID_WINDOW_AUTOSORT #endif - MENUITEM "&Symbole anordnen" , ID_WINDOW_ARRANGE - MENUITEM "&Aktualisieren\tF5" , ID_REFRESH - } + MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + } - POPUP "&?" { - MENUITEM "&Hilfethemen\tF1" , ID_HELP - MENUITEM "&Suchen...\tF1" , ID_HELP - MENUITEM "Hilfe &verwenden\tF1" , ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Info ³ber Winefile..." , ID_ABOUT - MENUITEM "Info ³ber &Wine..." , ID_ABOUT_WINE - } + POPUP "&?" { + MENUITEM "&Hilfethemen\tF1", ID_HELP + MENUITEM "&Suchen...\tF1", ID_HELP + MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Info ³ber Winefile...", ID_ABOUT +#ifdef __WINE__ + MENUITEM "Info ³ber &Wine...", ID_ABOUT_WINE +#endif + } } @@ -149,13 +151,13 @@ CAPTION "Ausf³hren" FONT 8, "MS Shell Dlg" { - 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 "Abbrechen" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Hilfe" , 254, 158, 43, 47, 14 + 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 "Abbrechen", 2, 158, 23, 47, 14 + PUSHBUTTON "&Hilfe", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 @@ -163,12 +165,12 @@ CAPTION "Ziel auswõhlen" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Verzeichnis:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 - PUSHBUTTON "Abbrechen" , 2, 158, 23, 47, 14 - PUSHBUTTON "&Durchsuchen" , 254, 158, 43, 47, 14 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Verzeichnis:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Abbrechen", 2, 158, 23, 47, 14 + PUSHBUTTON "&Durchsuchen", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 @@ -226,35 +228,35 @@ STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung" - IDS_FONT_SEL_ERROR "Fehler wõhrend der Schriftart-Auswahl." + IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung" + IDS_FONT_SEL_ERROR "Fehler wõhrend der Schriftart-Auswahl." } STRINGTABLE { - IDS_WINEFILE "Winefile" - IDS_ERROR "Fehler" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Desktop" - IDS_SHELL "Shell" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Noch nicht implementiert" - IDS_WINE "WINE" - IDS_WINE_FILE "Wine File" + IDS_WINEFILE "Winefile" + IDS_ERROR "Fehler" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Desktop" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Noch nicht implementiert" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "Name" - IDS_COL_SIZE "Gr÷?e" - IDS_COL_CDATE "CDatum" - IDS_COL_ADATE "ZDatum" - IDS_COL_MDATE "?Datum" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Links" - IDS_COL_ATTR "Attribute" - IDS_COL_SEC "Sicherheit" + IDS_COL_NAME "Name" + IDS_COL_SIZE "Gr÷?e" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ZDatum" + IDS_COL_MDATE "?Datum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Links" + IDS_COL_ATTR "Attribute" + IDS_COL_SEC "Sicherheit" - IDS_FREE_SPACE_FMT "%s von %s frei" + IDS_FREE_SPACE_FMT "%s von %s frei" } _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-06-12 09:36:25 UTC (rev 15866) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-06-12 10:14:37 UTC (rev 15867) @@ -29,122 +29,124 @@ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&File" { - MENUITEM "&Open\tEnter" , ID_ACTIVATE - MENUITEM "&Move...\tF7" , ID_FILE_MOVE - MENUITEM "&Copy...\tF8" , ID_FILE_COPY - MENUITEM "&In Clipboard...\tF9" , 118 - MENUITEM "&Delete\tDel" , ID_FILE_DELETE - 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..." , 111 - MENUITEM "Searc&h..." , 104 - MENUITEM "&Select Files..." , 116 - MENUITEM SEPARATOR + POPUP "&File" { + MENUITEM "&Open\tEnter", ID_ACTIVATE + MENUITEM "&Move...\tF7", ID_FILE_MOVE + MENUITEM "&Copy...\tF8", ID_FILE_COPY + MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "&Delete\tDel", ID_FILE_DELETE + 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...", 111 + MENUITEM "Searc&h...", 104 + MENUITEM "&Select Files...", 116 + MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "E&xit\tAlt+X" , ID_FILE_EXIT + MENUITEM "E&xit\tAlt+X", ID_FILE_EXIT #else - MENUITEM "E&xit", ID_FILE_EXIT + MENUITEM "E&xit", ID_FILE_EXIT #endif - } + } - POPUP "&Disk" { - MENUITEM "&Copy Disk..." , 201 [truncated at 1000 lines; 3218 more skipped]

19 years, 6 months

[chorns] 15866: Make test pass

by chorns＠svn.reactos.com

Make test pass Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp _____ Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp --- trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-06-12 09:17:06 UTC (rev 15865) +++ trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-06-12 09:36:25 UTC (rev 15866) @@ -21,5 +21,5 @@ StubbedSymbol& symbol2 = *component1.symbols[1]; ARE_EQUAL ( "LdrAccessResource@16", symbol2.symbol ); - ARE_EQUAL ( "LdrAccessResource@16", symbol2.newname ); + ARE_EQUAL ( "LdrAccessResource", symbol2.newname ); }

19 years, 6 months

[mf] 15865: remove unnecessary paint code

by mf＠svn.reactos.com

remove unnecessary paint code Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 09:14:12 UTC (rev 15864) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 09:17:06 UTC (rev 15865) @@ -3153,13 +3153,7 @@ #endif ) LineTo(dis->hDC, x, dis->rcItem.bottom); -/*@@ - if (entry->down && entry->expanded) { - x += IMAGE_WIDTH+TREE_LINE_DX; - MoveToEx(dis->hDC, x, dis->rcItem.top+IMAGE_HEIGHT, 0); - LineTo(dis->hDC, x, dis->rcItem.bottom); - } -*/ + SelectClipRgn(dis->hDC, hrgn_org); if (hrgn_org) DeleteObject(hrgn_org); /* SelectObject(dis->hDC, holdPen); */

19 years, 6 months

[mf] 15864: remove unsued compilation unit

by mf＠svn.reactos.com

remove unsued compilation unit Modified: trunk/reactos/subsys/system/winefile/winefile.dsp Modified: trunk/reactos/subsys/system/winefile/winefile.xml _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-12 09:13:45 UTC (rev 15863) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-12 09:14:12 UTC (rev 15864) @@ -251,6 +251,7 @@ # Begin Source File SOURCE=.\license.c +# PROP Exclude_From_Build 1 # End Source File # Begin Source File @@ -274,5 +275,9 @@ SOURCE=.\winefile.h # End Source File +# Begin Source File + +SOURCE=.\winefile.xml +# End Source File # End Target # End Project _____ Modified: trunk/reactos/subsys/system/winefile/winefile.xml --- trunk/reactos/subsys/system/winefile/winefile.xml 2005-06-12 09:13:45 UTC (rev 15863) +++ trunk/reactos/subsys/system/winefile/winefile.xml 2005-06-12 09:14:12 UTC (rev 15864) @@ -17,7 +17,6 @@ <library>oleaut32</library> <library>version</library> <library>mpr</library> - <file>license.c</file> <file>winefile.c</file> <file>winefile.rc</file> </module>

19 years, 6 months

[mf] 15863: remove unused variable

by mf＠svn.reactos.com

remove unused variable Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-11 21:29:59 UTC (rev 15862) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 09:13:45 UTC (rev 15863) @@ -1887,7 +1887,6 @@ case WM_INITDIALOG: { const static TCHAR sByteFmt[] = {'%','s',' ','B','y','t','e','s','\0'}; TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; - NUMBERFMT fmt = {0}; LPWIN32_FIND_DATA pWFD; ULONGLONG size;

19 years, 6 months

[fireball] 15862: Fix pdo->fdo typo, causing serious errors, ending up driver unloadable at all.

by fireball＠svn.reactos.com

Fix pdo->fdo typo, causing serious errors, ending up driver unloadable at all. Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-06-11 19:56:12 UTC (rev 15861) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-06-11 21:29:59 UTC (rev 15862) @@ -77,7 +77,7 @@ } // zerofill device extension - DeviceExtension = (POHCI_DEVICE_EXTENSION)pdo->DeviceExtension; + DeviceExtension = (POHCI_DEVICE_EXTENSION)fdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(OHCI_DEVICE_EXTENSION)); DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(fdo, pdo);

19 years, 6 months

[greatlrd] 15861: fix fill color and hline asm code

by greatlrd＠svn.reactos.com

fix fill color and hline asm code thx tamlin to notice some mistake Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-11 19:09:42 UTC (rev 15860) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-11 19:56:12 UTC (rev 15861) @@ -56,14 +56,14 @@ " jnz .L1\n" " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ " rep stosl\n" /* The actual fill */ -" jz .L2\n" +" jmp .L2\n" ".L1:\n" -" mov %%eax, %%ecx\n" " stosw\n" -" sub $0x04,%1\n" " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ +" dec %%ecx\n" +" rol $16,%%eax\n" " rep stosl\n" /* The actual fill */ -" shr $0x08,%%eax\n" +" shr $0x10,%%eax\n" " stosw\n" ".L2:\n" : /* no output */ @@ -720,14 +720,14 @@ " jnz .FL1\n" " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ " rep stosl\n" /* The actual fill */ - " jz .FL2\n" - ".FL1:\n" - " mov %%eax, %%ecx\n" + " jmp .FL2\n" + ".FL1:\n" " stosw\n" - " sub $0x04,%1\n" " mov %1,%%ecx\n" /* Setup count of fullwords to fill */ + " dec %%ecx\n" + " rol $16,%%eax\n" " rep stosl\n" /* The actual fill */ - " shr $0x08,%%eax\n" + " shr $0x10,%%eax\n" " stosw\n" ".FL2:\n" : /* no output */

19 years, 6 months

[hpoussin] 15860: Patch by Sylvain Petreolle <spetreolle@yahoo.fr>: Fix bug 646

by hpoussin＠svn.reactos.com

Patch by Sylvain Petreolle <spetreolle(a)yahoo.fr>: Fix bug 646 - Remove duplicate dll entries in reactos.dff, - Move some at their correct place. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-06-11 13:36:00 UTC (rev 15859) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-06-11 19:09:42 UTC (rev 15860) @@ -75,6 +75,7 @@ lib\devenum\devenum.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 +lib\dnsapi\dnsapi.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 lib\fmifs\fmifs.dll 1 @@ -115,6 +116,7 @@ lib\ole32\ole32.dll 1 lib\oleaut32\oleaut32.dll 1 lib\olepro32\olepro32.dll 1 +lib\opengl32\opengl32.dll 1 lib\psapi\psapi.dll 1 lib\riched20\riched20.dll 1 lib\richedit\riched32.dll 1 @@ -140,11 +142,6 @@ lib\ws2help\ws2help.dll 1 lib\wshirda\wshirda.dll 1 lib\wsock32\wsock32.dll 1 -lib\dnsapi\dnsapi.dll 1 -lib\iphlpapi\iphlpapi.dll 1 -lib\rpcrt4\rpcrt4.dll 1 -lib\ole32\ole32.dll 1 -lib\opengl32\opengl32.dll 1 subsys\csrss\csrss.exe 1 subsys\csrss\win32csr\win32csr.dll 1 subsys\ntvdm\ntvdm.exe 1

19 years, 6 months

← Newer
1
...
47
48
49
50
51
52
53
...
65
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 June 2005