Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 41201: - ElfrOpenBELW/ElfrOpenELW/ElfrRegisterEventSourceW: MajorVersion and MinorVersion must be 1 as documented on MSDN. - ReportEventW: Use RtlInitUnicodeString for ComputerName.
by mjmartin＠svn.reactos.org 30 May '09

30 May '09

Author: mjmartin Date: Sat May 30 04:38:46 2009 New Revision: 41201 URL: http://svn.reactos.org/svn/reactos?rev=41201&view=rev Log: - ElfrOpenBELW/ElfrOpenELW/ElfrRegisterEventSourceW: MajorVersion and MinorVersion must be 1 as documented on MSDN. - ReportEventW: Use RtlInitUnicodeString for ComputerName. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sat May 30 04:38:46 2009 @@ -513,8 +513,8 @@ { Status = ElfrOpenBELW((LPWSTR)lpUNCServerName, &FileName, - 0, - 0, + 1, + 1, &LogHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -593,8 +593,8 @@ Status = ElfrOpenELW((LPWSTR)lpUNCServerName, &SourceName, &EmptyString, - 0, - 0, + 1, + 1, &LogHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -799,8 +799,8 @@ Status = ElfrRegisterEventSourceW((LPWSTR)lpUNCServerName, &SourceName, &EmptyString, - 0, - 0, + 1, + 1, &LogHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -938,7 +938,7 @@ RtlInitUnicodeString(&Strings[i], lpStrings[i]); /*FIXME: ComputerName */ - RtlInitEmptyUnicodeString(&ComputerName, L"", 0); + RtlInitUnicodeString(&ComputerName, L""); RpcTryExcept {

1 0

[bfreisen] 41200: Paint: Added cropping via attributes dialog and setting desktop wallpaper (both not yet working)
by bfreisen＠svn.reactos.org 29 May '09

29 May '09

Author: bfreisen Date: Fri May 29 23:36:35 2009 New Revision: 41200 URL: http://svn.reactos.org/svn/reactos?rev=41200&view=rev Log: Paint: Added cropping via attributes dialog and setting desktop wallpaper (both not yet working) Added: trunk/reactos/base/applications/paint/registry.c (with props) trunk/reactos/base/applications/paint/registry.h (with props) Modified: trunk/reactos/base/applications/paint/dialogs.c trunk/reactos/base/applications/paint/history.c trunk/reactos/base/applications/paint/paint.rbuild trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] Fri May 29 23:36:35 2009 @@ -84,10 +84,16 @@ switch (LOWORD(wParam)) { case IDOK: - EndDialog(hwnd, 1); + EndDialog(hwnd, GetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, NULL, FALSE) | (GetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, NULL, FALSE)<<16)); break; case IDCANCEL: EndDialog(hwnd, 0); + break; + case IDD_ATTRIBUTESSTANDARD: + CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, imgXRes, FALSE); + SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, imgYRes, FALSE); break; } break; Modified: trunk/reactos/base/applications/paint/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.c [iso-8859-1] Fri May 29 23:36:35 2009 @@ -91,7 +91,7 @@ setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); } -void cropReversible(int x, int y) +void cropReversible(int x, int y)//FIXME: This function is broken { SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd+1)%4]); Modified: trunk/reactos/base/applications/paint/paint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] Fri May 29 23:36:35 2009 @@ -16,6 +16,7 @@ <file>main.c</file> <file>mouse.c</file> <file>palette.c</file> + <file>registry.c</file> <file>selection.c</file> <file>toolsettings.c</file> <file>winproc.c</file> Added: trunk/reactos/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.c (added) +++ trunk/reactos/base/applications/paint/registry.c [iso-8859-1] Fri May 29 23:36:35 2009 @@ -1,0 +1,39 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: registry.c + * PURPOSE: Offering functions dealing with registry values + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include <windows.h> + +/* FUNCTIONS ********************************************************/ + +void setWallpaper(char fname[], int style) +{ + HKEY hkeycontrolpanel; + HKEY hkeydesktop; + RegOpenKeyEx(HKEY_CURRENT_USER, "Control Panel", 0, 0, hkeycontrolpanel); + RegOpenKeyEx(hkeycontrolpanel, "Desktop", 0, KEY_SET_VALUE, hkeydesktop); + RegSetValueEx(hkeydesktop, "Wallpaper", 0, REG_SZ, fname, sizeof(fname)); + switch (style) + { + case 0: + RegSetValueEx(hkeydesktop, "WallpaperStyle", 0, REG_SZ, "2", 2); + RegSetValueEx(hkeydesktop, "TileWallpaper", 0, REG_SZ, "0", 2); + break; + case 1: + RegSetValueEx(hkeydesktop, "WallpaperStyle", 0, REG_SZ, "1", 2); + RegSetValueEx(hkeydesktop, "TileWallpaper", 0, REG_SZ, "0", 2); + break; + case 2: + RegSetValueEx(hkeydesktop, "WallpaperStyle", 0, REG_SZ, "1", 2); + RegSetValueEx(hkeydesktop, "TileWallpaper", 0, REG_SZ, "1", 2); + break; + } + RegCloseKey(hkeydesktop); + RegCloseKey(hkeycontrolpanel); +} Propchange: trunk/reactos/base/applications/paint/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/paint/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.h (added) +++ trunk/reactos/base/applications/paint/registry.h [iso-8859-1] Fri May 29 23:36:35 2009 @@ -1,0 +1,9 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: registry.h + * PURPOSE: Offering functions dealing with registry values + * PROGRAMMERS: Benedikt Freisen + */ + +void setWallpaper(char fname[], int style); Propchange: trunk/reactos/base/applications/paint/registry.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Fri May 29 23:36:35 2009 @@ -21,6 +21,7 @@ #include "drawing.h" #include "history.h" #include "mouse.h" +#include "registry.h" /* FUNCTIONS ********************************************************/ @@ -87,7 +88,7 @@ switch (lParam) { case 0: - if (FALSE) + if (isAFile) { EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERPLANE, MF_ENABLED | MF_BYCOMMAND); EnableMenuItem(GetMenu(hMainWnd), IDM_FILEASWALLPAPERCENTERED, MF_ENABLED | MF_BYCOMMAND); @@ -421,6 +422,15 @@ isAFile = TRUE; } break; + case IDM_FILEASWALLPAPERPLANE: + setWallpaper(filepathname, 2); + break; + case IDM_FILEASWALLPAPERCENTERED: + setWallpaper(filepathname, 1); + break; + case IDM_FILEASWALLPAPERSTRETCHED: + setWallpaper(filepathname, 0); + break; case IDM_EDITUNDO: undo(); SendMessage(hImageArea, WM_PAINT, 0, 0); @@ -507,10 +517,14 @@ break; case IDM_IMAGEATTRIBUTES: { - //int attrdata[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - attributesDlg(); - //cropReversible(640, 200); - //ZoomTo(zoom); + int retVal = attributesDlg(); + if ((LOWORD(retVal)!=0)&&(HIWORD(retVal)!=0)) + { + // cropReversible broken, dirty hack: + // insertReversible(CopyImage(hBms[currInd], IMAGE_BITMAP, LOWORD(retVal), HIWORD(retVal), 0)); + cropReversible(LOWORD(retVal), HIWORD(retVal)); + updateCanvasAndScrollbars(); + } } break; case IDM_IMAGECHANGESIZE:

1 0

[dgoette] 426: fix bug when saving draft while a similiar draft was already archived
by dgoette＠svn.reactos.org 29 May '09

29 May '09

Author: dgoette Date: Fri May 29 21:31:58 2009 New Revision: 426 URL: http://svn.reactos.org/svn/reactos?rev=426&view=rev Log: fix bug when saving draft while a similiar draft was already archived Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php [iso-8859-1] Fri May 29 21:31:58 2009 @@ -402,7 +402,7 @@ $thisuser_id = &ThisUser::getInstance()->id(); // check if revision exists - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE data_id = :data_id AND version = 0 AND lang_id = :lang AND user_id = :user_id AND status='draft' ORDER BY datetime DESC LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE data_id = :data_id AND version = 0 AND lang_id = :lang AND user_id = :user_id AND status='draft' AND archive IS FALSE ORDER BY datetime DESC LIMIT 1"); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); $stmt->bindParam('lang',$lang_id,PDO::PARAM_INT); $stmt->bindParam('user_id',$thisuser_id,PDO::PARAM_INT);

1 0

[dchapyshev] 41199: - Implement IOCTL_KEYBOARD_QUERY_ATTRIBUTES (not used yet, see FIXME comment) - Add KeyboardAttributes to I8042_KEYBOARD_EXTENSION
by dchapyshev＠svn.reactos.org 29 May '09

29 May '09

Author: dchapyshev Date: Fri May 29 21:25:03 2009 New Revision: 41199 URL: http://svn.reactos.org/svn/reactos?rev=41199&view=rev Log: - Implement IOCTL_KEYBOARD_QUERY_ATTRIBUTES (not used yet, see FIXME comment) - Add KeyboardAttributes to I8042_KEYBOARD_EXTENSION Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Fri May 29 21:25:03 2009 @@ -147,6 +147,8 @@ INTERNAL_I8042_HOOK_KEYBOARD KeyboardHook; /* FIXME: IsrWritePort ignored */ KDPC DpcKeyboard; + KEYBOARD_ATTRIBUTES KeyboardAttributes; + KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicators; KEYBOARD_SCAN_STATE KeyboardScanState; Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Fri May 29 21:25:03 2009 @@ -636,6 +636,20 @@ case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: { DPRINT1("IOCTL_KEYBOARD_QUERY_ATTRIBUTES not implemented\n"); +#if 0 + /* FIXME: KeyboardAttributes are not initialized anywhere */ + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n"); + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_ATTRIBUTES)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + *(PKEYBOARD_ATTRIBUTES) Irp->AssociatedIrp.SystemBuffer = DeviceExtension->KeyboardAttributes; + Irp->IoStatus.Information = sizeof(KEYBOARD_ATTRIBUTES); + Status = STATUS_SUCCESS; + break; +#endif Status = STATUS_NOT_IMPLEMENTED; break; }

1 0

[dgoette] 425: catch an error to prevent useless data in the database
by dgoette＠svn.reactos.org 29 May '09

29 May '09

Author: dgoette Date: Fri May 29 21:12:38 2009 New Revision: 425 URL: http://svn.reactos.org/svn/reactos?rev=425&view=rev Log: catch an error to prevent useless data in the database Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_SaveDraft… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_SaveDraft… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_SaveDraft… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_SaveDraft… [iso-8859-1] Fri May 29 21:12:38 2009 @@ -83,7 +83,7 @@ $stmt->execute(); $stable = $stmt->fetchColumn(); - if ($stable !== false) { + if ($stable !== false && $rev_id !== false) { // transfer from stable entry Tag::mergeFromRevision($stable, $rev_id); @@ -102,6 +102,11 @@ $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_TEXT." WHERE rev_id = :rev_id"); $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->execute(); + } + + if ($rev_id === false) { + echo 'Error while saving new draft'; + return; } // insert/update short text

1 0

[dchapyshev] 41198: - Add IOCTL_KEYBOARD_QUERY_ATTRIBUTES / IOCTL_KEYBOARD_QUERY_TYPEMATIC / IOCTL_KEYBOARD_SET_TYPEMATIC (unimplemented)
by dchapyshev＠svn.reactos.org 29 May '09

29 May '09

Author: dchapyshev Date: Fri May 29 21:11:46 2009 New Revision: 41198 URL: http://svn.reactos.org/svn/reactos?rev=41198&view=rev Log: - Add IOCTL_KEYBOARD_QUERY_ATTRIBUTES / IOCTL_KEYBOARD_QUERY_TYPEMATIC / IOCTL_KEYBOARD_SET_TYPEMATIC (unimplemented) Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Fri May 29 21:11:46 2009 @@ -633,6 +633,24 @@ Status = STATUS_SUCCESS; break; } + case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: + { + DPRINT1("IOCTL_KEYBOARD_QUERY_ATTRIBUTES not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_KEYBOARD_QUERY_TYPEMATIC: + { + DPRINT1("IOCTL_KEYBOARD_QUERY_TYPEMATIC not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_KEYBOARD_SET_TYPEMATIC: + { + DPRINT1("IOCTL_KEYBOARD_SET_TYPEMATIC not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: { TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION\n");

1 0

[dchapyshev] 41197: - Implement IOCTL_MOUSE_QUERY_ATTRIBUTES (untested)
by dchapyshev＠svn.reactos.org 29 May '09

29 May '09

Author: dchapyshev Date: Fri May 29 20:36:39 2009 New Revision: 41197 URL: http://svn.reactos.org/svn/reactos?rev=41197&view=rev Log: - Implement IOCTL_MOUSE_QUERY_ATTRIBUTES (untested) Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Fri May 29 20:36:39 2009 @@ -512,8 +512,16 @@ } case IOCTL_MOUSE_QUERY_ATTRIBUTES: { - DPRINT1("IOCTL_MOUSE_QUERY_ATTRIBUTES not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_MOUSE_QUERY_ATTRIBUTES\n"); + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + *(PMOUSE_ATTRIBUTES) Irp->AssociatedIrp.SystemBuffer = DeviceExtension->MouseAttributes; + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Status = STATUS_SUCCESS; break; } default:

1 0

[dgoette] 424: some work on the list navigations
by dgoette＠svn.reactos.org 29 May '09

29 May '09

Author: dgoette Date: Fri May 29 19:21:32 2009 New Revision: 424 URL: http://svn.reactos.org/svn/reactos?rev=424&view=rev Log: some work on the list navigations Removed: branches/compat/lib/view/Breadcrumb.class.php Modified: branches/compat/css/style.css branches/compat/lib/CDBConnection.class.php branches/compat/lib/view/HTML_List.class.php branches/compat/lib/view/HTML_Submit.class.php Modified: branches/compat/css/style.css URL: http://svn.reactos.org/svn/reactos/branches/compat/css/style.css?rev=424&r1… ============================================================================== --- branches/compat/css/style.css [iso-8859-1] (original) +++ branches/compat/css/style.css [iso-8859-1] Fri May 29 19:21:32 2009 @@ -1,17 +1,11 @@ -.row1 { - background-color: #EEE; -} -.row2 { - background-color: #E7E7E7; -} .tablebg { margin:10px 10px 0 0; width:500px; border:1px solid #dfdfdf; padding:1em; background-color:#EAF0F8; } .rtable THEAD { - background-color:#5984C3;color:white;} + background-color:#5984C3;color:white;border-collapse: collapse;} #submit { background-color: #EEE; @@ -73,6 +67,28 @@ cursor: pointer; } +LABEL.stable { color: #00CC00 !important; } +LABEL.unstable { color: #FF7800 !important; } +LABEL.crash { color: #FF3300 !important; } + +.rtable TD.first { width: 1.5em;} + +.rtable TD.stable { background-color: #00CC00; opacity: 0.5; } +.rtable TD.unstable { background-color: #FFCC00; opacity: 0.5;} +.rtable TD.crash { background-color: #FF3300; opacity: 0.5;} +.rtable A { opacity: 1;} + +.rtable TH { font-size: 1.2em; padding: 3px; } +.rtable TD { border-bottom: 1px solid #CCC;padding: 2px 3px; } + +.row1 { background-color: #EEE; } +.row2 { background-color: #E7E7E7; } + +#breadcrumb { display:block; list-style-type:none; clear:both; padding-left: 0px; } +#breadcrumb LI { float:left; padding-left:10px; } + +#letternavi A {font-family: monospace; font-size:1.4em; text-decoration: none; padding: 0px 2px; } + @@ -83,7 +99,7 @@ padding: 0; /* Only affects Opera */ background: #FFFFFF url('../images/topbar.jpg') repeat-x scroll top left; } - + /* hr { margin: 5px 0 5px 0; color: #8D8D8D; @@ -104,7 +120,7 @@ font-size: 9px; text-decoration:underline; } - +*/ h1, .contentSmallTitle { @@ -456,6 +472,6 @@ font-size: 15px; font-weight: bold; } - - - +*/ + + Modified: branches/compat/lib/CDBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/CDBConnection.class.… ============================================================================== --- branches/compat/lib/CDBConnection.class.php [iso-8859-1] (original) +++ branches/compat/lib/CDBConnection.class.php [iso-8859-1] Fri May 29 19:21:32 2009 @@ -54,6 +54,7 @@ // show errors as warning, and use our own statement class $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); $this->setAttribute(PDO::ATTR_STATEMENT_CLASS,array('CDBStatement', array($this))); + self::exec("SET NAMES 'utf8'"); } catch (PDOException $e) { Removed: branches/compat/lib/view/Breadcrumb.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/Breadcrumb.clas… ============================================================================== --- branches/compat/lib/view/Breadcrumb.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/Breadcrumb.class.php (removed) @@ -1,174 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - 2009 Danny Götte <dangerground(a)web.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -class Breadcrumb -{ - - - - const MODE_NONE = 0; // no breadcrumb - const MODE_INITIAL = 1; // show initial letter - const MODE_TREE = 2; // show hierarchical list - const MODE_VENDOR = 4; // show vendor - - const PARAM_UNKNOWN = 0; - const PARAM_CATEGORY = 1; - const PARAM_ENTRY = 2; - const PARAM_VERSION = 3; - const PARAM_VENDOR = 4; - - - - public function __construct( $mode = self::NONE, $param, $param_type = self::PARAM_UNKNOWN) - { - echo ' - <div style="clear: both;border: 2px solid gray;"> - <span style="float: left;">Browsing: </span> - <ul style="list-style-type: none;display: inline;">'; - - // needs entry - if ($mode & self::MODE_INITIAL) { - self::initial($param, $param_type); - } - - // needs entry or category - if ($mode & self::MODE_TREE) { - self::tree($param, $param_type); - } - - // needs vendor - if ($mode & self::MODE_VENDOR) { - self::vendor($param, $param_type); - } - - // get version data - if ($param > 0 && $param_type === self::PARAM_VERSION) { - $stmt=CDBConnection::getInstance()->prepare("SELECT comp_groupid, comp_id, comp_appversion, grpentr_name FROM rsdb_item_comp JOIN rsdb_groups ON grpentr_id=comp_group_id WHERE grpentr_visible = '1' AND comp_id = :item_id AND comp_visible='1'") ; - $stmt->bindParam('item_id',$param,PDO::PARAM_INT); - $stmt->execute(); - $version = $stmt->fetchOnce(PDO::FETCH_ASSOC); - $version_id = $version['comp_id']; - $version_name = $version['comp_appversion']; - $entry_id = $version['comp_groupid']; - } - - // get entry data - elseif ($param > 0 && $param_type === self::PARAM_ENTRY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_id, grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; - $stmt->bindParam('group_id',$param,PDO::PARAM_INT); - $stmt->execute(); - $group = $stmt->fetchOnce(PDO::FETCH_ASSOC); - $entry_id = $group['grpentr_id']; - $entry_name = $group['grpentr_name']; - } - - // show entry, if selected - if (isset($entry_id)) { - echo ' - <li style="float: left;padding-left: 10px;">→ <a href="'.$entry_id.'">'.htmlspecialchars($entry_name).'</a></li>'; - } - - // show entry, if selected - if (isset($version_id)) { - echo ' - <li style="float: left;padding-left: 10px;"> [<a href="'.$version_id.'">'.htmlspecialchars($version_name).'</a>] </li>'; - } - - echo ' - </ul> - <br style="clear: both;"/> - </div>'; - } // end of constructor - - - - private function tree( $param, $param_type ) - { - global $RSDB_intern_link_category_cat; - - $description = 'Root directory of the tree.'; - - // check if category exists and is visible - if ($param > 0 && $param_type === self::PARAM_CATEGORY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT cat_id FROM ".CDBT_CATEGORIES." WHERE id = :cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$param,PDO::PARAM_INT); - $stmt->execute(); - $category_id = $stmt->fetchColumn(); - - if ($category_id === false) { - echo 'Unknown Category'; - return; - } - } - - // check if entry exists and is visible - elseif ($param > 0 && $param_type === self::PARAM_ENTRY) { - $stmt=CDBConnection::getInstance()->prepare("SELECT grpentr_category, grpentr_name FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_id = :group_id") ; - $stmt->bindParam('group_id',$param,PDO::PARAM_INT); - $stmt->execute(); - $category_id = $stmt->fetchColumn(); - - if ($category_id === false) { - echo 'Unknown Group'; - return; - } - } - - // check if entry version exists and is visible - elseif ($param > 0 && $param_type === self::PARAM_VERSION) { - //@TODO - } - - // show root - echo ' - <li style="float: left;"><a href="'.$RSDB_intern_link_category_cat.'0">Root</a></li>'; - - if (isset($category_id) && $category_id === false) { - echo '<li>→ Unknown Category</li>'; - return; - } - - // show current path - $stmt=CDBConnection::getInstance()->prepare("SELECT name, id, parent FROM ".CDBT_CATEGORIES." WHERE id=:cat_id AND visible IS TRUE"); - $stmt->bindParam('cat_id',$category_id,PDO::PARAM_INT); - $stmt->execute(); - - // get output in reversed order - $output = ''; - while ($category = $stmt->fetch(PDO::FETCH_ASSOC)) { - $output = ' - <li style="float: left;padding-left: 10px;">→ <a href="'.$RSDB_intern_link_category_cat.$category['id'].'">'.htmlspecialchars($category['name']).'</a></li>'.$output; - - if ($category['parent'] > 0) { - $stmt->bindParam('cat_id',$category['parent'],PDO::PARAM_INT); - $stmt->execute(); - } - } // end while - - echo $output; - } // end of member function tree - - - - -} // end of Breadcrumb - Modified: branches/compat/lib/view/HTML_List.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_List.class… ============================================================================== --- branches/compat/lib/view/HTML_List.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_List.class.php [iso-8859-1] Fri May 29 19:21:32 2009 @@ -25,6 +25,8 @@ private $where = ''; private $from = ''; private $params = array(); + private $select = ''; + private $showColumn = array(); public function __construct($filter='') @@ -71,7 +73,88 @@ } $stmt->execute(); $entries_count = $stmt->fetchColumn(); - + + if ($entries_count > 0) { + echo ' + <h2>Entries</h2> + <table class="rtable" cellspacing="0" cellpadding="0"> + <thead> + <tr> + <th> </th> + <th>Application</th>'; + if (count($this->showColumn) > 0) { + foreach ($this->showColumn as $column) { + echo '<th>'.$column['description'].'</th>'; + } + } + echo ' + <th>Last modified</th> + </tr> + </thead> + <tbody>'; + + reset($this->params); + $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.modified, (SELECT works FROM ".CDBT_REPORTS." WHERE entry_id=e.id ORDER BY created DESC LIMIT 1) AS works ".$this->select." FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where." ORDER BY e.name ASC LIMIT :limit OFFSET :offset"); + foreach ($this->params as $param) { + $stmt->bindValue($param[0],$param[1],$param[2]); + } + $stmt->bindParam('limit', $limit, PDO::PARAM_INT); + $stmt->bindParam('offset', $offset, PDO::PARAM_INT); + $stmt->execute(); + $x=0; + while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + ++$x; + + $stmt_ver=CDBConnection::getInstance()->prepare("SELECT id, version FROM ".CDBT_VERSIONS." WHERE entry_id=:entry_id ORDER BY version DESC"); + $stmt_ver->bindParam('entry_id',$entry['id'],PDO::PARAM_STR); + $stmt_ver->execute(); + $versions = $stmt_ver->fetchAll(PDO::FETCH_ASSOC); + + // display entry only if it has also at least one version information + if (count($versions) > 0) { + echo ' + <tr class="row'.($x%2+1).'" id="tr'.$x.'" title="'.($entry['works'] == 'full' ? 'stable' : ($entry['works'] == 'part' ? 'unstable' : 'crash')).'"> + <td class="first '.($entry['works'] == 'full' ? 'stable' : ($entry['works'] == 'part' ? 'unstable' : 'crash')).'"> </td> + <td onmouseover="'."this.className=document.getElementById('tr".$x."').title;".'" onmouseout="this.className=\'\';">'; + + if (count($versions) == 1) { + echo ' + <a href="?page=item&ver='.$versions[0]['id'].'">'.htmlspecialchars($entry['name']).' '.$versions[0]['version'].'</a>'; + } + else { + echo ' + <a href="?page=item&item='.$entry['id'].'">'.htmlspecialchars($entry['name']).'</a> + <ul style="display:none;">'; + + + foreach ($versions as $version) { + echo ' + <li><a href="item&ver='.$entry['id'].'">'.htmlspecialchars($entry['name']).' '.$version['version'].'</a></li>'; + } + + echo ' + </ul>'; + } + + + echo ' + </td>'; + if (count($this->showColumn) > 0) { + foreach ($this->showColumn as $column) { + echo '<th>'.$entry[$column['field']].'</th>'; + } + } + echo ' + <td class="modified">'.$entry['modified'].'</td> + </tr>'; + } + } + + echo ' + </tbody> + </table>'; + } + if ($entries_count > $limit) { echo '<div>Navigation:'; $to = ceil($entries_count/(float)$limit); @@ -85,127 +168,95 @@ } echo '</div>'; } + } + } // end of member function body + + + + private function naviLetter( $letter ) + { + echo '<div id="letternavi"><h2>Letter Navigation</h2>'; + for ($i=ord('a'); $i <= ord('z') ; ++$i) { + if (isset($letter) && chr($i)==$letter) { + echo '<strong>['.strtoupper(chr($i)).']</strong>'; + } + else { + echo '<a href="?page=list&letter='.chr($i).'">'.strtoupper(chr($i)).'</a>'; + } + } + echo '</div>'; + } + + + + private function naviCategory( $category_id ) + { + + // show root + echo ' + <ul id="breadcrumb"> + <li style="float: left;"><a href="?page=list&cat=0">Root</a></li>'; + + + // show current path + $stmt=CDBConnection::getInstance()->prepare("SELECT name, id, parent FROM ".CDBT_CATEGORIES." WHERE id=:cat_id AND visible IS TRUE"); + $stmt->bindParam('cat_id',$category_id,PDO::PARAM_INT); + $stmt->execute(); + + // get output in reversed order + $output = ''; + while ($category = $stmt->fetch(PDO::FETCH_ASSOC)) { + $output = ' + <li>→ <a href="?page=list&cat='.$category['id'].'">'.htmlspecialchars($category['name']).'</a></li>'.$output; + + if ($category['parent'] > 0) { + $stmt->bindParam('cat_id',$category['parent'],PDO::PARAM_INT); + $stmt->execute(); + } + } // end while + + echo $output.' + </ul>'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".CDBT_CATEGORIES." p WHERE parent=:category_id"); + $stmt->bindParam('category_id',$category_id,PDO::PARAM_STR); + $stmt->execute(); + + if ($stmt->fetchColumn() > 0) { - echo ' - <table class="rtable"> - <thead> - <tr> - <th>Application</th> - <th>Works?</th> - <th>Last modified</th> - </tr> - </thead> - <tbody>'; - - reset($this->params); - $stmt=CDBConnection::getInstance()->prepare("SELECT e.id, e.name, e.modified, (SELECT works FROM ".CDBT_REPORTS." WHERE entry_id=e.id ORDER BY created DESC LIMIT 1) AS works FROM ".CDBT_ENTRIES." e ".$this->from." WHERE e.visible IS TRUE ".$this->where." ORDER BY e.name ASC LIMIT :limit OFFSET :offset"); - foreach ($this->params as $param) { - $stmt->bindValue($param[0],$param[1],$param[2]); - } - $stmt->bindParam('limit', $limit, PDO::PARAM_INT); - $stmt->bindParam('offset', $offset, PDO::PARAM_INT); + <div style="margin-bottom: 3em;clear:both;"> + <h2>Category Navigation</h2> + <table class="rtable" cellspacing="0" cellpadding="0"> + <thead> + <tr> + <th>Name</th> + <th>Subcategories</th> + <th>direct entries</th> + </tr> + </thead> + <tbody>'; + + $stmt=CDBConnection::getInstance()->prepare("SELECT id, name, (SELECT COUNT(*) FROM ".CDBT_CATEGORIES." WHERE parent=p.id) AS subcategories, (SELECT COUNT(*) FROM ".CDBT_ENTRIES." WHERE category_id=p.id) AS entries FROM ".CDBT_CATEGORIES." p WHERE parent=:category_id ORDER BY name ASC"); + $stmt->bindParam('category_id',$category_id,PDO::PARAM_STR); $stmt->execute(); $x=0; - while ($entry=$stmt->fetch(PDO::FETCH_ASSOC)) { + while ($category=$stmt->fetch(PDO::FETCH_ASSOC)) { ++$x; - $stmt_ver=CDBConnection::getInstance()->prepare("SELECT id, version FROM ".CDBT_VERSIONS." WHERE entry_id=:entry_id ORDER BY version DESC"); - $stmt_ver->bindParam('entry_id',$entry['id'],PDO::PARAM_STR); - $stmt_ver->execute(); - $versions = $stmt_ver->fetchAll(PDO::FETCH_ASSOC); - - // display entry only if it has also at least one version information - if (count($versions) > 0) { - echo ' - <tr class="row'.($x%2+1).'"> - <td>'; - - if (count($versions) == 1) { - echo ' - <a href="?page=item&ver='.$versions[0]['id'].'">'.htmlspecialchars($entry['name']).' '.$versions[0]['version'].'</a>'; - } - else { - echo ' - <a href="?page=item&item='.$entry['id'].'">'.htmlspecialchars($entry['name']).'</a> - <ul style="display:none;">'; - - - foreach ($versions as $version) { - echo ' - <li><a href="item&ver='.$entry['id'].'">'.htmlspecialchars($entry['name']).' '.$version['version'].'</a></li>'; - } - - echo ' - </ul>'; - } - - - echo ' - </td> - <td>'.$entry['works'].'</td> - <td>'.$entry['modified'].'</td> - </tr>'; - } + echo ' + <tr class="row'.($x%2+1).'"> + <td><a href="?page=list&cat='.$category['id'].'">'.$category['name'].'</a></td> + <td>'.$category['subcategories'].'</td> + <td>'.$category['entries'].'</td> + </tr>'; } echo ' - </tbody> - </table>'; - } - } // end of member function body - - - - private function naviLetter( $letter ) - { - echo '<div>Letters:'; - for ($i=ord('a'); $i <= ord('z') ; ++$i) { - if (isset($letter) && chr($i)==$letter) { - echo '<strong>['.chr($i).']</strong>'; - } - else { - echo '<a href="?page=list&letter='.chr($i).'">'.strtoupper(chr($i)).'</a>'; - } - } - echo '</div>'; - } - - - - private function naviCategory( $category_id ) - { - echo ' - <div style="margin-bottom: 3em;">Categories - <table class="rtable"> - <thead> - <tr> - <th>Name</th> - <th>Subcategories</th> - <th>direct entries</th> - </tr> - </thead> - <tbody>'; - - $stmt=CDBConnection::getInstance()->prepare("SELECT id, name, (SELECT COUNT(*) FROM ".CDBT_CATEGORIES." WHERE parent=p.id) AS subcategories, (SELECT COUNT(*) FROM ".CDBT_ENTRIES." WHERE category_id=p.id) AS entries FROM ".CDBT_CATEGORIES." p WHERE parent=:category_id ORDER BY name ASC"); - $stmt->bindParam('category_id',$category_id,PDO::PARAM_STR); - $stmt->execute(); - $x=0; - while ($category=$stmt->fetch(PDO::FETCH_ASSOC)) { - ++$x; - - echo ' - <tr class="row'.($x%2+1).'"> - <td><a href="?page=list&cat='.$category['id'].'">'.$category['name'].'</a></td> - <td>'.$category['subcategories'].'</td> - <td>'.$category['entries'].'</td> - </tr>'; - } - - echo ' - </tbody> - </table> - </div>'; + </tbody> + </table> + </div>'; + } } @@ -216,15 +267,16 @@ $stmt=CDBConnection::getInstance()->prepare("SELECT MAX((SELECT COUNT(*) FROM ".CDBT_TAGGED." WHERE tag_id=t.id)) AS max FROM ".CDBT_TAGS." t"); $stmt->execute(); $max = $stmt->fetchColumn(); - echo $max; - - echo ' - <div style="margin-bottom: 3em;">'; + + echo ' + <h2>Navigate by Tag</h2> + <div style="margin-bottom: 3em;text-align:left;">'; $stmt=CDBConnection::getInstance()->prepare("SELECT id, name, (SELECT COUNT(*) FROM ".CDBT_TAGGED." WHERE tag_id=t.id) AS count FROM ".CDBT_TAGS." t ORDER BY name ASC"); $stmt->execute(); while ($tag=$stmt->fetch(PDO::FETCH_ASSOC)) { - echo '<span style="float: left; margin-right: 20px; font-size: '.((floor($tag['count']/(float)$max)*12.0)+8).'px;"><a href="?page=list&tag='.htmlspecialchars($tag['name']).'">'.htmlspecialchars($tag['name']).'</a></span>'; + + echo '<a style="margin-right: 20px; font-size: '.(((int)$tag['count']/(float)$max*2.0)+0.9).'em;" href="?page=list&tag='.htmlspecialchars($tag['name']).'">'.htmlspecialchars($tag['name']).'</a>'; } echo ' </div>'; @@ -235,7 +287,12 @@ private function naviCustom( ) { - echo '<div>Not yet implemented</div>'; + echo ' + <form action="" method="get"> + <fieldset> + <legend></legend> + </fieldset> + </form>'; } @@ -282,6 +339,15 @@ $this->params[] = array('tagname',$part[2],PDO::PARAM_STR); break; + // show additional columns + case 's': + switch ($part[2]) { + case 'category'; + $this->select .= " (SELECT name FROM ".CDBT_CATEGORIES." WHERE id=e.category_id) AS category"; + $this->showColumn[] = array('field'=>'category','description'=>'Category'); + } + break; + // category case 'c': if ($part[1] == 'is') { Modified: branches/compat/lib/view/HTML_Submit.class.php URL: http://svn.reactos.org/svn/reactos/branches/compat/lib/view/HTML_Submit.cla… ============================================================================== --- branches/compat/lib/view/HTML_Submit.class.php [iso-8859-1] (original) +++ branches/compat/lib/view/HTML_Submit.class.php [iso-8859-1] Fri May 29 19:21:32 2009 @@ -164,13 +164,13 @@ <li> <span class="label">Outcome:</span><br /> <input type="radio" class="normal" name="status" id="works" value="full" onchange="'."javascript:document.getElementById('bugreport').style.display=(this.checked ? 'none' : 'block' );".'" /> - <label for="works" style="color: #00CC00;">Running Stable</label> + <label for="works" class="stable">Running Stable</label> - <input type="radio" class="normal" name="status" id="partworks" value="part" onchange="'."javascript:document.getElementById('bugreport').style.display=(this.checked ? 'none' : 'block' );".'" /> - <label for="partworks" style="color: #FF7800;">Minor Problems</label> + <input type="radio" class="normal pworks" name="status" id="partworks" value="part" onchange="'."javascript:document.getElementById('bugreport').style.display=(this.checked ? 'none' : 'block' );".'" /> + <label for="partworks" class="unstable">Minor Problems</label> - <input type="radio" class="normal" name="status" id="noworks" value="not" onchange="'."javascript:document.getElementById('bugreport').style.display=(this.checked ? 'block' : 'none' );".'" /> - <label for="noworks" style="color: #FF3300;">Crash</label> + <input type="radio" class="normal crash" name="status" id="noworks" value="not" onchange="'."javascript:document.getElementById('bugreport').style.display=(this.checked ? 'block' : 'none' );".'" /> + <label for="noworks" class="crash">Crash</label> <br /> <br /> </li>

1 0

[dreimer] 41196: Bug 4555: slovak translation update by Mario Kacmar Bug 4562: Romanian translation patch by Dimitriu Petru
by dreimer＠svn.reactos.org 29 May '09

29 May '09

Author: dreimer Date: Fri May 29 16:43:43 2009 New Revision: 41196 URL: http://svn.reactos.org/svn/reactos?rev=41196&view=rev Log: Bug 4555: slovak translation update by Mario Kacmar Bug 4562: Romanian translation patch by Dimitriu Petru Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc (with props) trunk/reactos/base/shell/cmd/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/downloader/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/paint/lang/ro-RO.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/shell/cmd/cmd.rc Modified: trunk/reactos/base/applications/downloader/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/lang/sk-SK.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 21-01-2008 - * LastChange: 31-10-2008 + * LastChange: 31-10-2008 */ Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,0 +1,82 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fiºier" + BEGIN + MENUITEM "I&eºire", IDC_EXIT + END + POPUP "Acþiune" + BEGIN + MENUITEM "Imprimare", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprietãþi", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ajutor", IDC_PROGHELP, GRAYED + END + POPUP "Vizualizare" + BEGIN + MENUITEM "Dispozitive dupã tip", IDC_DEVBYTYPE, CHECKED + MENUITEM "Dispozitive dupã conexiune", IDC_STATIC, GRAYED + MENUITEM "Resurse dupã tip", IDC_STATIC, GRAYED + MENUITEM "Resurse dupã conexiune", IDC_STATIC, GRAYED + END + POPUP "Ajutor" + BEGIN + MENUITEM "Ajutor", IDC_PROGHELP + MENUITEM "Despre", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Proprietãþi", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ajutor", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Despre Gestionarul de Dispozitive" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Gestionar de Dispozitive v0.1\nDrept de autor (C) 2006\nde Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "Închidere", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "Tradus în limba românã de Petru Dimitriu.\r\nAcest program este software liber; puteþi redistribui sau modifica programul sub termenii licenþei publice GNU aºa cum este publicatã de Free Software Foundation - fie versiunea 2 a licenþei, sau (la alegerea dvs.) oricare versiune ulterioarã.\r\n\r\nAcest program este distribuit în speranþa cã va fi de folos, dar FÃRÃ NICIO GARANÞIE, nici mãcar garanþia VANDABILITÃÞII sau a POTRIVIRII PENTRU UN SCOP ANUME. Vedeþi Licenþa GNU GPL pentru detalii.\r\n\r\nDvs. ar trebui sã fi primit o copie a licenþei împreunã cu acest program; dacã nu, scrieþi la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Proprietãþi" + IDS_TOOLTIP_REFRESH "Reîmprospãtare" + IDS_TOOLTIP_HELP "Ajutor" + IDS_TOOLTIP_EXIT "Ieºire" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "Gestionarul de Dispozitive ReactOS" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " Pãrãseºte programul." + IDS_HINT_REFRESH " Reîmprospãteazã lista de servicii." + IDS_HINT_PROP " Afieazã tabel cu proprietãþi pentru selecþia curentã." + IDS_HINT_HELP " Afiºeazã fereastra de ajutor." + IDS_HINT_ABOUT " Despre Gestionarul de Dispozitive ReactOS." + + IDS_HINT_SYS_RESTORE " Aduce fereastra la mãrimea normalã." + IDS_HINT_SYS_MOVE " Mutã fereastra." + IDS_HINT_SYS_SIZE " Redimensioneazã fereastra." + IDS_HINT_SYS_MINIMIZE " Reduce fereastra la o pictogramã pe ecran." + IDS_HINT_SYS_MAXIMIZE " Mãreºte fereastra astfel încât aceasta sã ocupe tot ecranul." + IDS_HINT_SYS_CLOSE " Închide fereastra." +END Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -23,6 +23,7 @@ #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/en-US.rc + * PURPOSE: Romanian Language File for ReactOS Event Viewer + * TRANSLATORS: Dimitriu Petru + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Jurnal" + BEGIN + MENUITEM "&Aplicaþii", ID_LOG_APPLICATION + MENUITEM "&Securitate", ID_LOG_SECURITY + MENUITEM "&Sistem", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "I&eºire", IDM_EXIT + END + POPUP "&Vizualizare" + BEGIN + MENUITEM "&Reîmprospãtare", IDM_REFRESH + END + MENUITEM "&Opþiuni", ID_OPTIONS + POPUP "&Ajutor" + BEGIN + MENUITEM "A&jutor", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Despre...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Vizualizator de Evenimente ReactOS Versiunea 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Drept de autor (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER +CAPTION "Aºteptaþi.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CTEXT "Încãrcare evenimente...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Detalii eveniment" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Închidere",IDOK,12,258,50,14 + PUSHBUTTON "&Precedent",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Urmãtor",IDNEXT,144,258,50,14 + PUSHBUTTON "&Ajutor",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Descriere:",IDC_STATIC,15,70,39,8 + LTEXT "Datã:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Orã:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Utilizator:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "EventID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Sursã:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Tip:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Categorie:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&ate",IDC_STATIC,14,194,20,8 + CONTROL "&Octeþi",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Cuvânt",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Vizualizator evenimente" + IDC_EVENTSTRINGIDNOTFOUND "Descrierea pentru ID-ul de eveniment ( %lu ) în sursa ( %s ) nu poate fi gãsitã. Computerul local este posibil sã nu aibã informaþiile sau fiºierele DLL pentru a afiºa mesajele de pe un computer la distanþã." + IDC_EVENTLOG_ERROR_TYPE "Eroare" + IDC_EVENTLOG_WARNING_TYPE "Avertisment" + IDC_EVENTLOG_INFORMATION_TYPE "Informaþie" + IDC_EVENTLOG_AUDIT_SUCCESS "Succes audit" + IDC_EVENTLOG_AUDIT_FAILURE "Eºec audit" + IDC_EVENTLOG_SUCCESS "Succes" + IDC_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -19,6 +19,7 @@ #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,0 +1,282 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fiºier" + BEGIN + MENUITEM "Export...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "I&eºire", ID_EXIT + END + POPUP "Acþiuni" + BEGIN + MENUITEM "Conectare la...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pornire", ID_START, GRAYED + MENUITEM "Oprire", ID_STOP, GRAYED + MENUITEM "Suspendare", ID_PAUSE, GRAYED + MENUITEM "Reluare", ID_RESUME, GRAYED + MENUITEM "Repornire", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Reîmprospãtare", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Editare...", ID_EDIT, GRAYED + MENUITEM "Creare...", ID_CREATE, GRAYED + MENUITEM "ªtergere...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprietãþi...", ID_PROP, GRAYED + END + POPUP "Vizualizare" + BEGIN + MENUITEM "Pictograme mari", ID_VIEW_LARGE + MENUITEM "Pictograme mici", ID_VIEW_SMALL + MENUITEM "Listã", ID_VIEW_LIST + MENUITEM "Detalii", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "Particularizare...",ID_VIEW_CUST, GRAYED + END + POPUP "Ajutor" + BEGIN + MENUITEM "Topici de ajutor", ID_HELP + MENUITEM "Despre", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Pornire", ID_START, GRAYED + MENUITEM "Oprire", ID_STOP, GRAYED + MENUITEM "Suspendare", ID_PAUSE, GRAYED + MENUITEM "Reluare", ID_RESUME, GRAYED + MENUITEM "Repornire", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Reîmprospãtare", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Editare...", ID_EDIT, GRAYED + MENUITEM "ªtergere...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprietãþi...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ajutor...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Despre Gestionarul de servicii" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Gestionar de servicii v0.8\nDrept de autor (C) 2005-2007\nde Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 + PUSHBUTTON "Închidere", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "General" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Pornire", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Oprire", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Suspendare", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Reluare", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "Nume serviciu:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "Nume de afiºare:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "Descriere:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Cale la executabil:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Tip pornire:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "Stare serviciu:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Puteþi specifica parametrii de pornire care se aplicã la pornirea serviciului de aici.",IDC_STATIC, 6,177,240,15 + LTEXT "Parametri de pornire:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Editare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Dependenþe" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "Unele servicii depind de alte servicii sau drivere de sistem ºi încarcã alte grupuri. Dacã o componentã de sistem a oprit un astfel de serviciu sau dacã acesta nu funcþioneazã corect, serviciile care depind de el pot avea probleme.", IDC_STATIC,8, 7, 238, 26 + LTEXT "Acest serviciu depinde de urmãtoarele componente:", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "Creare serviciu" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*Nume serviciu :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*Nume pentru afiºare :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Cale la executabil :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "Descriere :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Anulare", IDCANCEL, 176, 192, 46, 13 + LTEXT "Alte opþiuni (clic pe Ajutor pt. detalii)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "Ajutor", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "Eliminare serviciu" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Sigur vreþi sã ºtergeþi acest serviciu? Aceastã operaþie nu poate fi anulatã!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Nume serviciu:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Da", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "Nu", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Oprire alte servicii" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Vreþi sã opriþi aceste servicii?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Da", IDOK, 60, 129, 54, 14 + PUSHBUTTON "Nu", IDCANCEL, 120, 129, 54, 14 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "Opþiuni" +FONT 8, "MS Shell Dlg",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "OK", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "Control servicii" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&Închidere", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Nume" + IDS_SECONDCOLUMN "Descriere" + IDS_THIRDCOLUMN "Stare" + IDS_FOURTHCOLUMN "Tip pornire" + IDS_FITHCOLUMN "Autentificare ca" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Pornit" + IDS_SERVICES_STOPPED "Oprit" + IDS_SERVICES_AUTO "Automat" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Dezactivat" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Num. servicii: %d" + IDS_STOP_DEPENDS "Dacã %s se opreºte aceste procese se vor opri de asemenea." + IDS_NO_DEPENDS "<Fãrã dependenþe>" + IDS_LICENSE "Tradus în limba românã de Petru Dimitriu.\r\nAcest program este software liber; puteþi redistribui sau modifica programul sub termenii licenþei publice GNU aºa cum este publicatã de Free Software Foundation - fie versiunea 2 a licenþei, sau (la alegerea dvs.) oricare versiune ulterioarã.\r\n\r\nAcest program este distribuit în speranþa cã va fi de folos, dar FÃRÃ NICIO GARANÞIE, nici mãcar garanþia VANDABILITÃÞII sau a POTRIVIRII PENTRU UN SCOP ANUME. Vedeþi Licenþa GNU GPL pentru detalii.\r\n\r\nDvs. ar trebui sã fi primit o copie a licenþei împreunã cu acest program; dacã nu, scrieþi la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Proprietãþi" + IDS_TOOLTIP_REFRESH "Reîmprospãtare" + IDS_TOOLTIP_EXPORT "Listã de export" + IDS_TOOLTIP_CREATE "Creeazã un serviciu nou" + IDS_TOOLTIP_DELETE "Eliminã un serviciu existent" + IDS_TOOLTIP_START "Porneºte serviciul" + IDS_TOOLTIP_STOP "Opreºte serviciul" + IDS_TOOLTIP_PAUSE "Suspendã serviciul" + IDS_TOOLTIP_RESTART "Reporneºte serviciul" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS încearcã sã porneascã urmãtorul serviciu" + IDS_PROGRESS_INFO_STOP "ReactOS încearcã sã opreascã urmãtorul serviciu" + IDS_PROGRESS_INFO_PAUSE "ReactOS încearcã sã suspende urmãtorul serviciu" + IDS_PROGRESS_INFO_RESUME "ReactOS încearcã sã reia urmãtorul serviciu" + IDS_CREATE_SUCCESS "Serviciu creat cu succes" + IDS_DELETE_SUCCESS "Serviciu eliminat cu succes" + IDS_CREATE_REQ "Câmpurile cu\nasterisc sunt obligatorii" + IDS_DELETE_STOP "Trebuie sã opriþi serviciul manual înaintea eliminãrii!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Exportã lista curentã într-un fiºier." + IDS_HINT_EXIT " Pãrãseºte programul." + + IDS_HINT_CONNECT " Gestioneazã un alt computer." + IDS_HINT_START " Porneºte serviciul selectat." + IDS_HINT_STOP " Opreºte serviciul selectat." + IDS_HINT_PAUSE " Suspendã serviciul selectat." + IDS_HINT_RESUME " Reia serviciul selectat." + IDS_HINT_RESTART " Opreºte ºi porneºte serviciul selectat." + IDS_HINT_REFRESH " Reîmprospãteazã lista de servicii." + IDS_HINT_EDIT " Editeazã proprietãþile serviciului selectat." + IDS_HINT_CREATE " Creeazã un nou serviciu." + IDS_HINT_DELETE " Eliminã serviciul selectat." + IDS_HINT_PROP " Deschide fila de proprietãþi pentru selecþia curentã." + + IDS_HINT_LARGE " Afiºeazã elementele folosind pictograme mari." + IDS_HINT_SMALL " Afiºeazã elementele folosind pictograme mici." + IDS_HINT_LIST " Afiºeazã elementele în listã." + IDS_HINT_DETAILS " Afiºeazã informaþii despre fiecare element într-o fereastrã." + IDS_HINT_CUST " Particularizeazã afiºajul." + + IDS_HINT_HELP " Afiºeazã fereastra de ajutor." + IDS_HINT_ABOUT " Despre Gestionarul de servicii ReactOS." + + IDS_HINT_SYS_RESTORE " Restabileºte fereastra la mãrimea originalã." + IDS_HINT_SYS_MOVE " Mutã fereastra." + IDS_HINT_SYS_SIZE " Redimensioneazã fereastra." + IDS_HINT_SYS_MINIMIZE " Reduce fereastra la o pictogramã." + IDS_HINT_SYS_MAXIMIZE " Mãrºete fereastra astfel încât aceasta sã acopere tot ecranul." + IDS_HINT_SYS_CLOSE " Închide fereastra." +END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "Gestionarul de servicii ReactOS" +END Propchange: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -31,6 +31,7 @@ #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Modified: trunk/reactos/base/applications/paint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -169,7 +169,7 @@ IDS_PROGRAMNAME, "Paint" IDS_WINDOWTITLE, "%s - Paint" IDS_INFOTITLE, "Paint pentru ReactOS" - IDS_INFOTEXT, "Paint for ReactOS este disponibil sub licenþa GNU Lesser General Public versiunea 3 (vedeþi www.gnu.org)" + IDS_INFOTEXT, "Paint pentru ReactOS este disponibil sub licenþa GNU Lesser General Public versiunea 3 (vedeþi www.gnu.org)" IDS_SAVEPROMPTTEXT, "Vreþi sã salvaþi schimbãrile la %s?" IDS_DEFAULTFILENAME, "FãrãNume.bmp" IDS_TOOLTIP1, "Golire selecþie" Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,7 +1,7 @@ /* * Slovak Language resource file * Translated by: Mário Kaèmár /Mario Kacmar/ aka Kario - * Last changed: 28-04-2009 + * Last changed: 27-05-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -43,7 +43,7 @@ MENUITEM "Panel nástrojov\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED MENUITEM "Paleta farieb\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED MENUITEM "Stavový riadok", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "Format icon bar", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM "Panel písma", IDM_FORMATICONBAR, CHECKED, GRAYED MENUITEM SEPARATOR POPUP "Lupa" //Zoom BEGIN @@ -129,8 +129,8 @@ EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 LTEXT "írka:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 LTEXT "Výka:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 - LTEXT "File date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "File size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Dátum zmeny:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 //File date + LTEXT "Ve¾kos súboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 //File size LTEXT "Rozlíenie:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 @@ -189,6 +189,6 @@ IDS_TOOLTIP14, "Polygón" //mnohouholník IDS_TOOLTIP15, "Elipsa" IDS_TOOLTIP16, "Zaoblený obdånik" - IDS_OPENFILTER, "Bitmap files (*.bmp;*.dib)\1*.bmp;*.dib\1All files (*.*)\1*.*\1" - IDS_SAVEFILTER, "24 bit bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1" + IDS_OPENFILTER, "Súbory bitových máp (*.bmp;*.dib)\1*.bmp;*.dib\1Vetky súbory (*.*)\1*.*\1" + IDS_SAVEFILTER, "24-bitová mapa (*.bmp;*.dib)\1*.bmp;*.dib\1" END Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -20,6 +20,7 @@ #include "lang/pl-PL.rc" #include "lang/no-NO.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" STRINGTABLE DISCARDABLE Added: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc (added) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Fri May 29 16:43:43 2009 @@ -1,0 +1,728 @@ +/* Slovak translation for CMD + * TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 21-03-2009 + * LastChange: 27-05-2009 + * _________________________________________________________________ + * NOTE : this file is not really translated (only scrap yet) + */ + +#include "windows.h" +#include "resource.h" + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +assoc [.ext[=[FileType]]]\n\ +\n\ +assoc (print all associations)\n\ +assoc .ext (print specific association)\n\ +assoc .ext= (remove specific association)\n\ +assoc .ext=FileType (add new association)\n" + +STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ + [/S [/D]]\n\n\ + + Sets an attribute\n\ + - Clears an attribute\n\ + R Read-only file attribute\n\ + A Archive file attribute\n\ + S System file attribute\n\ + H Hidden file attribute\n\ + /S Processes matching files in the current directory\n\ + and all subdirectories\n\ + /D Processes directories as well\n\n\ +Type ATTRIB without a parameter to display the attributes of all files.\n" + +STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ +ALIAS [alias=[command]]\n\n\ + alias Name for an alias.\n\ + command Text to be substituted for an alias.\n\n\ +To list all aliases:\n\ + ALIAS\n\n\ +To set a new or replace an existing alias:\n\ + ALIAS da=dir a:\n\n\ +To remove an alias from the alias list:\n\ + ALIAS da=" + +STRING_BEEP_HELP, "Pípnutie reproduktora.\n\nBEEP\n" + +STRING_CALL_HELP, "Calls one batch program from another.\n\n\ +CALL [drive:][path]filename [batch-parameter]\n\n\ + batch-parameter Specifies any command-line information required by the\n\ + batch program." + +STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ +CHDIR [/D][drive:][path]\n\ +CHDIR[..|.]\n\ +CD [/D][drive:][path]\n\ +CD[..|.]\n\n\ + .. parent directory\n\ + . current directory\n\ + /D Will change current drive and current directory.\n\n\ +Type CD drive: to display the current directory on the specified drive.\n\ +Type CD without a parameter to display the current drive and directory.\n" + +STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ +Type CHCP without a parameter to display the active code page number.\n" + +STRING_CHOICE_HELP, "Waits for the user to choose one of a set of choices.\n\n\ +CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]choices Specifies allowable keys. Default is YN.\n\ + /N Do not display choices and ? at the end of the prompt string.\n\ + /S Treat choice keys as case sensitive.\n\ + /T[:]c,nn Default choice to c after nn seconds.\n\ + text Prompt string to display.\n\n\ +ERRORLEVEL is set to offset of key user presses in choices.\n" + +STRING_CLS_HELP, "Clears the screen.\n\nCLS\n" + +STRING_CMD_HELP1, "\nInternal commands available:\n" + +STRING_CMD_HELP2, "\nFeatures available:" + +STRING_CMD_HELP3," [aliases]" + +STRING_CMD_HELP4," [history]" + +STRING_CMD_HELP5," [unix filename completion]" + +STRING_CMD_HELP6," [directory stack]" + +STRING_CMD_HELP7," [redirections and piping]" + +STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line interpreter.\n\n\ +CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ + /C command Runs the specified command and terminates.\n\ + /K command Runs the specified command and remains.\n\ + /P CMD becomes permanent and runs autoexec.bat\n\ + (cannot be terminated).\n\ + /T:bf Sets the background/foreground color (see COLOR command).\n" + +STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ +COLOR [attr [/-F]] \n\n\ + attr Specifies color attribute of console output\n\ + /-F Does not fill the console blank space with color attribute\n\n\ +There are three ways to specify the colors:\n\ +1) [bright] name on [bright] name (only the first three letters are required)\n\ +2) decimal on decimal\n\ +3) two hex digits\n\n\ +Colors are:\n\ +dec hex name dec hex name\n\ +0 0 Black 8 8 Gray(Bright black)\n\ +1 1 Blue 9 9 Bright Blue\n\ +2 2 Green 10 A Bright Green\n\ +3 3 Cyan 11 B Bright Cyan\n\ +4 4 Red 12 C Bright Red\n\ +5 5 Magenta 13 D Bright Magenta\n\ +6 6 Yellow 14 E Bright Yellow\n\ +7 7 White 15 F Bright White\n" + +STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_COPY_HELP2, "Copies one or more files to another location.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ + source Specifies the file or files to be copied.\n\ + /A Indicates an ASCII text file.\n\ + /B Indicates a binary file.\n\ + destination Specifies the directory and/or filename for the new file(s).\n\ + /V Verifies that new files are written correctly.\n\ + /Y Suppresses prompting to confirm you want to overwrite an\n\ + existing destination file.\n\ + /-Y Causes prompting to confirm you want to overwrite an\n\ + existing destination file.\n\n\ +The switch /Y may be present in the COPYCMD environment variable.\n\ +...\n" + +STRING_DATE_HELP1, "\nZadajte nový dátum (mm%cdd%crrrr): " + +STRING_DATE_HELP2, "\nZadajte nový dátum (dd%cmm%crrrr): " + +STRING_DATE_HELP3, "\nZadajte nový dátum (rrrr%cmm%cdd): " + +STRING_DATE_HELP4, "Displays or sets the date.\n\n\ +DATE [/T][date]\n\n\ + /T display only\n\n\ +Type DATE without parameters to display the current date setting and\n\ +a prompt for a new one. Press ENTER to keep the same date.\n" + +STRING_DEL_HELP1, "Deletes one or more files.\n\n\ +DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ +ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ + file Specifies the file(s) to delete.\n\n\ + /N Nothing.\n\ + /P Prompt. Ask before deleting each file.\n\ + /T Total. Display total number of deleted files and freed disk space.\n\ + /Q Quiet.\n\ + /W Wipe. Overwrite the file with random numbers before deleting it.\n\ + /Y Yes. Kill even *.* without asking.\n\ + /F Force Delete hidden, read-only and system files.\n\ + /S Delete file from all sub directory\n\ + /A Select files to be deleted based on attributes.\n\ + attributes\n\ + R Read Only files\n\ + S System files\n\ + A Archiveable files\n\ + H Hidden Files\n\ + - prefix meaning not\n" + +STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" +STRING_DEL_HELP3, " %lu file deleted\n" +STRING_DEL_HELP4, " %lu files deleted\n" + +STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\ +DELAY [/m]n\n\n\ + /m specifiy than n are milliseconds\n\ + otherwise n are seconds\n" + +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [drive:][path][filename]\n\ + Specifies drive, directory, and/or files to list.\n\n\ + /A Displays files with specified attributes.\n\ + attributes D Directories R Read-only files\n\ + H Hidden files A Files ready for archiving\n\ + S System files - Prefix meaning not\n\ + /B Uses bare format (no heading information or summary).\n\ + /C Display the thousand separator in file sizes. This is the\n\ + default. Use /-C to disable display of separator.\n\ + /D Same as wide but files are list sorted by column.\n\ + /L Uses lowercase.\n\ + /N New long list format where filenames are on the far right.\n\ + /O List by files in sorted order.\n\ + sortorder N By name (alphabetic) S By size (smallest first)\n\ + E By extension (alphabetic) D By date/time (oldest first)\n\ + G Group directories first - Prefix to reverse order\n\ + /P Pauses after each screenful of information.\n\ + /Q Display the owner of the file.\n\ + /S Displays files in specified directory and all subdirectories.\n\ + /T Controls which time field displayed or used for sorting\n\ + timefield C Creation\n\ + A Last Access\n\ + W Last Written\n\ + /W Uses wide list format.\n\ + /X This displays the short names generated for non-8dot3 file\n\ + names. The format is that of /N with the short name inserted\n\ + before the long name. If no short name is present, blanks are\n\ + displayed in its place.\n\ + /4 Displays four-digit years\n\n\ +Switches may be preset in the DIRCMD environment variable. Override\n\ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" + +STRING_DIR_HELP2, " Volume in drive %c is %s\n" +STRING_DIR_HELP3, " Volume in drive %c has no label.\n" +STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" +STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes free\n" +STRING_DIR_HELP7, "\n Directory of %s\n\n" +STRING_DIR_HELP8, "%16i File(s)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ +changes to the specified directory.\n\n\ +PUSHD [path | ..]\n\n\ + path Specifies the directory to make the current directory\n" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + +STRING_ECHO_HELP1, "Display a messages without trailing carriage return and line feed.\n\n\ + ECHOS message" + +STRING_ECHO_HELP2, "Displays a message to the standard error output.\n\n\ + ECHOERR message\n\ + ECHOERR. prints an empty line" + +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carriage return and line feed.\n\n\ + ECHOSERR message" + +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [message]\n\ + ECHO. prints an empty line\n\n\ +Type ECHO without a parameter to display the current ECHO setting." + +STRING_ECHO_HELP5, "ECHO je %s\n" + +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Exits a batch file only. \n\ + If run outside of a batch file it will exit cmd.exe\n\ + ExitCode This value will be assigned to ERRORLEVEL on exit\n" + +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ +FOR %variable IN (set) DO command [parameters]\n\n\ + %variable Specifies a replaceable parameter.\n\ + (set) Specifies a set of one or more files. Wildcards may be used.\n\ + command Specifies the command to carry out for each file.\n\ + parameters Specifies parameters or switches for the specified command.\n\n\ +To use the FOR command in a batch program, specify %%variable instead of\n\ +%variable.\n" + +STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ + Sériové èíslo je %s\n\ + %16s bytes total disk space\n\ + %16s bytes used\n\ + %16s bytes free\n" + +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" + +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ + IF [NOT] ERRORLEVEL number command\n\ + IF [NOT] string1==string2 command\n\ + IF [NOT] EXIST filename command\n\ + IF [NOT] DEFINED variable command\n\n\ +NOT Specifies that CMD should carry out the command only if\n\ + the condition is false\n\ +ERRORLEVEL number Specifies a true condition if the last program run returned\n\ + an exit code equal or greater than the number specified.\n\ +command Specifies the command to carry out if the condition is met.\n\ +string1==string2 Specifies a true condition if the specified text strings\n\ + match.\n\ +EXIST filename Specifies a true condition if the specified filename exists.\n\ +DEFINED variable Specifies a true condition if the specified variable is\n\ + defined.\n" + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" + +STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" +STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" +STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" +STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " + +STRING_LOCALE_HELP1, "Aktuálny èas je" + +STRING_MKDIR_HELP, "Creates a directory.\n\n\ +MKDIR [drive:]path\nMD [drive:]path" + +STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ +MKLINK [/D | /H | /J] linkname target\n\n\ + /D Indicates that the symbolic link target is a directory.\n\ + /H Create a hard link.\n\ + /J Create a directory junction.\n\n\ +If neither /H or /J is specified, a symbolic link is created." + +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ + %13s bytes total physical RAM.\n\ + %13s bytes available physical RAM.\n\n\ + %13s bytes total page file.\n\ + %13s bytes available page file.\n\n\ + %13s bytes total virtual memory.\n\ + %13s bytes available virtual memory.\n" + +STRING_MISC_HELP1, "Press a key to continue...\n" //NOT ANY KEY ?! + +STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ +To move one or more files:\n\ +MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +To rename a directory:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Specifies the location and name of the file\n\ + or files you want to move.\n\ + /N Nothing. Do everything but move files or directories.\n\n\ +Current limitations:\n\ + - You can't move a file or directory from one drive to another.\n" + +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type button displayed\n\ + possible values are: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title title of message box\n\ +prompt text displayed by the message box\n\n\n\ +ERRORLEVEL is set according the button pressed:\n\n\ +YES : 10 | NO : 11\n\ +OK : 10 | CANCEL : 12\n" + +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Type PATH ; to clear all search-path settings and direct the command shell\n\ +to search only in the current directory.\n\ +Type PATH without parameters to display the current path.\n" + +STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ +PROMPT [text]\n\n\ + text Specifies a new command prompt.\n\n\ +Prompt can be made up of normal characters and the following special codes:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (¼avá okrúhla zátvorka)\n\ + $D Aktuálny dátum\n\ + $E Escape code (ASCII code 27)\n\ + $F ) (Pravá okrúhla zátvorka)\n\ + $G > (greater-than sign)\n\ + $H Backspace (erases previous character)\n\ + $L < (less-than sign)\n\ + $N Current drive\n\ + $P Current drive and path\n\ + $Q = (equal sign)\n\ + $T Aktuálny èas\n\ + $V Èíslo verzie OS\n\ + $_ Carriage return and linefeed\n\ + $$ $ (znak dolára)\n" + +STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ +'Pokraèujte stlaèením ¾ubovo¾ného klávesu ...' or a user defined message.\n\n\ +PAUSE [message]" + +STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" + +STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." + +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + +STRING_RMDIR_HELP, "Removes a directory.\n\n\ +RMDIR [drive:]path\nRD [drive:]path\n\ +/S Deletes all files and folders within target\n\ +/Q Doesnt prompt for user\n" +STRING_RMDIR_HELP2, "Directory is not empty!\n" + +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ + /E No error messages.\n\ + /N Nothing.\n\ + /P Prompts for confirmation before renaming each file.\n\ + (Not implemented yet!)\n\ + /Q Quiet.\n\ + /S Rename subdirectories.\n\ + /T Display total number of renamed files.\n\n\ +Note that you cannot specify a new drive or path for your destination. Use\n\ +the MOVE command for that purpose.\n" + +STRING_REN_HELP2, " %lu file renamed\n" + +STRING_REN_HELP3, " %lu files renamed\n" + +STRING_REPLACE_HELP1, "Replaces files.\n\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [drive1:][path1]filename Specifies the source file or files.\n\ + [drive2:][path2] Specifies the directory where files are to be\n\ + replaced.\n\ + /A Adds new files to destination directory. Cannot\n\ + use with /S or /U switches.\n\ + /P Prompts for confirmation before replacing a file or\n\ + adding a source file.\n\ + /R Replaces read-only files as well as unprotected\n\ + files.\n\ + /S Replaces files in all subdirectories of the\n\ + destination directory. Cannot use with the /A\n\ + switch.\n\ + /W Waits for you to insert a disk before beginning.\n\ + /U Replaces (updates) only files that are older than\n\ + source files. Cannot use with the /A switch.\n" + +STRING_REPLACE_HELP2, "Source path required\n" + +STRING_REPLACE_HELP3, "No files replaced\n" + +STRING_REPLACE_HELP4, "%lu file(s) replaced\n" + +STRING_REPLACE_HELP5, "Replacing %s\n" + +STRING_REPLACE_HELP6, "Replace %s\n" + +STRING_REPLACE_HELP7, "No files added\n" + +STRING_REPLACE_HELP8, "%lu file(s) added\n" + +STRING_REPLACE_HELP9, "Add %s (Y/N) " + +STRING_REPLACE_HELP10, "Replace %s (Y/N) " + +STRING_REPLACE_HELP11, "Adding %s\n" + + +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ +SHIFT [DOWN]" + +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ +SCREEN row col [text]\n\n\ + row row to which move the cursor\n\ + col column to which move the cursor" + +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ +SET [variable[=][string]]\n\n\ + variable Specifies the environment-variable name.\n\ + string Specifies a series of characters to assign to the variable.\n\n\ +Type SET without parameters to display the current environment variables.\n" + +STRING_START_HELP1, "Starts a command.\n\n\ +START command\n\n\ + command Specifies the command to run.\n\n\ +At the moment all commands are started asynchronously.\n" + +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ +TITLE [string]\n\n\ +string Specifies the title for the command prompt window.\n" + +STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +TIME [/T][time]\n\n\ + /T display only\n\n\ +Type TIME with no parameters to display the current time setting and a prompt\n\ +for a new one. Press ENTER to keep the same time.\n" + +STRING_TIME_HELP2, "Zadajte nový èas: " + +STRING_TIMER_HELP1, "Elapsed %d msecs\n" + +STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "allow the use of ten stopwatches.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON set stopwatch ON\n\ + OFF set stopwatch OFF\n\ + /S Split time. Return stopwatch split\n\ + time without changing its value\n\ + /n Specifiy the stopwatch number.\n\ + Stopwatches available are 0 to 9\n\ + If it is not specified default is 1\n\ + /Fn Format for output\n\ + n can be:\n\ + 0 milliseconds\n\ + 1 hh%cmm%css%cdd\n\n\ +if none of ON, OFF or /S is specified the command\n\ +will toggle stopwatch state\n\n" + +STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ + /P Shows one screen of output at a time.\n" + +STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ +Sets whether to verify that your files are written correctly to a\n\ +disk.\n\n\ +VERIFY [ON | OFF]\n\n\ +Type VERIFY without a parameter to display the current VERIFY setting.\n" + +STRING_VERIFY_HELP2, "VERIFY je %s.\n" + +STRING_VERIFY_HELP3, "Must specify ON or OFF." + +STRING_VERSION_HELP1, "Displays shell version information\n\n\ +VER [/C][/R][/W]\n\n\ + /C Displays credits.\n\ + /R Displays redistribution information.\n\ + /W Displays warranty information." + +STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n\ +type: `ver /w'. This is free software, and you are welcome to redistribute\n\ +it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n\ +listing of credits." + +STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ + GNU General Public License for more details." + +STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ + (at your option) any later version.\n" + +STRING_VERSION_HELP5, "\nHlásenia o chybách zasielajte na <ros-dev(a)reactos.org>.\n\ +Aktualizácie sú dostupné na: http://www.reactos.org" + +STRING_VERSION_HELP6, "\nFreeDOS version written by:\n" + +STRING_VERSION_HELP7, "\nReactOS version written by:\n" + +STRING_VOL_HELP1, " Volume in drive %c is %s\n" +STRING_VOL_HELP2, " Volume in drive %c has no label.\n" +STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" +STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" + +STRING_WINDOW_HELP1, "change console window aspect\n\n\ +WINDOW [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window" + +STRING_WINDOW_HELP2, "change console window aspect\n\n\ +ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +window tile of window on which perform actions\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window\n\ +title new title\n" + + +STRING_HELP1, "Zoznam vetkých dostupných príkazov (+ popis)\n\n\ + command /? For more information on a specific command\n\n\ +? List all available commands without description).\n\ +ALIAS Sets, removes or shows aliases.\n\ +ATTRIB Displays or changes file attributes.\n\ +BEEP Pípnutie reproduktora.\n\ +CALL Calls one batch program from another.\n\ +CD Displays the name of or changes the current directory.\n\ +CHCP Displays or sets the active code page number.\n\ +CHOICE Waits for the user to choose one of a set of choices.\n\ +CLS Clears the screen.\n\ +CMD Starts a new instance of the ReactOS command interpreter.\n\ +COLOR Sets the default console foreground and background colors.\n\ +COPY Copies one or more files to another location.\n\ +DATE Displays or sets the date.\n\ +DELETE Deletes one or more files.\n\ +DIR Displays a list of files and subdirectories in a directory.\n\ +ECHO Displays messages, or turns command echoing on or off.\n\ +ERASE Deletes one or more files.\n\ +EXIT Quits the CMD.EXE program (command interpreter).\n\ +FOR Runs a specified command for each file in a set of files.\n\ +FREE (free) disc space.\n\ +GOTO Directs the ReactOS command interpreter to a labeled line in\n\ + a batch program.\n\ +HELP Provides Help information for ReactOS commands.\n\ +HISTORY List all commands which has been used\n\ +IF Performs conditional processing in batch programs.\n\ +LABEL Creates, changes, or deletes the volume label of a disk.\n\ +MD Creates a directory.\n\ +MKDIR Creates a directory.\n\ +MKLINK Creates a filesystem link object.\n\ +MOVE Moves one or more files from one directory to another\n\ + directory.\n\ +PATH Displays or sets a search path for executable files.\n\ +PAUSE Suspends processing of a batch file and displays a message.\n\ +POPD Restores the previous value of the current directory saved by\n\ + PUSHD.\n\ +PROMPT Changes the command prompt.\n\ +PUSHD Saves the current directory then changes it.\n\ +RD Removes a directory.\n\ +REM Records comments (remarks) in batch files.\n\ +REN Renames a file or files.\n\ +RENAME Renames a file or files.\n\ +REPLACE Replaces files.\n\ +RMDIR Removes a directory.\n\ +SCREEN Move cursor and optionally print text.\n\ +SET Displays, sets, or removes ReactOS environment variables.\n\ +SHIFT Shifts the position of replaceable parameters in batch files.\n" +STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ + Executes command.\n\ +TIME Displays or sets the system time.\n\ +TIMER Allow the use of ten stopwatches.\n\ +TITLE Sets the window title for a CMD.EXE session.\n\ +TYPE Displays the contents of a text file.\n\ +VER Displays the ReactOS version.\n\ +VERIFY Tells ReactOS whether to verify that your files are written\n\ + correctly to a disk.\n\ +VOL Displays a disk volume label and serial number.\n" + + +STRING_CHOICE_OPTION, "YN" +STRING_COPY_OPTION, "YNA" + +STRING_ASSOC_ERROR, "File association not found for extension %s\n" +STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" +STRING_BATCH_ERROR, "Error opening batch file\n" +STRING_CHCP_ERROR1, "Active code page: %u\n" +STRING_CHCP_ERROR4, "Invalid code page\n" +STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" +STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" +STRING_MD_ERROR, "A subdirectory or file already exists.\n" +STRING_MD_ERROR2, "The path to the new folder does not exist.\n" +STRING_CMD_ERROR1, "Can't redirect input from file %s\n" +STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" +STRING_CMD_ERROR3, "Can't redirect to file %s\n" +STRING_CMD_ERROR4, "Running %s...\n" +STRING_CMD_ERROR5, "Running cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" +STRING_COLOR_ERROR2, "error in color specification" +STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR4, "same colors error!" +STRING_CONSOLE_ERROR, "Neznáma chyba: %d\n" +STRING_COPY_ERROR1, "Chyba: Cannot open source - %s!\n" +STRING_COPY_ERROR2, "Chyba: Can't copy onto itself!\n" +STRING_COPY_ERROR3, "Error writing destination!\n" +STRING_COPY_ERROR4, "Chyba: Zatia¾ neimplementované!\n" //Not implemented yet +STRING_DATE_ERROR, "Neplatný dátum." +STRING_DEL_ERROR5, "The file %s will be deleted! " +STRING_DEL_ERROR6, "Are you sure (Y/N)?" +STRING_DEL_ERROR7, "Deleting: %s\n" +STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" +STRING_ERROR_ERROR2, "Syntax error" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Invalid drive" +STRING_FREE_ERROR2, "unlabeled" +STRING_GOTO_ERROR1, "No label specified for GOTO" +STRING_GOTO_ERROR2, "Label '%s' not found\n" + +STRING_MOVE_ERROR1, "[OK]\n" +STRING_MOVE_ERROR2, "[Chyba]\n" + +STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" + +STRING_START_ERROR1, "No batch support at the moment!" + +STRING_TIME_ERROR1, "Neplatný èas." + +STRING_TYPE_ERROR1, "Invalid option '/%s'\n" + +STRING_WINDOW_ERROR1, "window not found" + + +STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" +STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "Príli ve¾a parametrov - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" +STRING_ERROR_FILE_NOT_FOUND, "File not found\n" +STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" +STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" +STRING_ERROR_BADCOMMAND, "Bad command or filename - %s\n" +STRING_ERROR_OUT_OF_MEMORY, "Chyba (z) nedostatku pamäte.\n" //Out of memory error. +STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "Pokraèujte stlaèením ¾ubovo¾ného klávesu ..." +STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" + +STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" + +STRING_REPLACE_ERROR1, "Invalid switch - %s\n" +STRING_REPLACE_ERROR2, "Path not found - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Access denied - %s\n" +STRING_REPLACE_ERROR6, "No files found - %s\n" +STRING_REPLACE_ERROR7, "Extended Error 32\n" + +STRING_REACTOS_VERSION, "Operaèný systém ReactOS [Verzia %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVerzia %s %s" +STRING_VERSION_RUNVER, " running on %s" +STRING_COPY_FILE , " %d súbor(ov) skopírovaný(ch)\n" +STRING_DELETE_WIPE, "wiped" +STRING_FOR_ERROR, "bad variable specification." +STRING_SCREEN_COL, "invalid value for col" +STRING_SCREEN_ROW, "invalid value for row" +STRING_TIMER_TIME "Timer %d is %s: " +STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "Viac? " //"More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " + +STRING_INVALID_OPERAND, "Invalid operand." +STRING_EXPECTED_CLOSE_PAREN, "Oèakávaná ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Oèakávané èíslo alebo názov premennej." +STRING_SYNTAX_COMMAND_INCORRECT, "Nesprávna syntax príkazu." + +END Propchange: trunk/reactos/base/shell/cmd/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 41195: - Use a reference name when registering audio subdevices (bug 4566) - Release subdevice interface when it is no longer needed - Fix a memory leak - Audio support is on hold untill bug 4566 is resolved
by janderwald＠svn.reactos.org 29 May '09

29 May '09

Author: janderwald Date: Fri May 29 16:40:09 2009 New Revision: 41195 URL: http://svn.reactos.org/svn/reactos?rev=41195&view=rev Log: - Use a reference name when registering audio subdevices (bug 4566) - Release subdevice interface when it is no longer needed - Fix a memory leak - Audio support is on hold untill bug 4566 is resolved Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -54,6 +54,7 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_POWER] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = PcDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = PcDispatchIrp; /* The driver-supplied AddDevice */ DriverObject->DriverExtension->AddDevice = AddDevice; @@ -181,6 +182,10 @@ status = STATUS_UNSUCCESSFUL; goto cleanup; } + + /* register shutdown notification */ + IoRegisterShutdownNotification(PhysicalDeviceObject); + return status; cleanup: @@ -223,6 +228,7 @@ UNICODE_STRING SymbolicLinkName; SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; ULONG Index; + UNICODE_STRING RefName; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -272,18 +278,17 @@ return Status; } - /* increment reference count */ - SubDevice->lpVtbl->AddRef(SubDevice); + /* initialize reference string */ + RtlInitUnicodeString(&RefName, Name); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { - //FIXME - // Use a reference string such as Wave0001 / Topology0001 - // - + /* FIXME + * check if reference string with that name already exists + */ Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], - NULL, + &RefName, &SymbolicLinkName); if (NT_SUCCESS(Status)) { @@ -292,5 +297,8 @@ } } + /* Release SubDevice reference */ + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -236,16 +236,20 @@ IN PIRP Irp) { ULONG Index; + PMINIPORTWAVECYCLIC Miniport; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) { - if (This->Pins[Index]) - { - This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); - } - - } + /* all pins should have been closed by now */ + ASSERT(This->Pins[Index] == NULL); + } + + /* release reference to port */ + This->Port->lpVtbl->Release(This->Port); + + Miniport = GetWaveCyclicMiniport(This->Port); + Miniport->lpVtbl->Release(Miniport); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -386,6 +390,29 @@ Port->lpVtbl->AddRef(Port); return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +IPortFilterWaveCyclic_fnFreePin( + IN IPortFilterWaveCyclic* iface, + IN struct IPortPinWaveCyclic* Pin) +{ + ULONG Index; + IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index] == Pin) + { + This->Pins[Index]->lpVtbl->Release(This->Pins[Index]); + This->Pins[Index] = NULL; + return STATUS_SUCCESS; + } + } + return STATUS_UNSUCCESSFUL; } static IPortFilterWaveCyclicVtbl vt_IPortFilterWaveCyclic = @@ -404,7 +431,8 @@ IPortFilterWaveCyclic_fnFastDeviceIoControl, IPortFilterWaveCyclic_fnFastRead, IPortFilterWaveCyclic_fnFastWrite, - IPortFilterWaveCyclic_fnInit + IPortFilterWaveCyclic_fnInit, + IPortFilterWaveCyclic_fnFreePin }; NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Fri May 29 16:40:09 2009 @@ -532,6 +532,8 @@ #undef INTERFACE #define INTERFACE IPortFilterWaveCyclic +struct IPortPinWaveCyclic; + DECLARE_INTERFACE_(IPortFilterWaveCyclic, IIrpTarget) { DEFINE_ABSTRACT_UNKNOWN() @@ -540,6 +542,9 @@ STDMETHOD_(NTSTATUS, Init)(THIS_ IN PPORTWAVECYCLIC Port)PURE; + + STDMETHOD_(NTSTATUS, FreePin)(THIS_ + IN struct IPortPinWaveCyclic* Pin)PURE; }; typedef IPortFilterWaveCyclic *PPORTFILTERWAVECYCLIC; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -151,7 +151,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Status %x Information %p\n", Irp->IoStatus.Status, Irp->IoStatus.Information); + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Status %x Information %p Information2 %p\n", Irp->IoStatus.Status, Irp->IoStatus.Information, IoStack->Parameters.FilterResourceRequirements.IoResourceRequirementList); Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -210,6 +210,25 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PortClsShutdown( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PortClsShutdown called\n"); + //DbgBreakPoint(); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + /* ========================================================================== @@ -252,6 +271,9 @@ case IRP_MJ_SYSTEM_CONTROL : return PortClsSysControl(DeviceObject, Irp); + + case IRP_MJ_SHUTDOWN: + return PortClsShutdown(DeviceObject, Irp); default: DPRINT1("Unhandled function %x\n", IoStack->MajorFunction); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -732,6 +732,7 @@ { Stream = This->Stream; This->Stream = NULL; + This->Filter->lpVtbl->FreePin(This->Filter, (IPortPinWaveCyclic*)This); DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); /* this line is never reached */ @@ -1064,7 +1065,7 @@ //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); - DPRINT1("Setting state to run %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -242,7 +242,7 @@ IPortWaveCyclic* iface) { IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; - + DPRINT("IPortWaveCyclic_fnAddRef %u entered\n", This->ref); return InterlockedIncrement(&This->ref); } @@ -254,13 +254,10 @@ IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; InterlockedDecrement(&This->ref); + DPRINT("IPortWaveCyclic_fnRelease %u entered\n", This->ref); if (This->ref == 0) { - if (This->bInitialized) - { - This->pMiniport->lpVtbl->Release(This->pMiniport); - } if (This->pPinCount) This->pPinCount->lpVtbl->Release(This->pPinCount); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -197,6 +197,9 @@ /* Release reference */ Port->lpVtbl->Release(Port); + + /* Release subdevice reference */ + SubDevice->lpVtbl->Release(SubDevice); return Status; }

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