Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23118: patch from Apal : bug 1429 : greek translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 11:38:53 2006 New Revision: 23118 URL: http://svn.reactos.org/svn/reactos?rev=23118&view=rev Log: patch from Apal : bug 1429 : greek translation Added: trunk/reactos/base/system/userinit/Gr.rc (with props) Modified: trunk/reactos/base/system/userinit/userinit.rc Added: trunk/reactos/base/system/userinit/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/Gr.rc… ============================================================================== --- trunk/reactos/base/system/userinit/Gr.rc (added) +++ trunk/reactos/base/system/userinit/Gr.rc Mon Jul 17 11:38:53 2006 @@ -1,0 +1,13 @@ +#include "resource.h" +/* Start move all hard code string to En.rc + * By Magnus Olsen 2005 + * Greek Version by Dj Apal + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "H Userinit äå ìðüñåóå íá åêêéíÞóåé ôï êÝëõöïò!\n" + +} Propchange: trunk/reactos/base/system/userinit/Gr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rc (original) +++ trunk/reactos/base/system/userinit/userinit.rc Mon Jul 17 11:38:53 2006 @@ -13,3 +13,4 @@ #include "Hu.rc" #include "Es.rc" #include "Ru.rc" +#include "Gr.rc"

18 years, 5 months

[greatlrd] 23117: patch from Apal : bug 1429 : greek translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 11:35:06 2006 New Revision: 23117 URL: http://svn.reactos.org/svn/reactos?rev=23117&view=rev Log: patch from Apal : bug 1429 : greek translation Added: trunk/reactos/base/applications/calc/Gr.rc (with props) Modified: trunk/reactos/base/applications/calc/rsrc.rc Added: trunk/reactos/base/applications/calc/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Gr.… ============================================================================== --- trunk/reactos/base/applications/calc/Gr.rc (added) +++ trunk/reactos/base/applications/calc/Gr.rc Mon Jul 17 11:35:06 2006 @@ -1,0 +1,154 @@ +/* + * WineCalc (Gr.rc) + * + * Copyright 2006 Dj Apal + * + * 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 + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "ÕðïëïãéóôÞò" + + IDS_COPYRIGHT1, "ÕðïëïãéóôÞò 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "ËáíèáóìÝíï üñéóìá ãéá ôç óõíÜñôçóç." + IDS_ERR_DIVIDE_BY_ZERO, "Äå ìðïñåß íá ãßíåé äéáßñåóç ôïõ ìçäåíüò." + IDS_ERR_UNDEFINED, "Ôï áðïôÝëåóìá ôçò óõíÜñôçóçò åßíáé áäéåõêñßíéóôï." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Åðåîåñãáóßá" { + MENUITEM "&ÁíôéãñáöÞ Ctrl+C", IDM_COPY + MENUITEM "&Åðéêüëëçóç Ctrl+V", IDM_PASTE + } + POPUP "&¸íäåéîç" { + MENUITEM "Êáíïíéêü", IDM_MODE_STANDARD + MENUITEM "Åðéóôçìïíéêü", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "ÏñãÜíùóç øçößùí", IDM_DIGIT_GROUPING + } + POPUP "&ÂïÞèåéá" { + MENUITEM "ÈÝìáôá âïÞèåéáò", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Ðåñß ôïõ ÕðïëïãéóôÞ", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Åðåîåñãáóßá" { + MENUITEM "&ÁíôéãñáöÞ Ctrl+C", IDM_COPY + MENUITEM "&Åðéêüëëçóç Ctrl+V", IDM_PASTE + } + POPUP "&¸íäåéîç" { + MENUITEM "Êáíïíéêü", IDM_MODE_STANDARD + MENUITEM "Åðéóôçìïíéêü", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Äåêáåîáäéêü\tF5", ID_CALC_NS_HEX + MENUITEM "Äåêáäéêü\tF6", ID_CALC_NS_DEC + MENUITEM "Ïêôáäéêü\tF7", ID_CALC_NS_OCT + MENUITEM "Äõáäéêü\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Âáèìïß\tF2", ID_CALC_MS_DEGREES + MENUITEM "Ìïßñåò\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grads\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "ÏñãÜíùóç øçößùí", IDM_DIGIT_GROUPING + } + POPUP "&ÂïÞèåéá" { + MENUITEM "ÈÝìáôá âïÞèåéáò", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Ðåñß ôïõ ÕðïëïãéóôÞ", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Åðåîåñãáóßá" { + MENUITEM "&ÁíôéãñáöÞ Ctrl+C", IDM_COPY + MENUITEM "&Åðéêüëëçóç Ctrl+V", IDM_PASTE + } + POPUP "&¸íäåéîç" { + MENUITEM "Êáíïíéêü", IDM_MODE_STANDARD + MENUITEM "Åðéóôçìïíéêü", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Äåêáåîáäéêü\tF5", ID_CALC_NS_HEX + MENUITEM "Äåêáäéêü\tF6", ID_CALC_NS_DEC + MENUITEM "Ïêôáäéêü\tF7", ID_CALC_NS_OCT + MENUITEM "Äõáäéêü\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Âáèìïß\tF2", ID_CALC_MS_DEGREES + MENUITEM "Ìïßñåò\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grads\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "ÏñãÜíùóç øçößùí", IDM_DIGIT_GROUPING + } + POPUP "&ÂïÞèåéá" { + MENUITEM "ÈÝìáôá âïÞèåéáò", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Ðåñß ôïõ ÕðïëïãéóôÞ", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Ðåñß ôïõ GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Ôé åßíáé áõôü;", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/Gr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Mon Jul 17 11:35:06 2006 @@ -36,5 +36,6 @@ #include "Sv.rc" #include "Hu.rc" #include "Uk.rc" +#include "Gr.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL

18 years, 5 months

[greatlrd] 23116: patch from LMH1 : Bug#: 1643 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 11:23:27 2006 New Revision: 23116 URL: http://svn.reactos.org/svn/reactos?rev=23116&view=rev Log: patch from LMH1 : Bug#: 1643 : Norwegian translation Added: trunk/reactos/base/applications/getfirefox/No.rc (with props) Modified: trunk/reactos/base/applications/getfirefox/getfirefox.rc Added: trunk/reactos/base/applications/getfirefox/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… ============================================================================== --- trunk/reactos/base/applications/getfirefox/No.rc (added) +++ trunk/reactos/base/applications/getfirefox/No.rc Mon Jul 17 11:23:27 2006 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: apps/utils/getfirefox/En.rc + * PURPOSE: Norwegian resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + */ +/* + * 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_NORWEGIAN, 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 "laster ned 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 "Fjern 'Last Ned Firefox' fra startmenyen", 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 "Få Firefox" +END Propchange: trunk/reactos/base/applications/getfirefox/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/getfirefox/getfirefox.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… ============================================================================== --- trunk/reactos/base/applications/getfirefox/getfirefox.rc (original) +++ trunk/reactos/base/applications/getfirefox/getfirefox.rc Mon Jul 17 11:23:27 2006 @@ -27,6 +27,7 @@ #include "Fr.rc" #include "Hu.rc" #include "Nl.rc" +#include "No.rc" #include "Ru.rc" #include "Sv.rc" #include "Uk.rc"

18 years, 5 months

[greatlrd] 23115: patch from LMH1 : Bug#: 1642 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 11:18:36 2006 New Revision: 23115 URL: http://svn.reactos.org/svn/reactos?rev=23115&view=rev Log: patch from LMH1 : Bug#: 1642 : Norwegian translation Added: trunk/reactos/subsystems/ntvdm/No.rc (with props) Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc Added: trunk/reactos/subsystems/ntvdm/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/No.rc?rev… ============================================================================== --- trunk/reactos/subsystems/ntvdm/No.rc (added) +++ trunk/reactos/subsystems/ntvdm/No.rc Mon Jul 17 11:18:36 2006 @@ -1,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "ReactOS Vituell DOS Maskin støtte.\n" +STRING_PromptMsg, "Skriv r<cr> for å kjøre, s<cr> å avslutte eller q<cr> for å slutte nå." +} Propchange: trunk/reactos/subsystems/ntvdm/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Mon Jul 17 11:18:36 2006 @@ -11,3 +11,5 @@ #include "Ja.rc" #include "Hu.rc" #include "Es.rc" +#include "No.rc" +

18 years, 5 months

[ion] 23114: - Fix two small bugs in NtQueryDirectoryObject. - RDISK Count, Windowstation list enumeration now work on startup. - Explorer's object viewer now works again.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 17 07:49:40 2006 New Revision: 23114 URL: http://svn.reactos.org/svn/reactos?rev=23114&view=rev Log: - Fix two small bugs in NtQueryDirectoryObject. - RDISK Count, Windowstation list enumeration now work on startup. - Explorer's object viewer now works again. Modified: trunk/reactos/ntoskrnl/ob/obdir.c Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jul 17 07:49:40 2006 @@ -551,6 +551,9 @@ DirectoryInfo->TypeName.Buffer = ObjectHeader-> Type->Name.Buffer; + /* Set success */ + Status = STATUS_SUCCESS; + /* Increase statistics */ TotalLength += Length; DirectoryInfo++; @@ -562,10 +565,10 @@ /* Increase the key by one */ SkipEntries++; } - } - - /* Move to the next directory */ - Entry = Entry->ChainLink; + + /* Move to the next directory */ + Entry = Entry->ChainLink; + } } Quickie:

18 years, 5 months

[ion] 23113: - Finish up implementation of NtQueryDirectoryObject by doing the final conversion.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 17 07:24:41 2006 New Revision: 23113 URL: http://svn.reactos.org/svn/reactos?rev=23113&view=rev Log: - Finish up implementation of NtQueryDirectoryObject by doing the final conversion. Modified: trunk/reactos/ntoskrnl/ob/obdir.c Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jul 17 07:24:41 2006 @@ -411,8 +411,6 @@ POBJECT_DIRECTORY Directory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG SkipEntries = 0; - ULONG NextEntry = 0; - ULONG CopyBytes = 0; NTSTATUS Status = STATUS_SUCCESS; PVOID LocalBuffer; POBJECT_DIRECTORY_INFORMATION DirectoryInfo; @@ -423,6 +421,7 @@ POBJECT_HEADER ObjectHeader; POBJECT_HEADER_NAME_INFO ObjectNameInfo; UNICODE_STRING Name; + PWSTR p; PAGED_CODE(); /* Check if we need to do any probing */ @@ -573,19 +572,59 @@ /* Make sure we got success */ if (NT_SUCCESS(Status)) { - /* We need to parse all the entries and convert absolute to relative */ - DPRINT1("NOT FULLY IMPLEMENTED\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - - /* Copy the buffer */ - RtlMoveMemory(Buffer, - LocalBuffer, - (TotalLength <= BufferLength) ? - TotalLength : BufferLength); - - /* Check if the caller requested the return length and return it*/ - if (ReturnLength) *ReturnLength = TotalLength; - } + /* Clear the current pointer and set it */ + RtlZeroMemory(DirectoryInfo, sizeof(OBJECT_DIRECTORY_INFORMATION)); + DirectoryInfo++; + + /* Set the buffer here now and loop entries */ + p = (PWSTR)DirectoryInfo; + DirectoryInfo = LocalBuffer; + while (Count--) + { + /* Copy the name buffer */ + RtlMoveMemory(p, + DirectoryInfo->Name.Buffer, + DirectoryInfo->Name.Length); + + /* Now fixup the pointers */ + DirectoryInfo->Name.Buffer = (PVOID)((ULONG_PTR)Buffer + + ((ULONG_PTR)p - + (ULONG_PTR)LocalBuffer)); + + /* Advance in buffer and NULL-terminate */ + p = (PVOID)((ULONG_PTR)p + DirectoryInfo->Name.Length); + *p++ = UNICODE_NULL; + + /* Now copy the type name buffer */ + RtlMoveMemory(p, + DirectoryInfo->TypeName.Buffer, + DirectoryInfo->TypeName.Length); + + /* Now fixup the pointers */ + DirectoryInfo->TypeName.Buffer = (PVOID)((ULONG_PTR)Buffer + + ((ULONG_PTR)p - + (ULONG_PTR)LocalBuffer)); + + /* Advance in buffer and NULL-terminate */ + p = (PVOID)((ULONG_PTR)p + DirectoryInfo->TypeName.Length); + *p++ = UNICODE_NULL; + + /* Move to the next entry */ + DirectoryInfo++; + } + + /* Set the key */ + *Context = CurrentEntry; + } + + /* Copy the buffer */ + RtlMoveMemory(Buffer, + LocalBuffer, + (TotalLength <= BufferLength) ? + TotalLength : BufferLength); + + /* Check if the caller requested the return length and return it*/ + if (ReturnLength) *ReturnLength = TotalLength; /* Dereference the directory and free our buffer */ ObDereferenceObject(Directory);

18 years, 5 months

[ion] 23112: - Fix definition of OBJECT_DIRECTORY_INFORMATION - Implement most of NtQueryDirectoryObject. It lacks the last step of converting the absolute buffer to a relative one. I have no idea why the old code was re-implemented in a recent commit when I clearly said I would fix this tonight.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 17 07:16:15 2006 New Revision: 23112 URL: http://svn.reactos.org/svn/reactos?rev=23112&view=rev Log: - Fix definition of OBJECT_DIRECTORY_INFORMATION - Implement most of NtQueryDirectoryObject. It lacks the last step of converting the absolute buffer to a relative one. I have no idea why the old code was re-implemented in a recent commit when I clearly said I would fix this tonight. Modified: trunk/reactos/base/applications/utils/objdir/objdir.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/driver.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/io/iomgr/disk.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/subsystems/csr/csrsrv/init.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/base/applications/utils/objdir/objdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ob… ============================================================================== --- trunk/reactos/base/applications/utils/objdir/objdir.c (original) +++ trunk/reactos/base/applications/utils/objdir/objdir.c Mon Jul 17 07:16:15 2006 @@ -257,11 +257,11 @@ CHAR TypeNameA [MAX_PATH]; CHAR TargetNameA [MAX_PATH]; - if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->ObjectTypeName.Buffer)) + if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->TypeName.Buffer)) { if (TRUE == ExpandSymbolicLink ( DirectoryNameW, - & pDirectoryEntry->ObjectName, + & pDirectoryEntry->Name, & TargetObjectName ) ) @@ -269,8 +269,8 @@ printf ( "%-16s %s -> %s\n", - RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), - RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA), + RawUszAsz (pDirectoryEntry->TypeName.Buffer, TypeNameA), + RawUszAsz (pDirectoryEntry->Name.Buffer, ObjectNameA), RawUszAsz (TargetObjectName.Buffer, TargetNameA) ); } @@ -278,8 +278,8 @@ { printf ( "%-16s %s -> (error!)\n", - RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), - RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA) + RawUszAsz (pDirectoryEntry->TypeName.Buffer, TypeNameA), + RawUszAsz (pDirectoryEntry->Name.Buffer, ObjectNameA) ); } } @@ -287,8 +287,8 @@ { printf ( "%-16s %s\n", - RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), - RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA) + RawUszAsz (pDirectoryEntry->TypeName.Buffer, TypeNameA), + RawUszAsz (pDirectoryEntry->Name.Buffer, ObjectNameA) ); } ++ pDirectoryEntry; @@ -306,9 +306,9 @@ if (FALSE != Recurse) { pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; - while (0 != pDirectoryEntry->ObjectTypeName.Length) + while (0 != pDirectoryEntry->TypeName.Length) { - if (0 == wcscmp (L"Directory", pDirectoryEntry->ObjectTypeName.Buffer)) + if (0 == wcscmp (L"Directory", pDirectoryEntry->TypeName.Buffer)) { WCHAR CurrentName [MAX_PATH]; UNICODE_STRING CurrentDirectory; @@ -319,7 +319,7 @@ { wcscat (CurrentName, L"\\"); } - wcscat (CurrentName, pDirectoryEntry->ObjectName.Buffer); + wcscat (CurrentName, pDirectoryEntry->Name.Buffer); RtlInitUnicodeString (& CurrentDirectory, CurrentName); ListDirectory (& CurrentDirectory, Recurse); } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Mon Jul 17 07:16:15 2006 @@ -470,12 +470,12 @@ if (!NT_SUCCESS(Status)) break; - DPRINT("Comparing: '%S' '%wZ'\n", Service->lpServiceName, &DirInfo->ObjectName); - - if (_wcsicmp(Service->lpServiceName, DirInfo->ObjectName.Buffer) == 0) + DPRINT("Comparing: '%S' '%wZ'\n", Service->lpServiceName, &DirInfo->Name); + + if (_wcsicmp(Service->lpServiceName, DirInfo->Name.Buffer) == 0) { DPRINT("Found: '%S' '%wZ'\n", - Service->lpServiceName, &DirInfo->ObjectName); + Service->lpServiceName, &DirInfo->Name); /* Mark service as 'running' */ Service->Status.dwCurrentState = SERVICE_RUNNING; Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c (original) +++ trunk/reactos/base/system/services/driver.c Mon Jul 17 07:16:15 2006 @@ -140,12 +140,12 @@ if (!NT_SUCCESS(Status)) break; - DPRINT("Comparing: '%S' '%wZ'\n", lpService->lpServiceName, &DirInfo->ObjectName); - - if (_wcsicmp(lpService->lpServiceName, DirInfo->ObjectName.Buffer) == 0) + DPRINT("Comparing: '%S' '%wZ'\n", lpService->lpServiceName, &DirInfo->Name); + + if (_wcsicmp(lpService->lpServiceName, DirInfo->Name.Buffer) == 0) { DPRINT1("Found: '%S' '%wZ'\n", - lpService->lpServiceName, &DirInfo->ObjectName); + lpService->lpServiceName, &DirInfo->Name); bFound = TRUE; break; Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dosdev.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dosdev.c Mon Jul 17 07:16:15 2006 @@ -298,11 +298,11 @@ break; } - if (!wcscmp (DirInfo->ObjectTypeName.Buffer, L"SymbolicLink")) + if (!wcscmp (DirInfo->TypeName.Buffer, L"SymbolicLink")) { - DPRINT ("Name: '%wZ'\n", &DirInfo->ObjectName); - - NameLength = DirInfo->ObjectName.Length / sizeof(WCHAR); + DPRINT ("Name: '%wZ'\n", &DirInfo->Name); + + NameLength = DirInfo->Name.Length / sizeof(WCHAR); if (Length + NameLength + 1 >= ucchMax) { Length = 0; @@ -311,8 +311,8 @@ } memcpy (Ptr, - DirInfo->ObjectName.Buffer, - DirInfo->ObjectName.Length); + DirInfo->Name.Buffer, + DirInfo->Name.Length); Ptr += NameLength; Length += NameLength; *Ptr = UNICODE_NULL; Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Mon Jul 17 07:16:15 2006 @@ -261,8 +261,8 @@ typedef struct _OBJECT_DIRECTORY_INFORMATION { - UNICODE_STRING ObjectName; - UNICODE_STRING ObjectTypeName; + UNICODE_STRING Name; + UNICODE_STRING TypeName; } OBJECT_DIRECTORY_INFORMATION, *POBJECT_DIRECTORY_INFORMATION; #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/io/iomgr/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/disk.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/disk.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/disk.c Mon Jul 17 07:16:15 2006 @@ -513,12 +513,12 @@ if (NT_SUCCESS(Status)) { Count = 0; - while (DirectoryInfo[Count].ObjectName.Buffer) + while (DirectoryInfo[Count].Name.Buffer) { DPRINT("Count %x\n", Count); - DirectoryInfo[Count].ObjectName.Buffer[DirectoryInfo[Count].ObjectName.Length / sizeof(WCHAR)] = 0; - ArcNameBuffer = DirectoryInfo[Count].ObjectName.Buffer; - if (DirectoryInfo[Count].ObjectName.Length >= sizeof(L"multi(0)disk(0)rdisk(0)") - sizeof(WCHAR) && + DirectoryInfo[Count].Name.Buffer[DirectoryInfo[Count].Name.Length / sizeof(WCHAR)] = 0; + ArcNameBuffer = DirectoryInfo[Count].Name.Buffer; + if (DirectoryInfo[Count].Name.Length >= sizeof(L"multi(0)disk(0)rdisk(0)") - sizeof(WCHAR) && !_wcsnicmp(ArcNameBuffer, L"multi(0)disk(0)rdisk(", (sizeof(L"multi(0)disk(0)rdisk(") - sizeof(WCHAR)) / sizeof(WCHAR))) { DPRINT("%S\n", ArcNameBuffer); Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jul 17 07:16:15 2006 @@ -414,6 +414,15 @@ ULONG NextEntry = 0; ULONG CopyBytes = 0; NTSTATUS Status = STATUS_SUCCESS; + PVOID LocalBuffer; + POBJECT_DIRECTORY_INFORMATION DirectoryInfo; + ULONG Length, TotalLength; + ULONG Count, CurrentEntry; + ULONG Hash; + POBJECT_DIRECTORY_ENTRY Entry; + POBJECT_HEADER ObjectHeader; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + UNICODE_STRING Name; PAGED_CODE(); /* Check if we need to do any probing */ @@ -446,6 +455,14 @@ /* This is kernel mode, save the context without probing, if needed */ SkipEntries = *Context; } + + /* Allocate a buffer */ + LocalBuffer = ExAllocatePoolWithTag(PagedPool, + sizeof(OBJECT_DIRECTORY_INFORMATION) + + BufferLength, + OB_NAME_TAG); + if (!LocalBuffer) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(LocalBuffer, BufferLength); /* Get a reference to directory */ Status = ObReferenceObjectByHandle(DirectoryHandle, @@ -454,199 +471,125 @@ PreviousMode, (PVOID*)&Directory, NULL); - if (NT_SUCCESS(Status)) - { - PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool, - BufferLength); - if(TemporaryBuffer != NULL) - { - POBJECT_HEADER EntryHeader; - ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); - ULONG nDirectories = 0; - POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - POBJECT_DIRECTORY_ENTRY DirectoryEntry; - ULONG i; - BOOLEAN StopIt = FALSE; - - Status = STATUS_NO_MORE_ENTRIES; - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&Directory->Lock, TRUE); - - for (i = 0; i < NUMBER_HASH_BUCKETS && !StopIt; i++) + if (!NT_SUCCESS(Status)) + { + /* Free the buffer and fail */ + ExFreePool(LocalBuffer); + return Status; + } + + /* Start at position 0 */ + DirectoryInfo = (POBJECT_DIRECTORY_INFORMATION)LocalBuffer; + TotalLength = sizeof(OBJECT_DIRECTORY_INFORMATION); + + /* Start with 0 entries */ + Count = 0; + CurrentEntry = 0; + + /* Set default status and start looping */ + Status = STATUS_NO_MORE_ENTRIES; + for (Hash = 0; Hash < 37; Hash++) + { + /* Get this entry and loop all of them */ + Entry = Directory->HashBuckets[Hash]; + while (Entry) + { + /* Check if we should process this entry */ + if (SkipEntries == CurrentEntry++) { - DirectoryEntry = Directory->HashBuckets[i]; - while (DirectoryEntry) + /* Get the header data */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Entry->Object); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + /* Get the object name */ + if (ObjectNameInfo) { - NextEntry++; - if (SkipEntries == 0) + /* Use the one we have */ + Name = ObjectNameInfo->Name; + } + else + { + /* Otherwise, use an empty one */ + RtlInitEmptyUnicodeString(&Name, NULL, 0); + } + + /* Calculate the length for this entry */ + Length = sizeof(OBJECT_DIRECTORY_INFORMATION) + + Name.Length + sizeof(UNICODE_NULL) + + ObjectHeader->Type->Name.Length + sizeof(UNICODE_NULL); + + /* Make sure this entry won't overflow */ + if ((TotalLength + Length) > BufferLength) + { + /* Check if the caller wanted only an entry */ + if (ReturnSingleEntry) { - PUNICODE_STRING Name, Type; - ULONG EntrySize; - - EntryHeader = OBJECT_TO_OBJECT_HEADER(DirectoryEntry->Object); - - /* Calculate the size of the required buffer space for this entry */ - Name = (OBJECT_HEADER_TO_NAME_INFO(EntryHeader)->Name.Length != 0 ? &OBJECT_HEADER_TO_NAME_INFO(EntryHeader)->Name : NULL); - Type = &EntryHeader->Type->Name; - EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + - ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + - (ULONG)EntryHeader->Type->Name.Length + sizeof(WCHAR); - - if (RequiredSize + EntrySize <= BufferLength) - { - /* The buffer is large enough to receive this entry. It would've - been much easier if the strings were directly appended to the - OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ - if (Name != NULL && Name->Length > 0) - DirInfo->ObjectName = *Name; - else - { - DirInfo->ObjectName.Length = DirInfo->ObjectName.MaximumLength = 0; - DirInfo->ObjectName.Buffer = NULL; - } - DirInfo->ObjectTypeName = *Type; - - nDirectories++; - RequiredSize += EntrySize; - - Status = STATUS_SUCCESS; - - if (ReturnSingleEntry) - { - /* We're only supposed to query one entry, so bail and copy the - strings to the buffer */ - StopIt = TRUE; - break; - } - DirInfo++; - } - else - { - if (ReturnSingleEntry) - { - /* The buffer is too small, so return the number of bytes that - would've been required for this query */ - RequiredSize += EntrySize; - Status = STATUS_BUFFER_TOO_SMALL; - } - - /* We couldn't query this entry, so leave the index that will be stored - in Context to this entry so the caller can query it the next time - he queries (hopefully with a buffer that is large enough then...) */ - NextEntry--; - - /* Just copy the entries that fit into the buffer */ - StopIt = TRUE; - break; - } + /* Then we'll fail and ask for more buffer */ + TotalLength += Length; + Status = STATUS_BUFFER_TOO_SMALL; } else { - /* Skip the entry */ - SkipEntries--; + /* Otherwise, we'll say we're done for now */ + Status = STATUS_MORE_ENTRIES; } - DirectoryEntry = DirectoryEntry->ChainLink; + + /* Decrease the entry since we didn't process */ + CurrentEntry--; + goto Quickie; } + + /* Now fill in the buffer */ + DirectoryInfo->Name.Length = Name.Length; + DirectoryInfo->Name.MaximumLength = Name.Length + + sizeof(UNICODE_NULL); + DirectoryInfo->Name.Buffer = Name.Buffer; + DirectoryInfo->TypeName.Length = ObjectHeader-> + Type->Name.Length; + DirectoryInfo->TypeName.MaximumLength = ObjectHeader-> + Type->Name.Length + + sizeof(UNICODE_NULL); + DirectoryInfo->TypeName.Buffer = ObjectHeader-> + Type->Name.Buffer; + + /* Increase statistics */ + TotalLength += Length; + DirectoryInfo++; + Count++; + + /* If the caller only wanted an entry, bail out */ + if (ReturnSingleEntry) goto Quickie; + + /* Increase the key by one */ + SkipEntries++; } - - if (!ReturnSingleEntry) - { - /* Check if there are more entries to enumerate but the buffer is already - full. Only tell this to the user if he queries multiple entries */ - if (DirectoryEntry) - Status = STATUS_MORE_ENTRIES; - else - for (; i < NUMBER_HASH_BUCKETS; i++) - if (Directory->HashBuckets[i]) - { - Status = STATUS_MORE_ENTRIES; - break; - } - } - - if (NT_SUCCESS(Status) && nDirectories > 0) - { - PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories + 1); - PWSTR deststrbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories + 1); - memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories, 0, sizeof(OBJECT_DIRECTORY_INFORMATION)); - - CopyBytes = (nDirectories + 1) * sizeof(OBJECT_DIRECTORY_INFORMATION); - - /* Copy the names from the objects and append them to the list of the - objects. copy to the temporary buffer only because the directory - lock can't be released and the buffer might be pagable memory! */ - for (DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - nDirectories > 0; - nDirectories--, DirInfo++) - { - ULONG NameLength; - - if (DirInfo->ObjectName.Length > 0) - { - RtlCopyMemory(strbuf, - DirInfo->ObjectName.Buffer, - DirInfo->ObjectName.Length); - /* Change the buffer pointer to the buffer */ - DirInfo->ObjectName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectName.Length / sizeof(WCHAR); - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - - RtlCopyMemory(strbuf, - DirInfo->ObjectTypeName.Buffer, - DirInfo->ObjectTypeName.Length); - /* Change the buffer pointer to the buffer */ - DirInfo->ObjectTypeName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectTypeName.Length / sizeof(WCHAR); - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - } - - ExReleaseResourceLite(&Directory->Lock); - KeLeaveCriticalRegion(); - ObDereferenceObject(Directory); - - if (NT_SUCCESS(Status) || ReturnSingleEntry) - { - _SEH_TRY - { - if (CopyBytes != 0) - { - RtlCopyMemory(Buffer, - TemporaryBuffer, - CopyBytes); - } - *Context = NextEntry; - if(ReturnLength != NULL) - { - *ReturnLength = RequiredSize; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(TemporaryBuffer); - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } + } + + /* Move to the next directory */ + Entry = Entry->ChainLink; + } + +Quickie: + /* Make sure we got success */ + if (NT_SUCCESS(Status)) + { + /* We need to parse all the entries and convert absolute to relative */ + DPRINT1("NOT FULLY IMPLEMENTED\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + + /* Copy the buffer */ + RtlMoveMemory(Buffer, + LocalBuffer, + (TotalLength <= BufferLength) ? + TotalLength : BufferLength); + + /* Check if the caller requested the return length and return it*/ + if (ReturnLength) *ReturnLength = TotalLength; + } + + /* Dereference the directory and free our buffer */ + ObDereferenceObject(Directory); + ExFreePool(LocalBuffer); /* Return status to caller */ return Status; Modified: trunk/reactos/subsystems/csr/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/init… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/init.c (original) +++ trunk/reactos/subsystems/csr/csrsrv/init.c Mon Jul 17 07:16:15 2006 @@ -94,14 +94,14 @@ if (NT_SUCCESS(Status)) { /* Make sure it has a name */ - if (!QueryBuffer->ObjectName.Buffer[0]) continue; + if (!QueryBuffer->Name.Buffer[0]) continue; /* Check if it's actually a symbolic link */ - if (wcscmp(QueryBuffer->ObjectTypeName.Buffer, SYMLINK_NAME)) + if (wcscmp(QueryBuffer->TypeName.Buffer, SYMLINK_NAME)) { /* It is, open it */ InitializeObjectAttributes(&ObjectAttributes, - &QueryBuffer->ObjectName, + &QueryBuffer->Name, OBJ_CASE_INSENSITIVE, NULL, hDirectory); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Jul 17 07:16:15 2006 @@ -1235,10 +1235,10 @@ */ ReturnLength = sizeof(DWORD); EntryCount = 0; - for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->ObjectName.Length; + for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->Name.Length; DirEntry++) { - ReturnLength += DirEntry->ObjectName.Length + sizeof(WCHAR); + ReturnLength += DirEntry->Name.Length + sizeof(WCHAR); EntryCount++; } DPRINT("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); @@ -1282,10 +1282,10 @@ lpBuffer = (PVOID) ((PCHAR) lpBuffer + sizeof(DWORD)); NullWchar = L'\0'; - for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->ObjectName.Length; + for (DirEntry = (POBJECT_DIRECTORY_INFORMATION) Buffer; 0 != DirEntry->Name.Length; DirEntry++) { - Status = MmCopyToCaller(lpBuffer, DirEntry->ObjectName.Buffer, DirEntry->ObjectName.Length); + Status = MmCopyToCaller(lpBuffer, DirEntry->Name.Buffer, DirEntry->Name.Length); if (! NT_SUCCESS(Status)) { if (Buffer != InitialBuffer) @@ -1294,7 +1294,7 @@ } return Status; } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + DirEntry->ObjectName.Length); + lpBuffer = (PVOID) ((PCHAR) lpBuffer + DirEntry->Name.Length); Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); if (! NT_SUCCESS(Status)) {

18 years, 5 months

[ion] 23111: - Added another MSVC intrinsic to gcc (BitScanReverse). Thanks to Vampyre. - Added very basic and skeletal NUMA code when creating a thread and process, currently only does some basic affinity checks and settings. - Added a table and helper function (KeFindNextRightSetAffinity) for calculating affinity masks and sets. - Split KeInitailizeThread into KeStartThread and KeInitThread, and modified Ps code to use the calls. Now added a failure case where Init fails, but we don't have to

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 17 05:40:10 2006 New Revision: 23111 URL: http://svn.reactos.org/svn/reactos?rev=23111&view=rev Log: - Added another MSVC intrinsic to gcc (BitScanReverse). Thanks to Vampyre. - Added very basic and skeletal NUMA code when creating a thread and process, currently only does some basic affinity checks and settings. - Added a table and helper function (KeFindNextRightSetAffinity) for calculating affinity masks and sets. - Split KeInitailizeThread into KeStartThread and KeInitThread, and modified Ps code to use the calls. Now added a failure case where Init fails, but we don't have to backout the entire effects of a "Start". - Changes based on WI4 and Windows Internals II. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Jul 17 05:40:10 2006 @@ -3814,6 +3814,19 @@ return OldBit; } +static __inline__ BOOLEAN +BitScanReverse(OUT ULONG *Index, + IN ULONG Mask) +{ + LONG OldBit; + __asm__ __volatile__("bsrl %1,%2\n\t" + "sbbl %0,%0\n\t" + :"=r" (OldBit),"=m" (*Index) + :"Ir" (Mask) + : "memory"); + return OldBit; +} + #endif #define YieldProcessor() __asm__ __volatile__("pause"); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Jul 17 05:40:10 2006 @@ -44,6 +44,9 @@ extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; extern ULONG KeI386FxsrPresent; +extern PKNODE KeNodeBlock[1]; +extern UCHAR KeNumberNodes; +extern UCHAR KeProcessNodeSeed; /* MACROS *************************************************************************/ @@ -68,6 +71,8 @@ #define KeReleaseDispatcherDatabaseLockFromDpcLevel() #endif +#define AFFINITY_MASK(Id) KiMask32Array[Id] + /* The following macro initializes a dispatcher object's header */ #define KeInitializeDispatcherHeader(Header, t, s, State) \ { \ @@ -188,6 +193,13 @@ /* next file ***************************************************************/ +UCHAR +NTAPI +KeFindNextRightSetAffinity( + IN UCHAR Number, + IN ULONG Set +); + VOID STDCALL DbgBreakPointNoBugCheck(VOID); @@ -267,16 +279,35 @@ ); VOID -STDCALL +NTAPI KeInitializeThread( - struct _KPROCESS* Process, - PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context, - PVOID Teb, - PVOID KernelStack + IN PKPROCESS Process, + IN OUT PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PVOID KernelStack +); + +NTSTATUS +NTAPI +KeInitThread( + IN OUT PKTHREAD Thread, + IN PVOID KernelStack, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PKPROCESS Process +); + +VOID +NTAPI +KeStartThread( + IN OUT PKTHREAD Thread ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Mon Jul 17 05:40:10 2006 @@ -16,6 +16,10 @@ /* GLOBALS *******************************************************************/ +KNODE KiNode0; +PKNODE KeNodeBlock[1]; +UCHAR KeNumberNodes = 1; +UCHAR KeProcessNodeSeed; ULONG KiPcrInitDone = 0; static ULONG PcrsAllocated = 0; static ULONG Ke386CpuidFlags2, Ke386CpuidExFlags, Ke386CpuidExMisc; @@ -340,6 +344,10 @@ KeActiveProcessors |= 1 << 0; + /* Set Node Data */ + KeNodeBlock[0] = &KiNode0; + KPCR->PrcbData.ParentNode = KeNodeBlock[0]; + KeNodeBlock[0]->ProcessorMask = KPCR->PrcbData.SetMember; if (KPCR->PrcbData.FeatureBits & X86_FEATURE_PGE) { Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Mon Jul 17 05:40:10 2006 @@ -24,7 +24,36 @@ ULONG IdleProcessorMask = 0; extern LIST_ENTRY PspReaperListHead; +ULONG KiMask32Array[MAXIMUM_PRIORITY] = +{ + 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, + 0x40, 0x80, 0x100, 0x200, 0x4000, 0x800, + 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, + 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, + 0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000, 0x20000000, + 0x40000000, 0x80000000 +}; + /* FUNCTIONS *****************************************************************/ + +UCHAR +NTAPI +KeFindNextRightSetAffinity(IN UCHAR Number, + IN ULONG Set) +{ + ULONG Bit, Result; + ASSERT(Set != 0); + + /* Calculate the mask */ + Bit = (AFFINITY_MASK(Number) - 1) & Set; + + /* If it's 0, use the one we got */ + if (!Bit) Bit = Set; + + /* Now find the right set and return it */ + BitScanReverse(&Result, Bit); + return (UCHAR)Result; +} STATIC VOID @@ -699,35 +728,29 @@ UNIMPLEMENTED; } -/* - * FUNCTION: Initialize the microkernel state of the thread - */ -VOID -STDCALL -KeInitializeThread(PKPROCESS Process, - PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context, - PVOID Teb, - PVOID KernelStack) -{ +NTSTATUS +NTAPI +KeInitThread(IN OUT PKTHREAD Thread, + IN PVOID KernelStack, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PKPROCESS Process) +{ + BOOLEAN AllocatedStack = FALSE; ULONG i; PKWAIT_BLOCK TimerWaitBlock; PKTIMER Timer; + NTSTATUS Status; /* Initalize the Dispatcher Header */ - DPRINT("Initializing Dispatcher Header for New Thread: %x in Process: %x\n", Thread, Process); KeInitializeDispatcherHeader(&Thread->DispatcherHeader, ThreadObject, sizeof(KTHREAD) / sizeof(LONG), FALSE); - DPRINT("Thread Header Created. SystemRoutine: %x, StartRoutine: %x with Context: %x\n", - SystemRoutine, StartRoutine, StartContext); - DPRINT("UserMode Information. Context: %x, Teb: %x\n", Context, Teb); - /* Initialize the Mutant List */ InitializeListHead(&Thread->MutantListHead); @@ -737,6 +760,15 @@ /* Put our pointer */ Thread->WaitBlock[i].Thread = Thread; } + + /* Set swap settings */ + Thread->EnableStackSwap = FALSE;//TRUE; + Thread->IdealProcessor = 1; + Thread->SwapBusy = FALSE; + Thread->AdjustReason = 0; + + /* Initialize the lock */ + KeInitializeSpinLock(&Thread->ThreadLock); /* Setup the Service Descriptor Table for Native Calls */ Thread->ServiceTable = KeServiceDescriptorTable; @@ -762,7 +794,7 @@ NULL); /* Initialize the Suspend Semaphore */ - KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); + KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 2); /* Setup the timer */ Timer = &Thread->Timer; @@ -780,53 +812,148 @@ /* Set the TEB */ Thread->Teb = Teb; + /* Check if we have a kernel stack */ + if (!KernelStack) + { + /* We don't, allocate one */ + KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE) + + KERNEL_STACK_SIZE); + if (!KernelStack) return STATUS_INSUFFICIENT_RESOURCES; + + /* Remember for later */ + AllocatedStack = TRUE; + } + /* Set the Thread Stacks */ Thread->InitialStack = (PCHAR)KernelStack; Thread->StackBase = (PCHAR)KernelStack; Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; - /* - * Establish the pde's for the new stack and the thread structure within the - * address space of the new process. They are accessed while taskswitching or - * while handling page faults. At this point it isn't possible to call the - * page fault handler for the missing pde's. - */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + /* ROS Mm HACK */ + MmUpdatePageDir((PEPROCESS)Process, + (PVOID)Thread->StackLimit, + KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); - /* Initalize the Thread Context */ - DPRINT("Initializing the Context for the thread: %x\n", Thread); - KiArchInitThreadWithContext(Thread, + /* Enter SEH to avoid crashes due to user mode */ + Status = STATUS_SUCCESS; + _SEH_TRY + { + /* Initalize the Thread Context */ + KiArchInitThreadWithContext(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); + } + _SEH_HANDLE + { + /* Set failure status */ + Status = STATUS_UNSUCCESSFUL; + + /* Check if a stack was allocated */ + if (AllocatedStack) + { + /* Delete the stack */ + MmDeleteKernelStack(Thread->StackBase, FALSE); + Thread->InitialStack = NULL; + } + } + _SEH_END; + + /* Set the Thread to initalized */ + Thread->State = Initialized; + return Status; +} + +VOID +NTAPI +KeStartThread(IN OUT PKTHREAD Thread) +{ + KIRQL OldIrql; + PKPROCESS Process = Thread->ApcState.Process; + PKNODE Node; + PKPRCB NodePrcb; + ULONG Set, Mask; + UCHAR IdealProcessor; + + /* Setup static fields from parent */ + Thread->Iopl = Process->Iopl; + Thread->Quantum = Process->QuantumReset; + Thread->QuantumReset = Process->QuantumReset; + Thread->SystemAffinityActive = FALSE; + + /* Lock the process */ + KeAcquireSpinLock(&Process->ProcessLock, &OldIrql); + + /* Setup volatile data */ + Thread->Priority = Process->BasePriority; + Thread->BasePriority = Process->BasePriority; + Thread->Affinity = Process->Affinity; + Thread->UserAffinity = Process->Affinity; + + /* Get the KNODE and its PRCB */ + Node = KeNodeBlock[Process->IdealNode]; + NodePrcb = (PKPRCB)(KPCR_BASE + (Process->ThreadSeed * PAGE_SIZE)); + + /* Calculate affinity mask */ + Set = ~NodePrcb->MultiThreadProcessorSet; + Mask = (ULONG)(Node->ProcessorMask & Process->Affinity); + Set &= Mask; + if (Set) Mask = Set; + + /* Get the new thread seed */ + IdealProcessor = KeFindNextRightSetAffinity(Process->ThreadSeed, Mask); + Process->ThreadSeed = IdealProcessor; + + /* Sanity check */ + ASSERT((Thread->UserAffinity & AFFINITY_MASK(IdealProcessor))); + + /* Set the Ideal Processor */ + Thread->IdealProcessor = IdealProcessor; + Thread->UserIdealProcessor = IdealProcessor; + + /* Lock the Dispatcher Database */ + KeAcquireDispatcherDatabaseLockAtDpcLevel(); + + /* Insert the thread into the process list */ + InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); + + /* Increase the stack count */ + ASSERT(Process->StackCount != MAXULONG_PTR); + Process->StackCount++; + + /* Release locks and return */ + KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KeReleaseSpinLock(&Process->ProcessLock, OldIrql); +} + +VOID +NTAPI +KeInitializeThread(IN PKPROCESS Process, + IN OUT PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PVOID KernelStack) +{ + /* Initailize and start the thread on success */ + if (NT_SUCCESS(KeInitThread(Thread, + KernelStack, SystemRoutine, StartRoutine, StartContext, - Context); - - /* Setup scheduler Fields based on Parent */ - DPRINT("Thread context created, setting Scheduler Data\n"); - Thread->BasePriority = Process->BasePriority; - Thread->Quantum = Process->QuantumReset; - Thread->QuantumReset = Process->QuantumReset; - Thread->Affinity = Process->Affinity; - Thread->Priority = Process->BasePriority; - Thread->UserAffinity = Process->Affinity; - Thread->DisableBoost = Process->DisableBoost; - Thread->AutoAlignment = Process->AutoAlignment; - Thread->Iopl = Process->Iopl; - - /* Set the Thread to initalized */ - Thread->State = Initialized; - - /* - * Insert the Thread into the Process's Thread List - * Note, this is the KTHREAD Thread List. It is removed in - * ke/kthread.c!KeTerminateThread. - */ - InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); - DPRINT("Thread initalized\n"); -} - + Context, + Teb, + Process))) + { + /* Start it */ + KeStartThread(Thread); + } +} /* * @implemented Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Mon Jul 17 05:40:10 2006 @@ -113,13 +113,14 @@ VOID NTAPI -KeInitializeProcess(PKPROCESS Process, - KPRIORITY Priority, - KAFFINITY Affinity, - LARGE_INTEGER DirectoryTableBase) -{ - DPRINT("KeInitializeProcess. Process: %x, DirectoryTableBase: %x\n", - Process, DirectoryTableBase); +KeInitializeProcess(IN OUT PKPROCESS Process, + IN KPRIORITY Priority, + IN KAFFINITY Affinity, + IN LARGE_INTEGER DirectoryTableBase) +{ + ULONG i = 0; + UCHAR IdealNode = 0; + PKNODE Node; /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Process->Header, @@ -127,19 +128,58 @@ sizeof(KPROCESS), FALSE); - /* Initialize Scheduler Data, Disable Alignment Faults and Set the PDE */ + /* Initialize Scheduler Data, Alignment Faults and Set the PDE */ Process->Affinity = Affinity; - Process->BasePriority = Priority; + Process->BasePriority = (CHAR)Priority; Process->QuantumReset = 6; Process->DirectoryTableBase = DirectoryTableBase; Process->AutoAlignment = TRUE; Process->IopmOffset = 0xFFFF; + + /* Initialize the lists */ + InitializeListHead(&Process->ThreadListHead); + InitializeListHead(&Process->ProfileListHead); + InitializeListHead(&Process->ReadyListHead); + + /* Initialize the current State */ Process->State = ProcessInMemory; - /* Initialize the Thread List */ - InitializeListHead(&Process->ThreadListHead); - KeInitializeSpinLock(&Process->ProcessLock); - DPRINT("The Process has now been initalized with the Kernel\n"); + /* Check how many Nodes there are on the system */ + if (KeNumberNodes > 1) + { + /* Set the new seed */ + KeProcessNodeSeed = (KeProcessNodeSeed + 1) / KeNumberNodes; + IdealNode = KeProcessNodeSeed; + + /* Loop every node */ + do + { + /* Check if the affinity matches */ + if (KeNodeBlock[IdealNode]->ProcessorMask != Affinity) break; + + /* No match, try next Ideal Node and increase node loop index */ + IdealNode++; + i++; + + /* Check if the Ideal Node is beyond the total number of nodes */ + if (IdealNode >= KeNumberNodes) + { + /* Normalize the Ideal Node */ + IdealNode -= KeNumberNodes; + } + } while (i < KeNumberNodes); + } + + /* Set the ideal node and get the ideal node block */ + Process->IdealNode = IdealNode; + Node = KeNodeBlock[IdealNode]; + ASSERT(Node->ProcessorMask & Affinity); + + /* Find the matching affinity set to calculate the thread seed */ + Affinity &= Node->ProcessorMask; + Process->ThreadSeed = KeFindNextRightSetAffinity(Node->Seed, + (ULONG)Affinity); + Node->Seed = Process->ThreadSeed; } ULONG Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Mon Jul 17 05:40:10 2006 @@ -15,7 +15,6 @@ * - MAJOR: Use Guarded Mutex instead of Fast Mutex for Active Process Locks. * - Generate process cookie for user-more thread. * - Add security calls where necessary. - * - KeInit/StartThread for better isolation of code */ /* INCLUDES ****************************************************************/ @@ -56,7 +55,7 @@ { /* Remember that we're dead */ DeadThread = TRUE; -} + } else { /* Get the Locale ID and save Preferred Proc */ @@ -157,12 +156,11 @@ HANDLE hThread; PEPROCESS Process; PETHREAD Thread; - PTEB TebBase; + PTEB TebBase = NULL; KIRQL OldIrql; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; HANDLE_TABLE_ENTRY CidEntry; - ULONG_PTR KernelStack; PAGED_CODE(); /* If we were called from PsCreateSystemThread, then we're kernel mode */ @@ -260,9 +258,6 @@ /* Acquire rundown protection */ ExAcquireRundownProtection(&Process->RundownProtect); - /* Allocate Stack for non-GUI Thread */ - KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; - /* Now let the kernel initialize the context */ if (ThreadContext) { @@ -281,14 +276,14 @@ Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; /* Let the kernel intialize the Thread */ - KeInitializeThread(&Process->Pcb, - &Thread->Tcb, - PspUserThreadStartup, - NULL, - NULL, - ThreadContext, - TebBase, - (PVOID)KernelStack); + Status = KeInitThread(&Thread->Tcb, + NULL, + PspUserThreadStartup, + NULL, + Thread->StartAddress, + ThreadContext, + TebBase, + &Process->Pcb); } else { @@ -297,15 +292,29 @@ InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_SYSTEM_THREAD_BIT); /* Let the kernel intialize the Thread */ - KeInitializeThread(&Process->Pcb, - &Thread->Tcb, - PspSystemThreadStartup, - StartRoutine, - StartContext, - NULL, - NULL, - (PVOID)KernelStack); - } + Status = KeInitThread(&Thread->Tcb, + NULL, + PspSystemThreadStartup, + StartRoutine, + StartContext, + NULL, + NULL, + &Process->Pcb); + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Delete the TEB if we had done */ + if (TebBase) MmDeleteTeb(Process, TebBase); + + /* Release rundown and dereference */ + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Thread); + return Status; + } + + /* FIXME: Acquire exclusive pushlock */ /* * Insert the Thread into the Process's Thread List @@ -315,6 +324,11 @@ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); Process->ActiveThreads++; + /* Start the thread */ + KeStartThread(&Thread->Tcb); + + /* FIXME: Wake pushlock */ + /* Release rundown */ ExReleaseRundownProtection(&Process->RundownProtect); @@ -326,10 +340,7 @@ PspRunCreateThreadNotifyRoutines(Thread, TRUE); /* Suspend the Thread if we have to */ - if (CreateSuspended) - { - KeSuspendThread(&Thread->Tcb); - } + if (CreateSuspended) KeSuspendThread(&Thread->Tcb); /* Check if we were already terminated */ if (Thread->Terminated)

18 years, 5 months

[greatlrd] 23110: patch from LMH1 : Bug#: 1641 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 05:15:56 2006 New Revision: 23110 URL: http://svn.reactos.org/svn/reactos?rev=23110&view=rev Log: patch from LMH1 : Bug#: 1641 : Norwegian translation Added: trunk/reactos/base/system/rundll32/No.rc (with props) Modified: trunk/reactos/base/system/rundll32/rundll32.rc Added: trunk/reactos/base/system/rundll32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/No.rc… ============================================================================== --- trunk/reactos/base/system/rundll32/No.rc (added) +++ trunk/reactos/base/system/rundll32/No.rc Mon Jul 17 05:15:56 2006 @@ -1,0 +1,12 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" +IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" +} Propchange: trunk/reactos/base/system/rundll32/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc Mon Jul 17 05:15:56 2006 @@ -11,4 +11,5 @@ #include "Hu.rc" #include "Ru.rc" #include "Gr.rc" +#include "No.rc"

18 years, 5 months

[greatlrd] 23109: patch from LMH1 : Bug#: 1637 : Norwegian translation

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 17 05:10:56 2006 New Revision: 23109 URL: http://svn.reactos.org/svn/reactos?rev=23109&view=rev Log: patch from LMH1 : Bug#: 1637 : Norwegian translation Added: trunk/reactos/base/shell/explorer/explorer-no.rc (with props) Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Mon Jul 17 05:10:56 2006 @@ -1,0 +1,399 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "A&vslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "&Ekstra verktøylinje", ID_VIEW_EXTRA_BAR + MENUITEM "&Stasjonlinje", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&idelinje", ID_VIEW_SIDE_BAR + MENUITEM "Status&linje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Vindu" + BEGIN + MENUITEM "Nytt &vindu", ID_WINDOW_NEW + MENUITEM "Som liste\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Sorter &horisontalt", ID_WINDOW_TILE_HORZ + MENUITEM "Sorter &vertikalt \tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordne Automatisk", ID_WINDOW_AUTOSORT + MENUITEM "Ordne &Symboler", ID_WINDOW_ARRANGE + END + POPUP "&Verktøy" + BEGIN + MENUITEM "&Innstillinger", ID_TOOLS_OPTIONS + END + POPUP "&Hjelp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Innstillinger...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Oppgavebehandling...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Åpne volum kontroll", ID_TRAY_VOLUME + MENUITEM "Still lyd innstillinger", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Vis skjulte ikoner", ID_SHOW_HIDDEN_ICONS + MENUITEM "Vis Ikon &knapp", ID_SHOW_ICON_BUTTON + MENUITEM "&konfigurere Notifikasjoner...", ID_CONFIG_NOTIFYAREA + MENUITEM "Still Dato/&Tid...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Avslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "&Sidelinje", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "S&tatuslinje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Verktøy" + BEGIN + MENUITEM "&Innstillinger", ID_TOOLS_OPTIONS + END + POPUP "&Hjelp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Utfør" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Som &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Avbryt",2,158,23,47,14 + PUSHBUTTON "&Hjelp",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Søk Programmer i Start meny" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Sjekk oppføringer",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skrivebord innstillinger" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Vennligst velg din foretrukne ikon justering algoritme:", + IDC_STATIC,7,7,166,8 + CONTROL "Venstre/topp dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "Venstre/topp høyre",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "Høyre/topp venstre",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./topp dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "Venstre/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "Venstre/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "høyre/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "kanter ned",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "kanter H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Knapp",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Vis &Versjon Nummer",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "oppgavelinje egenskaper" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Vis &klokken",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Skjul inaktive kunngjøring ikoner", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&kunngjøringer...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Start meny egenskaper" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Konfigurer underretning Ikoner" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Verktøylinje Tekst:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "V&indu tittel:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Modul Mappe:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Skjerm modus",IDC_LABEL4,7,96,157,28 + CONTROL "&vis",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&skjul",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "skjul a&utomatisk",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Sist endret:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "V&is skjulte",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Velg Explorer vindu mode" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Vennligst velg din foretrukne explorer bruker grensesnitt:", + IDC_STATIC,7,7,160,8 + CONTROL "&SSDB (sammensatt dokument brukergrensesnitt)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDB (separat dokument brukergrensesnitt)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Åpne undermapper i s&eparate vinduer", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Denne innstillingen vil bli brukt som standard for alle explorer vinduer i fremtiden.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Om ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Start" + IDS_LOGOFF "Logg av..." + IDS_SHUTDOWN "Slå av..." + IDS_LAUNCH "Kjør..." + IDS_START_HELP "Hjelp" + IDS_SEARCH_FILES "Søk..." + IDS_DOCUMENTS "Mine Dokumenter" + IDS_FAVORITES "Favoritter" + IDS_PROGRAMS "Programmer" + IDS_SETTINGS "Innstillinger" + IDS_EXPLORE "Explore" + IDS_EMPTY "(Tom)" + IDS_RECENT "Siste Dokumenter" + IDS_ADMIN "Administrasjon" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Start meny" + IDS_MINIMIZE_ALL "minimalisere alle vinduer" + IDS_DESKTOP_NUM "Skrivebord %d" + IDS_VOLUME "Volum" + IDS_ITEMS_CUR "gjeldende element" + IDS_ITEMS_CONFIGURED "Konfigurasjon" + IDS_ITEMS_VISIBLE "synlig" + IDS_ITEMS_HIDDEN "Skjult" + IDS_NOTIFY_SHOW "Vise" + IDS_NOTIFY_HIDE "skjule" + IDS_NOTIFY_AUTOHIDE "Skjul automatisk" + IDS_SHOW_HIDDEN_ICONS "Vis skjulte ikoner" + IDS_HIDE_ICONS "Skjul ikoner" + IDS_TERMINATE "Avslutte ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Nettverk" + IDS_CONNECTIONS "Nettverk tilkoblinger" + IDS_DRIVES "Drivere" + IDS_SEARCH_COMPUTER "Søk etter datamaskiner..." + IDS_SETTINGS_MENU "Innstilling Meny" + IDS_CONTROL_PANEL "Kontroll Panel" + IDS_PRINTERS "Skrivere" + IDS_BROWSE "Bla gjennom filer" + IDS_SEARCH_PRG "Søk etter Programmer..." + IDS_ALL_USERS "Alle brukere\\" + IDS_SEARCH "Søk" + IDS_ABOUT_EXPLORER "&Om Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Du har valgt mer enn et program.\nEr du sikker på at du vil kjøre alle på en gang?" + IDS_DESKTOPBAR_SETTINGS "Skrivebord Innstillinger" + IDS_DESKTOP "Skrivebord" + IDS_TASKBAR "oppgavelinje" +END + +#endif // Norwegian (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/shell/explorer/explorer-no.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Jul 17 05:10:56 2006 @@ -219,6 +219,7 @@ #include "explorer-it.rc" #include "explorer-nl.rc" #include "explorer-gr.rc" +#include "explorer-no.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"

18 years, 5 months

← Newer
1
...
26
27
28
29
30
31
32
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006