Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[greatlrd] 31260: Fixed param checks in createsurface code. and one wrong if check
by greatlrd＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: greatlrd Date: Sun Dec 16 00:34:17 2007 New Revision: 31260 URL: http://svn.reactos.org/svn/reactos?rev=31260&view=rev Log: Fixed param checks in createsurface code. and one wrong if check Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 00:34:17 2007 @@ -39,8 +39,7 @@ DWORD num_of_surf=1; DWORD count; - /* Fixme adding vaidlate of income param */ - if(pDDraw->lpLcl->dwLocalFlags == 0x20000) + if(pDDraw->lpLcl->dwLocalFlags != DDRAWILCL_SETCOOPCALLED) { return DDERR_NOCOOPERATIVELEVELSET; }

1 0

[greatlrd] 31259: always initate ppSurf to NULL if createsurface fail, the ppSurf must be zero out.
by greatlrd＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: greatlrd Date: Sun Dec 16 00:25:39 2007 New Revision: 31259 URL: http://svn.reactos.org/svn/reactos?rev=31259&view=rev Log: always initate ppSurf to NULL if createsurface fail, the ppSurf must be zero out. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Dec 16 00:25:39 2007 @@ -442,6 +442,8 @@ DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); + *ppSurf = NULL; + _SEH_TRY { if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) @@ -475,6 +477,8 @@ HRESULT ret; DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); + *ppSurf = NULL; + _SEH_TRY { ret = Internal_CreateSurface(This, pDDSD, ppSurf, pUnkOuter);

1 0

[greatlrd] 31258: Do not create a surface from wrong process. if we found it was another process try call on createsurface that have started ddraw it will fail.
by greatlrd＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: greatlrd Date: Sat Dec 15 23:53:33 2007 New Revision: 31258 URL: http://svn.reactos.org/svn/reactos?rev=31258&view=rev Log: Do not create a surface from wrong process. if we found it was another process try call on createsurface that have started ddraw it will fail. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat Dec 15 23:53:33 2007 @@ -54,6 +54,10 @@ { return DDERR_INVALIDPARAMS; } + if (pDDraw->lpLcl->dwProcessId != GetCurrentProcessId() ) + { + return DDERR_INVALIDOBJECT; + } if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE))

1 0

[fireball] 31257: - Fix typo in KCB flag. - CmDeleteKey takes a Key Body, not a KCB. - Simplify some code since ValueCache.RealKCB is a KCB now, not a hacked PKEY_OBJECT, so a bunch of typecasts can be removed. - Implement CmpCleanUpSubKeyInfo to remove cached subkey information when a KCB is deleted (subkeys are not cached yet, however). - Add checks in various code paths to make sure we don't touch a read-only KCB. - Don't double-dereference a key object during a delete. - Add checks for inval
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 23:51:40 2007 New Revision: 31257 URL: http://svn.reactos.org/svn/reactos?rev=31257&view=rev Log: - Fix typo in KCB flag. - CmDeleteKey takes a Key Body, not a KCB. - Simplify some code since ValueCache.RealKCB is a KCB now, not a hacked PKEY_OBJECT, so a bunch of typecasts can be removed. - Implement CmpCleanUpSubKeyInfo to remove cached subkey information when a KCB is deleted (subkeys are not cached yet, however). - Add checks in various code paths to make sure we don't touch a read-only KCB. - Don't double-dereference a key object during a delete. - Add checks for invalid key information classes. - For KeyNameInformation, the caller must have some handle access to succeed the call. - Validate alignment of key value names. - Don't accept NULLs at the end of key value names. - Validate key value name lengths. - Validate data lengths. - Remove a couple of forced lazy flushes that aren't required anymore. - Use CmpLockRegistry() in ntapi.c instead of the manual lock release. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sat Dec 15 23:51:40 2007 @@ -1035,12 +1035,13 @@ NTSTATUS NTAPI -CmDeleteKey(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmDeleteKey(IN PCM_KEY_BODY KeyBody) { NTSTATUS Status; PHHIVE Hive; PCM_KEY_NODE Node, Parent; HCELL_INDEX Cell, ParentCell; + PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; /* Acquire hive lock */ KeEnterCriticalRegion(); Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Sat Dec 15 23:51:40 2007 @@ -449,15 +449,15 @@ else if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) { /* This is a sym link, check if there's only one reference left */ - if ((((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->RefCount == 1) && - !(((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->Delete)) + if ((Kcb->ValueCache.RealKcb->RefCount == 1) && + !(Kcb->ValueCache.RealKcb->Delete)) { /* Disable delay close for the KCB */ - ((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; + Kcb->ValueCache.RealKcb->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; } /* Dereference the KCB */ - CmpDelayDerefKeyControlBlock((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb); + CmpDelayDerefKeyControlBlock(Kcb->ValueCache.RealKcb); Kcb->ExtFlags &= ~CM_KCB_SYM_LINK_FOUND; } } @@ -498,6 +498,61 @@ LockHeldExclusively ? CmpDereferenceKeyControlBlockWithLock(Kcb,LockHeldExclusively) : CmpDelayDerefKeyControlBlock(Kcb); + } +} + +VOID +NTAPI +CmpCleanUpSubKeyInfo(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + PCM_KEY_NODE KeyNode; + + /* Sanity check */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Check if there's any cached subkey */ + if (Kcb->ExtFlags & (CM_KCB_NO_SUBKEY | CM_KCB_SUBKEY_ONE | CM_KCB_SUBKEY_HINT)) + { + /* Check if there's a hint */ + if (Kcb->ExtFlags & (CM_KCB_SUBKEY_HINT)) + { + /* Kill it */ + ExFreePool(Kcb->IndexHint); + } + + /* Remove subkey flags */ + Kcb->ExtFlags &= ~(CM_KCB_NO_SUBKEY | CM_KCB_SUBKEY_ONE | CM_KCB_SUBKEY_HINT); + } + + /* Check if there's no linked cell */ + if (Kcb->KeyCell == HCELL_NIL) + { + /* Make sure it's a delete */ + ASSERT(Kcb->Delete); + KeyNode = NULL; + } + else + { + /* Get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Kcb->KeyHive, Kcb->KeyCell); + } + + /* Check if we got the node */ + if (!KeyNode) + { + /* We didn't, mark the cached data invalid */ + Kcb->ExtFlags |= CM_KCB_INVALID_CACHED_INFO; + } + else + { + /* We have a keynode, update subkey counts */ + Kcb->ExtFlags &= ~CM_KCB_INVALID_CACHED_INFO; + Kcb->SubKeyCount = KeyNode->SubKeyCounts[Stable] + + KeyNode->SubKeyCounts[Volatile]; + + /* Release the cell */ + HvReleaseCell(Kcb->KeyHive, Kcb->KeyCell); } } @@ -821,4 +876,3 @@ /* FIXME: Implement once we don't link parents to children anymore */ } - Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sat Dec 15 23:51:40 2007 @@ -33,7 +33,7 @@ HANDLE Handle; PAGED_CODE(); DPRINT("NtCreateKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); - + /* Setup the parse context */ ParseContext.CreateOperation = TRUE; ParseContext.CreateOptions = CreateOptions; @@ -65,7 +65,7 @@ NTSTATUS Status; PAGED_CODE(); DPRINT("NtOpenKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); - + /* Just let the object manager handle this */ Status = ObOpenObjectByName(ObjectAttributes, CmpKeyObjectType, @@ -90,7 +90,6 @@ REG_DELETE_KEY_INFORMATION DeleteKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); - DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); /* Verify that the handle is valid and is a registry key */ @@ -98,13 +97,9 @@ DELETE, CmpKeyObjectType, ExGetPreviousMode(), - (PVOID *)&KeyObject, + (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -112,16 +107,17 @@ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); if (NT_SUCCESS(Status)) { - /* Call the internal API */ - Status = CmDeleteKey(KeyObject->KeyControlBlock); - - /* Remove the keep-alive reference */ - ObDereferenceObject(KeyObject); - if (KeyObject->KeyControlBlock->KeyHive != - KeyObject->KeyControlBlock->ParentKcb->KeyHive) + /* Check if we are read-only */ + if ((KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) || + (KeyObject->KeyControlBlock->ParentKcb->ExtFlags & CM_KCB_READ_ONLY_KEY)) { - /* Dereference again */ - ObDereferenceObject(KeyObject); + /* Fail */ + Status = STATUS_ACCESS_DENIED; + } + else + { + /* Call the internal API */ + Status = CmDeleteKey(KeyObject); } /* Do post callback */ @@ -148,22 +144,26 @@ REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); - DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", - KeyHandle, Index, KeyInformationClass, Length); + KeyHandle, Index, KeyInformationClass, Length); + + /* Reject classes we don't know about */ + if ((KeyInformationClass != KeyBasicInformation) && + (KeyInformationClass != KeyNodeInformation) && + (KeyInformationClass != KeyFullInformation)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_ENUMERATE_SUB_KEYS, CmpKeyObjectType, ExGetPreviousMode(), - (PVOID *)&KeyObject, + (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -209,22 +209,26 @@ REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); - DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", - KeyHandle, Index, KeyValueInformationClass, Length); + KeyHandle, Index, KeyValueInformationClass, Length); + + /* Reject classes we don't know about */ + if ((KeyValueInformationClass != KeyValueBasicInformation) && + (KeyValueInformationClass != KeyValueFullInformation) && + (KeyValueInformationClass != KeyValuePartialInformation)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, CmpKeyObjectType, ExGetPreviousMode(), - (PVOID *)&KeyObject, + (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -269,25 +273,57 @@ PCM_KEY_BODY KeyObject; REG_QUERY_KEY_INFORMATION QueryKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - + OBJECT_HANDLE_INFORMATION HandleInfo; + PAGED_CODE(); DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", - KeyHandle, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != - KeyNameInformation) ? - KEY_QUERY_VALUE : 0, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } + KeyHandle, KeyInformationClass, Length); + + /* Reject invalid classes */ + if ((KeyInformationClass != KeyBasicInformation) && + (KeyInformationClass != KeyNodeInformation) && + (KeyInformationClass != KeyFullInformation) && + (KeyInformationClass != KeyNameInformation) && + (KeyInformationClass != KeyCachedInformation) && + (KeyInformationClass != KeyFlagsInformation)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } + + /* Check if just the name is required */ + if (KeyInformationClass == KeyNameInformation) + { + /* Ignore access level */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID*)&KeyObject, + &HandleInfo); + if (NT_SUCCESS(Status)) + { + /* At least a single bit of access is required */ + if (!HandleInfo.GrantedAccess) + { + /* No such luck */ + ObDereferenceObject(KeyObject); + Status = STATUS_ACCESS_DENIED; + } + } + } + else + { + /* Get a reference */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID*)&KeyObject, + NULL); + } + + /* Quit on failure */ + if (!NT_SUCCESS(Status)) return Status; /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -331,8 +367,8 @@ PCM_KEY_BODY KeyObject; REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - + UNICODE_STRING ValueNameCopy = *ValueName; + PAGED_CODE(); DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", KeyHandle, ValueName, KeyValueInformationClass, Length); @@ -341,18 +377,32 @@ KEY_QUERY_VALUE, CmpKeyObjectType, ExGetPreviousMode(), - (PVOID *)&KeyObject, + (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure the name is aligned properly */ + if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + { + /* It isn't, so we'll fail */ + ObDereferenceObject(KeyObject); + return STATUS_INVALID_PARAMETER; + } + else + { + /* Ignore any null characters at the end */ + while ((ValueNameCopy.Length) && + !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) + { + /* Skip it */ + ValueNameCopy.Length -= sizeof(WCHAR); + } } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; QueryValueKeyInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.ValueName = ValueName; + QueryValueKeyInfo.ValueName = &ValueNameCopy; QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; QueryValueKeyInfo.Length = Length; QueryValueKeyInfo.ResultLength = ResultLength; @@ -363,7 +413,7 @@ { /* Call the internal API */ Status = CmQueryValueKey(KeyObject->KeyControlBlock, - *ValueName, + ValueNameCopy, KeyValueInformationClass, KeyValueInformation, Length, @@ -373,8 +423,6 @@ PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); } - - DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); /* Dereference and return status */ ObDereferenceObject(KeyObject); @@ -394,8 +442,8 @@ PCM_KEY_BODY KeyObject; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - + UNICODE_STRING ValueNameCopy = *ValueName; + PAGED_CODE(); DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", KeyHandle, ValueName, TitleIndex, Type, DataSize); @@ -404,12 +452,34 @@ KEY_SET_VALUE, CmpKeyObjectType, ExGetPreviousMode(), - (PVOID *)&KeyObject, + (PVOID*)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); - return Status; + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure the name is aligned, not too long, and the data under 4GB */ + if ( (ValueNameCopy.Length > 32767) || + ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) || + (DataSize > 0x80000000)) + { + /* Fail */ + ObDereferenceObject(KeyObject); + return STATUS_INVALID_PARAMETER; + } + + /* Ignore any null characters at the end */ + while ((ValueNameCopy.Length) && + !(ValueNameCopy.Buffer[ValueNameCopy.Length / sizeof(WCHAR) - 1])) + { + /* Skip it */ + ValueNameCopy.Length -= sizeof(WCHAR); + } + + /* Don't touch read-only keys */ + if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) + { + /* Fail */ + ObDereferenceObject(KeyObject); + return STATUS_ACCESS_DENIED; } /* Setup callback */ @@ -427,19 +497,18 @@ { /* Call the internal API */ Status = CmSetValueKey(KeyObject->KeyControlBlock, - ValueName, + &ValueNameCopy, Type, Data, DataSize); } - /* Do the post-callback and de-reference the key object */ + /* Do the post-callback */ PostOperationInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); + + /* Dereference and return status */ ObDereferenceObject(KeyObject); - - /* Synchronize the hives and return */ - CmpLazyFlush(); return Status; } @@ -453,6 +522,7 @@ REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + UNICODE_STRING ValueNameCopy = *ValueName; PAGED_CODE(); /* Verify that the handle is valid and is a registry key */ @@ -462,10 +532,22 @@ PreviousMode, (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; + if (!NT_SUCCESS(Status)) return Status; + + /* Don't touch read-only keys */ + if (KeyObject->KeyControlBlock->ExtFlags & CM_KCB_READ_ONLY_KEY) + { + /* Fail */ + ObDereferenceObject(KeyObject); + return STATUS_ACCESS_DENIED; + } + + /* Make sure the name is aligned properly */ + if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1))) + { + /* It isn't, so we'll fail */ + ObDereferenceObject(KeyObject); + return STATUS_INVALID_PARAMETER; } /* Do the callback */ @@ -476,7 +558,7 @@ if (NT_SUCCESS(Status)) { /* Call the internal API */ - Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); + Status = CmDeleteValueKey(KeyObject->KeyControlBlock, ValueNameCopy); /* Do the post callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -485,9 +567,8 @@ &PostOperationInfo); } - /* Dereference the key body and synchronize the hives */ + /* Dereference the key body */ ObDereferenceObject(KeyObject); - CmpLazyFlush(); return Status; } @@ -509,8 +590,10 @@ if (!NT_SUCCESS(Status)) return Status; /* Lock the registry */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB */ + CmpAcquireKcbLockShared(KeyObject->KeyControlBlock); /* Make sure KCB isn't deleted */ if (KeyObject->KeyControlBlock->Delete) @@ -524,9 +607,9 @@ Status = CmFlushKey(KeyObject->KeyControlBlock, FALSE); } - /* Release the lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release the locks */ + CmpReleaseKcbLock(KeyObject->KeyControlBlock); + CmpUnlockRegistry(); /* Dereference the object and return status */ ObDereferenceObject(KeyObject); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h Sat Dec 15 23:51:40 2007 @@ -53,7 +53,7 @@ #define CM_KCB_KEY_NON_EXIST 0x10 #define CM_KCB_NO_DELAY_CLOSE 0x20 #define CM_KCB_INVALID_CACHED_INFO 0x40 -#define CM_KEY_READ_ONLY_KEY 0x80 +#define CM_KCB_READ_ONLY_KEY 0x80 // // CM_KEY_VALUE Types @@ -577,6 +577,16 @@ OUT PHCELL_INDEX CellToRelease ); +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpCompareNewValueDataAgainstKCBCache( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize +); + // // Registry Validation Functions // @@ -860,9 +870,21 @@ VOID NTAPI +CmpCleanUpKcbValueCache( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI CmpCleanUpKcbCacheWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively +); + +VOID +NTAPI +CmpCleanUpSubKeyInfo( + IN PCM_KEY_CONTROL_BLOCK Kcb ); VOID @@ -1324,7 +1346,7 @@ NTSTATUS NTAPI CmDeleteKey( - IN PCM_KEY_CONTROL_BLOCK Kcb + IN PCM_KEY_BODY KeyBody ); NTSTATUS

1 0

[dchapyshev] 31256: - Add Bulgarian layouts
by dchapyshev＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: dchapyshev Date: Sat Dec 15 22:17:32 2007 New Revision: 31256 URL: http://svn.reactos.org/svn/reactos?rev=31256&view=rev Log: - Add Bulgarian layouts Modified: trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (original) +++ trunk/reactos/dll/cpl/input/input.h Sat Dec 15 22:17:32 2007 @@ -14,7 +14,7 @@ extern HINSTANCE hApplet; #define BEGIN_LAYOUT 5000 -#define END_LAYOUT 5133 +#define END_LAYOUT 5135 /* input.c */ VOID Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc Sat Dec 15 22:17:32 2007 @@ -371,4 +371,6 @@ IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" -END + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Dec 15 22:17:32 2007 @@ -371,4 +371,6 @@ IDS_SYRIAC_PHONETIC_LAYOUT, "Syrisch (Phonetisch)" IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi (Phonetisch)" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi (Schreibmaschine)" -END + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Dec 15 22:17:32 2007 @@ -371,4 +371,6 @@ IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" -END + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Dec 15 22:17:32 2007 @@ -373,4 +373,6 @@ IDS_SYRIAC_PHONETIC_LAYOUT, "Syrien Phonétique" IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonétique" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" -END + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc Sat Dec 15 22:17:32 2007 @@ -239,138 +239,140 @@ STRINGTABLE BEGIN - //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "United States-Dvorak" - IDS_US_LAYOUT, "US" - IDS_BELGIAN_LAYOUT, "Belgian (Period)" - IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" - IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" - IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" - IDS_DANISH_LAYOUT, "Danish" - IDS_DUTCH_LAYOUT, "Dutch" - IDS_FINNISH_LAYOUT, "Finnish" - IDS_FRENCH_LAYOUT, "French" - IDS_GERMAN_LAYOUT, "German" - IDS_GERMAN_IBM_LAYOUT, "German (IBM)" - IDS_ICELANDIC_LAYOUT, "Icelandic" - IDS_IRISH_LAYOUT, "Irish" - IDS_ITALIAN_LAYOUT, "Italian" - IDS_ITALIAN_142_LAYOUT, "Italian (142)" - IDS_LATIN_AMERICAN_LAYOUT, "Latin American" - IDS_NORWEGIAN_LAYOUT, "Norwegian" - IDS_PORTUGUESE_LAYOUT, "Portuguese" - IDS_SPANISH_LAYOUT, "Spanish" - IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" - IDS_SWEDISH_LAYOUT, "Swedish" - IDS_SWISS_FRENCH_LAYOUT, "Swiss French" - IDS_SWISS_GERMAN_LAYOUT, "Swiss German" - IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" - IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" - IDS_ALBANIAN_LAYOUT, "Albanian" - IDS_CROATIAN_LAYOUT, "Croatian" - IDS_CZECH_LAYOUT, "Czech" - IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" - IDS_HUNGARIAN_LAYOUT, "Hungarian" - IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" - IDS_POLISH_LAYOUT, "Polish (Programmers)" - IDS_POLISH_214_LAYOUT, "Polish (214)" - IDS_ROMANIAN_LAYOUT, "Romanian" - IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" - IDS_SLOVAK_LAYOUT, "Slovak" - IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" - IDS_SLOVENIAN_LAYOUT, "Slovenian" - IDS_ESTONIAN_LAYOUT, "Estonian" - IDS_LATVIAN_LAYOUT, "Latvian" - IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" - IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" - IDS_GREEK_LAYOUT, "Greek" - IDS_GREEK_LATIN_LAYOUT, "Greek Latin" - IDS_GREEK_220_LAYOUT, "Greek (220)" - IDS_GREEK_319_LAYOUT, "Greek (319)" - IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" - IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" - IDS_BELARUSIAN_LAYOUT, "Belarusian" - IDS_BULGARIAN_LAYOUT, "Bulgarian" - IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" - IDS_RUSSIAN_LAYOUT, "Russian" - IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" - IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" - IDS_UKRAINIAN_LAYOUT, "Ukrainian" - IDS_TURKISH_F_LAYOUT, "Turkish F" - IDS_TURKISH_Q_LAYOUT, "Turkish Q" - IDS_JAPANESE_LAYOUT, "Japanese" - IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" - IDS_KOREAN_LAYOUT, "Korean" - IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" - IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" - IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" - IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" - IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" - IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" - IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" - IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" - IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" - IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" - IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" - IDS_HEBREW_LAYOUT, "Hebrew" - IDS_ARABIC_101_LAYOUT, "Arabic (101)" - IDS_ARABIC_102_LAYOUT, "Arabic (102)" - IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" - IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" - IDS_LITHUANIAN_LAYOUT, "Lithuanian" - IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" - IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" - IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" - IDS_ASSAMESE_LAYOUT, "Assamese" - IDS_BENGALI_LAYOUT, "Bengali" - IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" - IDS_GUJARATI_LAYOUT, "Gujarati" - IDS_KANNADA_LAYOUT, "Kannada" - IDS_MALAYALAM_LAYOUT, "Malayalam" - IDS_ORIYA_LAYOUT, "Oriya" - IDS_PUNJABI_LAYOUT, "Punjabi" - IDS_TAMIL_LAYOUT, "Tamil" - IDS_TELUGU_LAYOUT, "Telugu" - IDS_MARATHI_LAYOUT, "Marathi" - IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" - IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" - IDS_FAEROESE_LAYOUT, "Faeroese" - IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" - IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" - IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" - IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" - IDS_KAZAKH_LAYOUT, "Kazakh" - IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" - IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" - IDS_TATAR_LAYOUT, "Tatar" - IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" - IDS_VIETNAMESE_LAYOUT, "Vietnamese" - IDS_GEORGIAN_LAYOUT, "Georgian" - IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" - IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" - IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" - IDS_FARSI_LAYOUT, "Farsi" - IDS_GAELIC_LAYOUT, "Gaelic" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" - IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" - IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" - IDS_URDU_LAYOUT, "Urdu" - IDS_SYRIAC_LAYOUT, "Syriac" - IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" - IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" - IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" -END + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Dec 15 22:17:32 2007 @@ -380,4 +380,6 @@ IDS_SYRIAC_PHONETIC_LAYOUT, "Ñèð³éñüêà (ôîíåòè÷íà)" IDS_DIVEHI_PHONETIC_LAYOUT, "Ìàëüä³âñüêà (ôîíåòè÷íà)" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" -END + IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" +END Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (original) +++ trunk/reactos/dll/cpl/input/resource.h Sat Dec 15 22:17:32 2007 @@ -210,6 +210,8 @@ #define IDS_SYRIAC_PHONETIC_LAYOUT 5131 #define IDS_DIVEHI_PHONETIC_LAYOUT 5132 #define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133 +#define IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT 5134 +#define IDS_BULGARIAN_PHONETIC_BDS_LAYOUT 5135 #define IDS_SELECTED_LAYOUT 6000 #define IDS_SELECTED_LANGUAGE 6001

1 0

[dchapyshev] 31255: - Add some languages from wine
by dchapyshev＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: dchapyshev Date: Sat Dec 15 21:44:56 2007 New Revision: 31255 URL: http://svn.reactos.org/svn/reactos?rev=31255&view=rev Log: - Add some languages from wine Added: trunk/reactos/dll/win32/kernel32/nls/ara.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arb.nls (with props) trunk/reactos/dll/win32/kernel32/nls/are.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arg.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arh.nls (with props) trunk/reactos/dll/win32/kernel32/nls/ari.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arj.nls (with props) trunk/reactos/dll/win32/kernel32/nls/ark.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arl.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arm.nls (with props) trunk/reactos/dll/win32/kernel32/nls/aro.nls (with props) trunk/reactos/dll/win32/kernel32/nls/arq.nls (with props) trunk/reactos/dll/win32/kernel32/nls/ars.nls (with props) trunk/reactos/dll/win32/kernel32/nls/art.nls (with props) trunk/reactos/dll/win32/kernel32/nls/aru.nls (with props) trunk/reactos/dll/win32/kernel32/nls/ary.nls (with props) trunk/reactos/dll/win32/kernel32/nls/aze.nls (with props) trunk/reactos/dll/win32/kernel32/nls/azl.nls (with props) trunk/reactos/dll/win32/kernel32/nls/div.nls (with props) trunk/reactos/dll/win32/kernel32/nls/esc.nls (with props) trunk/reactos/dll/win32/kernel32/nls/far.nls (with props) trunk/reactos/dll/win32/kernel32/nls/guj.nls (with props) trunk/reactos/dll/win32/kernel32/nls/hin.nls (with props) trunk/reactos/dll/win32/kernel32/nls/kan.nls (with props) trunk/reactos/dll/win32/kernel32/nls/kat.nls (with props) trunk/reactos/dll/win32/kernel32/nls/kkz.nls (with props) trunk/reactos/dll/win32/kernel32/nls/knk.nls (with props) trunk/reactos/dll/win32/kernel32/nls/kyr.nls (with props) trunk/reactos/dll/win32/kernel32/nls/mar.nls (with props) trunk/reactos/dll/win32/kernel32/nls/mon.nls (with props) trunk/reactos/dll/win32/kernel32/nls/pan.nls (with props) trunk/reactos/dll/win32/kernel32/nls/san.nls (with props) trunk/reactos/dll/win32/kernel32/nls/syr.nls (with props) trunk/reactos/dll/win32/kernel32/nls/tel.nls (with props) trunk/reactos/dll/win32/kernel32/nls/ttt.nls (with props) trunk/reactos/dll/win32/kernel32/nls/urd.nls (with props) trunk/reactos/dll/win32/kernel32/nls/uzl.nls (with props) trunk/reactos/dll/win32/kernel32/nls/vit.nls (with props) trunk/reactos/dll/win32/kernel32/nls/zhh.nls (with props) trunk/reactos/dll/win32/kernel32/nls/zhm.nls (with props) Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… Added: trunk/reactos/dll/win32/kernel32/nls/ara.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ara… Added: trunk/reactos/dll/win32/kernel32/nls/arb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arb… Added: trunk/reactos/dll/win32/kernel32/nls/are.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/are… Added: trunk/reactos/dll/win32/kernel32/nls/arg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arg… Added: trunk/reactos/dll/win32/kernel32/nls/arh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arh… Added: trunk/reactos/dll/win32/kernel32/nls/ari.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ari… Added: trunk/reactos/dll/win32/kernel32/nls/arj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arj… Added: trunk/reactos/dll/win32/kernel32/nls/ark.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ark… Added: trunk/reactos/dll/win32/kernel32/nls/arl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arl… Added: trunk/reactos/dll/win32/kernel32/nls/arm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arm… Added: trunk/reactos/dll/win32/kernel32/nls/aro.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aro… Added: trunk/reactos/dll/win32/kernel32/nls/arq.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arq… Added: trunk/reactos/dll/win32/kernel32/nls/ars.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ars… Added: trunk/reactos/dll/win32/kernel32/nls/art.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/art… Added: trunk/reactos/dll/win32/kernel32/nls/aru.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aru… Added: trunk/reactos/dll/win32/kernel32/nls/ary.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ary… Added: trunk/reactos/dll/win32/kernel32/nls/aze.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aze… Added: trunk/reactos/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/azl… Added: trunk/reactos/dll/win32/kernel32/nls/div.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/div… Added: trunk/reactos/dll/win32/kernel32/nls/esc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esc… Added: trunk/reactos/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/far… Added: trunk/reactos/dll/win32/kernel32/nls/guj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/guj… Added: trunk/reactos/dll/win32/kernel32/nls/hin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hin… Added: trunk/reactos/dll/win32/kernel32/nls/kan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kan… Added: trunk/reactos/dll/win32/kernel32/nls/kat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kat… Added: trunk/reactos/dll/win32/kernel32/nls/kkz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kkz… Added: trunk/reactos/dll/win32/kernel32/nls/knk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/knk… Added: trunk/reactos/dll/win32/kernel32/nls/kyr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kyr… Added: trunk/reactos/dll/win32/kernel32/nls/mar.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mar… Added: trunk/reactos/dll/win32/kernel32/nls/mon.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mon… Added: trunk/reactos/dll/win32/kernel32/nls/pan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/pan… Added: trunk/reactos/dll/win32/kernel32/nls/san.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/san… Added: trunk/reactos/dll/win32/kernel32/nls/syr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/syr… Added: trunk/reactos/dll/win32/kernel32/nls/tel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tel… Added: trunk/reactos/dll/win32/kernel32/nls/ttt.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ttt… Added: trunk/reactos/dll/win32/kernel32/nls/urd.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/urd… Added: trunk/reactos/dll/win32/kernel32/nls/uzl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/uzl… Added: trunk/reactos/dll/win32/kernel32/nls/vit.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/vit… Added: trunk/reactos/dll/win32/kernel32/nls/zhh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhh… Added: trunk/reactos/dll/win32/kernel32/nls/zhm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm…

1 0

[hpoussin] 31254: Check if symbols are defined, not their value!
by hpoussin＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: hpoussin Date: Sat Dec 15 21:38:24 2007 New Revision: 31254 URL: http://svn.reactos.org/svn/reactos?rev=31254&view=rev Log: Check if symbols are defined, not their value! Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Sat Dec 15 21:38:24 2007 @@ -62,16 +62,16 @@ #include <ui/noui.h> #include <ui/tui.h> /* arch files */ -#ifdef _X86_ +#if defined(_M_IX86) #include <arch/i386/hardware.h> #include <arch/i386/i386.h> #include <arch/i386/machpc.h> #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #include <internal/i386/ke.h> -#elif _PPC_ +#elif defined(_M_PPC) #include <arch/powerpc/hardware.h> -#elif _MIPS_ +#elif defined(_M_MIPS) #include <arch/mips/arcbios.h> #endif /* misc files */

1 0

[fireball] 31253: - Use CmPrepareKey only in cmlib, since it's a cmlib hack.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 21:25:08 2007 New Revision: 31253 URL: http://svn.reactos.org/svn/reactos?rev=31253&view=rev Log: - Use CmPrepareKey only in cmlib, since it's a cmlib hack. Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/config/cmcontrl.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Sat Dec 15 21:25:08 2007 @@ -503,6 +503,8 @@ return Status; } + if (Operation != HINIT_CREATE) CmPrepareHive(Hive); + return Status; } Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcontrl.c (original) +++ trunk/reactos/ntoskrnl/config/cmcontrl.c Sat Dec 15 21:25:08 2007 @@ -138,9 +138,6 @@ /* Sanity check, flat hives don't have release routines */ ASSERT(SystemHive->ReleaseCellRoutine == NULL); - /* FIXME: Prepare it */ - CmPrepareHive(SystemHive); - /* Set the Root Cell */ RootCell = ((PHBASE_BLOCK)SystemHiveData)->RootCell; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Dec 15 21:25:08 2007 @@ -216,7 +216,6 @@ /* ROS: Init root key cell and prepare the hive */ if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); - CmPrepareHive(&NewHive->Hive); /* Duplicate the hive name */ NewHive->FileFullPath.Buffer = ExAllocatePoolWithTag(PagedPool, @@ -670,7 +669,6 @@ &HiveName, 2); if (!NT_SUCCESS(Status)) return FALSE; - CmPrepareHive(&SystemHive->Hive); /* Set the hive filename */ RtlCreateUnicodeString(&SystemHive->FileFullPath,

1 0

[fireball] 31252: - Implement NtCreateKey using the new parse routine. - NtOpenKey should only return the key handle if the operation was successful. - Point to new parse routine, and rename it to CmParseKey instead of CmParseKey2 which was used during the test phase. - Delete all of the "cm" directory, this code is now fully gone; the new Configuration Manager is in place. - Move cm.h and cm_x.h to include/internal where they belong to and fix all their includers.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 21:14:41 2007 New Revision: 31252 URL: http://svn.reactos.org/svn/reactos?rev=31252&view=rev Log: - Implement NtCreateKey using the new parse routine. - NtOpenKey should only return the key handle if the operation was successful. - Point to new parse routine, and rename it to CmParseKey instead of CmParseKey2 which was used during the test phase. - Delete all of the "cm" directory, this code is now fully gone; the new Configuration Manager is in place. - Move cm.h and cm_x.h to include/internal where they belong to and fix all their includers. Added: trunk/reactos/ntoskrnl/include/internal/cm.h - copied unchanged from r31245, trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/include/internal/cm_x.h (contents, props changed) - copied, changed from r31245, trunk/reactos/ntoskrnl/config/cm_x.h Removed: trunk/reactos/ntoskrnl/cm/ trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cm_x.h Modified: trunk/reactos/ntoskrnl/config/cmalloc.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmboot.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmcheck.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmconfig.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmcontrl.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmdata.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmhook.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmindex.c (contents, props changed) trunk/reactos/ntoskrnl/config/cminit.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmkcbncb.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmkeydel.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmlazy.c trunk/reactos/ntoskrnl/config/cmmapvw.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmname.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmparse.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmse.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmsecach.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmsysini.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmvalche.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmvalue.c (contents, props changed) trunk/reactos/ntoskrnl/config/cmwraprs.c (contents, props changed) trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (contents, props changed) trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c (contents, props changed) trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… Removed: trunk/reactos/ntoskrnl/config/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm_x.h?rev… Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… Modified: trunk/reactos/ntoskrnl/config/cmboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmboot.c?r… Modified: trunk/reactos/ntoskrnl/config/cmcheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcheck.c?… Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… Modified: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… Modified: trunk/reactos/ntoskrnl/config/cmsecach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsecach.c… Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… Modified: trunk/reactos/ntoskrnl/config/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmwraprs.c… Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=312… Copied: trunk/reactos/ntoskrnl/include/internal/cm_x.h (from r31245, trunk/reactos/ntoskrnl/config/cm_x.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[fireball] 31251: - Implement BIOS access routines in HAL. - Implement HalResetDisplay using those routines. - Uncomment a display reset in bootvid (as real Windows bootvid does). - Remove 1 sec delay from the shutdown thread. - As a result, no more red screen flashing at the end of the 1st stage, shutdown quotes are displayed again, and BSODs are shown correctly.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sat Dec 15 20:15:48 2007 New Revision: 31251 URL: http://svn.reactos.org/svn/reactos?rev=31251&view=rev Log: - Implement BIOS access routines in HAL. - Implement HalResetDisplay using those routines. - Uncomment a display reset in bootvid (as real Windows bootvid does). - Remove 1 sec delay from the shutdown thread. - As a result, no more red screen flashing at the end of the 1st stage, shutdown quotes are displayed again, and BSODs are shown correctly. Added: trunk/reactos/hal/halx86/generic/bios.c (with props) trunk/reactos/hal/halx86/generic/v86.s (with props) Modified: trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Sat Dec 15 20:15:48 2007 @@ -420,10 +420,8 @@ /* Now check if we have to set the mode */ if (SetMode) { - // - // Reset the display - // - //HalResetDisplay(); + /* Reset the display */ + HalResetDisplay(); curr_x = 0; curr_y = 0; @@ -463,7 +461,7 @@ curr_y = 0; /* Clear the screen with HAL if we were asked to */ - //if (HalReset) HalResetDisplay(); + if (HalReset) HalResetDisplay(); /* Re-initialize the VGA Display */ VgaInterpretCmdStream(AT_Initialization); Added: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c (added) +++ trunk/reactos/hal/halx86/generic/bios.c Sat Dec 15 20:15:48 2007 @@ -1,0 +1,237 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bios.c + * PURPOSE: BIOS Access Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +UCHAR HalpIopmSaveBuffer[0x2000]; +ULONG HalpSavedPfn; +HARDWARE_PTE HalpSavedPte; +ULONG HalpGpfHandler; +ULONG HalpBopHandler; +USHORT HalpSavedIopmBase; +PUCHAR HalpSavedIoMap; +ULONG HalpSavedEsp0; + +#define GetPdeAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 22) << 2) + 0xC0300000) +#define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +HalpStoreAndClearIopm(IN PUCHAR IoMap) +{ + ULONG i; + + /* Backup the old I/O Map */ + RtlCopyMemory(HalpIopmSaveBuffer, IoMap, 0x2000); + + /* Erase the current one */ + for (i = 0; i < 0x2000; i++) IoMap[i] = 0; + for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; +} + +VOID +NTAPI +HalpRestoreIopm(IN PUCHAR IoMap) +{ + ULONG i; + + /* Restore the backed up copy, and initialize it */ + RtlCopyMemory(IoMap, HalpIopmSaveBuffer, 0x2000); + for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; +} + +VOID +NTAPI +HalpMapRealModeMemory(VOID) +{ + PHARDWARE_PTE Pte, V86Pte; + ULONG i; + + /* Get the page table directory for the lowest meg of memory */ + Pte = GetPdeAddress(0); + HalpSavedPfn = Pte->PageFrameNumber; + HalpSavedPte = *Pte; + + /* Map it to the HAL reserved region and make it valid */ + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + Pte->PageFrameNumber = (GetPdeAddress(0xFFC00000))->PageFrameNumber; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); + + /* Now loop the first meg of memory */ + for (i = 0; i < 0x100000; i += PAGE_SIZE) + { + /* Identity map it */ + Pte = GetPteAddress((PVOID)i); + Pte->PageFrameNumber = i >> PAGE_SHIFT; + Pte->Valid = 1; + Pte->Write = 1; + Pte->Owner = 1; + } + + /* Now get the entry for our real mode V86 code and the target */ + Pte = GetPteAddress(0x20000); + V86Pte = GetPteAddress(&HalpRealModeStart); + do + { + /* Map the physical address into our real-mode region */ + Pte->PageFrameNumber = V86Pte->PageFrameNumber; + + /* Keep going until we've reached the end of our region */ + Pte++; + V86Pte++; + } while (V86Pte <= GetPteAddress(&HalpRealModeEnd)); + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +VOID +NTAPI +HalpSwitchToRealModeTrapHandlers(VOID) +{ + ULONG Handler; + + /* Save the current Invalid Opcode and General Protection Fault Handlers */ + HalpGpfHandler = ((((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset << 16) & + 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[13].Offset & 0xFFFF); + HalpBopHandler = ((((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset << 16) & + 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[6].Offset & 0xFFFF); + + /* Now set our own GPF handler to handle exceptions while in real mode */ + Handler = (ULONG_PTR)HalpTrap0D; + ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = + (USHORT)((Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)Handler; + + /* And our own invalid opcode handler to detect the BOP to get us out */ + Handler = (ULONG_PTR)HalpTrap06; + ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = + (USHORT)((Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)Handler; +} + +VOID +NTAPI +HalpSetupRealModeIoPermissionsAndTask(VOID) +{ + /* Save a copy of the I/O Map and delete it */ + HalpSavedIoMap = (PUCHAR)&(KeGetPcr()->TSS->IoMaps[0]); + HalpStoreAndClearIopm(HalpSavedIoMap); + + /* Save the IOPM and switch to the real-mode one */ + HalpSavedIopmBase = KeGetPcr()->TSS->IoMapBase; + KeGetPcr()->TSS->IoMapBase = KiComputeIopmOffset(1); + + /* Save our stack pointer */ + HalpSavedEsp0 = KeGetPcr()->TSS->Esp0; +} + +VOID +NTAPI +HalpRestoreTrapHandlers(VOID) +{ + /* We're back, restore the handlers we over-wrote */ + ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = + (USHORT)((HalpGpfHandler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)HalpGpfHandler; + ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = + (USHORT)((HalpBopHandler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)HalpBopHandler; +} + +VOID +NTAPI +HalpRestoreIoPermissionsAndTask(VOID) +{ + /* Restore the stack pointer */ + KeGetPcr()->TSS->Esp0 = HalpSavedEsp0; + + /* Restore the I/O Map */ + HalpRestoreIopm(HalpSavedIoMap); + + /* Restore the IOPM */ + KeGetPcr()->TSS->IoMapBase = HalpSavedIopmBase; +} + +VOID +NTAPI +HalpUnmapRealModeMemory(VOID) +{ + ULONG i; + PHARDWARE_PTE Pte; + + /* Loop the first meg of memory */ + for (i = 0; i < 0x100000; i += PAGE_SIZE) + { + /* Invalidate each PTE */ + Pte = GetPteAddress((PVOID)i); + Pte->Valid = 0; + Pte->Write = 0; + Pte->PageFrameNumber = 0; + } + + /* Restore the PDE for the lowest megabyte of memory */ + Pte = GetPdeAddress(0); + *Pte = HalpSavedPte; + Pte->PageFrameNumber = HalpSavedPfn; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +BOOLEAN +NTAPI +HalpBiosDisplayReset(VOID) +{ + ULONG Flags = 0; + + /* Disable interrupts */ + Ke386SaveFlags(Flags); + _disable(); + + /* Map memory available to the V8086 real-mode code */ + HalpMapRealModeMemory(); + + /* Use special invalid opcode and GPF trap handlers */ + HalpSwitchToRealModeTrapHandlers(); + + /* Configure the IOPM and TSS */ + HalpSetupRealModeIoPermissionsAndTask(); + + /* Now jump to real mode */ + HalpBiosCall(); + + /* Restore kernel trap handlers */ + HalpRestoreTrapHandlers(); + + /* Restore TSS and IOPM */ + HalpRestoreIoPermissionsAndTask(); + + /* Restore low memory mapping */ + HalpUnmapRealModeMemory(); + + /* Restore interrupts if they were previously enabled */ + Ke386RestoreFlags(Flags); + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/hal/halx86/generic/bios.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Sat Dec 15 20:15:48 2007 @@ -7,6 +7,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>beep.c</file> + <file>bios.c</file> <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> @@ -20,6 +21,7 @@ <file>sysinfo.c</file> <file>timer.c</file> <file>systimer.S</file> + <file>v86.s</file> <pch>../include/hal.h</pch> </module> <module name="hal_generic_up" type="objectlibrary"> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Sat Dec 15 20:15:48 2007 @@ -109,6 +109,7 @@ HalInitPnpDriver = NULL; // FIXME: TODO HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO + HalResetDisplay = HalpBiosDisplayReset; /* Initialize the hardware lock (CMOS) */ KeInitializeSpinLock(&HalpSystemHardwareLock); Added: trunk/reactos/hal/halx86/generic/v86.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/v86.s?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/v86.s (added) +++ trunk/reactos/hal/halx86/generic/v86.s Sat Dec 15 20:15:48 2007 @@ -1,0 +1,417 @@ +/* + * FILE: hal/halx86/generic/bios.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: V8086 Real-Mode BIOS Thunking + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +#include <internal/i386/asmmacro.S> +.intel_syntax noprefix + +// +// HAL BIOS Frame +// +#define HALP_BIOS_FRAME_SS 0x00 +#define HALP_BIOS_FRAME_ESP 0x04 +#define HALP_BIOS_FRAME_EFLAGS 0x08 +#define HALP_BIOS_FRAME_CS 0x0C +#define HALP_BIOS_FRAME_EIP 0x10 +#define HALP_BIOS_FRAME_TRAP_FRAME 0x14 +#define HALP_BIOS_FRAME_CS_LIMIT 0x18 +#define HALP_BIOS_FRAME_CS_BASE 0x1C +#define HALP_BIOS_FRAME_CS_FLAGS 0x20 +#define HALP_BIOS_FRAME_SS_LIMIT 0x24 +#define HALP_BIOS_FRAME_SS_BASE 0x28 +#define HALP_BIOS_FRAME_SS_FLAGS 0x2C +#define HALP_BIOS_FRAME_PREFIX 0x30 +#define HALP_BIOS_FRAME_LENGTH 0x34 + +/* GLOBALS *******************************************************************/ + +_HalpSavedEsp: + .long 0 + +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + +/* FUNCTIONS *****************************************************************/ + +.globl _HalpBiosCall@0 +.func HalpBiosCall@0 +_HalpBiosCall@0: + + /* Set up stack pointer */ + push ebp + mov ebp, esp + + /* Build a trap frame */ + pushfd + push edi + push esi + push ebx + push ds + push es + push fs + push gs + push offset _HalpRealModeEnd + + /* Save the stack */ + mov _HalpSavedEsp, esp + + /* Turn off alignment faults */ + mov eax, cr0 + and eax, ~CR0_AM + mov cr0, eax + + /* Setup a new stack */ + mov esi, fs:KPCR_TSS + mov eax, esp + sub eax, NPX_FRAME_LENGTH + mov [esi+KTSS_ESP0], eax + + /* Save V86 registers */ + push 0 + push 0 + push 0 + push 0 + push 0x2000 + + /* Get linear delta between stack and code */ + mov eax, offset _HalpRealModeEnd-4 + sub eax, offset _HalpRealModeStart + + /* Get offset of code */ + mov edx, offset _HalpRealModeStart + and edx, 0xFFF + + /* Add offset to linear address and save the new V86 SP */ + add eax, edx + push eax + + /* Start building interrupt frame. Setup V86 EFLAGS and IOPL 3 */ + pushfd + or dword ptr [esp], EFLAGS_V86_MASK + or dword ptr [esp], 0x3000 + + /* Push the CS and IP */ + push 0x2000 + push edx + + /* Do the interrupt return (jump to V86 mode) */ + iretd + +.globl _HalpRealModeStart +_HalpRealModeStart: + + /* Set mode 13 */ + mov ax, 0x12 + .byte 0 + .byte 0 + + /* Do the interrupt */ + int 0x10 + + /* BOP to exit V86 mode */ + .byte 0xC4 + .byte 0xC4 + + /* The stack lives here */ +.align 4 + .space 2048 +.globl _HalpRealModeEnd +_HalpRealModeEnd: + + /* We're back, clean up the trap frame */ + pop gs + pop fs + pop es + pop ds + pop ebx + pop esi + pop edi + popfd + + /* Return to caller */ + pop ebp + ret 0 +.endfunc + +.globl _HalpOpcodeInvalid@0 +.func HalpOpcodeInvalid@0 +_HalpOpcodeInvalid@0: + + /* Unhandled */ + UNHANDLED_PATH + + /* Nothing to return */ + xor eax, eax + ret 0 +.endfunc + +.globl _HalpPushInt@0 +.func HalpPushInt@0 +_HalpPushInt@0: + + /* Save EBX */ + push ebx + + /* Get SS offset and base */ + mov edx, [esi+HALP_BIOS_FRAME_ESP] + mov ebx, [esi+HALP_BIOS_FRAME_SS_BASE] + + /* Convert to 16-bits */ + and edx, 0xFFFF + sub dx, 2 + + /* Get EFLAGS and write them into the linear address of SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_EFLAGS] + mov [ebx+edx], ax + sub dx, 2 + + /* Get CS segment and write it into SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_CS] + mov [ebx+edx], ax + sub dx, 2 + + /* Get IP and write it into SP */ + mov ax, word ptr [esi+HALP_BIOS_FRAME_EIP] + mov [ebx+edx], ax + + /* Get new IP value (the interrupt ID is in ECX, so this is in the IVT) */ + mov eax, [ecx*4] + push eax + + /* Now save the new IP */ + movzx eax, ax + mov [esi+HALP_BIOS_FRAME_EIP], eax + + /* Save the new CS of this IP */ + pop eax + shr eax, 16 + mov [esi+HALP_BIOS_FRAME_CS], eax + + /* Update the stack pointer after our manual interrupt frame construction */ + mov word ptr [esi+HALP_BIOS_FRAME_ESP], dx + + /* Get CS and convert it to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_CS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_CS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 + + /* Return success and restore EBX */ + mov eax, 1 + pop ebx + ret 0 +.endfunc + +.globl _HalpOpcodeINTnn@0 +.func HalpOpcodeINTnn@0 +_HalpOpcodeINTnn@0: + + /* Save non-volatiles and stack */ + push ebp + push esi + push ebx + + /* Get SS and convert it to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_SS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_SS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_SS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_SS_FLAGS], 0 + + /* Increase IP and check if we're past the CS limit */ + inc dword ptr [esi+HALP_BIOS_FRAME_EIP] + mov edi, [esi+HALP_BIOS_FRAME_EIP] + cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] + ja EipLimitReached + + /* Convert IP to linear address and read the interrupt number */ + add edi, [esi+HALP_BIOS_FRAME_CS_BASE] + movzx ecx, byte ptr [edi] + + /* Increase EIP and do the interrupt, check for status */ + inc dword ptr [esi+HALP_BIOS_FRAME_EIP] + call _HalpPushInt@0 + test eax, 0xFFFF + jz Done + + /* Update the trap frame */ + mov ebp, [esi+HALP_BIOS_FRAME_TRAP_FRAME] + mov eax, [esi+HALP_BIOS_FRAME_SS] + mov [ebp+KTRAP_FRAME_SS], eax + mov eax, [esi+HALP_BIOS_FRAME_ESP] + mov [ebp+KTRAP_FRAME_ESP], eax + mov eax, [esi+HALP_BIOS_FRAME_CS] + mov [ebp+KTRAP_FRAME_CS], eax + mov eax, [esi+HALP_BIOS_FRAME_EFLAGS] + mov [ebp+KTRAP_FRAME_EFLAGS], eax + + /* Set success code */ + mov eax, 1 + +Done: + /* Restore volatiles */ + pop ebx + pop edi + pop ebp + ret 0 + +EipLimitReached: + /* Set failure code */ + xor eax, eax + jmp Done +.endfunc + +.globl _HalpDispatchV86Opcode@0 +.func HalpDispatchV86Opcode@0 +_HalpDispatchV86Opcode@0: + + /* Make space for the HAL BIOS Frame on the stack */ + push ebp + mov ebp, esp + sub esp, HALP_BIOS_FRAME_LENGTH + + /* Save non-volatiles */ + push esi + push edi + + /* Save pointer to the trap frame */ + mov esi, [ebp] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_TRAP_FRAME], esi + + /* Save SS */ + movzx eax, word ptr [esi+KTRAP_FRAME_SS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_SS], eax + + /* Save ESP */ + mov eax, [esi+KTRAP_FRAME_ESP] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_ESP], eax + + /* Save EFLAGS */ + mov eax, [esi+KTRAP_FRAME_EFLAGS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EFLAGS], eax + + /* Save CS */ + movzx eax, word ptr [esi+KTRAP_FRAME_CS] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_CS], eax + + /* Save EIP */ + mov eax, [esi+KTRAP_FRAME_EIP] + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_EIP], eax + + /* No prefix */ + xor eax, eax + mov [ebp-HALP_BIOS_FRAME_LENGTH+HALP_BIOS_FRAME_PREFIX], eax + + /* Set pointer to HAL BIOS Frame */ + lea esi, [ebp-HALP_BIOS_FRAME_LENGTH] + + /* Convert CS to linear format */ + mov eax, [esi+HALP_BIOS_FRAME_CS] + shl eax, 4 + mov [esi+HALP_BIOS_FRAME_CS_BASE], eax + mov dword ptr [esi+HALP_BIOS_FRAME_CS_LIMIT], 0xFFFF + mov dword ptr [esi+HALP_BIOS_FRAME_CS_FLAGS], 0 + + /* Make sure IP is within the CS Limit */ + mov edi, [esi+HALP_BIOS_FRAME_EIP] + cmp edi, [esi+HALP_BIOS_FRAME_CS_LIMIT] + ja DispatchError + + /* Convert IP to linear address and read the opcode */ + add edi, [esi+HALP_BIOS_FRAME_CS_BASE] + mov dl, [edi] + + /* We only deal with interrupts */ + cmp dl, 0xCD + je DispatchInt + + /* Anything else is invalid */ + call _HalpOpcodeInvalid@0 + jmp DispatchError + +DispatchInt: + /* Handle dispatching the interrupt */ + call _HalpOpcodeINTnn@0 + test eax, 0xFFFF + jz DispatchReturn + + /* Update the trap frame EIP */ + mov edi, [ebp-0x20] + mov eax, [ebp-0x24] + mov [edi+KTRAP_FRAME_EIP], eax + + /* Set success code */ + mov eax, 1 + +DispatchReturn: + /* Restore registers and return */ + pop edi + pop esi + mov esp, ebp + pop ebp + ret 0 + +DispatchError: + /* Set failure code and return */ + xor eax, eax + jmp DispatchReturn +.endfunc + +.func Ki16BitStackException +_Ki16BitStackException: + + /* Save stack */ + push ss + push esp + + /* Go to kernel mode thread stack */ + mov eax, PCR[KPCR_CURRENT_THREAD] + add esp, [eax+KTHREAD_INITIAL_STACK] + + /* Switch to good stack segment */ + UNHANDLED_PATH +.endfunc + +.globl _HalpTrap0D@0 +.func HalpTrap0D@0 +TRAP_FIXUPS htd_a, htd_t, DoFixupV86, DoFixupAbios +_HalpTrap0D@0: + + /* Enter trap */ + TRAP_PROLOG htd_a, htd_t + + /* Check if this is a V86 trap */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz DoDispatch + + /* Unhandled */ + UNHANDLED_PATH + +DoDispatch: + /* Handle the opcode */ + call _HalpDispatchV86Opcode@0 + + /* Exit the interrupt */ + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _HalpTrap06@0 +.func HalpTrap06@0 +_HalpTrap06@0: + + /* Restore DS/ES segments */ + mov eax, KGDT_R3_DATA | RPL_MASK + mov ds, ax + mov es, ax + + /* Restore ESP and return */ + mov esp, _HalpSavedEsp + ret 0 +.endfunc Propchange: trunk/reactos/hal/halx86/generic/v86.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Sat Dec 15 20:15:48 2007 @@ -115,6 +115,48 @@ IN OUT PVOID Buffer ); +// +// BIOS Routines +// +BOOLEAN +NTAPI +HalpBiosDisplayReset( + VOID +); + +ULONG +NTAPI +HalpBorrowTss( + VOID +); + +ULONG +NTAPI +HalpReturnTss( + ULONG SavedTss +); + +VOID +NTAPI +HalpBiosCall( + VOID +); + +VOID +NTAPI +HalpTrap0D( + VOID +); + +VOID +NTAPI +HalpTrap06( + VOID +); + +extern PVOID HalpRealModeStart; +extern PVOID HalpRealModeEnd; + extern KSPIN_LOCK HalpSystemHardwareLock; #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Dec 15 20:15:48 2007 @@ -107,6 +107,16 @@ // HAL Variables // #define INITIAL_STALL_COUNT 0x64 + +// +// IOPM Definitions +// +#define IO_ACCESS_MAP_NONE 0 +#define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) +#define KiComputeIopmOffset(MapNumber) \ + (MapNumber == IO_ACCESS_MAP_NONE) ? \ + (USHORT)(sizeof(KTSS)) : \ + (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Sat Dec 15 20:15:48 2007 @@ -48,7 +48,6 @@ ShutdownThreadMain(PVOID Context) { SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context; - LARGE_INTEGER Waittime; static PCH FamousLastWords[] = { @@ -167,15 +166,12 @@ } PspShutdownProcessManager(); - Waittime.QuadPart = (LONGLONG)-10000000; /* 1sec */ - KeDelayExecutionThread(KernelMode, FALSE, &Waittime); - + CmShutdownSystem(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); MiShutdownMemoryManager(); - if (Action == ShutdownNoReboot) { Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Sat Dec 15 20:15:48 2007 @@ -111,6 +111,7 @@ PCHAR CommandLine; BOOLEAN CustomLogo = FALSE; ULONG i; + extern BOOLEAN ExpInTextModeSetup; /* Quit if we're already installed */ if (InbvBootDriverInstalled) return TRUE; @@ -123,6 +124,9 @@ CommandLine = _strupr(LoaderBlock->LoadOptions); CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; } + + /* For SetupLDR, don't reset the BIOS Display -- FIXME! */ + if (ExpInTextModeSetup) CustomLogo = TRUE; /* Initialize the video */ InbvBootDriverInstalled = VidInitialize(!CustomLogo);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007