Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 31263: - fix typo spotted by towerr thanks
by janderwald＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: janderwald Date: Sun Dec 16 01:19:24 2007 New Revision: 31263 URL: http://svn.reactos.org/svn/reactos?rev=31263&view=rev Log: - fix typo spotted by towerr thanks Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Sun Dec 16 01:19:24 2007 @@ -246,7 +246,7 @@ HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-210" HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\Open\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\RunAs\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" -HKCR,"CLSID\{{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 ; Open With shell extension HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler"

1 0

[fireball] 31262: - Use CmpLockRegistry instead of manual registry locking -- this also makes the registry lock shared instead of exclusive. - Start using KCB locking/unlocking, usually shared first. - Support KCB lock promotion from shared to exclusive when value cache functions require it (SearchNeedExclusiveLock -- not yet used). - Add multiple checks for deleted KCBs so that operations on them fail. - Protect symlinks from being erroneously modified. - Remove a ReactOS symlink hack. - Add co
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sun Dec 16 01:06:10 2007 New Revision: 31262 URL: http://svn.reactos.org/svn/reactos?rev=31262&view=rev Log: - Use CmpLockRegistry instead of manual registry locking -- this also makes the registry lock shared instead of exclusive. - Start using KCB locking/unlocking, usually shared first. - Support KCB lock promotion from shared to exclusive when value cache functions require it (SearchNeedExclusiveLock -- not yet used). - Add multiple checks for deleted KCBs so that operations on them fail. - Protect symlinks from being erroneously modified. - Remove a ReactOS symlink hack. - Add code to setup the KCB Value Cache (right now we use the node list since nobody was setting the value cache up). - Detect and assert on CM_KCB_SYM_LINK_FOUND, this is used by caching which we don't support. - Protect KEY_NO_DELETE nodes from deletion. - Lock the registry during hive flushing. - Respect CmpNoWrite if it's set. - Don't ignore Allocate flag sent to CmpLinkhivetoMaster during hive loading. Modified: trunk/reactos/ntoskrnl/config/cmapi.c 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 Sun Dec 16 01:06:10 2007 @@ -266,10 +266,56 @@ NTSTATUS Status; BOOLEAN Found, Result; ULONG Count, ChildIndex, SmallData, Storage; - - /* Acquire hive lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + VALUE_SEARCH_RETURN_TYPE SearchResult; + + /* Acquire hive lock */ + CmpLockRegistry(); + CmpAcquireKcbLockShared(Kcb); + + /* Sanity check */ + ASSERT(sizeof(ULONG) == CM_KEY_VALUE_SMALL); + + /* Don't touch deleted KCBs */ +DoAgain: + if (Kcb->Delete) + { + /* Fail */ + Status = STATUS_KEY_DELETED; + goto Quickie; + } + + /* Don't let anyone mess with symlinks */ + if ((Kcb->Flags & KEY_SYM_LINK) && + ((Type != REG_LINK) || + !(ValueName) || + !(RtlEqualUnicodeString(&CmSymbolicLinkValueName, ValueName, TRUE)))) + { + /* Invalid modification of a symlink key */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* Search for the value */ + SearchResult = SearchFail; + if (SearchResult == SearchNeedExclusiveLock) + { + /* Try again with the exclusive lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (SearchResult == SearchSuccess) + { + /* We don't actually need to do anything! */ + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* We need the exclusive KCB lock now */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* Acquire exclusive lock */ + CmpConvertKcbSharedToExclusive(Kcb); + } /* Get pointer to key cell */ Hive = Kcb->KeyHive; @@ -315,7 +361,11 @@ /* No child list, we'll need to add it */ ChildIndex = 0; } - + + /* The KCB must be locked exclusive at this point */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + /* Mark the cell dirty */ HvMarkCellDirty(Hive, Cell, FALSE); @@ -357,27 +407,23 @@ SmallData); } - /* Mark link key */ - if ((Type == REG_LINK) && - (_wcsicmp(ValueName->Buffer, L"SymbolicLinkValue") == 0)) - { - Parent->Flags |= KEY_SYM_LINK; - } - /* Check for success */ -Quickie: if (NT_SUCCESS(Status)) { + /* Check if the maximum value name length changed */ ASSERT(Parent->MaxValueNameLen == Kcb->KcbMaxValueNameLen); if (Parent->MaxValueNameLen < ValueName->Length) { + /* Set the new values */ Parent->MaxValueNameLen = ValueName->Length; Kcb->KcbMaxValueNameLen = ValueName->Length; } - + + /* Check if the maximum data length changed */ ASSERT(Parent->MaxValueDataLen == Kcb->KcbMaxValueDataLen); if (Parent->MaxValueDataLen < DataLength) { + /* Update it */ Parent->MaxValueDataLen = DataLength; Kcb->KcbMaxValueDataLen = Parent->MaxValueDataLen; } @@ -385,11 +431,32 @@ /* Save the write time */ KeQuerySystemTime(&Parent->LastWriteTime); KeQuerySystemTime(&Kcb->KcbLastWriteTime); - } - - /* Release the lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + + /* Check if the cell is cached */ + if ((Found) && (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + else + { + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = Parent->ValueList.Count; + Kcb->ValueCache.ValueList = Parent->ValueList.List; + } + } + +Quickie: + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -408,8 +475,19 @@ BOOLEAN Result; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock KCB exclusively */ + CmpAcquireKcbLockExclusive(Kcb); + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and the cell index */ Hive = Kcb->KeyHive; @@ -490,6 +568,17 @@ Kcb->KcbMaxValueNameLen = 0; Kcb->KcbMaxValueDataLen = 0; } + + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = ChildList->Count; + Kcb->ValueCache.ValueList = ChildList->List; /* Change default Status to success */ Status = STATUS_SUCCESS; @@ -507,9 +596,9 @@ HvReleaseCell(Hive, ChildCell); } - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -533,8 +622,27 @@ PAGED_CODE(); /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ +DoAgain: + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } + + /* We don't deal with this yet */ + if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } /* Get the hive */ Hive = Kcb->KeyHive; @@ -547,6 +655,17 @@ &ValueData, &ValueCached, &CellToRelease); + if (Result == SearchNeedExclusiveLock) + { + /* Check if we need an exclusive lock */ + ASSERT(CellToRelease == HCELL_NIL); + ASSERT(ValueData == NULL); + + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + if (Result == SearchSuccess) { /* Sanity check */ @@ -562,6 +681,12 @@ Length, ResultLength, &Status); + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } } else { @@ -572,9 +697,9 @@ /* If we have a cell to release, do so */ if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -599,8 +724,20 @@ PAGED_CODE(); /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ +DoAgain: + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -620,6 +757,13 @@ HvReleaseCell(Hive, Kcb->KeyCell); Status = STATUS_NO_MORE_ENTRIES; goto Quickie; + } + + /* We don't deal with this yet */ + if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* Shouldn't happen */ + ASSERT(FALSE); } /* Find the value list */ @@ -627,7 +771,17 @@ &CellData, &IndexIsCached, &CellToRelease); - if (Result != SearchSuccess) + if (Result == SearchNeedExclusiveLock) + { + /* Check if we need an exclusive lock */ + ASSERT(CellToRelease == HCELL_NIL); + ASSERT(ValueData == NULL); + + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (Result != SearchSuccess) { /* Sanity check */ ASSERT(CellData == NULL); @@ -646,10 +800,16 @@ IndexIsCached, &ValueIsCached, &CellToRelease2); - if (Result != SearchSuccess) + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (Result != SearchSuccess) { /* Sanity check */ - ASSERT(CellToRelease2 == HCELL_NIL); + ASSERT(ValueData == NULL); /* Release the cells and fail */ Status = STATUS_INSUFFICIENT_RESOURCES; @@ -666,6 +826,12 @@ Length, ResultLength, &Status); + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } Quickie: /* If we have a cell to release, do so */ @@ -677,9 +843,9 @@ /* If we have a cell to release, do so */ if (CellToRelease2 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease2); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -911,8 +1077,10 @@ PCM_KEY_NODE Parent; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock KCB shared */ + CmpAcquireKcbLockShared(Kcb); /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -921,6 +1089,14 @@ { /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Fail */ + Status = STATUS_KEY_DELETED; goto Quickie; } @@ -961,9 +1137,9 @@ } Quickie: - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -982,8 +1158,19 @@ HCELL_INDEX ChildCell; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -1027,9 +1214,9 @@ ResultLength); Quickie: - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -1041,11 +1228,32 @@ PHHIVE Hive; PCM_KEY_NODE Node, Parent; HCELL_INDEX Cell, ParentCell; - PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; + PCM_KEY_CONTROL_BLOCK Kcb; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Get the kcb */ + Kcb = KeyBody->KeyControlBlock; + + /* Don't allow deleting the root */ + if (!Kcb->ParentKcb) + { + /* Fail */ + CmpUnlockRegistry(); + return STATUS_CANNOT_DELETE; + } + + /* Lock parent and child */ + CmpAcquireTwoKcbLocksExclusiveByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); + + /* Check if we're already being deleted */ + if (Kcb->Delete) + { + /* Don't do it twice */ + Status = STATUS_SUCCESS; + goto Quickie2; + } /* Get the hive and node */ Hive = Kcb->KeyHive; @@ -1059,34 +1267,22 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Quickie; } - - /* Check if we have no parent */ - if (!Node->Parent) - { - /* This is an attempt to delete \Registry itself! */ - Status = STATUS_CANNOT_DELETE; - goto Quickie; - } - - /* Check if we're already being deleted */ - if (Kcb->Delete) - { - /* Don't do it twice */ - Status = STATUS_SUCCESS; - goto Quickie; - } - + /* Sanity check */ ASSERT(Node->Flags == Kcb->Flags); /* Check if we don't have any children */ - if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile])) + if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile]) && + !(Node->Flags & KEY_NO_DELETE)) { /* Get the parent and free the cell */ ParentCell = Node->Parent; Status = CmpFreeKeyByCell(Hive, Cell, TRUE); if (NT_SUCCESS(Status)) { + /* Clean up information we have on the subkey */ + CmpCleanUpSubKeyInfo(Kcb->ParentKcb); + /* Get the parent node */ Parent = (PCM_KEY_NODE)HvGetCell(Hive, ParentCell); if (Parent) @@ -1119,16 +1315,16 @@ Status = STATUS_CANNOT_DELETE; } - /* Flush the registry */ - CmpLazyFlush(); - Quickie: /* Release the cell */ HvReleaseCell(Hive, Cell); + + /* Release the KCB locks */ +Quickie2: + CmpReleaseTwoKcbLockByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + CmpUnlockRegistry(); return Status; } @@ -1140,6 +1336,9 @@ PCMHIVE CmHive; NTSTATUS Status = STATUS_SUCCESS; PHHIVE Hive; + + /* Ignore flushes until we're ready */ + if (CmpNoWrite) return STATUS_SUCCESS; /* Get the hives */ Hive = Kcb->KeyHive; @@ -1239,7 +1438,7 @@ } /* Lock the registry shared */ - //CmpLockRegistry(); + CmpLockRegistry(); /* Lock the hive to this thread */ CmHive->Hive.HiveFlags |= HIVE_IS_UNLOADING; @@ -1252,7 +1451,7 @@ Status = CmpLinkHiveToMaster(TargetKey->ObjectName, TargetKey->RootDirectory, CmHive, - FALSE, + Allocate, TargetKey->SecurityDescriptor); if (NT_SUCCESS(Status)) { @@ -1276,7 +1475,7 @@ } /* Unlock the registry */ - //CmpUnlockRegistry(); + CmpUnlockRegistry(); /* Close handle and return */ if (KeyHandle) ZwClose(KeyHandle);

1 0

[fireball] 31261: - Delete cm rewrite branch since everything is merged into trunk now.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sun Dec 16 00:46:54 2007 New Revision: 31261 URL: http://svn.reactos.org/svn/reactos?rev=31261&view=rev Log: - Delete cm rewrite branch since everything is merged into trunk now. Removed: branches/alex-cm-branch/

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs