Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 25474: silence debug message
by gedmurphy＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: gedmurphy Date: Tue Jan 16 02:23:29 2007 New Revision: 25474 URL: http://svn.reactos.org/svn/reactos?rev=25474&view=rev Log: silence debug message Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Tue Jan 16 02:23:29 2007 @@ -505,7 +505,7 @@ } } - DPRINT1("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits); + DPRINT("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits); return BestEntry; } @@ -526,39 +526,42 @@ int Height, int ColorBits) { - int i, MaxWidth, MaxHeight, cx, cy, Bits, BestEntry = -1; - - /* Double height to account for AND and XOR masks */ - Height *= 2; - - /* First find the largest one smaller than or equal to the requested size*/ - MaxWidth = MaxHeight = 0; + int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; + UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; + UINT iTempXDiff, iTempYDiff, iTempColorDiff; + + /* Find Best Fit */ + iTotalDiff = 0xFFFFFFFF; + iColorDiff = 0xFFFFFFFF; for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - if ((cx <= Width) && (cy <= Height) && - (cx > MaxWidth) && (cy > MaxHeight) && - (Bits == 1)) + iTempXDiff = abs(Width - cx); + iTempYDiff = abs(Height - cy); + + if(iTotalDiff > (iTempXDiff + iTempYDiff)) { - BestEntry = i; - MaxWidth = cx; - MaxHeight = cy; + iXDiff = iTempXDiff; + iYDiff = iTempYDiff; + iTotalDiff = iXDiff + iYDiff; } } - if (BestEntry != -1) - return BestEntry; - - /* Now find the smallest one larger than the requested size */ - MaxWidth = MaxHeight = 255; + + /* Find Best Colors for Best Fit */ for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - if (((cx < MaxWidth) && (cy < MaxHeight) && (Bits == 1)) || - (BestEntry == -1)) + if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) { - BestEntry = i; - MaxWidth = cx; - MaxHeight = cy; + iTempColorDiff = abs(ColorBits - Bits); + if(iColorDiff > iTempColorDiff) + { + BestEntry = i; + BestBits = Bits; + iColorDiff = iTempColorDiff; + } } } + + DPRINT("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits); return BestEntry; } @@ -669,7 +672,7 @@ if(bIcon) entry = CURSORICON_FindBestIconRes(dir, width, height, ColorBits); else - entry = CURSORICON_FindBestCursorRes(dir, width, height, 1); + entry = CURSORICON_FindBestCursorRes(dir, width, height, ColorBits); if (entry) retVal = entry->nID;

1 0

[ion] 25473: - Fix locking bugs in guarded mutex implementation. In race conditions some operations were not re-attempted. - Fix some other logic bugs, including a serious bug in KeTrytoAcquireGuardedMutex which inversed the result.
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Tue Jan 16 00:34:36 2007 New Revision: 25473 URL: http://svn.reactos.org/svn/reactos?rev=25473&view=rev Log: - Fix locking bugs in guarded mutex implementation. In race conditions some operations were not re-attempted. - Fix some other logic bugs, including a serious bug in KeTrytoAcquireGuardedMutex which inversed the result. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ke/gate.c trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Jan 16 00:34:36 2007 @@ -745,7 +745,8 @@ ASSERT(PushLock->Waiting || PushLock->Shared == 0); /* Unlock the pushlock */ - OldValue.Value = InterlockedExchangeAddSizeT((PLONG)PushLock, -1); + OldValue.Value = InterlockedExchangeAddSizeT((PLONG)PushLock, + -EX_PUSH_LOCK_LOCK); /* Sanity checks */ ASSERT(OldValue.Locked); Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c (original) +++ trunk/reactos/ntoskrnl/ke/gate.c Tue Jan 16 00:34:36 2007 @@ -78,7 +78,7 @@ /* Release the APC lock and return */ KiReleaseApcLock(&ApcLock); - return; + break; } /* Setup a Wait Block */ @@ -122,8 +122,8 @@ /* Find a new thread to run */ Status = KiSwapThread(Thread, KeGetCurrentPrcb()); - /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) return; + /* Make sure we weren't executing an APC */ + if (Status == STATUS_SUCCESS) return; } } while (TRUE); } @@ -149,18 +149,14 @@ KiAcquireDispatcherObject(&Gate->Header); /* Make sure we're not already signaled or that the list is empty */ - if (Gate->Header.SignalState) - { - /* Lower IRQL and quit */ - KeLowerIrql(OldIrql); - return; - } + if (Gate->Header.SignalState) break; /* Check if our wait list is empty */ if (IsListEmpty(&Gate->Header.WaitListHead)) { /* It is, so signal the event */ Gate->Header.SignalState = 1; + break; } else { @@ -187,7 +183,7 @@ RemoveEntryList(&WaitBlock->WaitListEntry); /* Clear wait status */ - WaitThread->WaitStatus = 0; + WaitThread->WaitStatus = STATUS_SUCCESS; /* Set state and CPU */ WaitThread->State = DeferredReady; @@ -223,6 +219,7 @@ /* Exit the dispatcher */ KiExitDispatcher(OldIrql); + return; } } Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c Tue Jan 16 00:34:36 2007 @@ -30,9 +30,6 @@ BitsToRemove = GM_LOCK_BIT; BitsToAdd = GM_LOCK_WAITER_INC; - /* Get the Count Bits */ - OldValue = GuardedMutex->Count; - /* Start change loop */ for (;;) { @@ -42,43 +39,47 @@ ASSERT((BitsToAdd == GM_LOCK_WAITER_INC) || (BitsToAdd == GM_LOCK_WAITER_WOKEN)); - /* Check if the Guarded Mutex is locked */ - if (OldValue & GM_LOCK_BIT) + /* Get the Count Bits */ + OldValue = GuardedMutex->Count; + + /* Start internal bit change loop */ + for (;;) { - /* Sanity check */ - ASSERT((BitsToRemove == GM_LOCK_BIT) || - ((OldValue & GM_LOCK_WAITER_WOKEN) != 0)); - - /* Unlock it by removing the Lock Bit */ - NewValue = InterlockedCompareExchange(&GuardedMutex->Count, - OldValue ^ BitsToRemove, - OldValue); - if (NewValue == OldValue) break; - - /* Value got changed behind our backs, start over */ + /* Check if the Guarded Mutex is locked */ + if (OldValue & GM_LOCK_BIT) + { + /* Sanity check */ + ASSERT((BitsToRemove == GM_LOCK_BIT) || + ((OldValue & GM_LOCK_WAITER_WOKEN) != 0)); + + /* Unlock it by removing the Lock Bit */ + NewValue = OldValue ^ BitsToRemove; + NewValue = InterlockedCompareExchange(&GuardedMutex->Count, + NewValue, + OldValue); + if (NewValue == OldValue) return; + } + else + { + /* The Guarded Mutex isn't locked, so simply set the bits */ + NewValue = OldValue + BitsToAdd; + NewValue = InterlockedCompareExchange(&GuardedMutex->Count, + NewValue, + OldValue); + if (NewValue == OldValue) break; + } + + /* Old value changed, loop again */ OldValue = NewValue; } - else - { - /* The Guarded Mutex isn't locked, so simply set the bits */ - NewValue = InterlockedCompareExchange(&GuardedMutex->Count, - OldValue + BitsToAdd, - OldValue); - if (NewValue != OldValue) - { - /* Value got changed behind our backs, start over */ - OldValue = NewValue; - continue; - } - - /* Now we have to wait for it */ - KeWaitForGate(&GuardedMutex->Gate, WrGuardedMutex, KernelMode); - ASSERT((GuardedMutex->Count & GM_LOCK_WAITER_WOKEN) != 0); - - /* Ok, the wait is done, so set the new bits */ - BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; - BitsToAdd = GM_LOCK_WAITER_WOKEN; - } + + /* Now we have to wait for it */ + KeWaitForGate(&GuardedMutex->Gate, WrGuardedMutex, KernelMode); + ASSERT((GuardedMutex->Count & GM_LOCK_WAITER_WOKEN) != 0); + + /* Ok, the wait is done, so set the new bits */ + BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; + BitsToAdd = GM_LOCK_WAITER_WOKEN; } } @@ -109,7 +110,7 @@ GuardedMutex->Owner = NULL; /* Add the Lock Bit */ - OldValue = InterlockedExchangeAdd(&GuardedMutex->Count, 1); + OldValue = InterlockedExchangeAdd(&GuardedMutex->Count, GM_LOCK_BIT); ASSERT((OldValue & GM_LOCK_BIT) == 0); /* Check if it was already locked, but not woken */ @@ -247,7 +248,7 @@ /* Remove the lock */ OldBit = InterlockedBitTestAndReset(&GuardedMutex->Count, GM_LOCK_BIT_V); - if (OldBit) + if (!OldBit) { /* Re-enable APCs */ KeLeaveGuardedRegion();

1 0

[ion] 25472: - Fix several bugs in the rundown protection implementation, mostly related to incorrect loop restarting in case of a race condition. - The rundown event is a sync event, not a notification event. - Only take slow path when waiting for release if the value changed *and* is still not active, not if only one of the two is true.
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Tue Jan 16 00:12:32 2007 New Revision: 25472 URL: http://svn.reactos.org/svn/reactos?rev=25472&view=rev Log: - Fix several bugs in the rundown protection implementation, mostly related to incorrect loop restarting in case of a race condition. - The rundown event is a sync event, not a notification event. - Only take slow path when waiting for release if the value changed *and* is still not active, not if only one of the two is true. Modified: trunk/reactos/ntoskrnl/ex/rundown.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/rundown.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/rundown.c (original) +++ trunk/reactos/ntoskrnl/ex/rundown.c Tue Jan 16 00:12:32 2007 @@ -36,21 +36,21 @@ { ULONG_PTR Value = RunRef->Count, NewValue; - /* Make sure a rundown is not active */ - if (Value & EX_RUNDOWN_ACTIVE) return FALSE; - /* Loop until successfully incremented the counter */ for (;;) { + /* Make sure a rundown is not active */ + if (Value & EX_RUNDOWN_ACTIVE) return FALSE; + /* Add a reference */ NewValue = Value + EX_RUNDOWN_COUNT_INC; /* Change the value */ - Value = ExpChangeRundown(RunRef, NewValue, Value); - if (Value == NewValue) return TRUE; - - /* Make sure a rundown is not active */ - if (Value & EX_RUNDOWN_ACTIVE) return FALSE; + NewValue = ExpChangeRundown(RunRef, NewValue, Value); + if (NewValue == Value) return TRUE; + + /* Update it */ + Value = NewValue; } } @@ -78,25 +78,22 @@ IN ULONG Count) { ULONG_PTR Value = RunRef->Count, NewValue; - - /* Make sure a rundown is not active */ - if (Value & EX_RUNDOWN_ACTIVE) return FALSE; - - /* Convert the count to our internal representation */ - Count <<= EX_RUNDOWN_COUNT_SHIFT; /* Loop until successfully incremented the counter */ for (;;) { - /* Add references */ - NewValue = Value + Count; - - /* Change the value */ - Value = ExpChangeRundown(RunRef, NewValue, Value); - if (Value == NewValue) return TRUE; - /* Make sure a rundown is not active */ if (Value & EX_RUNDOWN_ACTIVE) return FALSE; + + /* Add references */ + NewValue = Value + EX_RUNDOWN_COUNT_INC * Count; + + /* Change the value */ + NewValue = ExpChangeRundown(RunRef, NewValue, Value); + if (NewValue == Value) return TRUE; + + /* Update the value */ + Value = NewValue; } } @@ -201,11 +198,11 @@ ULONG_PTR Value = RunRef->Count, NewValue; PEX_RUNDOWN_WAIT_BLOCK WaitBlock; - /* Check if rundown is not active */ - if (!(Value & EX_RUNDOWN_ACTIVE)) + /* Loop until successfully incremented the counter */ + for (;;) { - /* Loop until successfully incremented the counter */ - for (;;) + /* Check if rundown is not active */ + if (!(Value & EX_RUNDOWN_ACTIVE)) { /* Sanity check */ ASSERT((Value >= EX_RUNDOWN_COUNT_INC) || (KeNumberProcessors > 1)); @@ -214,24 +211,29 @@ NewValue = Value - EX_RUNDOWN_COUNT_INC; /* Change the value */ - Value = ExpChangeRundown(RunRef, NewValue, Value); - if (Value == NewValue) return; - - /* Loop again if we're still not active */ - if (Value & EX_RUNDOWN_ACTIVE) break; + NewValue = ExpChangeRundown(RunRef, NewValue, Value); + if (NewValue == Value) break; + + /* Update value */ + Value = NewValue; + } + else + { + /* Get the wait block */ + WaitBlock = (PEX_RUNDOWN_WAIT_BLOCK)(Value & ~EX_RUNDOWN_ACTIVE); + ASSERT((WaitBlock->Count > 0) || (KeNumberProcessors > 1)); + + /* Remove the one count */ + if (!InterlockedDecrementSizeT(&WaitBlock->Count)) + { + /* We're down to 0 now, so signal the event */ + KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); + } + + /* We're all done */ + break; } } - - /* Get the wait block */ - WaitBlock = (PEX_RUNDOWN_WAIT_BLOCK)(Value & ~EX_RUNDOWN_ACTIVE); - ASSERT((WaitBlock->Count > 0) || (KeNumberProcessors > 1)); - - /* Remove the one count */ - if (!InterlockedDecrementSizeT(&WaitBlock->Count)) - { - /* We're down to 0 now, so signal the event */ - KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); - } } /*++ @@ -260,37 +262,43 @@ ULONG_PTR Value = RunRef->Count, NewValue; PEX_RUNDOWN_WAIT_BLOCK WaitBlock; - /* Check if rundown is not active */ - if (!(Value & EX_RUNDOWN_ACTIVE)) + /* Loop until successfully incremented the counter */ + for (;;) { - /* Loop until successfully incremented the counter */ - for (;;) + /* Check if rundown is not active */ + if (!(Value & EX_RUNDOWN_ACTIVE)) { /* Sanity check */ - ASSERT((Value >= EX_RUNDOWN_COUNT_INC * Count) || (KeNumberProcessors > 1)); + ASSERT((Value >= EX_RUNDOWN_COUNT_INC * Count) || + (KeNumberProcessors > 1)); /* Get the new value */ - NewValue = Value - (Count * EX_RUNDOWN_COUNT_INC); + NewValue = Value - EX_RUNDOWN_COUNT_INC * Count; /* Change the value */ - Value = ExpChangeRundown(RunRef, NewValue, Value); - if (Value == NewValue) return; - - /* Loop again if we're still not active */ - if (Value & EX_RUNDOWN_ACTIVE) break; + NewValue = ExpChangeRundown(RunRef, NewValue, Value); + if (NewValue == Value) break; + + /* Update value */ + Value = NewValue; } - } - - /* Get the wait block */ - WaitBlock = (PEX_RUNDOWN_WAIT_BLOCK)(Value & ~EX_RUNDOWN_ACTIVE); - ASSERT((WaitBlock->Count >= Count) || (KeNumberProcessors > 1)); - - /* Remove the count */ - if (InterlockedExchangeAddSizeT(&WaitBlock->Count, -(LONG)Count) == - (LONG)Count) - { - /* We're down to 0 now, so signal the event */ - KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); + else + { + /* Get the wait block */ + WaitBlock = (PEX_RUNDOWN_WAIT_BLOCK)(Value & ~EX_RUNDOWN_ACTIVE); + ASSERT((WaitBlock->Count >= Count) || (KeNumberProcessors > 1)); + + /* Remove the counts */ + if (InterlockedExchangeAddSizeT(&WaitBlock->Count, + -(LONG)Count) == (LONG)Count) + { + /* We're down to 0 now, so signal the event */ + KeSetEvent(&WaitBlock->WakeEvent, IO_NO_INCREMENT, FALSE); + } + + /* We're all done */ + break; + } } } @@ -330,17 +338,17 @@ EX_RUNDOWN_ACTIVE); /* Start waitblock set loop */ - for(;;) + for (;;) { /* Save the count */ Count = Value >> EX_RUNDOWN_COUNT_SHIFT; - /* If the count is over one or we don't have en event yet, create it */ - if (Count || !Event) + /* If the count is over one and we don't have en event yet, create it */ + if ((Count) && !(Event)) { /* Initialize the event */ KeInitializeEvent(&WaitBlock.WakeEvent, - NotificationEvent, + SynchronizationEvent, FALSE); /* Set the pointer */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Jan 16 00:12:32 2007 @@ -364,7 +364,7 @@ FORCEINLINE _ExAcquireRundownProtection(IN PEX_RUNDOWN_REF RunRef) { - ULONG_PTR Value, NewValue, OldValue; + ULONG_PTR Value, NewValue; /* Get the current value and mask the active bit */ Value = RunRef->Count &~ EX_RUNDOWN_ACTIVE; @@ -373,8 +373,8 @@ NewValue = Value + EX_RUNDOWN_COUNT_INC; /* Change the value */ - OldValue = ExpChangeRundown(RunRef, NewValue, Value); - if (OldValue != Value) + NewValue = ExpChangeRundown(RunRef, NewValue, Value); + if (NewValue != Value) { /* Rundown was active, use long path */ return ExfAcquireRundownProtection(RunRef); @@ -405,7 +405,7 @@ FORCEINLINE _ExReleaseRundownProtection(IN PEX_RUNDOWN_REF RunRef) { - ULONG_PTR Value, NewValue, OldValue; + ULONG_PTR Value, NewValue; /* Get the current value and mask the active bit */ Value = RunRef->Count &~ EX_RUNDOWN_ACTIVE; @@ -414,10 +414,10 @@ NewValue = Value - EX_RUNDOWN_COUNT_INC; /* Change the value */ - OldValue = ExpChangeRundown(RunRef, NewValue, Value); + NewValue = ExpChangeRundown(RunRef, NewValue, Value); /* Check if the rundown was active */ - if (OldValue != Value) + if (NewValue != Value) { /* Rundown was active, use long path */ ExfReleaseRundownProtection(RunRef); @@ -476,7 +476,7 @@ /* Set the active bit */ Value = ExpChangeRundown(RunRef, EX_RUNDOWN_ACTIVE, 0); - if ((Value) || (Value != EX_RUNDOWN_ACTIVE)) + if ((Value) && (Value != EX_RUNDOWN_ACTIVE)) { /* If the the rundown wasn't already active, then take the long path */ ExfWaitForRundownProtectionRelease(RunRef);

1 0

[ion] 25471: - Add KeAreAllApcsDisabled to DDK. [4 bug fixes]: - Setup default GrantedAccess for system init thread/process in ObInit. - Fix a small bug in ObpReapObject. - Set object header flag is deletion was done deferred. - Simplify ObpDeferObjectDeletion. - Use KeAreAllApcsDisabled instead of only checking IRQL to determine if we should do defered deletion.
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Mon Jan 15 23:54:40 2007 New Revision: 25471 URL: http://svn.reactos.org/svn/reactos?rev=25471&view=rev Log: - Add KeAreAllApcsDisabled to DDK. [4 bug fixes]: - Setup default GrantedAccess for system init thread/process in ObInit. - Fix a small bug in ObpReapObject. - Set object header flag is deletion was done deferred. - Simplify ObpDeferObjectDeletion. - Use KeAreAllApcsDisabled instead of only checking IRQL to determine if we should do defered deletion. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Jan 15 23:54:40 2007 @@ -6454,6 +6454,12 @@ #define RtlZeroBytes RtlZeroMemory #endif +NTKERNELAPI +BOOLEAN +NTAPI +KeAreAllApcsDisabled( + VOID +); /* Guarded Mutex routines */ Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon Jan 15 23:54:40 2007 @@ -172,6 +172,10 @@ /* Initialize the Default Event */ KeInitializeEvent(&ObpDefaultObject, NotificationEvent, TRUE ); + + /* Setup default access for the system process */ + PsGetCurrentProcess()->GrantedAccess = PROCESS_ALL_ACCESS; + PsGetCurrentThread()->GrantedAccess = THREAD_ALL_ACCESS; /* Setup the Object Reaper */ ExInitializeWorkItem(&ObpReaperWorkItem, ObpReapObject, NULL); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jan 15 23:54:40 2007 @@ -193,6 +193,9 @@ /* Check if we have a delete procedure */ if (ObjectType->TypeInfo.DeleteProcedure) { + /* Save whether we were deleted from worker thread or not */ + if (!CalledFromWorkerThread) Header->Flags |= OB_FLAG_DEFER_DELETE; + /* Call it */ ObpCalloutStart(&CalloutIrql); ObjectType->TypeInfo.DeleteProcedure(Object); @@ -207,14 +210,13 @@ NTAPI ObpReapObject(IN PVOID Parameter) { - POBJECT_HEADER ReapObject = (PVOID)1; - PVOID NextObject; + POBJECT_HEADER ReapObject, NextObject; /* Start reaping */ do { /* Get the reap object */ - ReapObject = InterlockedExchangePointer(&ObpReaperList, ReapObject); + ReapObject = InterlockedExchangePointer(&ObpReaperList, (PVOID)1); /* Start deletion loop */ do @@ -227,7 +229,7 @@ /* Move to the next one */ ReapObject = NextObject; - } while ((NextObject) && (NextObject != (PVOID)1)); + } while ((ReapObject) && (ReapObject != (PVOID)1)); } while ((ObpReaperList != (PVOID)1) || (InterlockedCompareExchange((PLONG)&ObpReaperList, 0, 1) != 1)); } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jan 15 23:54:40 2007 @@ -55,7 +55,7 @@ SYMBOLIC_LINK_ALL_ACCESS, &ObjectAttributes, &Name); - if (NT_SUCCESS(Status)) NtClose(SymHandle); + if (NT_SUCCESS(Status)) NtClose(SymHandle); /* Link \??\Global to \?? */ RtlInitUnicodeString(&LinkName, L"Global"); Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jan 15 23:54:40 2007 @@ -13,7 +13,7 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ @@ -52,7 +52,7 @@ NTAPI ObpDeferObjectDeletion(IN POBJECT_HEADER Header) { - PVOID Entry, NewEntry; + PVOID Entry; /* Loop while trying to update the list */ do @@ -62,11 +62,10 @@ /* Link our object to the list */ Header->NextToFree = Entry; - NewEntry = Header; /* Update the list */ } while (InterlockedCompareExchangePointer(&ObpReaperList, - NewEntry, + Header, Entry) != Entry); /* Queue the work item if needed */ @@ -306,8 +305,8 @@ return Header->PointerCount; } - /* Check if we're at PASSIVE */ - if (KeGetCurrentIrql() == PASSIVE_LEVEL) + /* Check if APCs are still active */ + if (!KeAreAllApcsDisabled()) { /* Remove the object */ ObpDeleteObject(Object, FALSE);

1 0

[fireball] 25470: - Merge 25404-25406, very small part of 25407, 25409, 25410, 25412+25414, 25422-25426.
by fireball＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: fireball Date: Mon Jan 15 23:33:07 2007 New Revision: 25470 URL: http://svn.reactos.org/svn/reactos?rev=25470&view=rev Log: - Merge 25404-25406, very small part of 25407, 25409, 25410, 25412+25414, 25422-25426. Modified: branches/ros-branch-0_3_1/reactos/base/applications/cacls/lang/en-US.rc branches/ros-branch-0_3_1/reactos/base/applications/imagesoft/lang/en-US.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Fr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Ja.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/currency.c branches/ros-branch-0_3_1/reactos/dll/cpl/intl/cz.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/de.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/en.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/es.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/hu.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/nl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/resource.h branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/sv.rc branches/ros-branch-0_3_1/reactos/dll/cpl/intl/uk.rc branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/input.c branches/ros-branch-0_3_1/reactos/drivers/base/blue/blue.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/input.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/focus.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/cacls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/cacls/lang/en-US.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/cacls/lang/en-US.rc Mon Jan 15 23:33:07 2007 @@ -24,7 +24,7 @@ C Change (write)\n\ F Full control\n\ /D user Deny specified user access.\n\ -Wildcards can be used to specify more that one file in a command.\n\ +Wildcards can be used to specify more than one file in a command.\n\ You can specify more than one user in a command.\n\n\ Abbreviations:\n\ CI - Container Inherit.\n\ Modified: branches/ros-branch-0_3_1/reactos/base/applications/imagesoft/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/imagesoft/lang/en-US.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/imagesoft/lang/en-US.rc Mon Jan 15 23:33:07 2007 @@ -171,7 +171,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" - IDS_IMAGE_GREYSCALE "Greyscale (8 bit)" + IDS_IMAGE_GREYSCALE "Grayscale (8 bit)" IDS_IMAGE_PALETTE "Palette or 256 color (8 bit)" IDS_IMAGE_TRUECOLOR "True color (24 bit)" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc Mon Jan 15 23:33:07 2007 @@ -1,4 +1,5 @@ /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ +/* Updated French translation by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -88,19 +89,19 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Configure", ID_MENU_CONFIG - MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM "&Configurer", ID_MENU_CONFIG + MENUITEM "A&perçu", ID_MENU_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Add", ID_MENU_ADD - MENUITEM "&Delete\tDel", ID_MENU_DELETE + MENUITEM "&Ajouer", ID_MENU_ADD + MENUITEM "Supprimer\tSuppr", ID_MENU_DELETE END END IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Désactivé", ID_MENU_DISABLED + MENUITEM "Sélectionné", ID_MENU_SELECTED END STRINGTABLE @@ -132,10 +133,32 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Fenêtre inactive" + IDS_ACTWIN "Fenêtre active" + IDS_WINTEXT "Texte de la fenêtre" + IDS_MESSBOX "Boîte de message" + IDS_MESSTEXT "Texte de message" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "Objets 3D" + IDS_ITEM_SCROLLBAR "Barre de défilement" + IDS_ITEM_DESKTOP "Bureau" + IDS_ITEM_MESSAGE_BOX "Boîte de message" + IDS_ITEM_WINDOW "Fenêtre" + IDS_ITEM_APP_BACKGROUND "Espace de travail de l'application" + IDS_ITEM_SELECTED_ITEMS "Éléments sélectionnés" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Tite de palette" + IDS_ITEM_TOOLTIP "Info-bulle" + IDS_ITEM_INACTIVE_WINDOW "Bordure de fenêtre inactive" + IDS_ITEM_ACTIVE_WINDOW "Bordure de fenêtre active" + IDS_ITEM_ICON "Icône" + IDS_ITEM_ICON_SPACE_HORZ "Espacement des icônes (horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Espacement des icônes (vertical)" + IDS_ITEM_INACTIVE_TITLE "Barre de titre inactive" + IDS_ITEM_ACTIVE_TITLE "Barre de titre active" + IDS_ITEM_CAPTION_BUTTONS "Boutons de barre de titre" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Fr.rc Mon Jan 15 23:33:07 2007 @@ -1,82 +1,100 @@ /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Général" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Page de propriétés 1",-1,73,74,90,8 -END - - -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Nombres" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Page de propriétés 2",-1,73,74,90,8 -END - - -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Devise" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Page de propriétés 3",-1,73,74,90,8 -END - - -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Heure" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Notation de l'heure\n\n\ -h = heure m = minute s = seconde t = AM ou PM\n\n\ -h = 12 heures H =24 heures \n\ -hh, mm, ss = Zéro de départ h, m, s = Pas de zéro de départ", - -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP -END - - -IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Date" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Page de propriétés 5",-1,73,74,90,8 -END - - -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Langues" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Langue principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL -END - - -STRINGTABLE -BEGIN - IDS_CPLNAME "Options régionales" - IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises, l'heure et la date." -END +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriétés 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nombres" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriétés 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Devise" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Heure" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + LTEXT "Notation de l'heure\n\n\ +h = heure m = minute s = seconde t = AM ou PM\n\n\ +h = 12 heures H =24 heures \n\ +hh, mm, ss = Zéro de départ h, m, s = Pas de zéro de départ", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Date" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Page de propriétés 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Langues" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Options régionales" + IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises, l'heure et la date." +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Ja.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/Ja.rc Mon Jan 15 23:33:07 2007 @@ -23,7 +23,25 @@ CAPTION "ÊÝ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/currency.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/currency.c Mon Jan 15 23:33:07 2007 @@ -27,24 +27,305 @@ #include <windows.h> #include <commctrl.h> #include <cpl.h> +#include <tchar.h> #include "intl.h" #include "resource.h" + + +typedef struct _GLOBAL_DATA +{ + TCHAR szCurrencySymbol[6]; + TCHAR szDecimalSep[4]; + TCHAR szThousandSep[4]; + TCHAR szGrouping[10]; + + int PositiveOrder; + int NegativeOrder; + int NumDigits; + +} GLOBAL_DATA, *PGLOBAL_DATA; + + +static VOID +GetInitialCurrencyValues(PGLOBAL_DATA pGlobalData) +{ + TCHAR szBuffer[256]; + int ret; + + /* Get currency symbol */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_SCURRENCY, + pGlobalData->szCurrencySymbol, 6); + + /* Get positive format */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_ICURRENCY, + szBuffer, 256); + if (ret != 0) + { + pGlobalData->PositiveOrder = _ttoi(szBuffer); + } + + /* Get negative format */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_INEGCURR, + szBuffer, 256); + if (ret != 0) + { + pGlobalData->NegativeOrder = _ttoi(szBuffer); + } + + /* Get number of fractional digits */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_ICURRDIGITS, + szBuffer, 256); + if (ret != 0) + { + pGlobalData->NumDigits = _ttoi(szBuffer); + } + + /* Get decimal separator */ + ret = GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SMONDECIMALSEP, + pGlobalData->szDecimalSep, 4); + + /* Get group separator */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_SMONTHOUSANDSEP, + pGlobalData->szThousandSep, 4); + + /* Get grouping */ + ret = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_SMONGROUPING, + pGlobalData->szGrouping, 10); + +} + + +static VOID +UpdateExamples(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +{ + TCHAR szBuffer[256]; + CURRENCYFMT cyFmt; + + cyFmt.NumDigits = pGlobalData->NumDigits; + cyFmt.LeadingZero = 0; + cyFmt.Grouping = 3; + cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; + cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.PositiveOrder = pGlobalData->PositiveOrder; + cyFmt.NegativeOrder = pGlobalData->NegativeOrder; + cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; + + /* positive example */ + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("123456789.00"), + &cyFmt, szBuffer, 256); + + SetDlgItemText(hwndDlg, + IDC_CURRENCYPOSSAMPLE, + szBuffer); + + /* negative example */ + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("-123456789.00"), + &cyFmt, szBuffer, 256); + + SetDlgItemText(hwndDlg, + IDC_CURRENCYNEGSAMPLE, + szBuffer); +} + + +static VOID +OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +{ + TCHAR szBuffer[256]; + CURRENCYFMT cyFmt; + int i; + + GetInitialCurrencyValues(pGlobalData); + + /* Set currency symbol */ + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)pGlobalData->szCurrencySymbol); + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), + CB_SETCURSEL, + 0, /* index */ + 0); + + + /* positive currency values */ + cyFmt.NumDigits = pGlobalData->NumDigits; + cyFmt.LeadingZero = 0; + cyFmt.Grouping = 3; + cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; + cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.NegativeOrder = 0; + cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; + + for (i = 0; i < 4; i++) + { + cyFmt.PositiveOrder = i; + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("1.1"), + &cyFmt, szBuffer, 256); + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE), + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + } + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE), + CB_SETCURSEL, + pGlobalData->PositiveOrder, + 0); + + /* negative currency values */ + cyFmt.PositiveOrder = 0; + for (i = 0; i < 16; i++) + { + cyFmt.NegativeOrder = i; + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("-1.1"), + &cyFmt, szBuffer, 256); + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE), + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + } + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE), + CB_SETCURSEL, + pGlobalData->NegativeOrder, /* index */ + 0); + + /* decimal separator */ + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), + CB_ADDSTRING, + 0, + (LPARAM)pGlobalData->szDecimalSep); + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), + CB_SETCURSEL, + 0, /* index */ + 0); + + + /* */ + for (i = 0; i < 10; i++) + { + szBuffer[0] = _T('0') + i; + szBuffer[1] = 0; + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + } + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_SETCURSEL, + pGlobalData->NumDigits, /* index */ + 0); + + + /* digit group separator */ + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), + CB_ADDSTRING, + 0, + (LPARAM)pGlobalData->szThousandSep); + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* digit grouping */ + cyFmt.NumDigits = 0; + cyFmt.LeadingZero = 0; + cyFmt.lpDecimalSep = _T(""); + cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.NegativeOrder = 0; + cyFmt.lpCurrencySymbol = _T(""); + cyFmt.Grouping = 0; + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("123456789"), + &cyFmt, szBuffer, 256); + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + + cyFmt.Grouping = 3; + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("123456789"), + &cyFmt, szBuffer, 256); + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + + cyFmt.Grouping = 32; + GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + _T("123456789"), + &cyFmt, szBuffer, 256); + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + + i = 0; + if (pGlobalData->szGrouping[0] == _T('3')) + { + if ((pGlobalData->szGrouping[1] == _T(';')) && + (pGlobalData->szGrouping[2] == _T('2'))) + i = 2; + else + i = 1; + } + + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), + CB_SETCURSEL, + i, /* index */ + 0); + + /* Show the examples */ + UpdateExamples(hwndDlg, pGlobalData); +} /* Property page dialog callback */ INT_PTR CALLBACK CurrencyPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + OnInitDialog(hwndDlg, pGlobalData); + break; + + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; + } + + return FALSE; } /* EOF */ Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/cz.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/cz.rc Mon Jan 15 23:33:07 2007 @@ -25,7 +25,25 @@ CAPTION "Mìna" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/de.rc Mon Jan 15 23:33:07 2007 @@ -25,7 +25,25 @@ CAPTION "Währung" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Währungssymbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Format für &positive Beträge:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Format für &negative Beträge:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Dezimaltrennzeichen:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Anzahl der Dezimalstellen:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Symbol für Zifferngruppierung:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Zifferngruppierung:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/en.rc Mon Jan 15 23:33:07 2007 @@ -25,7 +25,25 @@ CAPTION "Currency" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/es.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/es.rc Mon Jan 15 23:33:07 2007 @@ -29,7 +29,25 @@ CAPTION "Moneda" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/hu.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/hu.rc Mon Jan 15 23:33:07 2007 @@ -24,7 +24,25 @@ CAPTION "Pénznem" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "3.tulajdonságlap",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/nl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/nl.rc Mon Jan 15 23:33:07 2007 @@ -25,7 +25,25 @@ CAPTION "Valuta" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/resource.h (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/resource.h Mon Jan 15 23:33:07 2007 @@ -8,7 +8,17 @@ #define IDD_GENERALPAGE 100 #define IDD_NUMBERSPAGE 101 -#define IDD_CURRENCYPAGE 102 + +#define IDD_CURRENCYPAGE 140 +#define IDC_CURRENCYPOSSAMPLE 141 +#define IDC_CURRENCYNEGSAMPLE 142 +#define IDC_CURRENCYSYMBOL 143 +#define IDC_CURRENCYPOSVALUE 144 +#define IDC_CURRENCYNEGVALUE 145 +#define IDC_CURRENCYDECSEP 146 +#define IDC_CURRENCYDECNUM 148 +#define IDC_CURRENCYGRPSEP 149 +#define IDC_CURRENCYGRPNUM 150 #define IDD_TIMEPAGE 103 #define IDC_TIMESAMPLE 107 Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/ru.rc Mon Jan 15 23:33:07 2007 @@ -25,7 +25,25 @@ CAPTION "Äåíåæíàÿ åäèíèöà" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âêëàäêà 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/sv.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/sv.rc Mon Jan 15 23:33:07 2007 @@ -26,7 +26,25 @@ CAPTION "Valuta" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -35,7 +53,23 @@ CAPTION "Tid" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 4",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Time sample:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Time format:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Time &separator:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "A&M symbol:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + LTEXT "Time format notation\n\n\ +h = hour m = minute s = second t = am or pm\n\n\ +h = 12 hour H = 24 hour\n\ +hh, mm, ss = leading zero h, m, s = no leading zero", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/uk.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/uk.rc Mon Jan 15 23:33:07 2007 @@ -32,7 +32,25 @@ CAPTION "Ãðîøîâà îäèíèöÿ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âêëàäêà âëàñòèâîñòåé 3",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/input.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/input.c Mon Jan 15 23:33:07 2007 @@ -35,7 +35,6 @@ /* Directory to load key layouts from */ #define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" - /* GLOBALS *******************************************************************/ @@ -338,11 +337,27 @@ BOOL bEnable) { LONG Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE); - Style = bEnable ? Style & ~WS_DISABLED : Style | WS_DISABLED; - NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); - - SendMessageA(hWnd, WM_ENABLE, (LPARAM) IsWindowEnabled(hWnd), 0); - + /* check if updating is needed */ + UINT bIsDisabled = (Style & WS_DISABLED); + if ( (bIsDisabled && bEnable) || (!bIsDisabled && !bEnable) ) + { + if (bEnable) + { + Style &= ~WS_DISABLED; + } + else + { + Style |= WS_DISABLED; + /* Remove keyboard focus from that window if it had focus */ + if (hWnd == GetFocus()) + { + SetFocus(NULL); + } + } + NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); + + SendMessageA(hWnd, WM_ENABLE, (LPARAM) IsWindowEnabled(hWnd), 0); + } // Return nonzero if it was disabled, or zero if it wasn't: return IsWindowEnabled(hWnd); } Modified: branches/ros-branch-0_3_1/reactos/drivers/base/blue/blue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_1/reactos/drivers/base/blue/blue.c (original) +++ branches/ros-branch-0_3_1/reactos/drivers/base/blue/blue.c Mon Jan 15 23:33:07 2007 @@ -109,7 +109,7 @@ /* Sequencer Registers */ {0x03, 0x00, 0x03, 0x00, 0x02}, /* Misc Output Register */ - 0xE3 + 0x67 }; static const UCHAR DefaultPalette[] = Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c Mon Jan 15 23:33:07 2007 @@ -97,7 +97,7 @@ OldValue = NewValue; /* Check if it's still locked */ - if (OldValue.Locked) continue; + if (!OldValue.Locked) break; } } Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/input.h (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/input.h Mon Jan 15 23:33:07 2007 @@ -2,6 +2,24 @@ #define _WIN32K_INPUT_H #include <internal/kbd.h> + +typedef struct _KBDRVFILE +{ + PSINGLE_LIST_ENTRY pkbdfChain; + WCHAR wcKBDF[9]; // used w GetKeyboardLayoutName same as wszKLID. + struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h +} KBDRVFILE, *PKBDRVFILE; + +typedef struct _KBL +{ + PLIST_ENTRY pklChain; + DWORD dwKBLFlags; + HKL hkl; + PKBDRVFILE pkbdf; +} KBL, *PKBL; + +#define KBL_UNLOADED 0x20000000 +#define KBL_RESET 0x40000000 NTSTATUS FASTCALL InitInputImpl(VOID); Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/focus.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/focus.c Mon Jan 15 23:33:07 2007 @@ -304,27 +304,37 @@ static HWND FASTCALL -co_IntSetFocusWindow(PWINDOW_OBJECT Window) +co_IntSetFocusWindow(PWINDOW_OBJECT Window OPTIONAL) { HWND hWndPrev = 0; PUSER_MESSAGE_QUEUE ThreadQueue; - ASSERT_REFS_CO(Window); + if (Window) + ASSERT_REFS_CO(Window); ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetCurrentThreadWin32Thread()->MessageQueue; ASSERT(ThreadQueue != 0); hWndPrev = ThreadQueue->FocusWindow; - if (hWndPrev == Window->hSelf) - { - return hWndPrev; - } - - ThreadQueue->FocusWindow = Window->hSelf; - - co_IntSendKillFocusMessages(hWndPrev, Window->hSelf); - co_IntSendSetFocusMessages(hWndPrev, Window->hSelf); - + + if (Window != 0) + { + if (hWndPrev == Window->hSelf) + { + return hWndPrev; + } + + ThreadQueue->FocusWindow = Window->hSelf; + + co_IntSendKillFocusMessages(hWndPrev, Window->hSelf); + co_IntSendSetFocusMessages(hWndPrev, Window->hSelf); + } + else + { + ThreadQueue->FocusWindow = 0; + + co_IntSendKillFocusMessages(hWndPrev, 0); + } return hWndPrev; } @@ -562,16 +572,23 @@ DPRINT("Enter NtUserSetFocus(%x)\n", hWnd); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(NULL); - } - - UserRefObjectCo(Window, &Ref); - ret = co_UserSetFocus(Window); - UserDerefObjectCo(Window); + if (hWnd) + { + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(NULL); + } + + UserRefObjectCo(Window, &Ref); + ret = co_UserSetFocus(Window); + UserDerefObjectCo(Window); - RETURN(ret); + RETURN(ret); + } + else + { + RETURN( co_UserSetFocus(0)); + } CLEANUP: DPRINT("Leave NtUserSetFocus, ret=%i\n",_ret_); Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/keyboard.c Mon Jan 15 23:33:07 2007 @@ -53,6 +53,9 @@ BYTE gQueueKeyStateTable[256]; +PKBDRVFILE KBLList = NULL; // Keyboard layout list. + + /* FUNCTIONS *****************************************************************/ /* Initialization -- Right now, just zero the key state and init the lock */ Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jan 15 23:33:07 2007 @@ -909,6 +909,7 @@ { PWINSTATION_OBJECT WinStaObject; NTSTATUS Status; + BOOL bChanged = FALSE; static BOOL bInitialized = FALSE; static LOGFONTW IconFont; @@ -956,16 +957,18 @@ case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: case SPI_SETDESKWALLPAPER: + case SPI_SETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVETIMEOUT: + case SPI_SETFLATMENU: + /* We will change something, so set the flag here */ + bChanged = TRUE; case SPI_GETDESKWALLPAPER: case SPI_GETWHEELSCROLLLINES: case SPI_GETWHEELSCROLLCHARS: - case SPI_SETSCREENSAVERRUNNING: case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: - case SPI_SETSCREENSAVETIMEOUT: case SPI_GETSCREENSAVEACTIVE: case SPI_GETFLATMENU: - case SPI_SETFLATMENU: { PSYSTEM_CURSORINFO CurInfo; @@ -982,43 +985,42 @@ switch(uiAction) { case SPI_GETFLATMENU: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; - return TRUE; + ASSERT(pvParam); + *((UINT*)pvParam) = WinStaObject->FlatMenu; break; case SPI_SETFLATMENU: - WinStaObject->FlatMenu = uiParam; + WinStaObject->FlatMenu = uiParam; break; case SPI_GETSCREENSAVETIMEOUT: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; - return TRUE; - break; - case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; + ASSERT(pvParam); + *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; + break; + case SPI_SETSCREENSAVETIMEOUT: + WinStaObject->ScreenSaverTimeOut = uiParam; break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - return TRUE; break; - case SPI_SETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - WinStaObject->ScreenSaverRunning = uiParam; + WinStaObject->ScreenSaverRunning = uiParam; break; case SPI_GETSCREENSAVEACTIVE: /* FIXME: how to disable the screensaver? */ - if (pvParam != NULL) *((BOOL*)pvParam) = TRUE; - return TRUE; + ASSERT(pvParam); + *((BOOL*)pvParam) = TRUE; break; case SPI_GETWHEELSCROLLLINES: + ASSERT(pvParam); CurInfo = IntGetSysCursorInfo(WinStaObject); - if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; + *((UINT*)pvParam) = CurInfo->WheelScroLines; /* FIXME add this value to scroll list as scroll value ?? */ - return TRUE; break; case SPI_GETWHEELSCROLLCHARS: + ASSERT(pvParam); CurInfo = IntGetSysCursorInfo(WinStaObject); - if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; + *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? - return TRUE; break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); @@ -1125,7 +1127,7 @@ if(!KeyValuePartialInfo) { NtClose(KeyHandle); - return 0; + return FALSE; } Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, @@ -1134,7 +1136,7 @@ { ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); - return 0; + return FALSE; } Tile.Length = KeyValuePartialInfo->DataLength; @@ -1160,7 +1162,7 @@ if(!KeyValuePartialInfo) { ZwClose(KeyHandle); - return 0; + return FALSE; } Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation, @@ -1169,7 +1171,7 @@ { ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); - return 0; + return FALSE; } Style.Length = KeyValuePartialInfo->DataLength; @@ -1210,7 +1212,7 @@ /* FIXME save the value to the registry */ ObDereferenceObject(WinStaObject); - return TRUE; + break; } case SPI_SETWORKAREA: { @@ -1226,8 +1228,9 @@ ASSERT(pvParam); rc = (RECT*)pvParam; Desktop->WorkArea = *rc; - - return TRUE; + bChanged = TRUE; + + break; } case SPI_GETWORKAREA: { @@ -1242,13 +1245,14 @@ ASSERT(pvParam); IntGetDesktopWorkArea(Desktop, (PRECT)pvParam); - return TRUE; + break; } case SPI_SETGRADIENTCAPTIONS: { GradientCaptions = (pvParam != NULL); /* FIXME - should be checked if the color depth is higher than 8bpp? */ - return TRUE; + bChanged = TRUE; + break; } case SPI_GETGRADIENTCAPTIONS: { @@ -1256,78 +1260,83 @@ BOOL Ret = GradientCaptions; hDC = IntGetScreenDC(); - if(hDC) - { + if(!hDC) + { + return FALSE; + } Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret; ASSERT(pvParam); *((PBOOL)pvParam) = Ret; - return TRUE; - } - return FALSE; - } + break; + } case SPI_SETFONTSMOOTHING: { IntEnableFontRendering(uiParam != 0); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETFONTSMOOTHING: { ASSERT(pvParam); *((BOOL*)pvParam) = IntIsFontRenderingEnabled(); - return TRUE; + break; } case SPI_GETICONTITLELOGFONT: { ASSERT(pvParam); *((LOGFONTW*)pvParam) = IconFont; - return TRUE; + break; } case SPI_GETNONCLIENTMETRICS: { ASSERT(pvParam); *((NONCLIENTMETRICSW*)pvParam) = pMetrics; - return TRUE; + break; } case SPI_SETNONCLIENTMETRICS: { ASSERT(pvParam); pMetrics = *((NONCLIENTMETRICSW*)pvParam); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETMINIMIZEDMETRICS: { ASSERT(pvParam); *((MINIMIZEDMETRICS*)pvParam) = MinimizedMetrics; - return TRUE; + break; } case SPI_SETMINIMIZEDMETRICS: { ASSERT(pvParam); MinimizedMetrics = *((MINIMIZEDMETRICS*)pvParam); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETFOCUSBORDERHEIGHT: { ASSERT(pvParam); *((UINT*)pvParam) = FocusBorderHeight; - return TRUE; + break; } case SPI_GETFOCUSBORDERWIDTH: { ASSERT(pvParam); *((UINT*)pvParam) = FocusBorderWidth; - return TRUE; + break; } case SPI_SETFOCUSBORDERHEIGHT: { FocusBorderHeight = (UINT)pvParam; - return TRUE; + bChanged = TRUE; + break; } case SPI_SETFOCUSBORDERWIDTH: { FocusBorderWidth = (UINT)pvParam; - return TRUE; + bChanged = TRUE; + break; } default: @@ -1337,7 +1346,18 @@ return FALSE; } } - return FALSE; + /* Did we change something ? */ + if (bChanged) + { + /* Shall we send a WM_SETTINGCHANGE message ? */ + if (fWinIni & (SPIF_UPDATEINIFILE | SPIF_SENDCHANGE)) + { + /* Broadcast WM_SETTINGCHANGE to all toplevel windows */ + /* FIXME: lParam should be pointer to a string containing the reg key */ + UserPostMessage(HWND_BROADCAST, WM_SETTINGCHANGE, (WPARAM)uiAction, 0); +} + } + return TRUE; } /*

1 0

[ion] 25469: [12 bug fixes]: - Isolate FuckedUpCm version of ObpLookupDirectoryObject into CmpLookupDirectoryObject to avoid name info leak. - Rename ObpIncrementQueryReference to ObpAcquireNameInformation and ObpDecrementQueryReference to ObpReleaseNameInformation and make some changes to make calling a lot easier. - Fixup reference increment loop in above function. - Fix incorrect check for defer delete flag instead of query references flag. - Only clear the directory/directory lock flag in Ob
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Mon Jan 15 23:24:40 2007 New Revision: 25469 URL: http://svn.reactos.org/svn/reactos?rev=25469&view=rev Log: [12 bug fixes]: - Isolate FuckedUpCm version of ObpLookupDirectoryObject into CmpLookupDirectoryObject to avoid name info leak. - Rename ObpIncrementQueryReference to ObpAcquireNameInformation and ObpDecrementQueryReference to ObpReleaseNameInformation and make some changes to make calling a lot easier. - Fixup reference increment loop in above function. - Fix incorrect check for defer delete flag instead of query references flag. - Only clear the directory/directory lock flag in ObpCleanupDirectoryLookup if the directory was actually locked. - Fix lock logic in ObpLookupDirectoryEntry. - Properly handle the case when lookup occurs after an existing object, avoid name information leak and reference leak. - Hold shared lock inside NtQuerydirectoryObject. - Properly initiailize the directory object in NtCreateDirectoryObject. - Clear create info before creating the unnamed handle in ObInsertObject. - Only dereference the target process if we actually have one in NtDuplicateObject. - Don't double-reference the name information in ObpDeleteNameCheck, thus avoiding another leak. - Fix object case sensitivity check in ObpLookupObjectName. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Jan 15 23:24:40 2007 @@ -27,6 +27,121 @@ PUNICODE_STRING TargetPath); /* FUNCTONS *****************************************************************/ + +PVOID +NTAPI +CmpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, + IN PUNICODE_STRING Name, + IN ULONG Attributes, + IN UCHAR SearchShadow, + IN POBP_LOOKUP_CONTEXT Context) +{ + BOOLEAN CaseInsensitive = FALSE; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + ULONG HashValue; + ULONG HashIndex; + LONG TotalChars; + WCHAR CurrentChar; + POBJECT_DIRECTORY_ENTRY *AllocatedEntry; + POBJECT_DIRECTORY_ENTRY *LookupBucket; + POBJECT_DIRECTORY_ENTRY CurrentEntry; + PVOID FoundObject = NULL; + PWSTR Buffer; + PAGED_CODE(); + + /* Always disable this until we have DOS Device Maps */ + SearchShadow = FALSE; + + /* Fail if we don't have a directory or name */ + if (!(Directory) || !(Name)) goto Quickie; + + /* Get name information */ + TotalChars = Name->Length / sizeof(WCHAR); + Buffer = Name->Buffer; + + /* Fail if the name is empty */ + if (!(Buffer) || !(TotalChars)) goto Quickie; + + /* Set up case-sensitivity */ + if (Attributes & OBJ_CASE_INSENSITIVE) CaseInsensitive = TRUE; + + /* Create the Hash */ + for (HashValue = 0; TotalChars; TotalChars--) + { + /* Go to the next Character */ + CurrentChar = *Buffer++; + + /* Prepare the Hash */ + HashValue += (HashValue << 1) + (HashValue >> 1); + + /* Create the rest based on the name */ + if (CurrentChar < 'a') HashValue += CurrentChar; + else if (CurrentChar > 'z') HashValue += RtlUpcaseUnicodeChar(CurrentChar); + else HashValue += (CurrentChar - ('a'-'A')); + } + + /* Merge it with our number of hash buckets */ + HashIndex = HashValue % 37; + + /* Save the result */ + Context->HashValue = HashValue; + Context->HashIndex = (USHORT)HashIndex; + + /* Get the root entry and set it as our lookup bucket */ + AllocatedEntry = &Directory->HashBuckets[HashIndex]; + LookupBucket = AllocatedEntry; + + /* Start looping */ + while ((CurrentEntry = *AllocatedEntry)) + { + /* Do the hashes match? */ + if (CurrentEntry->HashValue == HashValue) + { + /* Make sure that it has a name */ + ASSERT(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)->NameInfoOffset != 0); + + /* Get the name information */ + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)); + + /* Do the names match? */ + if ((Name->Length == HeaderNameInfo->Name.Length) && + (RtlEqualUnicodeString(Name, &HeaderNameInfo->Name, CaseInsensitive))) + { + break; + } + } + + /* Move to the next entry */ + AllocatedEntry = &CurrentEntry->ChainLink; + } + + /* Check if we still have an entry */ + if (CurrentEntry) + { + /* Set this entry as the first, to speed up incoming insertion */ + if (AllocatedEntry != LookupBucket) + { + /* Set the Current Entry */ + *AllocatedEntry = CurrentEntry->ChainLink; + + /* Link to the old Hash Entry */ + CurrentEntry->ChainLink = *LookupBucket; + + /* Set the new Hash Entry */ + *LookupBucket = CurrentEntry; + } + + /* Save the found object */ + FoundObject = CurrentEntry->Object; + if (!FoundObject) goto Quickie; + } + +Quickie: + /* Return the object we found */ + Context->Object = FoundObject; + return FoundObject; +} + NTSTATUS NTAPI CmFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, @@ -137,9 +252,10 @@ if (End != NULL) *End = 0; RtlInitUnicodeString(&StartUs, Start); + ObpInitializeDirectoryLookup(&Context); Context.DirectoryLocked = TRUE; Context.Directory = CurrentObject; - FoundObject = ObpLookupEntryDirectory(CurrentObject, &StartUs, Attributes, FALSE, &Context); + FoundObject = CmpLookupEntryDirectory(CurrentObject, &StartUs, Attributes, FALSE, &Context); if (FoundObject == NULL) { if (End != NULL) Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Mon Jan 15 23:24:40 2007 @@ -15,48 +15,58 @@ #define OBP_LOCK_STATE_RELEASED 0xEEEE1234 #define OBP_LOCK_STATE_INITIALIZED 0xFFFF1234 -ULONG -FORCEINLINE -ObpIncrementQueryReference(IN POBJECT_HEADER ObjectHeader, - IN POBJECT_HEADER_NAME_INFO ObjectNameInfo) -{ +POBJECT_HEADER_NAME_INFO +FORCEINLINE +ObpAcquireNameInformation(IN POBJECT_HEADER ObjectHeader) +{ + POBJECT_HEADER_NAME_INFO ObjectNameInfo; ULONG NewValue, References; + /* Make sure we have name information at all */ + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + if (!ObjectNameInfo) return NULL; + /* Get the number of references */ - NewValue = ObjectNameInfo->QueryReferences; - while ((NewValue != 0) && (References = NewValue)) - { + References = ObjectNameInfo->QueryReferences; + for (;;) + { + /* Check if the count is 0 and fail if so */ + if (!References) return NULL; + /* Increment the number of references */ - if (InterlockedCompareExchange((PLONG)&ObjectNameInfo->QueryReferences, - NewValue + 1, - NewValue) == References) - { - /* Check if the object is to be deferred deleted */ - if (ObjectHeader->Flags & OB_FLAG_DEFER_DELETE) - { - /* FIXME: Unhandled*/ - DbgPrint("OB: Unhandled path\n"); - KEBUGCHECK(0); - } - - /* Done looping */ - NewValue = ObjectNameInfo->QueryReferences; - break; - } - } - - /* Return the number of references */ - return NewValue; -} - -VOID -FORCEINLINE -ObpDecrementQueryReference(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) + NewValue = InterlockedCompareExchange((PLONG)&ObjectNameInfo-> + QueryReferences, + References + 1, + References); + if (NewValue == References) break; + + /* We failed, try again */ + References = NewValue; + } + + /* Check for magic flag */ + if (ObjectNameInfo->QueryReferences & 0x80000000) + { + /* FIXME: Unhandled*/ + DbgPrint("OB: Unhandled path\n"); + KEBUGCHECK(0); + } + + /* Return the name information */ + return ObjectNameInfo; +} + +VOID +FORCEINLINE +ObpReleaseNameInformation(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) { POBJECT_DIRECTORY Directory; + /* Bail out if there's no info at all */ + if (!HeaderNameInfo) return; + /* Remove a query reference and check if it was the last one */ - if (!InterlockedExchangeAdd((PLONG)&HeaderNameInfo->QueryReferences, -1)) + if (!InterlockedDecrement((PLONG)&HeaderNameInfo->QueryReferences)) { /* Check if we have a name */ if (HeaderNameInfo->Name.Buffer) @@ -149,8 +159,8 @@ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - /* Check if we do have name information */ - if (HeaderNameInfo) ObpDecrementQueryReference(HeaderNameInfo); + /* release the name information */ + ObpReleaseNameInformation(HeaderNameInfo); /* Dereference the object */ ObDereferenceObject(Context->Object); @@ -167,11 +177,11 @@ { /* Release the lock */ ObpReleaseDirectoryLock(Context->Directory, Context); + Context->Directory = NULL; + Context->DirectoryLocked = FALSE; } /* Clear the context */ - Context->Directory = NULL; - Context->DirectoryLocked = FALSE; ObpReleaseLookupContextObject(Context); } Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Mon Jan 15 23:24:40 2007 @@ -220,35 +220,49 @@ /* Set this entry as the first, to speed up incoming insertion */ if (AllocatedEntry != LookupBucket) { - /* Check if the directory was locked */ - if (!Context->DirectoryLocked) + /* Check if the directory was locked or convert the lock */ + if ((Context->DirectoryLocked) || + (ExConvertPushLockSharedToExclusive(&Directory->Lock))) { - /* Convert the lock from shared to exclusive */ - ExConvertPushLockSharedToExclusive(&Directory->Lock); + /* Set the Current Entry */ + *AllocatedEntry = CurrentEntry->ChainLink; + + /* Link to the old Hash Entry */ + CurrentEntry->ChainLink = *LookupBucket; + + /* Set the new Hash Entry */ + *LookupBucket = CurrentEntry; } - - /* Set the Current Entry */ - *AllocatedEntry = CurrentEntry->ChainLink; - - /* Link to the old Hash Entry */ - CurrentEntry->ChainLink = *LookupBucket; - - /* Set the new Hash Entry */ - *LookupBucket = CurrentEntry; } /* Save the found object */ FoundObject = CurrentEntry->Object; - if (!FoundObject) goto Quickie; - + goto Quickie; + } + else + { + /* Check if the directory was locked */ + if (!Context->DirectoryLocked) + { + /* Release the lock */ + ObpReleaseDirectoryLock(Directory, Context); + } + + /* Check if we should scan the shadow directory */ + if ((SearchShadow) && (Directory->DeviceMap)) + { + /* FIXME: We don't support this yet */ + KEBUGCHECK(0); + } + } + +Quickie: + /* Check if we inserted an object */ + if (FoundObject) + { /* Get the object name information */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); - HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - if (HeaderNameInfo) - { - /* Add a query reference */ - ObpIncrementQueryReference(ObjectHeader, HeaderNameInfo); - } + ObpAcquireNameInformation(ObjectHeader); /* Reference the object being looked up */ ObReferenceObject(FoundObject); @@ -260,29 +274,17 @@ ObpReleaseDirectoryLock(Directory, Context); } } - else - { - /* Check if the directory was locked */ - if (!Context->DirectoryLocked) - { - /* Release the lock */ - ObpReleaseDirectoryLock(Directory, Context); - } - - /* Check if we should scan the shadow directory */ - if ((SearchShadow) && (Directory->DeviceMap)) - { - /* FIXME: We don't support this yet */ - KEBUGCHECK(0); - } - } - -Quickie: + /* Check if we found an object already */ if (Context->Object) { /* We already did a lookup, so remove this object's query reference */ - //ObpDecrementQueryReference(Context->Object); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObpReleaseNameInformation(HeaderNameInfo); + + /* Also dereference the object itself */ + ObDereferenceObject(Context->Object); } /* Return the object we found */ @@ -354,17 +356,17 @@ *--*/ NTSTATUS NTAPI -NtOpenDirectoryObject (OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) +NtOpenDirectoryObject(OUT PHANDLE DirectoryHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hDirectory; + HANDLE Directory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check if we need to do any probing */ - if(PreviousMode != KernelMode) + if (PreviousMode != KernelMode) { _SEH_TRY { @@ -377,8 +379,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* If we failed, return the error */ if(!NT_SUCCESS(Status)) return Status; } @@ -389,13 +389,13 @@ NULL, DesiredAccess, NULL, - &hDirectory); - if(NT_SUCCESS(Status)) + &Directory); + if (NT_SUCCESS(Status)) { _SEH_TRY { /* Write back the handle to the caller */ - *DirectoryHandle = hDirectory; + *DirectoryHandle = Directory; } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { @@ -476,10 +476,14 @@ POBJECT_HEADER_NAME_INFO ObjectNameInfo; UNICODE_STRING Name; PWSTR p; + OBP_LOOKUP_CONTEXT LookupContext; PAGED_CODE(); + /* Initialize lookup */ + ObpInitializeDirectoryLookup(&LookupContext); + /* Check if we need to do any probing */ - if(PreviousMode != KernelMode) + if (PreviousMode != KernelMode) { _SEH_TRY { @@ -491,7 +495,7 @@ if (!RestartScan) SkipEntries = *Context; /* Probe the return length if the caller specified one */ - if(ReturnLength) ProbeForWriteUlong(ReturnLength); + if (ReturnLength) ProbeForWriteUlong(ReturnLength); } _SEH_HANDLE { @@ -499,8 +503,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Return the exception to caller if we failed */ if(!NT_SUCCESS(Status)) return Status; } else if (!RestartScan) @@ -530,6 +532,9 @@ ExFreePool(LocalBuffer); return Status; } + + /* Lock directory in shared mode */ + ObpAcquireDirectoryLockShared(Directory, &LookupContext); /* Start at position 0 */ DirectoryInfo = (POBJECT_DIRECTORY_INFORMATION)LocalBuffer; @@ -691,6 +696,9 @@ } _SEH_END; + /* Unlock the directory */ + ObpReleaseDirectoryLock(Directory, &LookupContext); + /* Dereference the directory and free our buffer */ ObDereferenceObject(Directory); ExFreePool(LocalBuffer); @@ -726,7 +734,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes) { POBJECT_DIRECTORY Directory; - HANDLE hDirectory; + HANDLE NewHandle; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -745,8 +753,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* If we failed, return the error */ if(!NT_SUCCESS(Status)) return Status; } @@ -760,30 +766,33 @@ 0, 0, (PVOID*)&Directory); - if(NT_SUCCESS(Status)) - { - /* Insert it into the handle table */ - Status = ObInsertObject((PVOID)Directory, - NULL, - DesiredAccess, - 0, - NULL, - &hDirectory); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - /* Return the handle back to the caller */ - *DirectoryHandle = hDirectory; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - /* Get the exception code */ - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the object */ + RtlZeroMemory(Directory, sizeof(OBJECT_DIRECTORY)); + ExInitializePushLock((PULONG_PTR)&Directory->Lock); + Directory->SessionId = -1; + + /* Insert it into the handle table */ + Status = ObInsertObject((PVOID)Directory, + NULL, + DesiredAccess, + 0, + NULL, + &NewHandle); + + /* Enter SEH to protect write */ + _SEH_TRY + { + /* Return the handle back to the caller */ + *DirectoryHandle = NewHandle; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* Return status to caller */ return Status; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jan 15 23:24:40 2007 @@ -2693,7 +2693,6 @@ { /* Display warning and break into debugger */ DPRINT1("OB: Attempting to insert existing object %08x\n", Object); - KEBUGCHECK(0); DbgBreakPoint(); /* Allow debugger to continue */ @@ -2703,22 +2702,11 @@ /* Get the create and name info, as well as the object type */ ObjectCreateInfo = ObjectHeader->ObjectCreateInfo; - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectNameInfo = ObpAcquireNameInformation(ObjectHeader); ObjectType = ObjectHeader->Type; - - /* Check if we have name information */ - if (ObjectNameInfo) - { - /* Add a query reference */ - if (!ObpIncrementQueryReference(ObjectHeader, ObjectNameInfo)) - { - /* There are no query references, so the name info is invalid */ - ObjectNameInfo = NULL; - } - } + ObjectName = NULL; /* Check if this is an named object */ - ObjectName = NULL; if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) { /* Get the object name */ @@ -2738,6 +2726,7 @@ { /* Assume failure */ *Handle = NULL; + ObjectHeader->ObjectCreateInfo = NULL; /* Create the handle */ Status = ObpCreateUnnamedHandle(Object, @@ -2750,10 +2739,9 @@ /* Free the create information */ ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); - ObjectHeader->ObjectCreateInfo = NULL; - - /* Remove a query reference if we added one */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + + /* Release the object name information */ + ObpReleaseNameInformation(ObjectNameInfo); /* Remove the extra keep-alive reference */ ObDereferenceObject(Object); @@ -2779,7 +2767,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); ObDereferenceObject(Object); return Status; } @@ -2793,7 +2781,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); ObDereferenceObject(Object); return Status; } @@ -2855,7 +2843,7 @@ ObpCleanupDirectoryLookup(&Context); /* Remove query reference that we added */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); /* Dereference the object and delete the access state */ ObDereferenceObject(Object); @@ -2922,11 +2910,19 @@ /* Check if anything until now failed */ if (!NT_SUCCESS(Status)) { - /* Cleanup lookup context */ + /* Check if the directory was added */ + if (Context.DirectoryLocked) + { + /* Weird case where we need to do a manual delete */ + DPRINT1("Unhandled path\n"); + KEBUGCHECK(0); + } + + /* Cleanup the lookup */ ObpCleanupDirectoryLookup(&Context); /* Remove query reference that we added */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); /* Dereference the object and delete the access state */ ObDereferenceObject(Object); @@ -2971,7 +2967,7 @@ } /* Remove a query reference */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); /* Remove the extra keep-alive reference */ ObDereferenceObject(Object); @@ -3078,7 +3074,8 @@ SourceProcessHandle, TargetProcessHandle); - if((TargetHandle) && (PreviousMode != KernelMode)) + /* Check if we have a target handle */ + if ((TargetHandle) && (PreviousMode != KernelMode)) { /* Enter SEH */ _SEH_TRY @@ -3092,8 +3089,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Fail if the pointer was invalid */ if (!NT_SUCCESS(Status)) return Status; } @@ -3168,7 +3163,7 @@ hTarget, TargetProcessHandle, Status); - ObDereferenceObject(Target); + if (Target) ObDereferenceObject(Target); ObDereferenceObject(SourceProcess); return Status; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jan 15 23:24:40 2007 @@ -170,19 +170,8 @@ /* Get object structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectNameInfo = ObpAcquireNameInformation(ObjectHeader); ObjectType = ObjectHeader->Type; - - /* Check if we have a name information structure */ - if (ObjectNameInfo) - { - /* Add a query reference */ - if (!ObpIncrementQueryReference(ObjectHeader, ObjectNameInfo)) - { - /* No references, so the name info is invalid */ - ObjectNameInfo = NULL; - } - } /* * Check if the handle count is 0, if the object is named, @@ -225,21 +214,14 @@ ObpDeleteSymbolicLinkName(Object); } - /* Add a query reference */ + /* Check if the magic protection flag is set */ ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - if (!ObpIncrementQueryReference(ObjectHeader, ObjectNameInfo)) - { - /* No references, so the name info is invalid */ - ObjectNameInfo = NULL; - } - - /* Check if the magic protection flag is set */ if ((ObjectNameInfo) && (ObjectNameInfo->QueryReferences & 0x40000000)) { - /* Add deletion flag */ + /* Remove protection flag */ InterlockedExchangeAdd((PLONG)&ObjectNameInfo->QueryReferences, - 0xC0000000); + -0x40000000); } /* Get the directory */ @@ -254,13 +236,13 @@ ObpCleanupDirectoryLookup(&Context); /* Remove another query reference since we added one on top */ - ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); /* Check if we were inserted in a directory */ if (Directory) { /* We were, so first remove the extra reference we had added */ - ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); /* Now dereference the object as well */ ObDereferenceObject(Object); @@ -269,7 +251,7 @@ else { /* Remove the reference we added */ - if (ObjectNameInfo) ObpDecrementQueryReference(ObjectNameInfo); + ObpReleaseNameInformation(ObjectNameInfo); } } @@ -313,11 +295,15 @@ Status = STATUS_SUCCESS; Object = NULL; - /* Check if case-insensitivity is forced */ - if ((ObpCaseInsensitive) || (ObjectType->TypeInfo.CaseInsensitive)) - { - /* Add the flag to disable case sensitivity */ - Attributes |= OBJ_CASE_INSENSITIVE; + /* Check if case-insensitivity is checked */ + if (ObpCaseInsensitive) + { + /* Check if the object type requests this */ + if (!(ObjectType) || (ObjectType->TypeInfo.CaseInsensitive)) + { + /* Add the flag to disable case sensitivity */ + Attributes |= OBJ_CASE_INSENSITIVE; + } } /* Check if this is a access checks are being forced */

1 0

[fireball] 25468: - Merge two small fixes from 25400 - Merge 25401 and 25402
by fireball＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: fireball Date: Mon Jan 15 22:41:14 2007 New Revision: 25468 URL: http://svn.reactos.org/svn/reactos?rev=25468&view=rev Log: - Merge two small fixes from 25400 - Merge 25401 and 25402 Added: branches/ros-branch-0_3_1/reactos/dll/cpl/access/Cz.rc - copied unchanged from r25402, trunk/reactos/dll/cpl/access/Cz.rc branches/ros-branch-0_3_1/reactos/dll/cpl/main/Cz.rc - copied unchanged from r25402, trunk/reactos/dll/cpl/main/Cz.rc branches/ros-branch-0_3_1/reactos/dll/cpl/mmsys/cs-CZ.rc - copied unchanged from r25402, trunk/reactos/dll/cpl/mmsys/cs-CZ.rc branches/ros-branch-0_3_1/reactos/dll/cpl/powercfg/cz.rc - copied unchanged from r25402, trunk/reactos/dll/cpl/powercfg/cz.rc Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/access/access.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc branches/ros-branch-0_3_1/reactos/dll/cpl/mmsys/mmsys.rc branches/ros-branch-0_3_1/reactos/dll/cpl/powercfg/powercfg.rc branches/ros-branch-0_3_1/reactos/ntoskrnl/lpc/port.c branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/section.c Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/access/access.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/access/access.rc Mon Jan 15 22:41:14 2007 @@ -16,3 +16,4 @@ #include "Ru.rc" #include "Fr.rc" #include "Es.rc" +#include "Cz.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/desk.rbuild Mon Jan 15 22:41:14 2007 @@ -26,7 +26,7 @@ <file>desk.c</file> <file>dibitmap.c</file> <file>misc.c</file> - <file>preview.c</file> + <file>preview.c</file> <file>screensaver.c</file> <file>settings.c</file> <file>desk.rc</file> Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc Mon Jan 15 22:41:14 2007 @@ -18,3 +18,4 @@ #include "Es.rc" #include "Ru.rc" #include "Uk.rc" +#include "Cz.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/mmsys/mmsys.rc Mon Jan 15 22:41:14 2007 @@ -10,6 +10,7 @@ IDI_CPLICON ICON "resources/mmsys.ico" +#include "cs-CZ.rc" #include "de-DE.rc" #include "el-GR.rc" #include "en-US.rc" Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/powercfg/powercfg.rc Mon Jan 15 22:41:14 2007 @@ -18,3 +18,4 @@ #include "de.rc" #include "ru.rc" #include "fr.rc" +#include "cz.rc" Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/lpc/port.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/lpc/port.c Mon Jan 15 22:41:14 2007 @@ -56,6 +56,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; + ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); LpcpNextMessageId = 0; Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/section.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/mm/section.c Mon Jan 15 22:41:14 2007 @@ -2275,6 +2275,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; + ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); return(STATUS_SUCCESS);

1 0

[ion] 25467: [22 bugfixes]: - ObpReferenceProcessObjectByHandle is always called with HandleInformation, remove this check. - ObpReferenceProcessObjectByHandle already gets a process parameter, don't query the current one. - ObpReferenceProcessObjectByHandle already gets a handle table, don't query the current one. - ObpDecrementHandleCount shouldn't remove the object from the creator info. - ObpDecrementHandleCount should clear the exclusive process if this is the last handle. - Killing a prote
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Mon Jan 15 21:37:53 2007 New Revision: 25467 URL: http://svn.reactos.org/svn/reactos?rev=25467&view=rev Log: [22 bugfixes]: - ObpReferenceProcessObjectByHandle is always called with HandleInformation, remove this check. - ObpReferenceProcessObjectByHandle already gets a process parameter, don't query the current one. - ObpReferenceProcessObjectByHandle already gets a handle table, don't query the current one. - ObpDecrementHandleCount shouldn't remove the object from the creator info. - ObpDecrementHandleCount should clear the exclusive process if this is the last handle. - Killing a protected handle should raise an exception if a debug port is connected, not an exception port. - ObpIncrementHandleCount should support OBJ_FORCE_ACCESS_CHECK. - ObpIncrementHandleCount needs to support ObDuplicateHandle. - ObpIncrementHandleCount needs to support being called without an AccessState. - Fix interlocked handle count accounting. - Allow user-mode to create kernel-mode handles. - Fix the way Additional reference bias is de-referenced during failures. - Complete rundown in ObKillProcess. - Send SourceProcess in ObDuplicateHandle. - Assume initial failure and clear handle in ObDuplicateHandle. - Don't leak object table references when failing in ObDuplicateHandle. - Assume failure in ObOpenObjectByName. - Don't leak buffer during failure in ObOpenObjectByName. - Don't leak object reference durning failure in ObOpenObjecByName. - Validate handle attributes in ObOpenObjectByPointer. - Use RtlCopyMemory when possible to speed up. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jan 15 21:37:53 2007 @@ -60,14 +60,14 @@ IN PHANDLE_TABLE HandleTable, IN KPROCESSOR_MODE AccessMode, OUT PVOID *Object, - OUT POBJECT_HANDLE_INFORMATION HandleInformation) + OUT POBJECT_HANDLE_INFORMATION HandleInformation, + OUT PACCESS_MASK AuditMask) { PHANDLE_TABLE_ENTRY HandleEntry; POBJECT_HEADER ObjectHeader; ACCESS_MASK GrantedAccess; ULONG Attributes; - PEPROCESS CurrentProcess; - PETHREAD CurrentThread; + PETHREAD Thread = PsGetCurrentThread(); NTSTATUS Status; PAGED_CODE(); @@ -77,46 +77,40 @@ /* Check if the caller wants the current process */ if (Handle == NtCurrentProcess()) { - /* Get the current process */ - CurrentProcess = PsGetCurrentProcess(); - - /* Check if the caller wanted handle information */ - if (HandleInformation) - { - /* Return it */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = Process->GrantedAccess; - } + /* Return handle info */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = Process->GrantedAccess; + + /* No audit mask */ + *AuditMask = 0; /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentProcess); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Process); InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); /* Return the pointer */ - *Object = CurrentProcess; + *Object = Process; + ASSERT(*Object != NULL); return STATUS_SUCCESS; } /* Check if the caller wants the current thread */ if (Handle == NtCurrentThread()) { - /* Get the current thread */ - CurrentThread = PsGetCurrentThread(); - - /* Check if the caller wanted handle information */ - if (HandleInformation) - { - /* Return it */ - HandleInformation->HandleAttributes = 0; - HandleInformation->GrantedAccess = CurrentThread->GrantedAccess; - } + /* Return handle information */ + HandleInformation->HandleAttributes = 0; + HandleInformation->GrantedAccess = Thread->GrantedAccess; /* Reference ourselves */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(CurrentThread); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Thread); InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + /* No audit mask */ + *AuditMask = 0; + /* Return the pointer */ - *Object = CurrentThread; + *Object = Thread; + ASSERT(*Object != NULL); return STATUS_SUCCESS; } @@ -126,11 +120,6 @@ /* Use the kernel handle table and get the actual handle value */ Handle = ObKernelHandleToHandle(Handle); HandleTable = ObpKernelHandleTable; - } - else - { - /* Otherwise use this process's handle table */ - HandleTable = PsGetCurrentProcess()->ObjectTable; } /* Enter a critical region while we touch the handle table */ @@ -156,6 +145,9 @@ /* Fill out the information */ HandleInformation->HandleAttributes = Attributes; HandleInformation->GrantedAccess = GrantedAccess; + + /* No audit mask (FIXME!) */ + *AuditMask = 0; /* Return the pointer */ *Object = &ObjectHeader->Body; @@ -244,7 +236,7 @@ if (!HandleDatabase) return NULL; /* Copy the old database */ - RtlMoveMemory(HandleDatabase, OldHandleDatabase, OldSize); + RtlCopyMemory(HandleDatabase, OldHandleDatabase, OldSize); /* Check if we he had a single entry before */ if (ObjectHeader->Flags & OB_FLAG_SINGLE_PROCESS) @@ -440,12 +432,12 @@ POBJECT_TYPE ObjectType; LONG SystemHandleCount, ProcessHandleCount; LONG NewCount; - POBJECT_HEADER_CREATOR_INFO CreatorInfo; KIRQL CalloutIrql; POBJECT_HEADER_HANDLE_INFO HandleInfo; POBJECT_HANDLE_COUNT_ENTRY HandleEntry; POBJECT_HANDLE_COUNT_DATABASE HandleDatabase; ULONG i; + PAGED_CODE(); /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); @@ -467,17 +459,11 @@ /* Decrement the handle count */ NewCount = InterlockedDecrement(&ObjectHeader->HandleCount); - /* Check if we're out of handles */ - if (!NewCount) - { - /* Get the creator info */ - CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); - if ((CreatorInfo) && !(IsListEmpty(&CreatorInfo->TypeList))) - { - /* Remove it from the list and re-initialize it */ - RemoveEntryList(&CreatorInfo->TypeList); - InitializeListHead(&CreatorInfo->TypeList); - } + /* Check if we're out of handles and this was an exclusive object */ + if (!(NewCount) && (ObjectHeader->Flags & OB_FLAG_EXCLUSIVE)) + { + /* Clear the exclusive flag */ + OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader)->ExclusiveProcess = NULL; } /* Is the object type keeping track of handles? */ @@ -644,8 +630,8 @@ /* We are! Unlock the entry */ ExUnlockHandleTableEntry(HandleTable, HandleEntry); - /* Make sure we have an exception port */ - if (PsGetCurrentProcess()->ExceptionPort) + /* Make sure we have a debug port */ + if (PsGetCurrentProcess()->DebugPort) { /* Raise an exception */ return KeRaiseUserException(STATUS_HANDLE_NOT_CLOSABLE); @@ -656,10 +642,11 @@ return STATUS_HANDLE_NOT_CLOSABLE; } } - - /* Otherwise, we are kernel mode, so unlock the entry and return */ - ExUnlockHandleTableEntry(HandleTable, HandleEntry); - return STATUS_HANDLE_NOT_CLOSABLE; + else + { + /* Otherwise, bugcheck the OS */ + KeBugCheckEx(0x8B, (ULONG_PTR)Handle, 0, 0, 0); + } } /* Destroy and unlock the handle entry */ @@ -727,6 +714,8 @@ BOOLEAN Exclusive = FALSE, NewObject; POBJECT_HEADER_CREATOR_INFO CreatorInfo; KIRQL CalloutIrql; + KPROCESSOR_MODE ProbeMode; + ULONG Total; /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -738,6 +727,18 @@ OpenReason, ObjectHeader->HandleCount, ObjectHeader->PointerCount); + + /* Check if caller is forcing user mode */ + if (HandleAttributes & OBJ_FORCE_ACCESS_CHECK) + { + /* Force it */ + ProbeMode = UserMode; + } + else + { + /* Keep original setting */ + ProbeMode = AccessMode; + } /* Lock the object type */ ObpEnterObjectTypeMutex(ObjectType); @@ -797,7 +798,8 @@ } /* Check if we're opening an existing handle */ - if (OpenReason == ObOpenHandle) + if ((OpenReason == ObOpenHandle) || + ((OpenReason == ObDuplicateHandle) && (AccessState))) { /* Validate the caller's access to this object */ if (!ObCheckObjectAccess(Object, @@ -875,7 +877,10 @@ Status = ObjectType->TypeInfo.OpenProcedure(OpenReason, Process, Object, - AccessState->PreviouslyGrantedAccess, + AccessState ? + AccessState-> + PreviouslyGrantedAccess : + 0, ProcessHandleCount); ObpCalloutEnd(CalloutIrql, "Open", ObjectType, Object); @@ -889,26 +894,30 @@ } } - /* Check if we have creator info */ - CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); - if (CreatorInfo) - { - /* We do, acquire the lock */ - ObpEnterObjectTypeMutex(ObjectType); - - /* Insert us on the list */ - InsertTailList(&ObjectType->TypeList, &CreatorInfo->TypeList); - - /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + /* Check if this is a create operation */ + if (OpenReason == ObCreateHandle) + { + /* Check if we have creator info */ + CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(ObjectHeader); + if (CreatorInfo) + { + /* We do, acquire the lock */ + ObpEnterObjectTypeMutex(ObjectType); + + /* Insert us on the list */ + InsertTailList(&ObjectType->TypeList, &CreatorInfo->TypeList); + + /* Release the lock */ + ObpLeaveObjectTypeMutex(ObjectType); + } } /* Increase total number of handles */ - InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); - if (ObjectType->TotalNumberOfHandles > ObjectType->HighWaterNumberOfHandles) + Total = InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); + if (Total > ObjectType->HighWaterNumberOfHandles) { /* Fixup count */ - ObjectType->HighWaterNumberOfHandles = ObjectType->TotalNumberOfHandles; + ObjectType->HighWaterNumberOfHandles = Total; } /* Trace call and return */ @@ -971,6 +980,7 @@ BOOLEAN Exclusive = FALSE, NewObject; POBJECT_HEADER_CREATOR_INFO CreatorInfo; KIRQL CalloutIrql; + ULONG Total; /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -1123,11 +1133,11 @@ } /* Increase total number of handles */ - InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); - if (ObjectType->TotalNumberOfHandles > ObjectType->HighWaterNumberOfHandles) + Total = InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfHandles); + if (Total > ObjectType->HighWaterNumberOfHandles) { /* Fixup count */ - ObjectType->HighWaterNumberOfHandles = ObjectType->TotalNumberOfHandles; + ObjectType->HighWaterNumberOfHandles = Total; } /* Trace call and return */ @@ -1208,7 +1218,7 @@ ObjectHeader->PointerCount); /* Check if this is a kernel handle */ - if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) + if (HandleAttributes & OBJ_KERNEL_HANDLE) { /* Set the handle table */ HandleTable = ObpKernelHandleTable; @@ -1309,14 +1319,9 @@ } /* Handle extra references */ - if (AdditionalReferences == 1) - { - /* Dereference the object once */ - ObDereferenceObject(Object); - } - else if (AdditionalReferences > 1) - { - /* Dereference it many times */ + if (AdditionalReferences) + { + /* Dereference it as many times as required */ InterlockedExchangeAdd(&ObjectHeader->PointerCount, -AdditionalReferences); } @@ -1413,7 +1418,7 @@ } /* Check if this is a kernel handle */ - if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) + if (HandleAttributes & OBJ_KERNEL_HANDLE) { /* Set the handle table */ HandleTable = ObpKernelHandleTable; @@ -1508,12 +1513,6 @@ /* Make sure we got a handle */ if (Handle) { - /* Check if we have auxiliary data */ - if (AuxData) - { - /* FIXME: Change handle security */ - } - /* Check if this was a kernel handle */ if (KernelHandle) Handle = ObMarkHandleAsKernelHandle(Handle); @@ -1573,16 +1572,18 @@ GrantedAccess); /* Handle extra references */ - if (AdditionalReferences == 1) - { - /* Dereference the object once */ + if (AdditionalReferences) + { + /* Check how many extra references were added */ + if (AdditionalReferences > 1) + { + /* Dereference it many times */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, + -(AdditionalReferences - 1)); + } + + /* Dereference the object one last time */ ObDereferenceObject(Object); - } - else if (AdditionalReferences > 1) - { - /* Dereference it many times */ - InterlockedExchangeAdd(&ObjectHeader->PointerCount, - -AdditionalReferences); } /* Detach if necessary and fail */ @@ -1670,9 +1671,9 @@ /* Detach */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Check if this was a user-mode caller with a valid exception port */ + /* Check if this was a user-mode caller with a valid debug port */ if ((AccessMode != KernelMode) && - (PsGetCurrentProcess()->ExceptionPort)) + (PsGetCurrentProcess()->DebugPort)) { /* Raise an exception */ Status = KeRaiseUserException(STATUS_INVALID_HANDLE); @@ -1948,8 +1949,9 @@ BOOLEAN HardErrors; PAGED_CODE(); - /* Wait for process rundown */ + /* Wait for process rundown and then complete it */ ExWaitForRundownProtectionRelease(&Process->RundownProtect); + ExRundownCompleted(&Process->RundownProtect); /* Get the object table */ HandleTable = Process->ObjectTable; @@ -2007,6 +2009,7 @@ AUX_DATA AuxData; PHANDLE_TABLE HandleTable; OBJECT_HANDLE_INFORMATION HandleInformation; + ULONG AuditMask; PAGED_CODE(); OBTRACE(OB_HANDLE_DEBUG, "%s - Duplicating handle: %lx for %p into %p\n", @@ -2015,6 +2018,9 @@ SourceProcess, TargetProcess); + /* Assume failure */ + if (TargetHandle) *TargetHandle = NULL; + /* Check if we're not duplicating the same access */ if (!(Options & DUPLICATE_SAME_ACCESS)) { @@ -2029,11 +2035,12 @@ /* Reference the process object */ Status = ObpReferenceProcessObjectByHandle(SourceHandle, - 0, + SourceProcess, HandleTable, PreviousMode, &SourceObject, - &HandleInformation); + &HandleInformation, + &AuditMask); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -2191,6 +2198,10 @@ /* Now check if incrementing actually failed */ if (!NT_SUCCESS(Status)) { + /* Dereference handle tables */ + ObDereferenceProcessHandleTable(SourceProcess); + ObDereferenceProcessHandleTable(TargetProcess); + /* Dereference the source object */ ObDereferenceObject(SourceObject); return Status; @@ -2283,11 +2294,13 @@ POB_TEMP_BUFFER TempBuffer; PAGED_CODE(); + /* Assume failure */ + *Handle = NULL; + /* Check if we didn't get any Object Attributes */ if (!ObjectAttributes) { /* Fail with special status code */ - *Handle = NULL; return STATUS_INVALID_PARAMETER; } @@ -2303,7 +2316,12 @@ TRUE, &TempBuffer->ObjectCreateInfo, &ObjectName); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ExFreePool(TempBuffer); + return Status; + } /* Check if we didn't get an access state */ if (!PassedAccessState) @@ -2378,6 +2396,9 @@ /* Cleanup after lookup */ ObpCleanupDirectoryLookup(&TempBuffer->LookupContext); + + /* Dereference the object */ + ObDereferenceObject(Object); } else { @@ -2466,8 +2487,8 @@ AUX_DATA AuxData; PAGED_CODE(); - /* Get the Header Info */ - Header = OBJECT_TO_OBJECT_HEADER(Object); + /* Assume failure */ + *Handle = NULL; /* Reference the object */ Status = ObReferenceObjectByPointer(Object, @@ -2475,6 +2496,9 @@ ObjectType, AccessMode); if (!NT_SUCCESS(Status)) return Status; + + /* Get the Header Info */ + Header = OBJECT_TO_OBJECT_HEADER(Object); /* Check if we didn't get an access state */ if (!PassedAccessState) @@ -2491,6 +2515,20 @@ ObDereferenceObject(Object); return Status; } + } + + /* Check if we have invalid object attributes */ + if (Header->Type->TypeInfo.InvalidAttributes & HandleAttributes) + { + /* Delete the access state */ + if (PassedAccessState == &AccessState) + { + SeDeleteAccessState(PassedAccessState); + } + + /* Dereference the object */ + ObDereferenceObject(Object); + return STATUS_INVALID_PARAMETER; } /* Create the handle */

1 0

[gedmurphy] 25466: fix icon loading code to load the correct icon for the current display bpp settings
by gedmurphy＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: gedmurphy Date: Mon Jan 15 21:08:37 2007 New Revision: 25466 URL: http://svn.reactos.org/svn/reactos?rev=25466&view=rev Log: fix icon loading code to load the correct icon for the current display bpp settings Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Jan 15 21:08:37 2007 @@ -231,10 +231,7 @@ if (IconResDir == NULL) return NULL; - /* - * Find the best fitting in the IconResDir for this resolution - */ - + /* Find the best fitting in the IconResDir for this resolution */ id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); @@ -256,6 +253,7 @@ SizeofResource(hinst, h2Resource), Icon, 0x00030000, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); + if (hIcon && 0 != (fuLoad & LR_SHARED)) { NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Jan 15 21:08:37 2007 @@ -440,35 +440,47 @@ PBYTE presbits, BOOL fIcon) { - return LookupIconIdFromDirectoryEx( presbits, fIcon, - fIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR), - fIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), LR_DEFAULTCOLOR ); -} - -/* Ported from WINE20030408 */ -GRPCURSORICONDIRENTRY* -CURSORICON_FindBestCursor( GRPCURSORICONDIR *dir, int width, int height, int colors) -{ - int i; - GRPCURSORICONDIRENTRY *entry, *bestEntry = NULL; + return LookupIconIdFromDirectoryEx(presbits, + fIcon, + fIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR), + fIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), + LR_DEFAULTCOLOR); +} + + + + + +/* + * The following macro function accounts for the irregularities of + * accessing cursor and icon resources in files and resource entries. + */ +typedef BOOL +(*fnGetCIEntry)(LPVOID dir, int n, int *width, int *height, int *bits ); + +/********************************************************************** + * CURSORICON_FindBestIcon + * + * Find the icon closest to the requested size and number of colors. + */ +static int +CURSORICON_FindBestIcon(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits) +{ + int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; UINT iTempXDiff, iTempYDiff, iTempColorDiff; - - if (dir->idCount < 1) - { - DPRINT("Empty directory!\n"); - return NULL; - } - if (dir->idCount == 1) - return &dir->idEntries[0]; /* No choice... */ /* Find Best Fit */ iTotalDiff = 0xFFFFFFFF; iColorDiff = 0xFFFFFFFF; - for (i = 0, entry = &dir->idEntries[0]; i < dir->idCount; i++,entry++) - { - iTempXDiff = abs(width - entry->ResInfo.icon.bWidth); - iTempYDiff = abs(height - entry->ResInfo.icon.bHeight); + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + iTempXDiff = abs(Width - cx); + iTempYDiff = abs(Height - cy); if(iTotalDiff > (iTempXDiff + iTempYDiff)) { @@ -479,118 +491,191 @@ } /* Find Best Colors for Best Fit */ - for (i = 0, entry = &dir->idEntries[0]; i < dir->idCount; i++,entry++) - { - if(abs(width - entry->ResInfo.icon.bWidth) == (int) iXDiff && - abs(height - entry->ResInfo.icon.bHeight) == (int) iYDiff) + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) { - iTempColorDiff = abs(colors - entry->ResInfo.icon.bColorCount); - - if(iColorDiff > iTempColorDiff) - { - bestEntry = entry; - iColorDiff = iTempColorDiff; - } - } - } - - return bestEntry; -} - -/* Ported from WINE20030408 */ -GRPCURSORICONDIRENTRY* -CURSORICON_FindBestIcon( GRPCURSORICONDIR *dir, int width, int height, int colorbits) -{ - int i; - GRPCURSORICONDIRENTRY *entry, *bestEntry = NULL; - UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; - UINT iTempXDiff, iTempYDiff, iTempColorDiff; - - if (dir->idCount < 1) - { - DPRINT("Empty directory!\n"); - return NULL; - } - if (dir->idCount == 1) - return &dir->idEntries[0]; /* No choice... */ - - /* Find Best Fit */ - iTotalDiff = 0xFFFFFFFF; - iColorDiff = 0xFFFFFFFF; - for (i = 0, entry = &dir->idEntries[0]; i < dir->idCount; i++,entry++) - { - iTempXDiff = abs(width - entry->ResInfo.icon.bWidth); - - iTempYDiff = abs(height - entry->ResInfo.icon.bHeight); - - if(iTotalDiff > (iTempXDiff + iTempYDiff)) - { - iXDiff = iTempXDiff; - iYDiff = iTempYDiff; - iTotalDiff = iXDiff + iYDiff; - } - } - - /* Find Best Colors for Best Fit */ - for (i = 0, entry = &dir->idEntries[0]; i < dir->idCount; i++,entry++) - { - if(abs(width - entry->ResInfo.icon.bWidth) == (int) iXDiff && - abs(height - entry->ResInfo.icon.bHeight) == (int) iYDiff) - { - iTempColorDiff = abs(colorbits - entry->wBitCount); + iTempColorDiff = abs(ColorBits - Bits); if(iColorDiff > iTempColorDiff) { - bestEntry = entry; + BestEntry = i; + BestBits = Bits; iColorDiff = iTempColorDiff; } } } - return bestEntry; -} - -/* Ported from WINE20030408 */ -/* - * @implemented - */ -INT STDCALL -LookupIconIdFromDirectoryEx( - PBYTE presbits, - BOOL fIcon, - int cxDesired, - int cyDesired, - UINT Flags) -{ - GRPCURSORICONDIR *dir = (GRPCURSORICONDIR*)presbits; - UINT retVal = 0; - - if (dir && !dir->idReserved && (IMAGE_ICON == dir->idType || IMAGE_CURSOR == dir->idType)) - { - GRPCURSORICONDIRENTRY *entry; - HDC hdc; - int ColorBits; - - hdc = CreateICW(NULL, NULL, NULL, NULL); - if (Flags & LR_MONOCHROME) - { - ColorBits = 1; - } - else - { - ColorBits = GetDeviceCaps(hdc, BITSPIXEL); - if (ColorBits > 8) - ColorBits = 8; - } - DeleteDC(hdc); - - entry = CURSORICON_FindBestIcon( dir, cxDesired, cyDesired, ColorBits ); - - if (entry) - retVal = entry->nID; - } - else - { - DbgPrint("invalid resource directory\n"); - } - return retVal; -} + DPRINT1("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits); + + return BestEntry; +} + + + +/********************************************************************** + * CURSORICON_FindBestCursor + * + * Find the cursor closest to the requested size. + * FIXME: parameter 'color' ignored and entries with more than 1 bpp + * ignored too + */ +static int +CURSORICON_FindBestCursor(LPVOID dir, + fnGetCIEntry get_entry, + int Width, + int Height, + int ColorBits) +{ + int i, MaxWidth, MaxHeight, cx, cy, Bits, BestEntry = -1; + + /* Double height to account for AND and XOR masks */ + Height *= 2; + + /* First find the largest one smaller than or equal to the requested size*/ + MaxWidth = MaxHeight = 0; + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + if ((cx <= Width) && (cy <= Height) && + (cx > MaxWidth) && (cy > MaxHeight) && + (Bits == 1)) + { + BestEntry = i; + MaxWidth = cx; + MaxHeight = cy; + } + } + if (BestEntry != -1) + return BestEntry; + + /* Now find the smallest one larger than the requested size */ + MaxWidth = MaxHeight = 255; + for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) + { + if (((cx < MaxWidth) && (cy < MaxHeight) && (Bits == 1)) || + (BestEntry == -1)) + { + BestEntry = i; + MaxWidth = cx; + MaxHeight = cy; + } + } + + return BestEntry; +} + + +static BOOL +CURSORICON_GetResIconEntry(LPVOID dir, + int n, + int *Width, + int *Height, + int *Bits) +{ + GRPCURSORICONDIR *ResDir = dir; + ICONRESDIR *Icon; + + if (ResDir->idCount <= n) + return FALSE; + + Icon = &ResDir->idEntries[n].ResInfo.icon; + *Width = Icon->bWidth; + *Height = Icon->bHeight; + *Bits = ResDir->idEntries[n].wBitCount; + return TRUE; +} + +static BOOL +CURSORICON_GetResCursorEntry(LPVOID dir, + int n, + int *Width, + int *Height, + int *Bits) +{ + GRPCURSORICONDIR *ResDir = dir; + CURSORRESDIR *Cursor; + + if (ResDir->idCount <= n) + return FALSE; + + Cursor = &ResDir->idEntries[n].ResInfo.cursor; + *Width = Cursor->wWidth; + *Height = Cursor->wHeight; + *Bits = ResDir->idEntries[n].wBitCount; + return TRUE; +} + +static GRPCURSORICONDIRENTRY * +CURSORICON_FindBestIconRes(GRPCURSORICONDIR * dir, + int Width, + int Height, + int ColorBits) +{ + int n; + n = CURSORICON_FindBestIcon(dir, + CURSORICON_GetResIconEntry, + Width, + Height, + ColorBits); + if (n < 0) + return NULL; + + return &dir->idEntries[n]; +} + +static GRPCURSORICONDIRENTRY * +CURSORICON_FindBestCursorRes(GRPCURSORICONDIR *dir, + int Width, + int Height, + int ColorBits) +{ + int n; + n = CURSORICON_FindBestCursor(dir, + CURSORICON_GetResCursorEntry, + Width, + Height, + ColorBits); + if (n < 0) + return NULL; + + return &dir->idEntries[n]; +} + + +INT WINAPI +LookupIconIdFromDirectoryEx(PBYTE xdir, + BOOL bIcon, + INT width, + INT height, + UINT cFlag) +{ + GRPCURSORICONDIR *dir = (GRPCURSORICONDIR*)xdir; + UINT retVal = 0; + if(dir && !dir->idReserved && (IMAGE_ICON == dir->idType || IMAGE_CURSOR == dir->idType)) + { + GRPCURSORICONDIRENTRY *entry = NULL; + int ColorBits; + + if (cFlag & LR_MONOCHROME) + { + ColorBits = 1; + } + else + { + HDC hdc = GetDC(0); + ColorBits = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + } + + if(bIcon) + entry = CURSORICON_FindBestIconRes(dir, width, height, ColorBits); + else + entry = CURSORICON_FindBestCursorRes(dir, width, height, 1); + + if (entry) + retVal = entry->nID; + } + else + DPRINT1("%s() : Invalid resource directory\n", __FUNCTION__); + + return retVal; +}

1 0

[arty] 25465: Updated linker script.
by arty＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: arty Date: Mon Jan 15 13:20:00 2007 New Revision: 25465 URL: http://svn.reactos.org/svn/reactos?rev=25465&view=rev Log: Updated linker script. Modified: branches/powerpc/reactos/tools/ppc-build/ldscript Modified: branches/powerpc/reactos/tools/ppc-build/ldscript URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/ldscript (original) +++ branches/powerpc/reactos/tools/ppc-build/ldscript Mon Jan 15 13:20:00 2007 @@ -23,6 +23,7 @@ .rodata : { *(.rodata) + *(.got2) } .idata : { @@ -40,6 +41,7 @@ } .bss : { + *(.sbss) *(.bss) *(COMMON) }

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