Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[janderwald] 25404: Updated French translation by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) See issue #1969 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jan 10 01:02:17 2007 New Revision: 25404 URL: http://svn.reactos.org/svn/reactos?rev=25404&view=rev Log: Updated French translation by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) See issue #1969 for more details. Modified: trunk/reactos/dll/cpl/desk/Fr.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=254… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Wed Jan 10 01:02:17 2007 @@ -1,4 +1,5 @@ /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ +/* Updated French translation by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -88,19 +89,19 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Configure", ID_MENU_CONFIG - MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM "&Configurer", ID_MENU_CONFIG + MENUITEM "A&perçu", ID_MENU_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Add", ID_MENU_ADD - MENUITEM "&Delete\tDel", ID_MENU_DELETE + MENUITEM "&Ajouer", ID_MENU_ADD + MENUITEM "Supprimer\tSuppr", ID_MENU_DELETE END END IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Désactivé", ID_MENU_DISABLED + MENUITEM "Sélectionné", ID_MENU_SELECTED END STRINGTABLE @@ -132,32 +133,32 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Fenêtre inactive" + IDS_ACTWIN "Fenêtre active" + IDS_WINTEXT "Texte de la fenêtre" + IDS_MESSBOX "Boîte de message" + IDS_MESSTEXT "Texte de message" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN - IDS_ITEM_3D_OBJECTS "3D Objects" - IDS_ITEM_SCROLLBAR "Scrollbar" - IDS_ITEM_DESKTOP "Desktop" - IDS_ITEM_MESSAGE_BOX "Message Box" - IDS_ITEM_WINDOW "Window" - IDS_ITEM_APP_BACKGROUND "Application Background" - IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_3D_OBJECTS "Objets 3D" + IDS_ITEM_SCROLLBAR "Barre de défilement" + IDS_ITEM_DESKTOP "Bureau" + IDS_ITEM_MESSAGE_BOX "Boîte de message" + IDS_ITEM_WINDOW "Fenêtre" + IDS_ITEM_APP_BACKGROUND "Espace de travail de l'application" + IDS_ITEM_SELECTED_ITEMS "Éléments sélectionnés" IDS_ITEM_MENU "Menu" - IDS_ITEM_PALETTE_TITLE "Palette Title" - IDS_ITEM_TOOLTIP "Tooltip" - IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" - IDS_ITEM_ACTIVE_WINDOW "Active Window Border" - IDS_ITEM_ICON "Icon" - IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" - IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" - IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" - IDS_ITEM_ACTIVE_TITLE "Active Title Bar" - IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" + IDS_ITEM_PALETTE_TITLE "Tite de palette" + IDS_ITEM_TOOLTIP "Info-bulle" + IDS_ITEM_INACTIVE_WINDOW "Bordure de fenêtre inactive" + IDS_ITEM_ACTIVE_WINDOW "Bordure de fenêtre active" + IDS_ITEM_ICON "Icône" + IDS_ITEM_ICON_SPACE_HORZ "Espacement des icônes (horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Espacement des icônes (vertical)" + IDS_ITEM_INACTIVE_TITLE "Barre de titre inactive" + IDS_ITEM_ACTIVE_TITLE "Barre de titre active" + IDS_ITEM_CAPTION_BUTTONS "Boutons de barre de titre" END

17 years, 9 months

[ion] 25403: - Heavy cleanup of locking and lookup macros in ob_x.h. - Add calls to ObpInitializeDirectoryLookup where required. - Fixup calls to ObpAcquireDirectoryLockExclusive, but still keep them stubbed out for now.

by ion＠svn.reactos.org

Author: ion Date: Wed Jan 10 00:48:26 2007 New Revision: 25403 URL: http://svn.reactos.org/svn/reactos?rev=25403&view=rev Log: - Heavy cleanup of locking and lookup macros in ob_x.h. - Add calls to ObpInitializeDirectoryLookup where required. - Fixup calls to ObpAcquireDirectoryLockExclusive, but still keep them stubbed out for now. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Wed Jan 10 00:48:26 2007 @@ -8,92 +8,12 @@ #include "ex.h" -#if DBG -VOID -FORCEINLINE -ObpCalloutStart(IN PKIRQL CalloutIrql) -{ - /* Save the callout IRQL */ - *CalloutIrql = KeGetCurrentIrql(); -} - -VOID -FORCEINLINE -ObpCalloutEnd(IN KIRQL CalloutIrql, - IN PCHAR Procedure, - IN POBJECT_TYPE ObjectType, - IN PVOID Object) -{ - /* Detect IRQL change */ - if (CalloutIrql != KeGetCurrentIrql()) - { - /* Print error */ - DbgPrint("OB: ObjectType: %wZ Procedure: %s Object: %08x\n", - &ObjectType->Name, Procedure, Object); - DbgPrint(" Returned at %x IRQL, but was called at %x IRQL\n", - KeGetCurrentIrql(), CalloutIrql); - DbgBreakPoint(); - } -} -#else -VOID -FORCEINLINE -ObpCalloutStart(IN PKIRQL CalloutIrql) -{ - /* No-op */ - UNREFERENCED_PARAMETER(CalloutIrql); -} - -VOID -FORCEINLINE -ObpCalloutEnd(IN KIRQL CalloutIrql, - IN PCHAR Procedure, - IN POBJECT_TYPE ObjectType, - IN PVOID Object) -{ - UNREFERENCED_PARAMETER(CalloutIrql); -} -#endif - -VOID -FORCEINLINE -_ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) -{ - /* It's not, set lock flag */ - Context->LockStateSignature = 0xBBBB1234; - - /* Lock it */ - KeEnterCriticalRegion(); - ExAcquirePushLockShared(&Directory->Lock); - - /* Update lock flag */ - Context->LockStateSignature = 0xDDDD1234; -} - -VOID -FORCEINLINE -_ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) -{ - /* Update lock flag */ - Context->LockStateSignature = 0xAAAA1234; - - /* Lock it */ - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(&Directory->Lock); -} - -VOID -FORCEINLINE -_ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory, - IN POBP_LOOKUP_CONTEXT Context) -{ - /* Release the lock */ - ExReleasePushLock(&Directory->Lock); - Context->LockStateSignature = 0xEEEE1234; - KeLeaveCriticalRegion(); -} +#define OBP_LOCK_STATE_PRE_ACQUISITION_EXCLUSIVE 0xAAAA1234 +#define OBP_LOCK_STATE_PRE_ACQUISITION_SHARED 0xBBBB1234 +#define OBP_LOCK_STATE_POST_ACQUISITION_EXCLUSIVE 0xCCCC1234 +#define OBP_LOCK_STATE_POST_ACQUISITION_SHARED 0xDDDD1234 +#define OBP_LOCK_STATE_RELEASED 0xEEEE1234 +#define OBP_LOCK_STATE_INITIALIZED 0xFFFF1234 ULONG FORCEINLINE @@ -159,36 +79,49 @@ VOID FORCEINLINE -_ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context, - IN BOOLEAN DereferenceObject) -{ - POBJECT_HEADER ObjectHeader; - POBJECT_HEADER_NAME_INFO HeaderNameInfo; - - /* Check if we came back with the directory locked */ - if (Context->DirectoryLocked) - { - /* Release the lock */ - _ObpReleaseDirectoryLock(Context->Directory, Context); - } - - /* Clear the context */ - Context->Directory = NULL; - Context->DirectoryLocked = FALSE; - - /* Check if we had found an object */ - if (Context->Object) - { - /* Get the object name information */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); - HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - - /* Check if we do have name information */ - if (HeaderNameInfo) _ObpDecrementQueryReference(HeaderNameInfo); - - /* Check if we need to dereference it */ - if (DereferenceObject) ObDereferenceObject(Context->Object); - } +_ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory, + IN POBP_LOOKUP_CONTEXT Context) +{ + /* It's not, set lock flag */ + Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_SHARED; + + /* Lock it */ + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&Directory->Lock); + + /* Update lock flag */ + Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED; +} + +VOID +FORCEINLINE +_ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory, + IN POBP_LOOKUP_CONTEXT Context) +{ + /* Update lock flag */ + Context->LockStateSignature = OBP_LOCK_STATE_PRE_ACQUISITION_EXCLUSIVE; + + /* Acquire an exclusive directory lock */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&Directory->Lock); + + /* Set the directory */ + Context->Directory = Directory; + + /* Update lock settings */ + Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_EXCLUSIVE; + Context->DirectoryLocked = TRUE; +} + +VOID +FORCEINLINE +_ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory, + IN POBP_LOOKUP_CONTEXT Context) +{ + /* Release the lock */ + ExReleasePushLock(&Directory->Lock); + Context->LockStateSignature = OBP_LOCK_STATE_RELEASED; + KeLeaveCriticalRegion(); } VOID @@ -199,7 +132,47 @@ Context->Object = NULL; Context->Directory = NULL; Context->DirectoryLocked = FALSE; - Context->LockStateSignature = 0xFFFF1234; + Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED; +} + +VOID +FORCEINLINE +_ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + + /* Check if we had found an object */ + if (Context->Object) + { + /* Get the object name information */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + /* Check if we do have name information */ + if (HeaderNameInfo) _ObpDecrementQueryReference(HeaderNameInfo); + + /* Dereference the object */ + ObDereferenceObject(Context->Object); + Context->Object = NULL; + } +} + +VOID +FORCEINLINE +_ObpCleanupDirectoryLookup(IN POBP_LOOKUP_CONTEXT Context) +{ + /* Check if we came back with the directory locked */ + if (Context->DirectoryLocked) + { + /* Release the lock */ + _ObpReleaseDirectoryLock(Context->Directory, Context); + } + + /* Clear the context */ + Context->Directory = NULL; + Context->DirectoryLocked = FALSE; + _ObpReleaseLookupContextObject(Context); } #if _OB_DEBUG_ @@ -365,5 +338,49 @@ ObpFreeCapturedAttributes(ObjectCreateInfo, LookasideCreateInfoList); } - - +#if DBG +VOID +FORCEINLINE +ObpCalloutStart(IN PKIRQL CalloutIrql) +{ + /* Save the callout IRQL */ + *CalloutIrql = KeGetCurrentIrql(); +} + +VOID +FORCEINLINE +ObpCalloutEnd(IN KIRQL CalloutIrql, + IN PCHAR Procedure, + IN POBJECT_TYPE ObjectType, + IN PVOID Object) +{ + /* Detect IRQL change */ + if (CalloutIrql != KeGetCurrentIrql()) + { + /* Print error */ + DbgPrint("OB: ObjectType: %wZ Procedure: %s Object: %08x\n", + &ObjectType->Name, Procedure, Object); + DbgPrint(" Returned at %x IRQL, but was called at %x IRQL\n", + KeGetCurrentIrql(), CalloutIrql); + DbgBreakPoint(); + } +} +#else +VOID +FORCEINLINE +ObpCalloutStart(IN PKIRQL CalloutIrql) +{ + /* No-op */ + UNREFERENCED_PARAMETER(CalloutIrql); +} + +VOID +FORCEINLINE +ObpCalloutEnd(IN KIRQL CalloutIrql, + IN PCHAR Procedure, + IN POBJECT_TYPE ObjectType, + IN PVOID Object) +{ + UNREFERENCED_PARAMETER(CalloutIrql); +} +#endif Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Wed Jan 10 00:48:26 2007 @@ -1249,7 +1249,7 @@ if ((Type) && (ObjectType != Type)) { /* They don't, cleanup */ - //if (Context) ObpCleanupDirectoryLookup(Object, Context); + //if (Context) ObpCleanupDirectoryLookup(Context); return STATUS_OBJECT_TYPE_MISMATCH; } @@ -1287,7 +1287,7 @@ * We failed (meaning security failure, according to NT Internals) * detach and return */ - //if (Context) ObpCleanupDirectoryLookup(Object, Context); + //if (Context) ObpCleanupDirectoryLookup(Context); if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return Status; } @@ -1327,7 +1327,8 @@ } /* Now we can release the object */ - //if (Context) ObpCleanupDirectoryLookup(Object, Context); + //if (Context) ObpCleanupDirectoryLookup(Context); + if (Context) Context->Object = NULL; /* Save the object header */ NewEntry.Object = ObjectHeader; @@ -2116,7 +2117,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE); + //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext); TempBuffer->LookupContext.Object = NULL; goto Cleanup; } @@ -2151,7 +2152,8 @@ Status = STATUS_INVALID_PARAMETER; /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE); + //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext); + TempBuffer->LookupContext.Object = NULL; } else { Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Wed Jan 10 00:48:26 2007 @@ -283,9 +283,6 @@ /* Lock it */ //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); - - /* Setup directory */ - // FIXME: ObpSetLookupDirectory(Dir);? Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; Context.LockStateSignature = 0xCCCC1234; @@ -326,7 +323,7 @@ } /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(&Context, TRUE); + //ObpCleanupDirectoryLookup(&Context); Context.Object = NULL; /* Initialize DOS Devices Directory and related Symbolic Links */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Wed Jan 10 00:48:26 2007 @@ -958,14 +958,19 @@ if (*p++ == OBJ_NAME_PATH_SEPARATOR) return STATUS_OBJECT_NAME_INVALID; } - Context.Object = NULL; + /* Setup a lookup context */ + ObpInitializeDirectoryLookup(&Context); /* Check if we've already created the directory of types */ if (ObpTypeDirectoryObject) { - /* Then scan it to figure out if we've already created this type */ + /* Acquire the directory lock */ + //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; + Context.LockStateSignature = 0xCCCC1234; + + /* Do the lookup */ if (ObpLookupEntryDirectory(ObpTypeDirectoryObject, TypeName, OBJ_CASE_INSENSITIVE, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Wed Jan 10 00:48:26 2007 @@ -194,12 +194,10 @@ !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { /* Setup a lookup context */ - Context.Object = NULL; + ObpInitializeDirectoryLookup(&Context); /* Lock the directory */ //ObpAcquireDirectoryLockExclusive(ObjectNameInfo->Directory, &Context); - - /* Set the lookup parameters */ Context.Directory = ObjectNameInfo->Directory; Context.DirectoryLocked = TRUE; Context.LockStateSignature = 0xCCCC1234; @@ -255,7 +253,7 @@ } /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(&Context, TRUE); + //ObpCleanupDirectoryLookup(&Context); Context.Object = NULL; /* Remove another query reference since we added one on top */ @@ -313,7 +311,7 @@ InsertObject); /* Initialize starting state */ - LookupContext->Object = NULL; + ObpInitializeDirectoryLookup(LookupContext); *FoundObject = NULL; Status = STATUS_SUCCESS; Object = NULL; @@ -575,10 +573,7 @@ if (InsertObject) { /* Lock the directory */ - //ObpAcquireDirectoryLockExclusive(LookupContext, Directory); - - /* Setup the context */ - // FIXME: ObpSetLookupDirectory(Dir);? + //ObpAcquireDirectoryLockExclusive(Directory, LookupContext); LookupContext->Directory = Directory; LookupContext->DirectoryLocked = TRUE; LookupContext->LockStateSignature = 0xCCCC1234; @@ -701,7 +696,7 @@ InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); /* Cleanup from the first lookup */ - //ObpCleanupDirectoryLookup(LookupContext, TRUE); + //ObpCleanupDirectoryLookup(LookupContext); LookupContext->Object = NULL; /* Check if we have a referenced directory */ @@ -868,7 +863,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(LookupContext, TRUE); + //ObpCleanupDirectoryLookup(LookupContext); LookupContext->Object = NULL; } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Wed Jan 10 00:48:26 2007 @@ -430,7 +430,7 @@ &Object); /* Cleanup after lookup */ - //ObpCleanupDirectoryLookup(&Context, TRUE); + //ObpCleanupDirectoryLookup(&Context); Context.Object = NULL; /* Check if the lookup succeeded */

17 years, 9 months

[janderwald] 25402: - czech translation by Kamil Hornicek, hornik1@fel.cvut.cz See issue #1959 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jan 10 00:21:52 2007 New Revision: 25402 URL: http://svn.reactos.org/svn/reactos?rev=25402&view=rev Log: - czech translation by Kamil Hornicek, hornik1(a)fel.cvut.cz See issue #1959 for more details. Added: trunk/reactos/dll/cpl/access/Cz.rc trunk/reactos/dll/cpl/main/Cz.rc (with props) trunk/reactos/dll/cpl/mmsys/cs-CZ.rc (with props) trunk/reactos/dll/cpl/powercfg/cz.rc (with props) Modified: trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc Added: trunk/reactos/dll/cpl/access/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/Cz.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/Cz.rc (added) +++ trunk/reactos/dll/cpl/access/Cz.rc Wed Jan 10 00:21:52 2007 @@ -1,0 +1,109 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Klávesnice" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Jedním prstem",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Tuto funkci pouijte, pokud chcete pouívat Shift, Ctrl nebo Alt stisknutím pouze jedné klávesy najednou.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Pouívat funkci &Jedním prstem",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20),14 + PUSHBUTTON "&Nastavení",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Filtrování kláves",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Pouijte funkci Filtrování kláves, pokud chcete, aby ReactOS ignoroval náhodná nebo opakovaná stisknutí kláves.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Pouívat funkci &Filtrování kláves",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(20),14 + PUSHBUTTON "N&astavení",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Ozvuèení kláves",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Pouijte funkci Ozvuèení kláves, chcete-li být upozornìni na stisk kláves Caps Lock, Num Lock a Scroll Lock zvukovým signálem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)+6 + CHECKBOX "Pouívat funkci O&zvuèení kláves",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+4,PROPSHEETPADDING(20),14 + PUSHBUTTON "Na&stavení",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+4,PROPSHEETPADDING(15),14 +// CHECKBOX "&V programech zobrazovat dodateènou nápovìdu ke klávesám.",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zvuk" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Funkce Popis zvuku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Pouijte funkci Zobrazení zvuku, pokud chcete aby ReactOS vizuálnì upozoròoval na kadý zvuk vydaný systémem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Pouívat funkci Popis zvuku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20),14 + PUSHBUTTON "&Nastavení",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zobrazení" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Funkce Vysoký kontrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Vyberte tuto monost pokud chcete, aby Reactos pouíval barvy a písma urèené pro snadnou èitelnost.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Pouít funkci Vysoký kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+30,14 + PUSHBUTTON "&Nastavení",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "My" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Funkce My klávesnicí",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Vyberte tuto monost, pokud chcete ovládat my pomocí ipek na numerické klávesnici.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Pouít funkci &My klávesnicí",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+30,14 + PUSHBUTTON "&Nastavení",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Obecné" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Automatické vypnutí",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + CHECKBOX "Vypnout &funkce usnadnìní po neèinnosti delí ne:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 minut", IDC_RESET_5 + // MENUITEM "10 minut", IDC_RESET_10 + // MENUITEM "15 minut", IDC_RESET_15 + // MENUITEM "20 minut", IDC_RESET_20 + // MENUITEM "25 minut", IDC_RESET_25 + // MENUITEM "30 minut", IDC_RESET_30 + //} + + GROUPBOX "Upozornìní",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + CHECKBOX "Pøi zapnutí funkce zobrazit upozornìní.",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Upozornit na zapnutí nebo vypnutí funkce usnadnìní zvukem.",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+20,LABELLINE(1) + + + GROUPBOX "Funkce SerialKey",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "Funkce SerialKey Vám umoní alternativní pøístup k funkcím myi a klávesnice.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Pouít funkci &SerialKey",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "Na&stavení",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Monosti správy",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + + CHECKBOX "Pouít &nastavení pøi pøihláení.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Po&uít nastavení jako výchozí pro nové uivatele.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Monosti usnadnìní" + IDS_CPLSYSTEMDESCRIPTION "Upraví monosti usnadnìní pro tento poèítaè." +END + Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Wed Jan 10 00:21:52 2007 @@ -16,3 +16,4 @@ #include "Ru.rc" #include "Fr.rc" #include "Es.rc" +#include "Cz.rc" Added: trunk/reactos/dll/cpl/main/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/Cz.rc?rev=254… ============================================================================== --- trunk/reactos/dll/cpl/main/Cz.rc (added) +++ trunk/reactos/dll/cpl/main/Cz.rc Wed Jan 10 00:21:52 2007 @@ -1,0 +1,162 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Rychlost" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Opakování znakù", -1, 5, 5, 230, 130 + ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 + LTEXT "&Prodleva pøed opakováním", -1, 40, 15, 150, 10 + LTEXT "Dlouhá", -1, 40, 30, 25, 10 + LTEXT "Krátká", -1, 200, 30, 25, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 + ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 + LTEXT "&Rychlost opakování", -1, 40, 70, 120, 10 + LTEXT "Malá", -1, 40, 85, 25, 10 + LTEXT "Velká", -1, 200, 85, 25, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Zde mùete vyzkouet rychlost opakování:", -1, 15, 105, 150, 10 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Rychlost &blikání kurzoru:", -1, 5, 145, 230, 50 + LTEXT "ádná", -1, 40, 165, 30, 10 + LTEXT "Velká", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavení funkce ClickLock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Krátká", -1, 35, 50, 30, 10 + LTEXT "Dlouhá", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "Storno", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Nastavte dobu, po kterou musíte dret tlaèítko myi stisknuté, ne se funkce ClickLock aktivuje.",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Tlaèítka" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Nastavení tlaèítek", -1, 5, 5, 230, 70 + CHECKBOX "Z&amìnit levé a pravé tlaèítko", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Zakrtnutím toto políèka nastavíte pravé tlaèítko jako primární pro funkce jako výbìr nebo pøetaení.", -1, 10, 30, 140, 30 + GROUPBOX "Rychlost poklepání", -1, 5, 75, 230, 70 + LTEXT "Poklepejte na sloku pro otestování nastavení. Pokud se sloka neotevøe, zkuste nií rychlost.", -1, 10, 85, 160, 30 + LTEXT "&Rychlost: Malá", -1, 10, 120, 90, 8 + LTEXT "Velká", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "Funkce ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Zapnout funkci ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 100, 20 + PUSHBUTTON "&Nastavení...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Funkce ClickLock Vám umoní oznaèení nebo pøetaení bez drení tlaèítka myi. Krátkým stisknutím tlaèítka funkci zapnete, dalí stisknutí funkci vypne.", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Ukazatele" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sc&héma", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "&Uloit jako...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Odstranit", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "Vl&astní", -1, 5, 60, 40, 10 + CHECKBOX "&Zobrazit stín pod ukazatelem", IDC_CHECK_DROP_SHADOW, 5, 200, 110, 10 + PUSHBUTTON "Pouít &výchozí", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 + PUSHBUTTON "&Procházet", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 +END + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Uloit Schéma" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Uloit toto schéma jako:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "Storno", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Monosti ukazatele" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Pohyb", -1, 5, 5, 230, 60 + LTEXT "&Vyberte rychlost ukazatele:", -1, 60, 15, 110, 10 + LTEXT "Malá", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Velká", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Zvýit pøesnost ukazatele.", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Pøichytit", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "&Automaticky pøesunout ukazatel nad výchozí tlaèítko.", -1, 73, 75, 152, 20 + GROUPBOX "Viditelnost", -1, 5, 105, 230, 90 + CHECKBOX "&Zobrazit stopu ukazatele.", IDC_CHECK_POINTER_TRAIL, 60, 110, 150, 10 + LTEXT "Krátká", -1, 60, 130, 30, 10 + LTEXT "Dlouhá", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Skrýt ukazatel, pokud píete.", IDC_CHECK_HIDE_POINTER, 60, 150, 150, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Ukázat pozici ukazatele pøi stisknutí klávesy Ctrl.", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Koleèko" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Posouvání", -1, 5, 5, 230, 80 + LTEXT "Otoèení koleèka o jeden krok posune o:", -1, 60, 15, 150, 10 + CONTROL "&tento poèet øádkù", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "My" + IDS_CPLDESCRIPTION_1 "Zmìní nastavení myi." + IDS_CPLNAME_2 "Klávesnice" + IDS_CPLDESCRIPTION_2 "Zmìní nastavení klávesnice." + IDS_ARROW "Normální výbìr" + IDS_HELP "Výbìr nápovìdy" + IDS_APPSTARTING "Práce v pozadí" + IDS_WAIT "Zaneprázdnìn" + IDS_CROSSHAIR "Pøesný výbìr" + IDS_IBEAM "Výbìr textu" + IDS_NWPEN "Psaní rukou" + IDS_NO "Není k dispozici" + IDS_SIZENS "Zmìna výky" + IDS_SIZENWSE "Diagonální zmìna velikosti 1" + IDS_SIZENESW "Diagonální zmìna velikosti 2" + IDS_SIZEALL "Pøesunout" + IDS_UPARROW "Alternativní výbìr" + IDS_HAND "Výbìr odkazu" + IDS_NONE "(Není)" + IDS_SYSTEM_SCHEME "(systémové schéma)" +END Propchange: trunk/reactos/dll/cpl/main/Cz.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (original) +++ trunk/reactos/dll/cpl/main/rsrc.rc Wed Jan 10 00:21:52 2007 @@ -18,3 +18,4 @@ #include "Es.rc" #include "Ru.rc" #include "Uk.rc" +#include "Cz.rc" Added: trunk/reactos/dll/cpl/mmsys/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/cs-CZ.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/cs-CZ.rc (added) +++ trunk/reactos/dll/cpl/mmsys/cs-CZ.rc Wed Jan 10 00:21:52 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Zvuky a zvuková zaøízení" + IDS_CPLDESCRIPTION "Upraví zvukové schéma Vaeho poèítaèe, nebo nastaví reproduktory a nahrávací zaøízení." +END + Propchange: trunk/reactos/dll/cpl/mmsys/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Wed Jan 10 00:21:52 2007 @@ -10,6 +10,7 @@ IDI_CPLICON ICON "resources/mmsys.ico" +#include "cs-CZ.rc" #include "de-DE.rc" #include "el-GR.rc" #include "en-US.rc" Added: trunk/reactos/dll/cpl/powercfg/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/cz.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/cz.rc (added) +++ trunk/reactos/dll/cpl/powercfg/cz.rc Wed Jan 10 00:21:52 2007 @@ -1,0 +1,162 @@ +// Czech (cz) resources by tykef (at atlas cz) + +LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Schémata napájení" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 5,5,20,20 + LTEXT "Vyberte napájecí schéma, které se nejvíce hodí pro tento poèítaè. Vechny zmìny nastavení se uloí do vybraného schématu.", + -1,45,13,194,36 + GROUPBOX "&Schéma napájení", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Uloit jako...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Odstranit", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "Neznámý", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "Pokud je poèítaè:",IDC_SAT,15,120,60,10 + LTEXT "Pøipojen",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "Funguje na baterie",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "Vypnout &monitor:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vypnout pevné &disky:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Úsporný &reim:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Reim spánku:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarms" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Low battery alarm",-1,10,15,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "unknown",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,70,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,70,50,10 + LTEXT "Unknown",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Action:",-1,95,80,45,10 + LTEXT "Unknown",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Run Program:",-1,95,90,50,10 + LTEXT "Unknown",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Critical battery alarm",-1,10,115,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "unknown",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,170,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,170,50,10 + LTEXT "Unknown",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Action:",-1,95,180,45,10 + LTEXT "Unknown",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Run Program:",-1,95,190,50,10 + LTEXT "Unknown",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Upøesnit" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Vyberte, které nastavení sníené spotøeby chcete pouít.",-1,30,5,205,20 + GROUPBOX "Monosti",-1,5,35,225,55 + CONTROL "Vdy zobrazovat &ikonu na hlavním panelu",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "Dotázat se na &heslo pøi pøechodu z úsporného reimu",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "&Sníit jas displeje pøi chodu na baterie.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Tlaèítka napájení",-1,5,100,230,105 + LTEXT "&Pøi sklopení displeje pøenosného poèítaèe:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Pøi stisknutí tlaèítka &napájení:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Pøi stisknutí tlaèítka reimu &spánku:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Reim spánku" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "Pokud Vá poèítaè pøejde do reimu spánku, uloí obsah své pamìti na pevný disk a vypne se. Po opìtovném sputìní se vrátí do pùvodního stavu.", + -1,35,5,195,35 + GROUPBOX "Reim spánku",-1,5,45,235,25 + CONTROL "Zapnout funkci reim &spánku",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Místo na disku potøebné pro reim spánku",-1,5,80,240,60 + LTEXT "Volné místo:",-1,10,90,100,10 + LTEXT "Neznámé",IDC_FREESPACE,120,90,70,10 + LTEXT "Potøebné místo na disku:",-1,10,100,115,10 + LTEXT "Neznámé",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "Pro funkci reim spánku musíte uvolnit místo na disku. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Monosti napájení" + IDS_CPLDESCRIPTION_1 "Nastaví monosti napájení a etøení energií pro tento poèítaè." + IDS_PROCENT "%i%%" + IDS_SOUND "Zvuk" + IDS_TEXT "Text" + IDS_CONFIG1 "Nastavení pro schéma napájení %1" + IDS_CONFIG2 "Pokroèilá nastavení pro %1" + + IDS_SIZEBYTS "%i bytù" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "Nedìlej nic" + + IDS_PowerActionNone1 "ádná akce" + IDS_PowerActionUnknown "Neznámý" + IDS_PowerActionSleep "Úsporný reim" + IDS_PowerActionHibernate "Reim spánku" + IDS_PowerActionShutdown "Vypnout" + IDS_PowerActionRestart "Restartovat" + IDS_PowerActionShutdownOff "Vypnout a odpojit napájení" + IDS_PowerActionWarmEject "Zeptat se na poadovanou akci" + IDS_PowerActionNone2 "Není" + + IDS_TIMEOUT1 "Po 1 minutì" + IDS_TIMEOUT2 "Po 2 minutách" + IDS_TIMEOUT3 "Po 3 minutách" + IDS_TIMEOUT4 "Po 5 minutách" + IDS_TIMEOUT5 "Po 10 minutách" + IDS_TIMEOUT6 "Po 15 minutách" + IDS_TIMEOUT7 "Po 20 minutách" + IDS_TIMEOUT8 "Po 25 minutách" + IDS_TIMEOUT9 "Po 30 minutách" + IDS_TIMEOUT10 "Po 45 minutách" + IDS_TIMEOUT11 "Po 1 hodinì" + IDS_TIMEOUT12 "Po 2 hodinách" + IDS_TIMEOUT13 "Po 3 hodinách" + IDS_TIMEOUT14 "Po 4 hodinách" + IDS_TIMEOUT15 "Po 5 hodinách" + IDS_TIMEOUT16 "Nikdy" +END + Propchange: trunk/reactos/dll/cpl/powercfg/cz.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Wed Jan 10 00:21:52 2007 @@ -18,3 +18,4 @@ #include "de.rc" #include "ru.rc" #include "fr.rc" +#include "cz.rc"

17 years, 9 months

[janderwald] 25401: - i prefer tabs

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jan 9 23:41:14 2007 New Revision: 25401 URL: http://svn.reactos.org/svn/reactos?rev=25401&view=rev Log: - i prefer tabs Modified: trunk/reactos/dll/cpl/desk/desk.rbuild Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Tue Jan 9 23:41:14 2007 @@ -26,7 +26,7 @@ <file>desk.c</file> <file>dibitmap.c</file> <file>misc.c</file> - <file>preview.c</file> + <file>preview.c</file> <file>screensaver.c</file> <file>settings.c</file> <file>desk.rc</file>

17 years, 9 months

[ion] 25400: - Fix Port and Section Object Type creation by specifying a valid ValidAccessMask when creating the types. - NTLPC "Branch": Ports need to maintain a Type List. - Use proper access mode in parse callbacks. - Properly validate the access mask given to ObpCreate(Unnamed)Handle and only grant valid bits according to ValidAccessMask. - Use InterlockedExchangeAdd for reference count bias instead of looping on a single increment. - Only return the object if the caller did any bias to it.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 9 20:18:22 2007 New Revision: 25400 URL: http://svn.reactos.org/svn/reactos?rev=25400&view=rev Log: - Fix Port and Section Object Type creation by specifying a valid ValidAccessMask when creating the types. - NTLPC "Branch": Ports need to maintain a Type List. - Use proper access mode in parse callbacks. - Properly validate the access mask given to ObpCreate(Unnamed)Handle and only grant valid bits according to ValidAccessMask. - Use InterlockedExchangeAdd for reference count bias instead of looping on a single increment. - Only return the object if the caller did any bias to it. - Detach from the process much later, since exclusive process support and handle table database needs to be in the same context as the owner. - Add audit calls to ObpCreateHandle. - Add stubbed out calls to ObpCleanupDirectoryLookup in ObpCreateHandle. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/lpc/ntlpc/port.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Tue Jan 9 20:18:22 2007 @@ -11,8 +11,7 @@ // // Ob: // - Add Directory Lock. -// - Strengthen code with debug checks and assertions. -// - Fix FIXMEs/commented out code. +// - Add Object Table Referencing. // // Ex: // - Fixup existing code that talks to Ke. Modified: trunk/reactos/ntoskrnl/lpc/ntlpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/ntlpc/port.c?… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/ntlpc/port.c (original) +++ trunk/reactos/ntoskrnl/lpc/ntlpc/port.c Tue Jan 9 20:18:22 2007 @@ -55,6 +55,7 @@ ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; + ObjectTypeInitializer.MaintainTypeList = TRUE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c (original) +++ trunk/reactos/ntoskrnl/lpc/port.c Tue Jan 9 20:18:22 2007 @@ -56,6 +56,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; + ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); LpcpNextMessageId = 0; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Tue Jan 9 20:18:22 2007 @@ -2277,6 +2277,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; + ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jan 9 20:18:22 2007 @@ -1031,14 +1031,16 @@ POBJECT_HEADER ObjectHeader; HANDLE Handle; KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; + BOOLEAN AttachedToProcess = FALSE, KernelHandle = FALSE; PVOID HandleTable; NTSTATUS Status; - ULONG i; + ACCESS_MASK GrantedAccess; + POBJECT_TYPE ObjectType; PAGED_CODE(); /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; OBTRACE(OB_HANDLE_DEBUG, "%s - Creating handle for: %p. UNNAMED. HC LC %lx %lx\n", __FUNCTION__, @@ -1051,6 +1053,7 @@ { /* Set the handle table */ HandleTable = ObpKernelHandleTable; + KernelHandle = TRUE; /* Check if we're not in the system process */ if (PsGetCurrentProcess() != PsInitialSystemProcess) @@ -1082,8 +1085,7 @@ return Status; } - /* Save the object header (assert its validity too) */ - ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + /* Save the object header */ NewEntry.Object = ObjectHeader; /* Mask out the internal attributes */ @@ -1092,20 +1094,20 @@ EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - /* Save the access mask */ - NewEntry.GrantedAccess = DesiredAccess; + /* Remove what's not in the valid access mask */ + GrantedAccess = DesiredAccess & (ObjectType->TypeInfo.ValidAccessMask | + ACCESS_SYSTEM_SECURITY); /* Handle extra references */ if (AdditionalReferences) { - /* Make a copy in case we fail later below */ - i = AdditionalReferences; - while (i--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - } + /* Add them to the header */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, + AdditionalReferences); + } + + /* Save the access mask */ + NewEntry.GrantedAccess = GrantedAccess; /* * Create the actual handle. We'll need to do this *after* calling @@ -1118,22 +1120,26 @@ NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); - /* Detach if needed */ - if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Make sure we got a handle */ if (Handle) { /* Check if this was a kernel handle */ - if (HandleAttributes & OBJ_KERNEL_HANDLE) - { - /* Set the kernel handle bit */ - Handle = ObMarkHandleAsKernelHandle(Handle); - } + if (KernelHandle) Handle = ObMarkHandleAsKernelHandle(Handle); /* Return handle and object */ *ReturnedHandle = Handle; - if (ReturnedObject) *ReturnedObject = Object; + + /* Return the new object only if caller wanted it biased */ + if ((AdditionalReferences) && (ReturnedObject)) + { + /* Return it */ + *ReturnedObject = Object; + } + + /* Detach if needed */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Trace and return */ OBTRACE(OB_HANDLE_DEBUG, "%s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -1144,16 +1150,25 @@ } /* Handle extra references */ - while (AdditionalReferences--) - { - /* Decrement the count */ - InterlockedDecrement(&ObjectHeader->PointerCount); + if (AdditionalReferences == 1) + { + /* Dereference the object once */ + ObDereferenceObject(Object); + } + else if (AdditionalReferences > 1) + { + /* Dereference it many times */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, + -AdditionalReferences); } /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), - NewEntry.GrantedAccess); + GrantedAccess); + + /* Detach and fail */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1191,7 +1206,7 @@ * * @return <FILLMEIN>. * -* @remarks Cleans up the Lookup Context on success. +* @remarks Cleans up the Lookup Context on return. * *--*/ NTSTATUS @@ -1211,11 +1226,12 @@ POBJECT_HEADER ObjectHeader; HANDLE Handle; KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; + BOOLEAN AttachedToProcess = FALSE, KernelHandle = FALSE; POBJECT_TYPE ObjectType; PVOID HandleTable; NTSTATUS Status; - ULONG i; + ACCESS_MASK DesiredAccess, GrantedAccess; + PAUX_DATA AuxData; PAGED_CODE(); /* Get the object header and type */ @@ -1230,13 +1246,19 @@ ObjectHeader->PointerCount); /* Check if the types match */ - if ((Type) && (ObjectType != Type)) return STATUS_OBJECT_TYPE_MISMATCH; + if ((Type) && (ObjectType != Type)) + { + /* They don't, cleanup */ + //if (Context) ObpCleanupDirectoryLookup(Object, Context); + return STATUS_OBJECT_TYPE_MISMATCH; + } /* Check if this is a kernel handle */ if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) { /* Set the handle table */ HandleTable = ObpKernelHandleTable; + KernelHandle = TRUE; /* Check if we're not in the system process */ if (PsGetCurrentProcess() != PsInitialSystemProcess) @@ -1265,13 +1287,17 @@ * We failed (meaning security failure, according to NT Internals) * detach and return */ + //if (Context) ObpCleanupDirectoryLookup(Object, Context); if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return Status; } - /* Save the object header (assert its validity too) */ - ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); - NewEntry.Object = ObjectHeader; + /* Check if we are doing audits on close */ + if (AccessState->GenerateOnClose) + { + /* Force the attribute on */ + HandleAttributes|= EX_HANDLE_ENTRY_AUDITONCLOSE; + } /* Mask out the internal attributes */ NewEntry.ObAttributes |= HandleAttributes & @@ -1279,21 +1305,35 @@ EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - /* Save the access mask */ - NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | - AccessState->PreviouslyGrantedAccess; + /* Get the original desired access */ + DesiredAccess = AccessState->RemainingDesiredAccess | + AccessState->PreviouslyGrantedAccess; + + /* Remove what's not in the valid access mask */ + GrantedAccess = DesiredAccess & (ObjectType->TypeInfo.ValidAccessMask | + ACCESS_SYSTEM_SECURITY); + + /* Update the value in the access state */ + AccessState->PreviouslyGrantedAccess = GrantedAccess; + + /* Get the auxiliary data */ + AuxData = AccessState->AuxData; /* Handle extra references */ if (AdditionalReferences) { - /* Make a copy in case we fail later below */ - i = AdditionalReferences; - while (i--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - } + /* Add them to the header */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, AdditionalReferences); + } + + /* Now we can release the object */ + //if (Context) ObpCleanupDirectoryLookup(Object, Context); + + /* Save the object header */ + NewEntry.Object = ObjectHeader; + + /* Save the access mask */ + NewEntry.GrantedAccess = GrantedAccess; /* * Create the actual handle. We'll need to do this *after* calling @@ -1306,22 +1346,59 @@ NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); - /* Detach if needed */ - if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Make sure we got a handle */ if (Handle) { + /* Check if we have auxiliary data */ + if (AuxData) + { + /* FIXME: Change handle security */ + } + /* Check if this was a kernel handle */ - if (HandleAttributes & OBJ_KERNEL_HANDLE) - { - /* Set the kernel handle bit */ - Handle = ObMarkHandleAsKernelHandle(Handle); - } - - /* Return handle and object */ + if (KernelHandle) Handle = ObMarkHandleAsKernelHandle(Handle); + + /* Return it */ *ReturnedHandle = Handle; - if (ReturnedObject) *ReturnedObject = Object; + + /* Check if we need to generate on audit */ + if (AccessState->GenerateAudit) + { + /* Audit the handle creation */ + //SeAuditHandleCreation(AccessState, Handle); + } + + /* Check if this was a create */ + if (OpenReason == ObCreateHandle) + { + /* Check if we need to audit the privileges */ + if ((AuxData->PrivilegeSet) && + (AuxData->PrivilegeSet->PrivilegeCount)) + { + /* Do the audit */ +#if 0 + SePrivilegeObjectAuditAlarm(Handle, + &AccessState-> + SubjectSecurityContext, + GrantedAccess, + AuxData->PrivilegeSet, + TRUE, + ExGetPreviousMode()); +#endif + } + } + + /* Return the new object only if caller wanted it biased */ + if ((AdditionalReferences) && (ReturnedObject)) + { + /* Return it */ + *ReturnedObject = Object; + } + + /* Detach if needed */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Trace and return */ OBTRACE(OB_HANDLE_DEBUG, "%s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, @@ -1331,17 +1408,26 @@ return STATUS_SUCCESS; } - /* Handle extra references */ - while (AdditionalReferences--) - { - /* Increment the count */ - InterlockedDecrement(&ObjectHeader->PointerCount); - } - /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), - NewEntry.GrantedAccess); + GrantedAccess); + + /* Handle extra references */ + if (AdditionalReferences == 1) + { + /* Dereference the object once */ + ObDereferenceObject(Object); + } + else if (AdditionalReferences > 1) + { + /* Dereference it many times */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, + -AdditionalReferences); + } + + /* Detach if necessary and fail */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Jan 9 20:18:22 2007 @@ -292,19 +292,19 @@ IN POBP_LOOKUP_CONTEXT LookupContext, OUT PVOID *FoundObject) { - PVOID RootDirectory; - PVOID Directory = NULL, ParentDirectory = NULL; PVOID Object; POBJECT_HEADER ObjectHeader; + UNICODE_STRING ComponentName, RemainingName; + BOOLEAN InsideRoot = FALSE; + PDEVICE_MAP DeviceMap = NULL; + POBJECT_DIRECTORY Directory = NULL, ParentDirectory = NULL, RootDirectory; + POBJECT_DIRECTORY ReferencedDirectory = NULL, ReferencedParentDirectory = NULL; + KIRQL CalloutIrql; + OB_PARSE_METHOD ParseRoutine; NTSTATUS Status; + KPROCESSOR_MODE AccessCheckMode; PWCHAR NewName; POBJECT_HEADER_NAME_INFO ObjectNameInfo; - UNICODE_STRING RemainingName, ComponentName; - BOOLEAN InsideRoot = FALSE; - KPROCESSOR_MODE AccessCheckMode; - OB_PARSE_METHOD ParseRoutine; - KIRQL CalloutIrql; - POBJECT_DIRECTORY ReferencedDirectory = NULL, ReferencedParentDirectory = NULL; PAGED_CODE(); OBTRACE(OB_NAMESPACE_DEBUG, "%s - Finding Object: %wZ. Expecting: %p\n", @@ -337,7 +337,7 @@ 0, NULL, AccessMode, - &RootDirectory, + (PVOID*)&RootDirectory, NULL); if (!NT_SUCCESS(Status)) return Status; @@ -377,7 +377,7 @@ Status = ParseRoutine(RootDirectory, ObjectType, AccessState, - AccessMode, + AccessCheckMode, Attributes, ObjectName, &RemainingName, @@ -725,7 +725,7 @@ Status = ParseRoutine(Object, ObjectType, AccessState, - AccessMode, + AccessCheckMode, Attributes, ObjectName, &RemainingName, @@ -873,7 +873,7 @@ } /* Check if we have a device map and dereference it if so */ - //if (DeviceMap) ObfDereferenceDeviceMap(DeviceMap); + if (DeviceMap) ObfDereferenceDeviceMap(DeviceMap); /* Check if we have a referenced directory and dereference it if so */ if (ReferencedDirectory) ObDereferenceObject(ReferencedDirectory);

17 years, 9 months

[cwittich] 25399: don't include the Iso targets in the workspace

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 9 15:28:30 2007 New Revision: 25399 URL: http://svn.reactos.org/svn/reactos?rev=25399&view=rev Log: don't include the Iso targets in the workspace Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Tue Jan 9 15:28:30 2007 @@ -302,24 +302,29 @@ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - - std::string Cbp_file = CbpFileName ( module ); - fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); - - /* dependencies */ - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector<Library*>& libs = data.libraries; - for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); - } - fprintf ( OUT, "\t\t</Project>\r\n" ); - + + if ((module.type != Iso) && + (module.type != LiveIso) && + (module.type != IsoRegTest) && + (module.type != LiveIsoRegTest)) + { + std::string Cbp_file = CbpFileName ( module ); + fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); + + /* dependencies */ + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<Library*>& libs = data.libraries; + for ( size_t j = 0; j < libs.size(); j++ ) + fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); + } + fprintf ( OUT, "\t\t</Project>\r\n" ); + } } fprintf ( OUT, "\t</Workspace>\r\n" ); fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" );

17 years, 9 months

[greatlrd] 25398: minor changes, for be use later, adding some new data types

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jan 9 13:53:19 2007 New Revision: 25398 URL: http://svn.reactos.org/svn/reactos?rev=25398&view=rev Log: minor changes, for be use later, adding some new data types Modified: trunk/rosapps/devutils/cputointel/misc.h Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Tue Jan 9 13:53:19 2007 @@ -1,13 +1,16 @@ -#define CPU_UNINT unsigned int -#define CPU_INT int -#define CPU_BYTE unsigned char +/* 64bits unsigned */ +#define CPU_UNINT64 unsigned long long + +/* 32bits */ +#define CPU_UNINT unsigned int +#define CPU_INT int + +/* 8bits unsigned */ +#define CPU_BYTE unsigned char /* Prototypes for misc stuff */ - - -/* Convert Bit index to int */ CPU_INT LoadPFileImage(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, char *cpuid, CPU_UNINT type); CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, CPU_UNINT base, CPU_UNINT size);

17 years, 9 months

[ion] 25397: - Hold reference to the current directory and to the current parent directory during lookups. - Add more stubbed out cleanup code.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 9 12:37:36 2007 New Revision: 25397 URL: http://svn.reactos.org/svn/reactos?rev=25397&view=rev Log: - Hold reference to the current directory and to the current parent directory during lookups. - Add more stubbed out cleanup code. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Jan 9 12:37:36 2007 @@ -304,6 +304,7 @@ KPROCESSOR_MODE AccessCheckMode; OB_PARSE_METHOD ParseRoutine; KIRQL CalloutIrql; + POBJECT_DIRECTORY ReferencedDirectory = NULL, ReferencedParentDirectory = NULL; PAGED_CODE(); OBTRACE(OB_NAMESPACE_DEBUG, "%s - Finding Object: %wZ. Expecting: %p\n", @@ -535,6 +536,13 @@ if ((AccessCheckMode != KernelMode) && !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) { + /* We shouldn't have referenced a directory yet */ + ASSERT(ReferencedDirectory == NULL); + + /* Reference the directory */ + ObReferenceObject(Directory); + ReferencedDirectory = Directory; + /* Check if we have a parent directory */ if (ParentDirectory) { @@ -555,6 +563,14 @@ /* Check if we don't have a remaining name yet */ if (!RemainingName.Length) { + /* Check if we don't have a referenced directory yet */ + if (!ReferencedDirectory) + { + /* Reference it */ + ObReferenceObject(Directory); + ReferencedDirectory = Directory; + } + /* Check if we are inserting an object */ if (InsertObject) { @@ -683,6 +699,26 @@ /* Increment the pointer count */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + + /* Cleanup from the first lookup */ + //ObpCleanupDirectoryLookup(LookupContext, TRUE); + LookupContext->Object = NULL; + + /* Check if we have a referenced directory */ + if (ReferencedDirectory) + { + /* We do, dereference it */ + ObDereferenceObject(ReferencedDirectory); + ReferencedDirectory = NULL; + } + + /* Check if we have a referenced parent directory */ + if (ReferencedParentDirectory) + { + /* We do, dereference it */ + ObDereferenceObject(ReferencedParentDirectory); + ReferencedParentDirectory = NULL; + } /* Call the Parse Procedure */ ObpCalloutStart(&CalloutIrql); @@ -804,9 +840,18 @@ /* We still have a name; check if this is a directory object */ if (ObjectHeader->Type == ObDirectoryType) { - /* Restart from this directory */ + /* Check if we have a referenced parent directory */ + if (ReferencedParentDirectory) + { + /* Dereference it */ + ObDereferenceObject(ReferencedParentDirectory); + } + + /* Restart the lookup from this directory */ + ReferencedParentDirectory = ReferencedDirectory; ParentDirectory = Directory; Directory = Object; + ReferencedDirectory = NULL; } else { @@ -825,6 +870,19 @@ /* Cleanup after lookup */ //ObpCleanupDirectoryLookup(LookupContext, TRUE); LookupContext->Object = NULL; + } + + /* Check if we have a device map and dereference it if so */ + //if (DeviceMap) ObfDereferenceDeviceMap(DeviceMap); + + /* Check if we have a referenced directory and dereference it if so */ + if (ReferencedDirectory) ObDereferenceObject(ReferencedDirectory); + + /* Check if we have a referenced parent directory */ + if (ReferencedParentDirectory) + { + /* We do, dereference it */ + ObDereferenceObject(ReferencedParentDirectory); } /* Set the found object and check if we got one */

17 years, 9 months

[ion] 25396: - Complete the hack that's already in SeAccessCheck to also return STATUS_SUCCESS if we return TRUE always. Otherwise, code might weirdly fail. - Save parent directory during lookups and check if the caller has the right to traverse it, if we ever need to. - Optimize the configuration of the lookup context so that it's only done when necessary, add stub calls to lock the directory.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 9 12:30:43 2007 New Revision: 25396 URL: http://svn.reactos.org/svn/reactos?rev=25396&view=rev Log: - Complete the hack that's already in SeAccessCheck to also return STATUS_SUCCESS if we return TRUE always. Otherwise, code might weirdly fail. - Save parent directory during lookups and check if the caller has the right to traverse it, if we ever need to. - Optimize the configuration of the lookup context so that it's only done when necessary, add stub calls to lock the directory. Modified: trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Jan 9 12:30:43 2007 @@ -293,7 +293,7 @@ OUT PVOID *FoundObject) { PVOID RootDirectory; - PVOID Directory = NULL; + PVOID Directory = NULL, ParentDirectory = NULL; PVOID Object; POBJECT_HEADER ObjectHeader; NTSTATUS Status; @@ -523,20 +523,58 @@ } /* Get its size and make sure it's valid */ - if (!(ComponentName.Length -= RemainingName.Length)) - { + ComponentName.Length -= RemainingName.Length; + if (!ComponentName.Length) + { + /* Invalid size, fail */ Status = STATUS_OBJECT_NAME_INVALID; break; } - /* Do the look up */ - LookupContext->DirectoryLocked = TRUE; - LookupContext->Directory = Directory; + /* Check if this is a user-mode call that needs to traverse */ + if ((AccessCheckMode != KernelMode) && + !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) + { + /* Check if we have a parent directory */ + if (ParentDirectory) + { + /* Check for traverse access */ + if (!ObpCheckTraverseAccess(ParentDirectory, + DIRECTORY_TRAVERSE, + AccessState, + FALSE, + AccessCheckMode, + &Status)) + { + /* We don't have it, fail */ + break; + } + } + } + + /* Check if we don't have a remaining name yet */ + if (!RemainingName.Length) + { + /* Check if we are inserting an object */ + if (InsertObject) + { + /* Lock the directory */ + //ObpAcquireDirectoryLockExclusive(LookupContext, Directory); + + /* Setup the context */ + // FIXME: ObpSetLookupDirectory(Dir);? + LookupContext->Directory = Directory; + LookupContext->DirectoryLocked = TRUE; + LookupContext->LockStateSignature = 0xCCCC1234; + } + } + + /* Do the lookup */ Object = ObpLookupEntryDirectory(Directory, - &ComponentName, - Attributes, - InsertObject ? FALSE : TRUE, - LookupContext); + &ComponentName, + Attributes, + InsertObject ? FALSE : TRUE, + LookupContext); if (!Object) { /* We didn't find it... do we still have a path? */ @@ -568,64 +606,64 @@ break; } - /* Get the object header */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(InsertObject); - - /* FIXME: Check if this is a Section Object or Sym Link */ - /* FIXME: If it is, then check if this isn't session 0 */ - /* FIXME: If it isn't, check for SeCreateGlobalPrivilege */ - /* FIXME: If privilege isn't there, check for unsecure name */ - /* FIXME: If it isn't a known unsecure name, then fail */ - - /* Create Object Name */ - NewName = ExAllocatePoolWithTag(PagedPool, - ComponentName.Length, - OB_NAME_TAG); - if (!(NewName) || - !(ObpInsertEntryDirectory(Directory, - LookupContext, - ObjectHeader))) - { - /* Either couldn't allocate the name, or insert failed */ - if (NewName) ExFreePool(NewName); - - /* Fail due to memory reasons */ - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - /* Reference newly to be inserted object */ - ObReferenceObject(InsertObject); - - /* Get the name information */ - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - - /* Reference the directory */ - ObReferenceObject(Directory); - - /* Copy the Name */ - RtlCopyMemory(NewName, - ComponentName.Buffer, - ComponentName.Length); - - /* Check if we had an old name */ - if (ObjectNameInfo->Name.Buffer) - { - /* Free it */ - ExFreePool(ObjectNameInfo->Name.Buffer); - } - - /* Write new one */ - ObjectNameInfo->Name.Buffer = NewName; - ObjectNameInfo->Name.Length = ComponentName.Length; - ObjectNameInfo->Name.MaximumLength = ComponentName.Length; - - /* Return Status and the Expected Object */ - Status = STATUS_SUCCESS; - Object = InsertObject; - - /* Get out of here */ + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(InsertObject); + + /* FIXME: Check if this is a Section Object or Sym Link */ + /* FIXME: If it is, then check if this isn't session 0 */ + /* FIXME: If it isn't, check for SeCreateGlobalPrivilege */ + /* FIXME: If privilege isn't there, check for unsecure name */ + /* FIXME: If it isn't a known unsecure name, then fail */ + + /* Create Object Name */ + NewName = ExAllocatePoolWithTag(PagedPool, + ComponentName.Length, + OB_NAME_TAG); + if (!(NewName) || + !(ObpInsertEntryDirectory(Directory, + LookupContext, + ObjectHeader))) + { + /* Either couldn't allocate the name, or insert failed */ + if (NewName) ExFreePool(NewName); + + /* Fail due to memory reasons */ + Status = STATUS_INSUFFICIENT_RESOURCES; break; + } + + /* Reference newly to be inserted object */ + ObReferenceObject(InsertObject); + + /* Get the name information */ + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + /* Reference the directory */ + ObReferenceObject(Directory); + + /* Copy the Name */ + RtlCopyMemory(NewName, + ComponentName.Buffer, + ComponentName.Length); + + /* Check if we had an old name */ + if (ObjectNameInfo->Name.Buffer) + { + /* Free it */ + ExFreePool(ObjectNameInfo->Name.Buffer); + } + + /* Write new one */ + ObjectNameInfo->Name.Buffer = NewName; + ObjectNameInfo->Name.Length = ComponentName.Length; + ObjectNameInfo->Name.MaximumLength = ComponentName.Length; + + /* Return Status and the Expected Object */ + Status = STATUS_SUCCESS; + Object = InsertObject; + + /* Get out of here */ + break; } Reparse: @@ -680,6 +718,7 @@ } /* Start at Root */ + ParentDirectory = NULL; RootDirectory = NameSpaceRoot; /* Check for reparse status */ @@ -766,6 +805,7 @@ if (ObjectHeader->Type == ObDirectoryType) { /* Restart from this directory */ + ParentDirectory = Directory; Directory = Object; } else Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Tue Jan 9 12:30:43 2007 @@ -444,7 +444,6 @@ &Status)) { /* Return the object */ - Status = STATUS_SUCCESS; *ObjectPtr = Object; } } Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Tue Jan 9 12:30:43 2007 @@ -1054,7 +1054,7 @@ } else { - *AccessStatus = STATUS_ACCESS_DENIED; + *AccessStatus = STATUS_SUCCESS; DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", *GrantedAccess, DesiredAccess); return TRUE; /* FIXME: should be FALSE */

17 years, 9 months

[ion] 25395: - Add missing code to ObpLookupDirectoryEntry. - Add calls to ObpInitailizeDirectoryLookup. - Add calls to ObpCleanupDirectoryLookup but disable them for now. - Add calls to ObpAcquireDirectoryLock but disable them for now.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 9 12:07:36 2007 New Revision: 25395 URL: http://svn.reactos.org/svn/reactos?rev=25395&view=rev Log: - Add missing code to ObpLookupDirectoryEntry. - Add calls to ObpInitailizeDirectoryLookup. - Add calls to ObpCleanupDirectoryLookup but disable them for now. - Add calls to ObpAcquireDirectoryLock but disable them for now. Modified: trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Tue Jan 9 12:07:36 2007 @@ -185,7 +185,8 @@ /* Check if the directory is already locked */ if (!Context->DirectoryLocked) { - + /* Lock it */ + ObpAcquireDirectoryLockShared(Directory, Context); } /* Start looping */ @@ -222,6 +223,8 @@ /* Check if the directory was locked */ if (!Context->DirectoryLocked) { + /* Convert the lock from shared to exclusive */ + ExConvertPushLockSharedToExclusive(&Directory->Lock); } /* Set the Current Entry */ @@ -241,6 +244,11 @@ /* Get the object name information */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + if (HeaderNameInfo) + { + /* Add a query reference */ + //ObpIncrementQueryReference(ObjectHeader, HeaderNameInfo); + } /* Reference the object being looked up */ //ObReferenceObject(FoundObject); @@ -248,6 +256,8 @@ /* Check if the directory was locked */ if (!Context->DirectoryLocked) { + /* Release the lock */ + ObpReleaseDirectoryLock(Directory, Context); } } else @@ -255,6 +265,8 @@ /* Check if the directory was locked */ if (!Context->DirectoryLocked) { + /* Release the lock */ + ObpReleaseDirectoryLock(Directory, Context); } /* Check if we should scan the shadow directory */ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jan 9 12:07:36 2007 @@ -2030,6 +2030,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup after lookup */ + //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE); TempBuffer->LookupContext.Object = NULL; goto Cleanup; } @@ -2062,7 +2063,9 @@ { /* Set failure code */ Status = STATUS_INVALID_PARAMETER; - TempBuffer->LookupContext.Object = NULL; + + /* Cleanup after lookup */ + //ObpCleanupDirectoryLookup(&TempBuffer->LookupContext, TRUE); } else { @@ -2440,12 +2443,13 @@ if (!NT_SUCCESS(Status)) { /* Fail */ + if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); ObDereferenceObject(Object); return Status; } /* Setup a lookup context */ - Context.Object = NULL; + ObpInitializeDirectoryLookup(&Context); InsertObject = Object; OpenReason = ObCreateHandle; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Tue Jan 9 12:07:36 2007 @@ -278,9 +278,17 @@ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - Context.Object = NULL; + /* Initialize lookup context */ + ObpInitializeDirectoryLookup(&Context); + + /* Lock it */ + //ObpAcquireDirectoryLockExclusive(ObpTypeDirectoryObject, &Context); + + /* Setup directory */ + // FIXME: ObpSetLookupDirectory(Dir);? Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; + Context.LockStateSignature = 0xCCCC1234; /* Loop the object types */ ListHead = &ObTypeObjectType->TypeList; @@ -317,6 +325,8 @@ NextEntry = NextEntry->Flink; } + /* Cleanup after lookup */ + //ObpCleanupDirectoryLookup(&Context, TRUE); Context.Object = NULL; /* Initialize DOS Devices Directory and related Symbolic Links */ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Tue Jan 9 12:07:36 2007 @@ -428,6 +428,9 @@ PassedAccessState, &Context, &Object); + + /* Cleanup after lookup */ + //ObpCleanupDirectoryLookup(&Context, TRUE); Context.Object = NULL; /* Check if the lookup succeeded */

17 years, 9 months

← Newer
1
...
24
25
26
27
28
29
30
...
41
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 January 2007