Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[ion] 22036: - Get rid of OB_ROS_PARSE_METHOD and use OB_PARSE_METHOD instead. Hacked the current parse methods to keep using a PWSTR, however they should be modified to use the UNICODE_STRING instead...
by ion＠svn.reactos.org 25 May '06

25 May '06

Author: ion Date: Thu May 25 05:18:31 2006 New Revision: 22036 URL: http://svn.reactos.ru/svn/reactos?rev=22036&view=rev Log: - Get rid of OB_ROS_PARSE_METHOD and use OB_PARSE_METHOD instead. Hacked the current parse methods to keep using a PWSTR, however they should be modified to use the UNICODE_STRING instead... Modified: trunk/reactos/include/reactos/win32k/callout.h trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/reactos/win32k/callout.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/call… ============================================================================== --- trunk/reactos/include/reactos/win32k/callout.h (original) +++ trunk/reactos/include/reactos/win32k/callout.h Thu May 25 05:18:31 2006 @@ -10,7 +10,7 @@ OB_OPEN_METHOD DesktopOpen; OB_DELETE_METHOD DesktopDelete; OB_DELETE_METHOD WinStaDelete; - OB_ROS_PARSE_METHOD WinStaParse; + OB_PARSE_METHOD WinStaParse; OB_OPEN_METHOD WinStaOpen; OB_ROS_FIND_METHOD WinStaFind; OB_ROS_CREATE_METHOD DesktopCreate; Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=22036&… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu May 25 05:18:31 2006 @@ -439,10 +439,15 @@ NTSTATUS STDCALL CmiObjectParse(IN PVOID ParsedObject, - OUT PVOID *NextObject, - IN PUNICODE_STRING FullPath, - IN OUT PWSTR *Path, - IN ULONG Attribute); + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject); VOID STDCALL CmiObjectDelete(PVOID DeletedObject); Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu May 25 05:18:31 2006 @@ -369,7 +369,7 @@ ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; - ObjectTypeInitializer.ParseProcedure = (PVOID)CmiObjectParse; + ObjectTypeInitializer.ParseProcedure = CmiObjectParse; ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu May 25 05:18:31 2006 @@ -24,12 +24,18 @@ /* FUNCTONS *****************************************************************/ + NTSTATUS STDCALL -CmiObjectParse(PVOID ParsedObject, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes) +CmiObjectParse(IN PVOID ParsedObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject) { BLOCK_OFFSET BlockOffset; PKEY_OBJECT FoundObject; @@ -42,6 +48,7 @@ UNICODE_STRING LinkPath; UNICODE_STRING TargetPath; UNICODE_STRING KeyName; + PWSTR *Path = &RemainingName->Buffer; ParsedKey = ParsedObject; Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Thu May 25 05:18:31 2006 @@ -36,7 +36,7 @@ }; OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; -OB_ROS_PARSE_METHOD ExpWindowStationObjectParse = NULL; +OB_PARSE_METHOD ExpWindowStationObjectParse = NULL; OB_DELETE_METHOD ExpWindowStationObjectDelete = NULL; OB_ROS_FIND_METHOD ExpWindowStationObjectFind = NULL; OB_ROS_CREATE_METHOD ExpDesktopObjectCreate = NULL; @@ -82,20 +82,28 @@ NTSTATUS STDCALL -ExpWinStaObjectParse(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes, - POBP_LOOKUP_CONTEXT Context) +ExpWinStaObjectParse(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) { /* Call the Registered Callback */ - return ExpWindowStationObjectParse(Object, - NextObject, - FullPath, - Path, + return ExpWindowStationObjectParse(ParseObject, + ObjectType, + AccessState, + AccessMode, Attributes, - Context); + CompleteName, + RemainingName, + Context, + SecurityQos, + Object); } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu May 25 05:18:31 2006 @@ -60,16 +60,6 @@ ULONG Attributes ); -typedef NTSTATUS -(NTAPI *OB_ROS_PARSE_METHOD)( - PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes, - POBP_LOOKUP_CONTEXT Context -); - BOOLEAN NTAPI ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu May 25 05:18:31 2006 @@ -37,6 +37,7 @@ PWSTR current; UNICODE_STRING PathString; ULONG Attributes; + UNICODE_STRING CurrentUs; PAGED_CODE(); @@ -169,12 +170,19 @@ DPRINT("Current object can't parse\n"); break; } - Status = ((OB_ROS_PARSE_METHOD)CurrentHeader->Type->TypeInfo.ParseProcedure)(CurrentObject, - &NextObject, + + RtlInitUnicodeString(&CurrentUs, current); + Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, + CurrentHeader->Type, + NULL, + ExGetPreviousMode(), + Attributes, &PathString, - &current, - Attributes, - Context); + &CurrentUs, + NULL, + NULL, + &NextObject); + current = CurrentUs.Buffer; if (Status == STATUS_REPARSE) { /* reparse the object path */ Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Thu May 25 05:18:31 2006 @@ -86,16 +86,22 @@ *--*/ NTSTATUS NTAPI -ObpParseSymbolicLink(PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * RemainingPath, - ULONG Attributes) -{ - POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)Object; +ObpParseSymbolicLink(IN PVOID ParsedObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject) +{ + POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)ParsedObject; PUNICODE_STRING TargetPath; PWSTR NewTargetPath; ULONG LengthUsed, MaximumLength, RemainLength; + PWSTR *RemainingPath = &RemainingName->Buffer; /* * Stop parsing if the entire path has been parsed and @@ -186,7 +192,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseSymbolicLink; + ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); } Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu May 25 05:18:31 2006 @@ -21,7 +21,7 @@ static PKWIN32_THREAD_CALLOUT PspWin32ThreadCallback = NULL; extern OB_OPEN_METHOD ExpWindowStationObjectOpen; -extern OB_ROS_PARSE_METHOD ExpWindowStationObjectParse; +extern OB_PARSE_METHOD ExpWindowStationObjectParse; extern OB_DELETE_METHOD ExpWindowStationObjectDelete; extern OB_ROS_FIND_METHOD ExpWindowStationObjectFind; extern OB_ROS_CREATE_METHOD ExpDesktopObjectCreate; Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Thu May 25 05:18:31 2006 @@ -70,12 +70,16 @@ NTSTATUS STDCALL -IntWinStaObjectParse(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes, - PVOID Context); +IntWinStaObjectParse(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object); NTSTATUS FASTCALL IntValidateWindowStationHandle( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Thu May 25 05:18:31 2006 @@ -382,7 +382,7 @@ * Register Object Manager Callbacks */ CalloutData.WinStaOpen = IntWinStaObjectOpen; - CalloutData.WinStaParse = (OB_ROS_PARSE_METHOD)IntWinStaObjectParse; + CalloutData.WinStaParse = IntWinStaObjectParse; CalloutData.WinStaDelete = IntWinStaObjectDelete; CalloutData.WinStaFind = IntWinStaObjectFind; CalloutData.DesktopCreate = IntDesktopObjectCreate; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu May 25 05:18:31 2006 @@ -186,13 +186,18 @@ NTSTATUS STDCALL -IntWinStaObjectParse(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes, - PVOID Context) -{ +IntWinStaObjectParse(IN PVOID Object, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING FullPath, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *NextObject) +{ + PWSTR *Path = &RemainingName->Buffer; PVOID FoundObject; NTSTATUS Status; PWSTR End;

1 0

[greatlrd] 22035: delete empty folder
by greatlrd＠svn.reactos.org 25 May '06

25 May '06

Author: greatlrd Date: Thu May 25 04:06:36 2006 New Revision: 22035 URL: http://svn.reactos.ru/svn/reactos?rev=22035&view=rev Log: delete empty folder Removed: trunk/reactos/drivers/network/tcpip/network/

1 0

[greatlrd] 22034: Did foregt the translate file we try one more time for bug : 1279 : patch from : user temarez : adding Ukrainian translations
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 03:44:44 2006 New Revision: 22034 URL: http://svn.reactos.ru/svn/reactos?rev=22034&view=rev Log: Did foregt the translate file we try one more time for bug : 1279 : patch from : user temarez : adding Ukrainian translations Added: trunk/reactos/base/setup/welcome/Uk.rc Added: trunk/reactos/base/setup/welcome/Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/welcome/Uk.rc?re… ============================================================================== --- trunk/reactos/base/setup/welcome/Uk.rc (added) +++ trunk/reactos/base/setup/welcome/Uk.rc Thu May 25 03:44:44 2006 @@ -1,0 +1,80 @@ +/* + * Welcome (Ukrainian resources) + * + * Copyright 2006 Artem Reznikov + * + * 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. + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Ëàñêàâî ïðîñèìî" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Ëàñêàâî ïðîñèìî äî îïåðàö³éíî¿ ñèñòåìè ReactOS.\n\nÊëàöí³òü ïî òåì³ ë³âîðó÷" +// IDS_CHECKTEXT "Ïîêàçóâàòè öåé ä³àëîã çíîâ" +// IDS_CLOSETEXT "Âèõ³ä" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Âñòàíîâëåííÿ ReactOS" + IDS_TOPICBUTTON1 "Îãëÿä öüîãî CD" + IDS_TOPICBUTTON2 "Âèõ³ä" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Âñòàíîâëåííÿ ReactOS" + IDS_TOPICTITLE1 "Îãëÿä öüîãî CD" + IDS_TOPICTITLE2 "Âèõ³ä" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Ñòâîðåííÿ íîâî¿ ³íñòàëÿö³¿ ReactOS íà Âàøîìó êîìïþòåð³ ÷è îíîâëåííÿ ³ñíóþ÷î¿ ³íñòàëÿö³¿." + IDS_TOPICDESC1 "Ïðîãëÿíóòè CD." + IDS_TOPICDESC2 "Íàòèñí³òü äëÿ âèõîäó ç ö³º¿ ïðîãðàìè." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */

1 0

[greatlrd] 22033: Swedish translation of getfirefox by Andreas Bjerkeholt
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 03:43:26 2006 New Revision: 22033 URL: http://svn.reactos.ru/svn/reactos?rev=22033&view=rev Log: Swedish translation of getfirefox by Andreas Bjerkeholt Added: trunk/reactos/base/applications/getfirefox/Sv.rc Modified: trunk/reactos/base/applications/getfirefox/getfirefox.rc Added: trunk/reactos/base/applications/getfirefox/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/getfirefo… ============================================================================== --- trunk/reactos/base/applications/getfirefox/Sv.rc (added) +++ trunk/reactos/base/applications/getfirefox/Sv.rc Thu May 25 03:43:26 2006 @@ -1,0 +1,46 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/Sv.rc + * PURPOSE: Swedish resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + * Copyright 2006 Andreas Bjerkeholt (harteex(a)gmail.com) + */ +/* + * Based on Wine dlls/shdocvw/En.rc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hämtar Firefox" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "Ta bort ""Hämta Firefox"" från startmenyn när nedladdningen är klar", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "Hämta Firefox" +END + Modified: trunk/reactos/base/applications/getfirefox/getfirefox.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/getfirefo… ============================================================================== --- trunk/reactos/base/applications/getfirefox/getfirefox.rc (original) +++ trunk/reactos/base/applications/getfirefox/getfirefox.rc Thu May 25 03:43:26 2006 @@ -28,4 +28,5 @@ #include "Hu.rc" #include "Nl.rc" #include "Ru.rc" +#include "Sv.rc"

1 0

[greatlrd] 22032: bug : 1279 : patch from : user temarez : adding Ukrainian translations
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 03:35:52 2006 New Revision: 22032 URL: http://svn.reactos.ru/svn/reactos?rev=22032&view=rev Log: bug : 1279 : patch from : user temarez : adding Ukrainian translations Modified: trunk/reactos/base/setup/welcome/welcome.rc Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/setup/welcome/welcome.… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rc (original) +++ trunk/reactos/base/setup/welcome/welcome.rc Thu May 25 03:35:52 2006 @@ -58,5 +58,6 @@ #include "Ja.rc" #include "Sv.rc" #include "Ru.rc" +#include "Uk.rc" /* EOF */

1 0

[greatlrd] 22031: bug : 1279 : patch from : user temarez : updating Ukrainian translations
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 03:33:36 2006 New Revision: 22031 URL: http://svn.reactos.ru/svn/reactos?rev=22031&view=rev Log: bug : 1279 : patch from : user temarez : updating Ukrainian translations Modified: trunk/reactos/base/applications/notepad/res/Uk.rc Modified: trunk/reactos/base/applications/notepad/res/Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/r… ============================================================================== --- trunk/reactos/base/applications/notepad/res/Uk.rc (original) +++ trunk/reactos/base/applications/notepad/res/Uk.rc Thu May 25 03:33:36 2006 @@ -1,7 +1,7 @@ /* * Notepad (Ukrainian resources) * - * Copyright 2005 Artem Reznikov + * Copyright 2005, 2006 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ MAIN_MENU MENU { - POPUP "&File" { + POPUP "&Ôàéë" { MENUITEM "&Ñòâîðèòè", CMD_NEW MENUITEM "&Â³äêðèòè...\tCtrl+O", CMD_OPEN MENUITEM "&Ç&áåðåãòè\tCtrl+S", CMD_SAVE @@ -121,14 +121,14 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" +CAPTION "Ïðî Áëîêíîò ReactOS" FONT 8, "Tahoma" BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", + CONTROL "Áëîêíîò ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\nÇíà÷îê çàïîçè÷åíî ç Notepad2 - http://www.flos-freeware.ch/notepad2.html", -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 - CONTROL " ", + CONTROL "Çíà÷îê çàïîçè÷åíî ç Notepad2 - http://www.flos-freeware.ch/notepad2.html", -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + DEFPUSHBUTTON "Çàêðèòè",IDOK,114,149,44,15,WS_GROUP ICON IDI_NPICON,-1,12,9,20,30 EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | ES_READONLY | WS_VSCROLL

1 0

[greatlrd] 22030: bug : 1279 : patch from : user temarez : adding Ukrainian translations to taskmgr
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 03:25:40 2006 New Revision: 22030 URL: http://svn.reactos.ru/svn/reactos?rev=22030&view=rev Log: bug : 1279 : patch from : user temarez : adding Ukrainian translations to taskmgr Added: trunk/reactos/base/applications/taskmgr/Uk.rc Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc Added: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/U… ============================================================================== --- trunk/reactos/base/applications/taskmgr/Uk.rc (added) +++ trunk/reactos/base/applications/taskmgr/Uk.rc Thu May 25 03:25:40 2006 @@ -1,0 +1,686 @@ +///////////////////////////////////////////////////////////////////////////// +// Ukrainian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR) +#ifdef _WIN32 +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +#pragma code_page(1251) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "&Íîâå çàâäàííÿ (Âèêîíàòè...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Çàâåðøåííÿ äèñïåò÷åðà çàâäàíü", ID_FILE_EXIT + END + POPUP "&Ïàðàìåòðè" + BEGIN + MENUITEM "&Ïîâåðõ ³íøèõ â³êîí", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Çãîðòàòè ï³ñëÿ çâåðíåííÿ", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "Ïðè&õîâóâàòè çãîðíóòå", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Â³äîáðàæàòè 16-ðîçðÿäí³ çàâäàííÿ", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Âèãëÿä" + BEGIN + MENUITEM "&Îíîâèòè", ID_VIEW_REFRESH + POPUP "&Øâèäê³ñòü îíîâëåííÿ" + BEGIN + MENUITEM "&Âèñîêà", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Çâè÷àéíà", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Íèçüêà", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Ïðèçóïèíèòè", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "&Âåëèê³ çíà÷êè", ID_VIEW_LARGE + MENUITEM "&Äð³áí³ çíà÷êè", ID_VIEW_SMALL + MENUITEM "&Òàáëèöÿ", ID_VIEW_DETAILS, CHECKED + MENUITEM "Â&èáðàòè ñòîâïö³...", ID_VIEW_SELECTCOLUMNS + POPUP "&Õðîíîëîã³ÿ ÖÏ" + BEGIN + MENUITEM "&Îäèí ãðàô³ê äëÿ âñ³õ ÖÏ", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Îêðåìèé &ãðàô³ê äëÿ êîæíîãî ÖÏ", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Âèâ³ä ÷àñó ÿäðà", ID_VIEW_SHOWKERNELTIMES + END + POPUP "Â&³êíà" + BEGIN + MENUITEM "Ç&ë³âà íàïðàâî", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Çãîðè äî&íèçó", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Çãîðíóòè", ID_WINDOWS_MINIMIZE + MENUITEM "&Ðîçãîðíóòè", ID_WINDOWS_MAXIMIZE + MENUITEM "&Êàñêàäîì", ID_WINDOWS_CASCADE + MENUITEM "Íà ïåðåäí³&é ïëàí", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Çì³ñò", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Ïðî Äèñïåò÷åð çàâäàíü", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Ç&ë³âà íàïðàâî", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Çãîðè äî&íèçó", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Çãîðíóòè", ID_WINDOWS_MINIMIZE + MENUITEM "&Ðîçãîðíóòè", ID_WINDOWS_MAXIMIZE + MENUITEM "&Êàñêàäîì", ID_WINDOWS_CASCADE + MENUITEM "Íà ïåðåäí³&é ïëàí", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Íîâå çàâäàííÿ (Âèêîíàòè...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Âåëèê³ çíà÷êè", ID_VIEW_LARGE + MENUITEM "&Äð³áí³ çíà÷êè", ID_VIEW_SMALL + MENUITEM "&Òàáëèöÿ", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "Ï&åðåêëþ÷èòèñÿ", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Íà ïåðåäí³&é ïëàí", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Ç&ë³âà íàïðàâî", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Çãîðè äî&íèçó", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Çãîðíóòè", ID_WINDOWS_MINIMIZE + MENUITEM "&Ðîçãîðíóòè", ID_WINDOWS_MAXIMIZE + MENUITEM "&Êàñêàäîì", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "Çí&ÿòè çàâäàííÿ", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Ïåðåéòè äî ïðîöåñ³â", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Â³äíîâèòè", ID_RESTORE + MENUITEM "&Çàêðèòè", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Ïîâåðõ ³íøèõ â³êîí", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Çàâåðøèòè ïðîöåñ", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Çàâåðøèòè &äåðåâî ïðîöåñ³â", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Íàëàãîäæåííÿ", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "&Ïð³îðèòåò" + BEGIN + MENUITEM "&Ðåàëüíîãî ÷àñó", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Âèñîêèé", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "Âè&ùå ñåðåäíüîãî", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Ñåðåäí³é", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "Íè&æ÷å ñåðåäíüîãî", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Íèçüêèé", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Ó&ñòàíîâèòè â³äïîâ³äí³ñòü...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî Äèñïåò÷åð çàâäàíü" +FONT 8, "Tahoma" +BEGIN + CONTROL "Äèñïåò÷åð çàâäàíü v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Äèñïåò÷åð çàâäàíü" +MENU IDR_TASKMANAGER +FONT 8, "Tahoma" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Íîâå çàâäàííÿ...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "Ï&åðåêëþ÷èòèñÿ",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Â³äîáðàæàòè ïðîöåñè âñ³õ êîðèñòóâà÷³â",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Óñüîãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Âèä³ëåííÿ ïàì'ÿò³ (ÊÁ)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Ô³çè÷íà ïàì'ÿòü (ÊÁ)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Ïàì'ÿòü ÿäðà (ÊÁ)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Äåñêðèïòîð³â",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Ïîòîê³â",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Ïðîöåñ³â",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Óñüîãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Ï³ê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Óñüîãî",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Ñèñòåìíèé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Óñüîãî",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "Âèâàíòàæóâàíà",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Íåâèâàíòàæóâàíà",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Â³äîáðàæåííÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàãîäæåííÿ êàíàë³â" +FONT 8, "Tahoma" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Çàêðèòè",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Â³äïîâ³äí³ñòü ïðîöåñîð³â" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,174,133,50,14 + LTEXT "Ïàðàìåòð â³äïîâ³äíîñò³ ïðîöåñîð³â âèçíà÷àº, íà ÿêîìó ÖÏ áóäå äîçâîëåíî âèêîíóâàòè ïðîöåñ.", + IDC_STATIC,5,5,220,16 + CONTROL "ÖÏ 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "ÖÏ 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "ÖÏ 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "ÖÏ 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "ÖÏ 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "ÖÏ 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "ÖÏ 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "ÖÏ 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "ÖÏ 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "ÖÏ 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "ÖÏ 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "ÖÏ 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "ÖÏ 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "ÖÏ 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "ÖÏ 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "ÖÏ 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "ÖÏ 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "ÖÏ 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "ÖÏ 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "ÖÏ 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "ÖÏ 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "ÖÏ 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "ÖÏ 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "ÖÏ 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "ÖÏ 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "ÖÏ 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "ÖÏ 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "ÖÏ 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "ÖÏ 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "ÖÏ 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "ÖÏ 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "ÖÏ 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Âèá³ð ñòîâïö³â" +FONT 8, "Tahoma" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,138,178,50,14 + LTEXT "Âèáåð³òü ñòîâïö³, ÿê³ ñë³ä â³äîáðàæàòè íà âêëàäö³ Ïðîöåñ äèñïåò÷åðà çàâäàíü.", + IDC_STATIC,7,7,181,17 + CONTROL "&²ì'ÿ îáðàçó",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "²äåíòè&ô. ïðîöåñó (PID)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "&Âèêîðèñòàííÿ ÖÏ",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "&×àñ ÖÏ",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Ïàì'ÿòü - âèêîðèñòàííÿ",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "Ïàì'ÿòü - çì³&íà",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "Ïàì'ÿòü - &ìàêñèìóì",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "Ï&îìèëîê ñòîð³íêè",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "Î&á'ºêòè USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Ê³ëüê³ñòü ÷èòàíü",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "Ïðî÷èòàíî áàéò³â",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "Êîä ñå&àíñó",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "²ì'&ÿ êîðèñòóâà÷à",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Ïîìèëîê &ñòîð³íêè - çì³íà",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "Îá'ºì â³ðòóàë&üíî¿ ïàì'ÿò³",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Âèâàíòà&æóâàíèé ïóë",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "Íåâèâàíòàæ&óâàíèé ïóë",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "Áàçîâè&é ïð³îðèòåò",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "Ë³÷èëüíèê &äåñêðèïòîð³â",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Ë³÷èëüíèê ïîòîê³â",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "Îá'&ºêòè GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "Ê³ëüê³ñòü çàïèñ³â",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "Çàïèñàíî áàéò³â",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "²íøèé ââ³ä-âèâ³ä",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "²íøèõ áàéò³â ï³ä ÷àñ ââîäó-âèâîäó",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Äèñïåò÷åð çàâäàíü" + IDC_TASKMGR "Äèñïåò÷åð çàâäàíü" + IDS_IDLE_PROCESS "Íåä³ÿííÿ ñèñòåìè" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Çàïóñêàº íîâó ïðîãðàìó" + ID_OPTIONS_ALWAYSONTOP "Â³êíî äèñïåò÷åðà çàâäàíü çàëèøàºòüñÿ ïîâåðõ ³íøèõ â³êîí, ÿêùî éîãî íå çãîðíóòî" + ID_OPTIONS_MINIMIZEONUSE + "Â³êíî äèñïåò÷åðà çàâäàíü çãîðòàºòüñÿ ïðè ïåðåêëþ÷åíí³" + ID_OPTIONS_HIDEWHENMINIMIZED "Ïðèõîâóâàííÿ çãîðíóòîãî â³êíà äèñïåò÷åðà çàâäàíü" + ID_VIEW_REFRESH "Ñïðè÷èíþº íåãàéíå îíîâëåííÿ â³êíà äèñïåò÷åðà çàâäàíü" + ID_VIEW_LARGE "Ïîêàçóº çàâäàííÿ âåëèêèìè çíà÷êàìè" + ID_VIEW_SMALL "Ïîêàçóº çàâäàííÿ ìàëèìè çíà÷êàìè" + ID_VIEW_DETAILS "Ïîêàçóº äîäàòêîâ³ â³äîìîñò³ ïðî êîæíå çàâäàííÿ" + ID_VIEW_UPDATESPEED_HIGH "Îíîâëþº çîáðàæåííÿ äâ³÷³ íà ñåêóíäó" + ID_VIEW_UPDATESPEED_NORMAL "Îíîâëþº çîáðàæåííÿ ðàç íà äâ³ ñåêóíäè" + ID_VIEW_UPDATESPEED_LOW "Îíîâëþº çîáðàæåííÿ ðàç íà ÷îòèðè ñåêóíäè" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Íå îíîâëþâàòè àâòîìàòè÷íî" + ID_WINDOWS_TILEHORIZONTALLY + "Ðîçòàøîâóº â³êíà ãîðèçîíòàëüíî íà ðîáî÷îìó ñòîë³" + ID_WINDOWS_TILEVERTICALLY "Ðîçòàøîâóº â³êíà âåðòèêàëüíî íà ðîáî÷îìó ñòîë³" + ID_WINDOWS_MINIMIZE "Çãîðòàº â³êíà" + ID_WINDOWS_MAXIMIZE "Ðîçãîðòàº â³êíà" + ID_WINDOWS_CASCADE "Ðîçòàøîâóº â³êíà êàñêàäîì íà ðîáî÷îìó ñòîë³" + ID_WINDOWS_BRINGTOFRONT "Ïåðåì³ùåííÿ â³êíà íà ïåðåäí³é ïëàí áåç ïåðåõîäó äî íüîãî" + ID_HELP_TOPICS "Ïîêàçóº äîâ³äêó äèñïåò÷åðà çàâäàíü" + ID_HELP_ABOUT "Ïîêàçóº â³äîìîñò³ ïðî ïðîãðàìó, ¿¿ âåðñ³þ òà àâòîðñüê³ ïðàâà" + ID_FILE_EXIT "Çàêðèâàº äèñïåò÷åð çàâäàíü" + ID_OPTIONS_SHOW16BITTASKS + "Ïîêàç 16-ðîçðÿäíèõ çàâäàíü, ÿê³ îáðîáëÿº ntvdm.exe" + ID_VIEW_SELECTCOLUMNS "Âèáåð³òü ñòîâïö³, ÿê³ ñë³ä â³äîáðàæàòè íà âêëàäö³ Ïðîöåñè" + ID_VIEW_SHOWKERNELTIMES "Ïîêàçóº ÷àñ ÿäðà íà ãðàô³êàõ ïðîäóêòèâíîñò³" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "ªäèíèé õðîíîëîã³÷íèé ãðàô³ê çàãàëüíîãî âèêîðèñòàííÿ ÖÏ" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Êîæíèé ÖÏ ìàº âëàñíèé õðîíîëîã³÷íèé ãðàô³ê" + ID_APPLICATION_PAGE_SWITCHTO + "Ïåðåì³ùåííÿ çàâäàííÿ íà ïåðåäí³é ïëàí ³ ïåðåäà÷à êåðóâàííÿ öüîìó çàâäàííþ" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Íàêàçóº âèáðàíèì çàâäàííÿì çàêðèòèñÿ" + ID_GOTOPROCESS "Ïåðåäà÷à ôîêóñà äî ïðîöåñó âèáðàíîãî çàâäàííÿ" + ID_RESTORE "Â³äíîâëåííÿ ïðèõîâàíîãî â³êíà äèñïåò÷åðà çàâäàíü" + ID_PROCESS_PAGE_ENDPROCESS "Âèäàëÿº ïðîöåñ ³ç ñèñòåìè" + ID_PROCESS_PAGE_ENDPROCESSTREE + "Âèäàëÿº ³ç ñèñòåìè öåé ïðîöåñ ³ âñ³õ éîãî íàùàäê³â" + ID_PROCESS_PAGE_DEBUG "Çàñòîñîâóº íàëàãîäæóâà÷ äî öüîãî ïðîöåñó" + ID_PROCESS_PAGE_SETAFFINITY + "Âèçíà÷àº, ÿê³ ïðîöåñîðè ìîæå âèêîðèñòîâóâàòè ïðîöåñ" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Ðåàëüíîãî ÷àñó\" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Âèñîêèé\" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Âèùå ñåðåäíüîãî\" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Ñåðåäí³é\" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Íèæ÷å ñåðåäíüîãî\" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Íèçüêèé\" äëÿ ïðîöåñó" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Äîäàòêè" + IDS_TAB_PROCESSES "Ïðîöåñè" + IDS_TAB_PERFORMANCE "Øâèäêîä³ÿ" + IDS_TAB_TASK "Çàâäàííÿ" + IDS_TAB_STATUS "Ñòàí" + IDS_TAB_IMAGENAME "²ì'ÿ îáðàçó" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "²ì'ÿ êîðèñòóâà÷à" + IDS_TAB_SESSIONID "Êîä ñåàíñó" + IDS_TAB_CPU "ÖÏ" + IDS_TAB_CPUTIME "×àñ ÖÏ" + IDS_TAB_MEMUSAGE "Ïàì'ÿòü" + IDS_TAB_PEAKMEMUSAGE "Ï³êîâå âèêîðèñòàííÿ ïàì'ÿò³" + IDS_TAB_MEMDELTA "Ïàì'ÿòü (çì³í)" + IDS_TAB_PAGEFAULT "Ïîì.ñò." + IDS_TAB_PFDELTA "Ïîì.ñò.(çì³í)" + IDS_TAB_VMSIZE "Â³ðò.ï." + IDS_TAB_PAGEDPOOL "Âèâ.ïóë" + IDS_TAB_NPPOOL "Íåâèâ.ïóë" + IDS_TAB_BASEPRI "Áàç.ïð." + IDS_TAB_HANDLES "Äåñêð." + IDS_TAB_THREADS "Ïîòîê³â" + IDS_TAB_USERPBJECTS "Îá'ºêòè USER" + IDS_TAB_GDIOBJECTS "Îá'ºêòè GDI" + IDS_TAB_IOREADS "Ê³ëüê³ñòü ÷èòàíü" + IDS_TAB_IOWRITES "Ê³ëüê³ñòü çàïèñ³â" + IDS_TAB_IOOTHER "²íøèé ââ³ä-âèâ³ä" + IDS_TAB_IOREADBYTES "Ïðî÷èòàíî áàéò³â" + IDS_TAB_IOWRITESBYTES "Çàïèñàíî áàéò³â" + IDS_TAB_IOOTHERBYTES "²íøèõ áàéò³â ï³ä ÷àñ ââîäó-âèâîäó" + IDS_MENU_SELECTCOLUMNS "Â&èáðàòè ñòîâïö³..." + IDS_MENU_16BITTASK "&Â³äîáðàæàòè 16-ðîçðÿäí³ çàâäàííÿ" + IDS_MENU_WINDOWS "Â&³êíà" + IDS_MENU_LARGEICONS "&Âåëèê³ çíà÷êè" + IDS_MENU_SMALLICONS "&Äð³áí³ çíà÷êè" + IDS_MENU_DETAILS "&Òàáëèöÿ" + IDS_MENU_ONEGRAPHALLCPUS "&Îäèí ãðàô³ê äëÿ âñ³õ ÖÏ" + IDS_MENU_ONEGRAPHPERCPU "Îêðåìèé &ãðàô³ê äëÿ êîæíîãî ÖÏ" + IDS_MENU_CPUHISTORY "&Õðîíîëîã³ÿ ÖÏ" + IDS_MENU_SHOWKERNELTIMES "&Âèâ³ä ÷àñó ÿäðà" + IDS_CREATENEWTASK "Ñòâîðèòè íîâå çàâäàííÿ" + IDS_CREATENEWTASK_DESC "Ââåä³òü ³ì'ÿ ïðîãðàìè, ïàïêè, äîêóìåíòà àáî ðåñóðñó ²íòåðíåòó, ³ Äèñïåò÷åð çàâäàíü â³äêðèº ¿õ." + IDS_MSG_ACCESSPROCESSAFF "Íå âäàëîñÿ îòðèìàòè äîñòóï àáî óñòàíîâèòè íàëåæí³ñòü ïðîöåñó" + IDS_MSG_PROCESSONEPRO "Ïðîöåñó ìàº â³äïîâ³äàòè ïðèíàéìí³ îäèí ïðîöåñîð." + IDS_MSG_INVALIDOPTION "Íåïðàâèëüíèé ïàðàìåòð" + IDS_MSG_UNABLEDEBUGPROCESS "Íå âäàºòüñÿ íàëàãîäèòè ïðîöåñ" + IDS_MSG_WARNINGDEBUG "ÓÂÀÃÀ! Íàëàãîäæåííÿ öüîãî ïðîöåñó ìîæå ñïðè÷èíèòè âòðàòó äàíèõ.\nÂè ä³éñíî áàæàºòå çàñòîñóâàòè íàëàãîäæóâà÷?" + IDS_MSG_TASKMGRWARNING "Ïîïåðåäæåííÿ äèñïåò÷åðà çàâäàíü" + IDS_MSG_WARNINGTERMINATING "ÓÂÀÃÀ! Ïðèïèíåííÿ ïðîöåñó ìîæå ïðèçâåñòè äî \níåáàæàíèõ íàñë³äê³â, âêëþ÷àþ÷è âòðàòó äàíèõ ³ \níåñòàá³ëüíó ðîáîòó ñèñòåìè. Ïðîöåñ íå çìîæå \nçáåðåãòè ñâ³é ñòàí àáî äàí³ ïåðåä ïðèïèíåííÿì. \nÂè ä³éñíî áàæàºòå ïðèïèíèòè ïðîöåñ?" + IDS_MSG_UNABLETERMINATEPRO "Íåìîæëèâî çàâåðøèòè ïðîöåñ" + IDS_MSG_UNABLECHANGEPRIORITY "Íåìîæëèâî çì³íèòè ïð³îðèòåò" + IDS_MSG_WARNINGCHANGEPRIORITY "ÓÂÀÃÀ! Çì³íà êëàñó ïð³îðèòåòó öüîãî ïðîöåñó ìîæå ïðèçâåñòè äî \níåáàæàíèõ íàñë³äê³â, âêëþ÷àþ÷è íåñòàá³ëüíó ðîáîòó \nñèñòåìè. Âè ä³éñíî áàæàºòå çì³íèòè ïð³îðèòåò êëàñó?" + IDS_MSG_TRAYICONCPUUSAGE "Âèêîðèñòàííÿ ÖÏ: %d%%" + IDS_STATUS_MEMUSAGE "Ïàì'ÿòü: %dK / %dK" + IDS_STATUS_CPUUSAGE "Âèêîðèñòàííÿ ÖÏ: %3d%%" + IDS_STATUS_PROCESSES "Ïðîöåñ³â: %d" + IDS_Not_Responding "Íå â³äïîâ³äàº" + IDS_Running "Âèêîíóºòüñÿ" +END + + +#endif // Ukrainian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/taskmgr/t… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Thu May 25 03:25:40 2006 @@ -211,3 +211,4 @@ #include "Ja.rc" #include "Nl.rc" #include "Sv.rc" +#include "Uk.rc"

1 0

[ion] 22029: - Cleanup profiling and debugging code, add function comment headers and comment the functions in obdir.c - Remove directory object parsing. Directory objects don't have parse routines. Instead, inline the lookup in ObFindObject (this hasn't been optimized yet, a lot of the code is now setting a = b, c = a, c = b.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Thu May 25 03:20:50 2006 New Revision: 22029 URL: http://svn.reactos.ru/svn/reactos?rev=22029&view=rev Log: - Cleanup profiling and debugging code, add function comment headers and comment the functions in obdir.c - Remove directory object parsing. Directory objects don't have parse routines. Instead, inline the lookup in ObFindObject (this hasn't been optimized yet, a lot of the code is now setting a = b, c = a, c = b. Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/t… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Thu May 25 03:20:50 2006 @@ -118,8 +118,9 @@ #define TAG_SYMLINK_TTARGET TAG('S', 'Y', 'T', 'T') #define TAG_SYMLINK_TARGET TAG('S', 'Y', 'M', 'T') -/* Object Name Tag */ -#define OB_NAME_TAG TAG('O','b','N','m') +/* Object Manager Tags */ +#define OB_NAME_TAG TAG('O', 'b', 'N', 'm') +#define OB_DIR_TAG TAG('O', 'b', 'D', 'i') /* formerly located in ps/cid.c */ #define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O') Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu May 25 03:20:50 2006 @@ -18,45 +18,29 @@ #define NDEBUG #include <internal/debug.h> -#define OBP_PROFILE -#ifdef OBP_PROFILE - -LARGE_INTEGER ObpProfileTime; -BOOLEAN ObpProfileComplete; - -#define ObpStartProfile() \ - LARGE_INTEGER StartTime; \ - LARGE_INTEGER EndTime; \ - StartTime = KeQueryPerformanceCounter(NULL); - -#define ObpEndProfile() \ - EndTime = KeQueryPerformanceCounter(NULL); \ - ObpProfileTime.QuadPart += (EndTime.QuadPart - \ - StartTime.QuadPart); - -#define ObpCompleteProfile() \ - if (!wcscmp(Name, L"NlsSectionCP1252") && \ - !ObpProfileComplete) \ - { \ - DPRINT1("******************************\n");\ - DPRINT1("Obp Profiling1 Complete: %I64d\n", \ - ObpProfileTime.QuadPart); \ - DPRINT1("******************************\n");\ - ObpProfileComplete = TRUE; \ - } - -#else - -#define ObpStartProfile() -#define ObpEndProfile() -#define ObpCompleteProfile() - -#endif - POBJECT_TYPE ObDirectoryType = NULL; /* PRIVATE FUNCTIONS ******************************************************/ +/*++ +* @name ObpInsertEntryDirectory +* +* The ObpInsertEntryDirectory routine <FILLMEIN>. +* +* @param Parent +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @param ObjectHeader +* <FILLMEIN>. +* +* @return TRUE if the object was inserted, FALSE otherwise. +* +* @remarks None. +* +*--*/ BOOLEAN NTAPI ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, @@ -70,19 +54,10 @@ /* Make sure we have a name */ ASSERT(ObjectHeader->NameInfoOffset != 0); - /* Validate the context */ - if ((Context->Object) || !(Context->DirectoryLocked) || !Parent) - { - DbgPrint("OB: ObpInsertEntryDirectory - invalid context %p %ld\n", - Context, Context->DirectoryLocked); - DbgBreakPoint(); - return FALSE; - } - /* Allocate a new Directory Entry */ NewEntry = ExAllocatePoolWithTag(PagedPool, sizeof(OBJECT_DIRECTORY_ENTRY), - TAG('O', 'b', 'D', 'i')); + OB_DIR_TAG); if (!NewEntry) return FALSE; /* Save the hash */ @@ -93,12 +68,6 @@ /* Get the Allocated entry */ AllocatedEntry = &Parent->HashBuckets[Context->HashIndex]; - DPRINT("ADD: Allocated Entry: %p. NewEntry: %p\n", AllocatedEntry, NewEntry); - DPRINT("ADD: Name: %wZ, Hash: %lx\n", &HeaderNameInfo->Name, Context->HashIndex); - DPRINT("ADD: Parent: %p. Name: %wZ\n", - Parent, - HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent)) ? - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent))->Name : NULL); /* Set it */ NewEntry->ChainLink = *AllocatedEntry; @@ -112,6 +81,31 @@ return TRUE; } +/*++ +* @name ObpLookupEntryDirectory +* +* The ObpLookupEntryDirectory routine <FILLMEIN>. +* +* @param Directory +* <FILLMEIN>. +* +* @param Name +* <FILLMEIN>. +* +* @param Attributes +* <FILLMEIN>. +* +* @param SearchShadow +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return Pointer to the object which was found, or NULL otherwise. +* +* @remarks None. +* +*--*/ PVOID NTAPI ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, @@ -133,21 +127,23 @@ PWSTR Buffer; PAGED_CODE(); - /* Always disable this until we have LUID Device Maps */ + /* Always disable this until we have DOS Device Maps */ SearchShadow = FALSE; - /* Fail the following cases */ + /* Fail if we don't have a directory or name */ + if (!(Directory) || !(Name)) goto Quickie; + + /* Get name information */ TotalChars = Name->Length / sizeof(WCHAR); - if (!(Directory) || !(Name) || !(Name->Buffer) || !(TotalChars)) - { - goto Quickie; - } + Buffer = Name->Buffer; + + /* Fail if the name is empty */ + if (!(Buffer) || !(TotalChars)) goto Quickie; /* Set up case-sensitivity */ if (Attributes & OBJ_CASE_INSENSITIVE) CaseInsensitive = TRUE; /* Create the Hash */ - Buffer = Name->Buffer; for (HashValue = 0; TotalChars; TotalChars--) { /* Go to the next Character */ @@ -164,8 +160,6 @@ /* Merge it with our number of hash buckets */ HashIndex = HashValue % 37; - DPRINT("LOOKUP: ObjectName: %wZ\n", Name); - DPRINT("LOOKUP: Generated Hash: 0x%x. Generated Id: 0x%x\n", HashValue, HashIndex); /* Save the result */ Context->HashValue = HashValue; @@ -174,7 +168,6 @@ /* Get the root entry and set it as our lookup bucket */ AllocatedEntry = &Directory->HashBuckets[HashIndex]; LookupBucket = AllocatedEntry; - DPRINT("LOOKUP: Allocated Entry: %p. LookupBucket: %p\n", AllocatedEntry, LookupBucket); /* Check if the directory is already locked */ if (!Context->DirectoryLocked) @@ -182,14 +175,12 @@ /* Lock it */ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&Directory->Lock, TRUE); - Context->LockStateSignature = 0xDDDD1234; } /* Start looping */ while ((CurrentEntry = *AllocatedEntry)) { /* Do the hashes match? */ - DPRINT("CurrentEntry: %p. CurrentHash: %lx\n", CurrentEntry, CurrentEntry->HashValue); if (CurrentEntry->HashValue == HashValue) { /* Make sure that it has a name */ @@ -199,11 +190,9 @@ HeaderNameInfo = HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(CurrentEntry->Object)); /* Do the names match? */ - DPRINT("NameCheck: %wZ, %wZ\n", Name, &HeaderNameInfo->Name); if ((Name->Length == HeaderNameInfo->Name.Length) && (RtlEqualUnicodeString(Name, &HeaderNameInfo->Name, CaseInsensitive))) { - DPRINT("Found Name Match\n"); break; } } @@ -242,16 +231,27 @@ /* Lock it */ ExReleaseResourceLite(&Directory->Lock); KeLeaveCriticalRegion(); - Context->LockStateSignature = 0xEEEE1234; } Quickie: /* Return the object we found */ - DPRINT("Object Found: %p Context: %p\n", FoundObject, Context); Context->Object = FoundObject; return FoundObject; } +/*++ +* @name ObpDeleteEntryDirectory +* +* The ObpDeleteEntryDirectory routine <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return TRUE if the object was deleted, FALSE otherwise. +* +* @remarks None. +* +*--*/ BOOLEAN NTAPI ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context) @@ -267,8 +267,6 @@ /* Get the Entry */ AllocatedEntry = &Directory->HashBuckets[Context->HashIndex]; CurrentEntry = *AllocatedEntry; - DPRINT("DEL: Parent: %p, Hash: %lx, AllocatedEntry: %p, CurrentEntry: %p\n", - Directory, Context->HashIndex, AllocatedEntry, CurrentEntry); /* Unlink the Entry */ *AllocatedEntry = CurrentEntry->ChainLink; @@ -281,80 +279,13 @@ return TRUE; } -NTSTATUS -NTAPI -ObpParseDirectory(PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * Path, - ULONG Attributes, - POBP_LOOKUP_CONTEXT Context) -{ - PWSTR Start; - PWSTR End; - PVOID FoundObject; - //KIRQL oldlvl; - UNICODE_STRING StartUs; - - *NextObject = NULL; - - if ((*Path) == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - Start = *Path; - if (*Start == L'\\') - Start++; - - End = wcschr(Start, L'\\'); - if (End != NULL) - { - *End = 0; - } - - //KeAcquireSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), &oldlvl); - RtlInitUnicodeString(&StartUs, Start); - Context->DirectoryLocked = TRUE; - Context->Directory = Object; - FoundObject = ObpLookupEntryDirectory(Object, &StartUs, Attributes, FALSE, Context); - if (FoundObject == NULL) - { - //KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); - if (End != NULL) - { - *End = L'\\'; - } - return STATUS_UNSUCCESSFUL; - } - - ObReferenceObjectByPointer(FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); - //KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); - if (End != NULL) - { - *End = L'\\'; - *Path = End; - } - else - { - *Path = NULL; - } - - *NextObject = FoundObject; - - return STATUS_SUCCESS; -} - /* FUNCTIONS **************************************************************/ /*++ * @name NtOpenDirectoryObject * @implemented NT4 * -* The NtOpenDirectoryObject opens a namespace directory object. +* The NtOpenDirectoryObject routine opens a namespace directory object. * * @param DirectoryHandle * Variable which receives the directory handle. @@ -381,25 +312,26 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + /* Check if we need to do any probing */ if(PreviousMode != KernelMode) { _SEH_TRY { + /* Probe the return handle */ ProbeForWriteHandle(DirectoryHandle); } _SEH_HANDLE { + /* Get the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - + /* If we failed, return the error */ + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the directory object */ Status = ObOpenObjectByName(ObjectAttributes, ObDirectoryType, NULL, @@ -411,15 +343,18 @@ { _SEH_TRY { + /* Write back the handle to the caller */ *DirectoryHandle = hDirectory; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; } + /* Return the status to the caller */ return Status; } @@ -427,7 +362,7 @@ * @name NtQueryDirectoryObject * @implemented NT4 * -* The NtQueryDirectoryObject Reads information from a directory in +* The NtQueryDirectoryObject routine reads information from a directory in * the system namespace. * * @param DirectoryHandle @@ -482,41 +417,38 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + /* Check if we need to do any probing */ if(PreviousMode != KernelMode) { _SEH_TRY { - /* a test showed that the Buffer pointer just has to be 16 bit aligned, - propably due to the fact that most information that needs to be copied - is unicode strings */ + /* Probe the buffer (assuming it will hold Unicode characters) */ ProbeForWrite(Buffer, BufferLength, sizeof(WCHAR)); + + /* Probe the context and copy it unless scan-restart was requested */ ProbeForWriteUlong(Context); - if(!RestartScan) - { - SkipEntries = *Context; - } - if(ReturnLength != NULL) - { - ProbeForWriteUlong(ReturnLength); - } + if (!RestartScan) SkipEntries = *Context; + + /* Probe the return length if the caller specified one */ + if(ReturnLength) ProbeForWriteUlong(ReturnLength); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - else if(!RestartScan) - { + /* Return the exception to caller if we failed */ + if(!NT_SUCCESS(Status)) return Status; + } + else if (!RestartScan) + { + /* This is kernel mode, save the context without probing, if needed */ SkipEntries = *Context; } + /* Get a reference to directory */ Status = ObReferenceObjectByHandle(DirectoryHandle, DIRECTORY_QUERY, ObDirectoryType, @@ -525,9 +457,11 @@ NULL); if(NT_SUCCESS(Status)) { + /* FIXME: TODO. UNIMPLEMENTED */ Status = STATUS_INSUFFICIENT_RESOURCES; } + /* Return status to caller */ return Status; } @@ -535,7 +469,7 @@ * @name NtCreateDirectoryObject * @implemented NT4 * -* The NtOpenDirectoryObject creates or opens a directory object. +* The NtOpenDirectoryObject routine creates or opens a directory object. * * @param DirectoryHandle * Variable which receives the directory handle. @@ -567,25 +501,26 @@ "DesiredAccess %x, ObjectAttributes %x\n", DirectoryHandle, DesiredAccess, ObjectAttributes); + /* Check if we need to do any probing */ if(PreviousMode != KernelMode) { _SEH_TRY { + /* Probe the return handle */ ProbeForWriteHandle(DirectoryHandle); } _SEH_HANDLE { + /* Get the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - + /* If we failed, return the error */ + if(!NT_SUCCESS(Status)) return Status; + } + + /* Create the object */ Status = ObCreateObject(PreviousMode, ObDirectoryType, ObjectAttributes, @@ -595,9 +530,9 @@ 0, 0, (PVOID*)&Directory); - if(NT_SUCCESS(Status)) { + /* Insert it into the handle table */ Status = ObInsertObject((PVOID)Directory, NULL, DesiredAccess, @@ -608,18 +543,22 @@ { _SEH_TRY { + /* Return the handle back to the caller */ *DirectoryHandle = hDirectory; } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; } + /* ReactOS HACK: ObInsertObject double-references */ ObDereferenceObject(Directory); } + /* Return status to caller */ return Status; } Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Thu May 25 03:20:50 2006 @@ -77,7 +77,6 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = FALSE; - ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseDirectory; ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu May 25 03:20:50 2006 @@ -107,11 +107,62 @@ while (TRUE) { - DPRINT("current %S\n",current); CurrentHeader = BODY_TO_HEADER(CurrentObject); - DPRINT("Current ObjectType %wZ\n", - &CurrentHeader->Type->Name); + /* Loop as long as we're dealing with a directory */ + while (CurrentHeader->Type == ObDirectoryType) + { + PWSTR Start, End; + PVOID FoundObject; + UNICODE_STRING StartUs; + NextObject = NULL; + + if (!current) goto Next; + + Start = current; + if (*Start == L'\\') Start++; + + End = wcschr(Start, L'\\'); + if (End != NULL) *End = 0; + + RtlInitUnicodeString(&StartUs, Start); + Context->DirectoryLocked = TRUE; + Context->Directory = CurrentObject; + FoundObject = ObpLookupEntryDirectory(CurrentObject, &StartUs, Attributes, FALSE, Context); + if (FoundObject == NULL) + { + if (End != NULL) + { + *End = L'\\'; + } + goto Next; + } + + ObReferenceObjectByPointer(FoundObject, + STANDARD_RIGHTS_REQUIRED, + NULL, + UserMode); + if (End != NULL) + { + *End = L'\\'; + current = End; + } + else + { + current = NULL; + } + + NextObject = FoundObject; + +Next: + if (NextObject == NULL) + { + break; + } + ObDereferenceObject(CurrentObject); + CurrentObject = NextObject; + CurrentHeader = BODY_TO_HEADER(CurrentObject); + } if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) { @@ -135,6 +186,7 @@ NULL, ObjectCreateInfo->ProbeMode); } + if (NextObject == NULL) {

1 0

[ion] 22028: Forgot to commit this change
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Thu May 25 02:56:46 2006 New Revision: 22028 URL: http://svn.reactos.ru/svn/reactos?rev=22028&view=rev Log: Forgot to commit this change Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=22… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu May 25 02:56:46 2006 @@ -354,6 +354,8 @@ FILE_APPEND_DATA | \ SYNCHRONIZE) /* end winnt.h */ + +#define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') #define OBJECT_TYPE_CREATE (0x0001) #define OBJECT_TYPE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1)

1 0

[greatlrd] 22027: [AUDIT] clean seam be imported/ported/base/inspered from DJGPP source code for everything look simulare to djgpp
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Thu May 25 02:34:14 2006 New Revision: 22027 URL: http://svn.reactos.ru/svn/reactos?rev=22027&view=rev Log: [AUDIT] clean seam be imported/ported/base/inspered from DJGPP source code for everything look simulare to djgpp Modified: trunk/reactos/lib/crt/wstring/wcscoll.c (props changed) trunk/reactos/lib/crt/wstring/wcscspn.c (props changed) trunk/reactos/lib/crt/wstring/wcsdup.c (props changed) trunk/reactos/lib/crt/wstring/wcsicmp.c (props changed) trunk/reactos/lib/crt/wstring/wcslwr.c (props changed) trunk/reactos/lib/crt/wstring/wcsnicmp.c (props changed) trunk/reactos/lib/crt/wstring/wcspbrk.c (props changed) trunk/reactos/lib/crt/wstring/wcsrev.c (props changed) trunk/reactos/lib/crt/wstring/wcsset.c (props changed) trunk/reactos/lib/crt/wstring/wcsspn.c (props changed) trunk/reactos/lib/crt/wstring/wcsstr.c (props changed) trunk/reactos/lib/crt/wstring/wcstok.c (props changed) trunk/reactos/lib/crt/wstring/wcsupr.c (props changed) trunk/reactos/lib/crt/wstring/wcsxfrm.c (props changed) trunk/reactos/lib/crt/wstring/wlasttok.c (props changed) Propchange: trunk/reactos/lib/crt/wstring/wcscoll.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcscspn.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsdup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsicmp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcslwr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsnicmp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcspbrk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsrev.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsset.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsspn.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsstr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcstok.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsupr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wcsxfrm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/wstring/wlasttok.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
38
Older →

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 May 2006