Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 29927: Fix/Update the medatada element based on Colin's suggestions (part 1)
by mpiulachs＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: mpiulachs Date: Sun Oct 28 03:12:20 2007 New Revision: 29927 URL: http://svn.reactos.org/svn/reactos?rev=29927&view=rev Log: Fix/Update the medatada element based on Colin's suggestions (part 1) Modified: branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp Sun Oct 28 03:12:20 2007 @@ -111,7 +111,7 @@ fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n", module.output->relative_path.c_str () ); fprintf ( m_VReportFile, "\t\t<version>%s</version>\r\n", module.metadata->version.c_str () ); fprintf ( m_VReportFile, "\t\t<date>%s</date>\r\n", module.metadata->date.c_str () ); - fprintf ( m_VReportFile, "\t\t<owner>%s</owner>\r\n", module.metadata->owner.c_str () ); + fprintf ( m_VReportFile, "\t\t<license>%s</license>\r\n", module.metadata->license.c_str () ); fprintf ( m_VReportFile, "\t</component>\r\n" ); } } Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sun Oct 28 03:12:20 2007 @@ -1795,12 +1795,12 @@ else version = ""; - /* The module copyright */ - att = _node.GetAttribute ( "copyright", false ); + /* The module license */ + att = _node.GetAttribute ( "license", false ); if (att != NULL) - copyright = att->value; - else - copyright = ""; + license = att->value; + else + license = ""; att = _node.GetAttribute ( "url", false ); if (att != NULL) @@ -1814,13 +1814,6 @@ date = att->value; else date = "?"; - - /* When was this module updated */ - att = _node.GetAttribute ( "owner", false ); - if (att != NULL) - owner = att->value; - else - owner = "ReactOS"; } Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Oct 28 03:12:20 2007 @@ -572,10 +572,9 @@ std::string name; std::string description; std::string version; - std::string copyright; + std::string license; std::string url; std::string date; - std::string owner; Metadata ( const XMLElement& _node, const Module& _module );

1 0

[tkreuzer] 29926: user32: - implement User32InitializeImmEntryTable() stub - implement _assert() to remove reference to msvcrt.dll todo: remove references to advapi32 and imm32. user32 should only link to ntdll, kernel32 and gdi32. The goal is to make it at least load on windows.
by tkreuzer＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: tkreuzer Date: Sun Oct 28 02:37:08 2007 New Revision: 29926 URL: http://svn.reactos.org/svn/reactos?rev=29926&view=rev Log: user32: - implement User32InitializeImmEntryTable() stub - implement _assert() to remove reference to msvcrt.dll todo: remove references to advapi32 and imm32. user32 should only link to ntdll, kernel32 and gdi32. The goal is to make it at least load on windows. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Sun Oct 28 02:37:08 2007 @@ -779,3 +779,14 @@ UNIMPLEMENTED; return FALSE; } + + +/* + * @unimplemented + */ +DWORD STDCALL User32InitializeImmEntryTable(PVOID p) +{ + UNIMPLEMENTED; + return 0; +} + Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Sun Oct 28 02:37:08 2007 @@ -709,7 +709,7 @@ UpdateLayeredWindow@36 UpdatePerUserSystemParameters@8 UpdateWindow@4 -;User32InitializeImmEntryTable +User32InitializeImmEntryTable UserClientDllInitialize=DllMain@12 UserHandleGrantAccess@12 ;UserLpkPSMTextOut Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Sun Oct 28 02:37:08 2007 @@ -33,6 +33,14 @@ #include <wine/debug.h> /* FUNCTIONS *****************************************************************/ + +void _assert(const char *msg, const char *file, int line) +{ + /* Assertion failed at foo.c line 45: x<y */ + DbgPrint("Assertion failed at %s line %d: %s\n", file, line, msg); + ExitProcess(3); + for(;;); /* eliminate warning by mingw */ +} /* * @implemented

1 0

[cfinck] 29925: Import the new code for showing floating point values with the correct decimal separator from shell32. sysdm.cpl now shows the processor speed and RAM size values with the correct decimal separator based on the current locale.
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sun Oct 28 01:37:32 2007 New Revision: 29925 URL: http://svn.reactos.org/svn/reactos?rev=29925&view=rev Log: Import the new code for showing floating point values with the correct decimal separator from shell32. sysdm.cpl now shows the processor speed and RAM size values with the correct decimal separator based on the current locale. Modified: trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sun Oct 28 01:37:32 2007 @@ -198,12 +198,32 @@ return Ret; } -static VOID +static VOID +MakeFloatValueString(double* dFloatValue, + LPTSTR szOutput, + LPTSTR szAppend) +{ + TCHAR szDecimalSeparator[4]; + + // Get the decimal separator for the current locale + if( GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(TCHAR)) > 0) + { + UCHAR uDecimals; + UINT uIntegral; + + // Show the value with two decimals + uIntegral = (UINT)*dFloatValue; + uDecimals = (UCHAR)((UINT)(*dFloatValue * 100) - uIntegral * 100); + + wsprintf(szOutput, _T("%u%s%02u %s"), uIntegral, szDecimalSeparator, uDecimals, szAppend); + } +} + +static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) - { TCHAR szBuf[64]; DWORD BufSize = sizeof(DWORD); @@ -228,12 +248,12 @@ { if (ppi.CurrentMhz < 1000) { - _stprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); + wsprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); } else { double flt = ppi.CurrentMhz / 1000.0; - _stprintf(szBuf, _T("%.2f GHz"), flt); + MakeFloatValueString(&flt, szBuf, _T("GHz")); } SetDlgItemText(hwnd, @@ -289,29 +309,28 @@ { TCHAR szStr[32]; double dTotalPhys; - UINT i = 0; - static const UINT uStrId[] = { - IDS_MEGABYTE, - IDS_GIGABYTE, - IDS_TERABYTE, - IDS_PETABYTE - }; if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) { - /* We're dealing with GBs or more */ + UINT i = 0; + static const UINT uStrId[] = { + IDS_GIGABYTE, + IDS_TERABYTE, + IDS_PETABYTE + }; + + // We're dealing with GBs or more MemStat.ullTotalPhys /= 1024 * 1024; - i++; if (MemStat.ullTotalPhys > 1024 * 1024) { - /* We're dealing with TBs or more */ + // We're dealing with TBs or more MemStat.ullTotalPhys /= 1024; i++; if (MemStat.ullTotalPhys > 1024 * 1024) { - /* We're dealing with PBs or more */ + // We're dealing with PBs or more MemStat.ullTotalPhys /= 1024; i++; @@ -322,22 +341,18 @@ } else dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + + LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(TCHAR)); + MakeFloatValueString(&dTotalPhys, Buf, szStr); } else { - /* We're daling with MBs */ - dTotalPhys = (double)MemStat.ullTotalPhys / 1024 / 1024; - } - - if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) - { - if( _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr) ) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); - } - } + // We're dealing with MBs, don't show any decimals + LoadString(hApplet, IDS_MEGABYTE, szStr, sizeof(szStr) / sizeof(TCHAR)); + wsprintf(Buf, _T("%u %s"), (UINT)MemStat.ullTotalPhys / 1024 / 1024, szStr); + } + + SetDlgItemText(hwnd, CurMachineLine, Buf); } }

1 0

[cfinck] 29924: - Implement a new ShellAbout dialog, which looks more like the Windows one. Uses the ReactOS Logo bitmap from base/setup/welcome/res. The "Authors" button in the dialog currently highlights a redrawing bug in ReactOS (tracked in bug 2769). - Define default strings in include/reactos/version.rc, which shouldn't be overwritten by applications. These strings can later be used i.e. in resource files like it's done in shell32 now.
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sun Oct 28 01:02:34 2007 New Revision: 29924 URL: http://svn.reactos.org/svn/reactos?rev=29924&view=rev Log: - Implement a new ShellAbout dialog, which looks more like the Windows one. Uses the ReactOS Logo bitmap from base/setup/welcome/res. The "Authors" button in the dialog currently highlights a redrawing bug in ReactOS (tracked in bug 2769). - Define default strings in include/reactos/version.rc, which shouldn't be overwritten by applications. These strings can later be used i.e. in resource files like it's done in shell32 now. Added: trunk/reactos/dll/win32/shell32/res/bitmaps/ trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp - copied unchanged from r29776, trunk/reactos/base/setup/welcome/res/title.bmp Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shell32_main.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/include/reactos/version.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_r… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc…

1 0

[janderwald] 29923: - fix a bug
by janderwald＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: janderwald Date: Sun Oct 28 00:48:45 2007 New Revision: 29923 URL: http://svn.reactos.org/svn/reactos?rev=29923&view=rev Log: - fix a bug Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Sun Oct 28 00:48:45 2007 @@ -1,7 +1,7 @@ /* - * IContextMenu for items in the shellview + * Open With Context Menu extension * - * Copyright 1998, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> + * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -161,7 +161,7 @@ wcscpy(szBuffer, szChoose); } - mii.dwItemData = (LPWSTR)szBuffer; + mii.dwTypeData = (LPWSTR)szBuffer; if (InsertMenuItemW(hMenu, 0, TRUE, &mii)) count++;

1 0

[mpiulachs] 29922: Update shell32 spanish localization
by mpiulachs＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: mpiulachs Date: Sun Oct 28 00:31:25 2007 New Revision: 29922 URL: http://svn.reactos.org/svn/reactos?rev=29922&view=rev Log: Update shell32 spanish localization Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Oct 28 00:31:25 2007 @@ -155,7 +155,7 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Accesso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE @@ -220,7 +220,7 @@ SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Versión" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "File version: ", 14000, 10, 10, 45, 10 @@ -242,23 +242,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Tipo:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 LTEXT "File system:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "Espacio ocupado:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "Espacio libre:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "Capacidad:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 @@ -272,7 +272,7 @@ DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" +CAPTION "Herramientas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 @@ -295,7 +295,7 @@ RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" +CAPTION "Ejecutar como" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 @@ -316,7 +316,7 @@ BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Propiedades de la papelera de reciclaje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 @@ -340,15 +340,15 @@ IDS_SHV_COLUMN7 "Tamaño disponible" IDS_SHV_COLUMN8 "Nombre" IDS_SHV_COLUMN9 "Comentarios" - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN10 "Propietario" + IDS_SHV_COLUMN11 "Groupo" + IDS_SHV_COLUMN_DELFROM "Ubicación original" + IDS_SHV_COLUMN_DELDATE "Fecha de eliminación" /* special folders */ IDS_DESKTOP "Escritorio" IDS_MYCOMPUTER "Mi PC" - IDS_RECYCLEBIN_FOLDER_NAME "Trash" + IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje" /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" @@ -378,9 +378,9 @@ /* message box strings */ IDS_RESTART_TITLE "Reiniciar" - IDS_RESTART_PROMPT "¿Desea simular un reinicio de Windows?" + IDS_RESTART_PROMPT "¿Desea reiniciar el equipo?" IDS_SHUTDOWN_TITLE "Apagar" - IDS_SHUTDOWN_PROMPT "¿Desea terminar su sesión ReactOS?" + IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" @@ -410,9 +410,9 @@ IDS_COMMON_PICTURES "Documentos\\Mis imágenes" IDS_COMMON_VIDEO "Documentos\\Mis vídeos" IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." -END + IDS_DRIVE_NETWORK "Unidad de red" + IDS_OPEN_WITH "Abrir con" + IDS_OPEN_WITH_CHOOSE "Elegir programa..." +END

1 0

[janderwald] 29921: - start implementing "Open With" shell extension - see http://windowsxp.mvps.org/OpenWith.htm
by janderwald＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: janderwald Date: Sun Oct 28 00:09:38 2007 New Revision: 29921 URL: http://svn.reactos.org/svn/reactos?rev=29921&view=rev Log: - start implementing "Open With" shell extension - see http://windowsxp.mvps.org/OpenWith.htm Added: trunk/reactos/dll/win32/shell32/she_ocmenu.c (with props) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_item_cmenu.c trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,7 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + +END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Lokaler Datenträger" IDS_DRIVE_CDROM "CD-Laufwerk" IDS_DRIVE_NETWORK "Netzlaufwerk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Oct 28 00:09:38 2007 @@ -415,4 +415,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sun Oct 28 00:09:38 2007 @@ -415,4 +415,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sun Oct 28 00:09:38 2007 @@ -414,4 +414,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sun Oct 28 00:09:38 2007 @@ -414,4 +414,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Oct 28 00:09:38 2007 @@ -413,4 +413,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sun Oct 28 00:09:38 2007 @@ -412,4 +412,6 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" -END + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sun Oct 28 00:09:38 2007 @@ -413,6 +413,8 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sun Oct 28 00:09:38 2007 @@ -412,6 +412,8 @@ IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" END #pragma code_page(default) Added: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (added) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Sun Oct 28 00:09:38 2007 @@ -1,0 +1,315 @@ +/* + * IContextMenu for items in the shellview + * + * Copyright 1998, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define YDEBUG +#include "winerror.h" +#include "wine/debug.h" + +#include "windef.h" +#include "wingdi.h" +#include "pidl.h" +#include "undocshell.h" +#include "shlobj.h" +#include "objbase.h" + +#include "shell32_main.h" +#include "shellfolder.h" +#include "shresdef.h" + +const GUID CLSID_OpenWith = { 0x09799AFB, 0xAD67, 0x11d1, {0xAB,0xCD,0x00,0xC0,0x4F,0xC3,0x09,0x36} }; + +typedef struct +{ + const IContextMenu2Vtbl *lpVtblContextMenu; + const IShellExtInitVtbl *lpvtblShellExtInit; + LONG wId; + volatile LONG ref; +} SHEOWImpl; + + +static const IShellExtInitVtbl eivt; +static const IContextMenu2Vtbl cmvt; +static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj); +static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface); + +HRESULT WINAPI SHEOW_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv) +{ + SHEOWImpl * ow; + HRESULT res; + + ow = LocalAlloc(LMEM_ZEROINIT, sizeof(SHEOWImpl)); + if (!ow) + { + return E_OUTOFMEMORY; + } + + ow->ref = 1; + ow->lpVtblContextMenu = &cmvt; + ow->lpvtblShellExtInit = &eivt; + + TRACE("(%p)->()\n",ow); + + res = SHEOWCm_fnQueryInterface( (IContextMenu2*)&ow->lpVtblContextMenu, riid, ppv ); + SHEOWCm_fnRelease( (IContextMenu2*)&ow->lpVtblContextMenu ); + return res; +} + +static inline SHEOWImpl *impl_from_IShellExtInit( IShellExtInit *iface ) +{ + return (SHEOWImpl *)((char*)iface - FIELD_OFFSET(SHEOWImpl, lpvtblShellExtInit)); +} + +static inline SHEOWImpl *impl_from_IContextMenu( IContextMenu2 *iface ) +{ + return (SHEOWImpl *)((char*)iface - FIELD_OFFSET(SHEOWImpl, lpVtblContextMenu)); +} + +static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2)) + { + *ppvObj = &This->lpVtblContextMenu; + } + else if(IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppvObj = &This->lpvtblShellExtInit; + } + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI SHEOWCm_fnAddRef(IContextMenu2 *iface) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%i)\n", This, refCount + 1); + + if (!refCount) + { + TRACE(" destroying IContextMenu(%p)\n",This); + HeapFree(GetProcessHeap(),0,This); + } + return refCount; +} + +static UINT +AddItems(SHEOWImpl *This, HMENU hMenu, UINT idCmdFirst) +{ + UINT count = 0; + MENUITEMINFOW mii; + WCHAR szBuffer[50]; + static const WCHAR szChoose[] = { 'C','h','o','o','s','e',' ','P','r','o','g','r','a','m','.','.','.',0 }; + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED; + mii.wID = idCmdFirst; + + if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH_CHOOSE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) + { + ERR("Failed to load string\n"); + wcscpy(szBuffer, szChoose); + } + + mii.dwItemData = (LPWSTR)szBuffer; + if (InsertMenuItemW(hMenu, 0, TRUE, &mii)) + count++; + + return count; +} + + +static HRESULT WINAPI SHEOWCm_fnQueryContextMenu( + IContextMenu2 *iface, + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + MENUITEMINFOW mii; + USHORT items = 0; + WCHAR szBuffer[100]; + + HMENU hSubMenu = NULL; + SHEOWImpl *This = impl_from_IContextMenu(iface); + + if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH, szBuffer, 100) < 0) + { + TRACE("failed to load string\n"); + return E_FAIL; + } + + + hSubMenu = CreatePopupMenu(); + if (hSubMenu == NULL) + { + ERR("failed to create submenu"); + return E_FAIL; + } + items = AddItems(This, hSubMenu, idCmdFirst); + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + if (hSubMenu) + { + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = hSubMenu; + } + mii.dwTypeData = (LPWSTR) szBuffer; + mii.fState = MFS_ENABLED; + mii.wID = idCmdFirst + items; + mii.fType = MFT_STRING; + if (InsertMenuItemW( hmenu, 0, TRUE, &mii)) + items++; + + TRACE("items %x\n",items); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, items); +} + +static HRESULT WINAPI +SHEOWCm_fnInvokeCommand( IContextMenu2* iface, LPCMINVOKECOMMANDINFO lpici ) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + + TRACE("This %p\n", This); + + return E_FAIL; +} + +static HRESULT WINAPI +SHEOWCm_fnGetCommandString( IContextMenu2* iface, UINT_PTR idCmd, UINT uType, + UINT* pwReserved, LPSTR pszName, UINT cchMax ) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + + FIXME("%p %lu %u %p %p %u\n", This, + idCmd, uType, pwReserved, pszName, cchMax ); + + return E_NOTIMPL; +} + +static HRESULT WINAPI SHEOWCm_fnHandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + SHEOWImpl *This = impl_from_IContextMenu(iface); + + TRACE("This %p uMsg %x\n",This, uMsg); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl cmvt = +{ + SHEOWCm_fnQueryInterface, + SHEOWCm_fnAddRef, + SHEOWCm_fnRelease, + SHEOWCm_fnQueryContextMenu, + SHEOWCm_fnInvokeCommand, + SHEOWCm_fnGetCommandString, + SHEOWCm_fnHandleMenuMsg +}; + +static HRESULT WINAPI +SHEOW_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, HKEY hkeyProgID ) +{ + SHEOWImpl *This = impl_from_IShellExtInit(iface); + + TRACE("This %p\n", This); + + return S_OK; +} + +static ULONG WINAPI SHEOW_ExtInit_AddRef(IShellExtInit *iface) +{ + SHEOWImpl *This = impl_from_IShellExtInit(iface); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI SHEOW_ExtInit_Release(IShellExtInit *iface) +{ + SHEOWImpl *This = impl_from_IShellExtInit(iface); + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%i)\n", This, refCount + 1); + + if (!refCount) + { + HeapFree(GetProcessHeap(),0,This); + } + return refCount; +} + +static HRESULT WINAPI +SHEOW_ExtInit_QueryInterface( IShellExtInit* iface, REFIID riid, void** ppvObject ) +{ + SHEOWImpl *This = impl_from_IShellExtInit(iface); + return SHEOWCm_fnQueryInterface((IContextMenu2*)This, riid, ppvObject); +} + +static const IShellExtInitVtbl eivt = +{ + SHEOW_ExtInit_QueryInterface, + SHEOW_ExtInit_AddRef, + SHEOW_ExtInit_Release, + SHEOW_ExtInit_Initialize +}; Propchange: trunk/reactos/dll/win32/shell32/she_ocmenu.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Sun Oct 28 00:09:38 2007 @@ -69,4 +69,5 @@ <file>fprop.c</file> <file>drive.c</file> <file>recyclebin.c</file> + <file>she_ocmenu.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Sun Oct 28 00:09:38 2007 @@ -100,6 +100,7 @@ HRESULT WINAPI FolderShortcut_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); +HRESULT WINAPI SHEOW_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); HRESULT WINAPI ShellFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c (original) +++ trunk/reactos/dll/win32/shell32/shellole.c Sun Oct 28 00:09:38 2007 @@ -77,6 +77,7 @@ #endif {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, + {&CLSID_OpenWith, &SHEOW_Constructor}, {NULL,NULL} }; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Sun Oct 28 00:09:38 2007 @@ -96,6 +96,8 @@ #define IDS_TRASHMULTIPLE_TEXT 139 #define IDS_CANTTRASH_TEXT 140 #define IDS_OVERWRITEFOLDER_TEXT 141 +#define IDS_OPEN_WITH 142 +#define IDS_OPEN_WITH_CHOOSE 143 /* Note: this string is referenced from the registry*/ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sun Oct 28 00:09:38 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG +#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -378,9 +378,10 @@ if(!(uFlags & CMF_EXPLORE)) _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Select", MFS_ENABLED); + TRACE("rfg %x\n", This->rfg); if (This->rfg & SFGAO_BROWSABLE) { - if(This->bAllValues) + if(This->bAllValues) { _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h Sun Oct 28 00:09:38 2007 @@ -560,6 +560,8 @@ /* policy functions */ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey); +DEFINE_GUID(CLSID_OpenWith, 0x09799AFB, 0xAD67, 0x11d1, 0xAB,0xCD,0x00,0xC0,0x4F,0xC3,0x09,0x36); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[mpiulachs] 29920: - Constify true/false yes/no attribute checking - Experimental support to autogenerate rsrc.rc equivalent and platform dependent manifest.xml to intermediate folder - Add preliminary support to track authors/contributors/developers/translators for each module. It can be useful to autogenerate uptodate \CREDITS file , module/authors reports (see for example: http://www.codexchange.net/rosdoc/authors.htm or http://www.codexchange.net/rosdoc/eventvwr.htm) or even source code for
by mpiulachs＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: mpiulachs Date: Sat Oct 27 23:40:38 2007 New Revision: 29920 URL: http://svn.reactos.org/svn/reactos?rev=29920&view=rev Log: - Constify true/false yes/no attribute checking - Experimental support to autogenerate rsrc.rc equivalent and platform dependent manifest.xml to intermediate folder - Add preliminary support to track authors/contributors/developers/translators for each module. It can be useful to autogenerate uptodate \CREDITS file , module/authors reports (see for example: http://www.codexchange.net/rosdoc/authors.htm or http://www.codexchange.net/rosdoc/eventvwr.htm) or even source code for modules like notevil note: I added some developers as sample , feel free to add your information to contributors.rbuild using current information as template Added: branches/rbuild/reactos/contributors.rbuild (with props) Modified: branches/rbuild/reactos/ReactOS-generic.rbuild branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild branches/rbuild/reactos/dll/cpl/desk/desk.rbuild branches/rbuild/reactos/tools/rbuild/define.cpp branches/rbuild/reactos/tools/rbuild/linkerscript.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-generic.… ============================================================================== --- branches/rbuild/reactos/ReactOS-generic.rbuild (original) +++ branches/rbuild/reactos/ReactOS-generic.rbuild Sat Oct 27 23:40:38 2007 @@ -2,6 +2,7 @@ <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> + <xi:include href="contributors.rbuild" /> <define name="__REACTOS__" overridable="true" /> <if property="MP" value="1"> Modified: branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild Sat Oct 27 23:40:38 2007 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" generatemanifest="true" generateresource="true"> +<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe"> <include base="eventvwr">.</include> <include base="eventvwr" root="intermediate">.</include> <define name="__REACTOS__" /> @@ -13,12 +13,22 @@ <file>eventvwr.c</file> <file>eventvwr.rc</file> +  + <automanifest>manifest.xml</automanifest> + <autoresource>auto.rc</autoresource> + +  + <developer>mpiulachs</developer> + <translator>cfinck</translator> + <translator>fireball</translator> + <translator>mpiulachs</translator> + <metadata description="ReactOS Event Log Viewer" /> +  <localization isoname="de-DE">lang/de-DE.rc</localization> <localization isoname="en-US">lang/en-US.rc</localization> <localization isoname="es-ES">lang/es-ES.rc</localization> <localization isoname="fr-FR">lang/fr-FR.rc</localization> <localization isoname="ru-RU">lang/ru-RU.rc</localization> -</module> - +</module> Added: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (added) +++ branches/rbuild/reactos/contributors.rbuild Sat Oct 27 23:40:38 2007 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <contributor firstname="Marc" lastname="Piulachs" mail="marc.piulachs(a)codexchange.net" alias="mpiulachs" country="Spain" city="Barcelona" /> + <contributor firstname="Colin" lastname="Finck" alias="cfinck" /> + <contributor firstname="Aleksey" lastname="Bragin" alias="fireball" /> + <contributor firstname="Eric" lastname="Kohl" alias="ekohl" /> +</group> Propchange: branches/rbuild/reactos/contributors.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rbuild (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Sat Oct 27 23:40:38 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="true" generatemanifest="true" generateresource="true"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="true"> <importlibrary definition="desk.def" /> <include base="desk">.</include> <include base="desk" root="intermediate">.</include> @@ -37,6 +37,13 @@ <file>monslctl.c</file> <file>desk.rc</file> +  + <automanifest>manifest.xml</automanifest> + <autoresource>auto.rc</autoresource> + +  + <developer>ekohl</developer> + <metadata description="ReactOS Display ControlPanel Applet" /> <localization isoname="bg-BG">lang/bg-BG.rc</localization> Modified: branches/rbuild/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/def… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/define.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/define.cpp Sat Oct 27 23:40:38 2007 @@ -87,7 +87,7 @@ att = node->GetAttribute ( "overridable", false ); if ( att ) - overridable = ( att->value == "true" || att->value == "yes" ); + overridable = ( att->value == TRUE_STRING || att->value == YES_STRING ); else overridable = false; } Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/lin… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Sat Oct 27 23:40:38 2007 @@ -35,3 +35,27 @@ LinkerScript::ProcessXML() { } + +AutoResource::AutoResource ( const XMLElement& node_, + const Module& module_, + const FileLocation& file_ ) + : node(node_), module(module_), file(file_) +{ +} + +void +AutoResource::ProcessXML() +{ +} + +AutoManifest::AutoManifest ( const XMLElement& node_, + const Module& module_, + const FileLocation& file_ ) + : node(node_), module(module_), file(file_) +{ +} + +void +AutoManifest::ProcessXML() +{ +} Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sat Oct 27 23:40:38 2007 @@ -247,7 +247,9 @@ linkerScript (NULL), pch (NULL), cplusplus (false), - host (HostDefault) + host (HostDefault), + autoManifest (NULL), + autoResource (NULL) { if ( node.name != "module" ) throw InvalidOperationException ( __FILE__, @@ -292,9 +294,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) isUnicode = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) isUnicode = false; else { @@ -306,14 +308,14 @@ } else isUnicode = false; - +/* att = moduleNode.GetAttribute ( "generatemanifest", false ); if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) generateManifestFile = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) generateManifestFile = false; else { @@ -330,10 +332,10 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) { generateResourceFile = true; -/* + File* resFile = new File ( IntermediateDirectory, output->relative_path, "auto.rc", @@ -342,9 +344,9 @@ false ); non_if_data.files.push_back ( resFile ); -*/ - } - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + + } + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) generateResourceFile = false; else { @@ -356,7 +358,7 @@ } else generateResourceFile = false; - +*/ if (isUnicode) { // Always define UNICODE and _UNICODE @@ -397,9 +399,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) mangledSymbols = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) mangledSymbols = false; else { @@ -414,7 +416,7 @@ att = moduleNode.GetAttribute ( "underscoresymbols", false ); if ( att != NULL ) - underscoreSymbols = att->value == "true"; + underscoreSymbols = att->value == TRUE_STRING; else underscoreSymbols = false; @@ -422,9 +424,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) host = HostTrue; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) host = HostFalse; else { @@ -439,9 +441,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) isStartupLib = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) isStartupLib = false; else { @@ -481,7 +483,7 @@ } } if ( att != NULL ) - allowWarnings = att->value == "true"; + allowWarnings = att->value == TRUE_STRING; else allowWarnings = false; @@ -598,9 +600,9 @@ const XMLAttribute* att = e.GetAttribute ( "first", false ); if ( att != NULL ) { - if ( !stricmp ( att->value.c_str(), "true" ) ) + if ( !stricmp ( att->value.c_str(), TRUE_STRING ) ) first = true; - else if ( stricmp ( att->value.c_str(), "false" ) ) + else if ( stricmp ( att->value.c_str(), FALSE_STRING ) ) { throw XMLInvalidBuildFileException ( e.location, @@ -764,6 +766,64 @@ dependencies.push_back ( new Dependency ( e, *this ) ); subs_invalid = true; } + else if ( e.name == "autoresource" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<autoresource> is not a valid sub-element of <if>" ); + } + if ( autoResource ) + { + throw XMLInvalidBuildFileException ( + e.location, + "Only one <autoresource> is valid per module" ); + } + size_t pos = e.value.find_last_of ( "/\\" ); + if ( pos == string::npos ) + { + autoResource = new AutoResource ( + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); + } + else + { + string dir = e.value.substr ( 0, pos ); + string name = e.value.substr ( pos + 1); + autoResource = new AutoResource ( + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); + } + subs_invalid = true; + } + else if ( e.name == "automanifest" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<automanifest> is not a valid sub-element of <if>" ); + } + if ( autoManifest ) + { + throw XMLInvalidBuildFileException ( + e.location, + "Only one <automanifest> is valid per module" ); + } + size_t pos = e.value.find_last_of ( "/\\" ); + if ( pos == string::npos ) + { + autoManifest = new AutoManifest ( + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); + } + else + { + string dir = e.value.substr ( 0, pos ); + string name = e.value.substr ( pos + 1); + autoManifest = new AutoManifest ( + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); + } + subs_invalid = true; + } else if ( e.name == "importlibrary" ) { if ( parseContext.ifData ) @@ -866,6 +926,26 @@ linkerScript = new LinkerScript ( e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); } + subs_invalid = true; + } + else if ( e.name == "developer" ) + { + authors.push_back ( new Author ( e, *this , Developer) ); + subs_invalid = true; + } + else if ( e.name == "mantainer" ) + { + authors.push_back ( new Author ( e, *this , Mantainer ) ); + subs_invalid = true; + } + //else if ( e.name == "contributor" ) + //{ + // authors.push_back ( new Author ( e, *this , Contributor ) ); + // subs_invalid = false; + //} + else if ( e.name == "translator" ) + { + authors.push_back ( new Author ( e, *this , Translator ) ); subs_invalid = true; } else if ( e.name == "component" ) @@ -1591,6 +1671,46 @@ { } +/* +AuthorRole +Author::GetAuthorRole ( const string& location, const XMLAttribute& attribute ) +{ + if ( attribute.value == "developer" ) + return Developer; + if ( attribute.value == "mantainer" ) + return Mantainer; + if ( attribute.value == "contributor" ) + return Contributor; + if ( attribute.value == "translator" ) + return Translator; + throw InvalidAttributeValueException ( location, + attribute.name, + attribute.value ); +} +*/ + +Author::Author ( const XMLElement& _node , const Module& module_ , AuthorRole role_) + : node (_node), module(module_) , role(role_) +{ + ProcessXML (); +} + +Author::Author ( const XMLElement& _node , const Module& module_) + : node (_node), module(module_) , role (Developer) +{ + //const XMLAttribute* att = _node.GetAttribute ( "role", true ); + //assert(att); + //role = GetAuthorRole(_node.location , *att); + + ProcessXML (); +} + +void +Author::ProcessXML() +{ + alias = node.value; +} + Localization::Localization ( const XMLElement& node_, const Module& module_, const FileLocation& file_) @@ -1604,9 +1724,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) dirty = true; - else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + else if ( !stricmp ( p, FALSE_STRING) || !stricmp ( p, NO_STRING ) ) dirty = false; else { Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Sat Oct 27 23:40:38 2007 @@ -37,7 +37,7 @@ { Module& module = *project.modules[i]; - if (module.generateManifestFile) + if (module.autoManifest != NULL) { WriteManifestFile (module); } Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Sat Oct 27 23:40:38 2007 @@ -37,7 +37,7 @@ { Module& module = *project.modules[i]; - if (module.generateResourceFile) + if (module.autoResource != NULL) { WriteResourceFile (module); } @@ -78,7 +78,7 @@ s = s + sprintf ( s, "#include <reactos/version.rc>\n"); s = s + sprintf ( s, "\n" ); - if (module.generateManifestFile) + if (module.autoManifest != NULL) { s = s + sprintf ( s, "1 24 DISCARDABLE \"manifest.xml\"\n"); s = s + sprintf ( s, "\n" ); Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sat Oct 27 23:40:38 2007 @@ -51,6 +51,11 @@ extern std::string sBadSep; extern char cSep; extern char cBadSep; + +#define TRUE_STRING "true" +#define FALSE_STRING "false" +#define YES_STRING "yes" +#define NO_STRING "no" #ifdef WIN32 #define DEF_EXEPREFIX "" @@ -106,6 +111,9 @@ class Metadata; class Language; class Localization; +class Author; +class AutoManifest; +class AutoResource; typedef std::map<std::string,Directory*> directory_map; @@ -130,6 +138,14 @@ OutputDirectory, InstallDirectory, TemporaryDirectory, +}; + +enum AuthorRole +{ + Developer, + Mantainer, +// Contributor, + Translator }; class Directory @@ -349,16 +365,15 @@ std::string buildtype; ModuleType type; ImportLibrary* importLibrary; - Metadata* metadata; + Metadata* metadata; bool mangledSymbols; bool underscoreSymbols; bool isUnicode; bool isDefaultEntryPoint; - bool generateManifestFile; - bool generateResourceFile; Bootstrap* bootstrap; AutoRegister* autoRegister; // <autoregister> node IfableData non_if_data; + std::vector<Author*> authors; std::vector<Invoke*> invocations; std::vector<Localization*> localizations; std::vector<Dependency*> dependencies; @@ -377,6 +392,8 @@ FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; + AutoManifest* autoManifest; + AutoResource* autoResource; Module ( const Project& project, const XMLElement& moduleNode, @@ -566,6 +583,34 @@ void ProcessXML(); }; +class AutoManifest +{ + const XMLElement& node; +public: + const Module& module; + FileLocation file; + + AutoManifest ( const XMLElement& node, + const Module& module, + const FileLocation& file ); + + void ProcessXML(); +}; + +class AutoResource +{ + const XMLElement& node; +public: + const Module& module; + FileLocation file; + + AutoResource ( const XMLElement& node, + const Module& module, + const FileLocation& file ); + + void ProcessXML(); +}; + class ImportLibrary : public XmlNode { public: @@ -587,6 +632,23 @@ Language ( const XMLElement& _node ); void ProcessXML (); +}; + +class Author +{ +public: + const XMLElement& node; + const Module& module; + std::string alias; + AuthorRole role; + + Author ( const XMLElement& _node, const Module& module ); + Author ( const XMLElement& _node, const Module& module, AuthorRole role ); + + void ProcessXML (); +//private: +// AuthorRole GetAuthorRole ( const std::string& location, +// const XMLAttribute& attribute ); }; class Localization

1 0

[cfinck] 29919: Portuguese (Brazilian) translation for sndvol32 by Mateus de Lima (mateusloliveira AT hotmail DOT com) See issue #2768 for more details.
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sat Oct 27 23:31:40 2007 New Revision: 29919 URL: http://svn.reactos.org/svn/reactos?rev=29919&view=rev Log: Portuguese (Brazilian) translation for sndvol32 by Mateus de Lima (mateusloliveira AT hotmail DOT com) See issue #2768 for more details. Added: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc Added: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc Sat Oct 27 23:31:40 2007 @@ -1,0 +1,49 @@ + +/* + Translated by: + Mateus de Lima (aka wavemaster) <mateusloliveira [@] hotmail.com> +*/ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Opções" + BEGIN + MENUITEM "&Propriedades", IDC_PROPERTIES + MENUITEM "&Controles avançados", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "Sai&r", IDC_EXIT + END + POPUP "Aj&uda" + BEGIN + MENUITEM "Tópicos de &ajuda", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Sobre o &Controle de Volume", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "Controle de Volume" + IDS_NOMIXERDEVICES "Não há dispositivos de mixagem disponíveis! O aplicativo irá sair agora." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Propriedades" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Dispositivo de &mixagem:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Ajustar volume para:", -1, 7,25,211,77 + PUSHBUTTON "&Reprodução", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Gravação", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Outros:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Mostar os seguintes controles de volume:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 +END Propchange: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Sat Oct 27 23:31:40 2007 @@ -20,6 +20,7 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc"

1 0

[cfinck] 29918: Added and updated Slovak translations for the screensavers by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 27 Oct '07

27 Oct '07

Author: cfinck Date: Sat Oct 27 21:36:40 2007 New Revision: 29918 URL: http://svn.reactos.org/svn/reactos?rev=29918&view=rev Log: Added and updated Slovak translations for the screensavers by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc Added: trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc Sat Oct 27 21:36:40 2007 @@ -1,0 +1,23 @@ +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 27-10-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_CONFIG DIALOGEX 0, 0, 273, 178 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenie etrièa obrazovky 3D text" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "Zrui",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "¼ubovo¾ný text",IDC_STATIC_TEXT,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D text - etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadne nastavenia." +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Sat Oct 27 21:36:40 2007 @@ -13,3 +13,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc Sat Oct 27 21:36:40 2007 @@ -8,5 +8,5 @@ BEGIN IDS_DESCRIPTION "Logon - etriè obrazovky" IDS_TITLE "Èo je ..." - IDS_TEXT "Nie sú potrebné iadné nastavenia." + IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc Sat Oct 27 21:36:40 2007 @@ -1,6 +1,6 @@ /* * PROJECT: Matrix ScreenSaver - * FILE: base/applications/screensavers\matrix\lang\ + * FILE: base/applications/screensavers/matrix/lang/ * PURPOSE: Slovak Language File Matrix ScreenSaver * TRANSLATOR: Kario (kario(a)szm.sk) * DATE OF TR: 25-07-2007 @@ -42,17 +42,17 @@ SS_CENTERIMAGE | WS_GROUP,154,39,116,72 PUSHBUTTON "Prid&a",IDC_ADD,280,41,44,18 PUSHBUTTON "O&dstráni",IDC_REMOVE,280,66,44,18 - CONTROL "&Náhodné poradie správ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,134,85,10 - DEFPUSHBUTTON "OK",IDOK,222,162,50,14 - PUSHBUTTON "Zrui",IDCANCEL,283,162,50,14 LTEXT "Typ &písma:",IDC_STATIC,151,118,40,8 COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "&Náhodné poradie správ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,90,10 CONTROL "&Tuèné písmo",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,55,10 CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, 158,75,18 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Zrui",IDCANCEL,283,162,50,14 END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc Sat Oct 27 21:36:40 2007 @@ -8,5 +8,5 @@ BEGIN IDS_DESCRIPTION "Predvolený etriè obrazovky" IDS_TITLE "Èo je ..." - IDS_TEXT "Nie sú potrebné iadné nastavenia." + IDS_TEXT "Nie sú potrebné iadne nastavenia." END Modified: trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc Sat Oct 27 21:36:40 2007 @@ -8,5 +8,5 @@ BEGIN IDS_DESCRIPTION "Hviezdne pole - etriè obrazovky" IDS_TITLE "Èo je ..." - IDS_TEXT "Nie sú potrebné iadné nastavenia." + IDS_TEXT "Nie sú potrebné iadne nastavenia." END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs