Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[sginsberg] 43337: - Stub out ExpSystemErrorHandler more properly.
by sginsberg＠svn.reactos.org 08 Oct '09

08 Oct '09

Author: sginsberg Date: Thu Oct 8 22:06:37 2009 New Revision: 43337 URL: http://svn.reactos.org/svn/reactos?rev=43337&view=rev Log: - Stub out ExpSystemErrorHandler more properly. Modified: trunk/reactos/ntoskrnl/ex/harderr.c Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Thu Oct 8 22:06:37 2009 @@ -58,12 +58,26 @@ IN PULONG_PTR Parameters, IN BOOLEAN Shutdown) { - ULONG_PTR Dummy[4] = {0, 0, 0, 0}; + ULONG_PTR BugCheckParameters[MAXIMUM_HARDERROR_PARAMETERS] = {0, 0, 0, 0}; + ULONG i; + + /* Sanity check */ + ASSERT(NumberOfParameters <= MAXIMUM_HARDERROR_PARAMETERS); + + /* + * KeBugCheck expects MAXIMUM_HARDERROR_PARAMETERS parameters, + * but we might get called with less, so use a local buffer here. + */ + for (i = 0; i < NumberOfParameters; i++) + { + /* Copy them over */ + BugCheckParameters[i] = Parameters[i]; + } /* FIXME: STUB */ KeBugCheckEx(FATAL_UNHANDLED_HARD_ERROR, ErrorStatus, - (ULONG_PTR)Dummy, + (ULONG_PTR)BugCheckParameters, 0, 0); return STATUS_SUCCESS; @@ -507,7 +521,7 @@ * Optional string parameter (can be only one per error code) * * @param Parameters - * Array of ULONG parameters for use in error message string + * Array of ULONG_PTR parameters for use in error message string * * @param ValidResponseOptions * See HARDERROR_RESPONSE_OPTION for possible values description

1 0

[dchapyshev] 43336: - Partially revert r42993 for imagelist See issue #4304 for more details.
by dchapyshev＠svn.reactos.org 08 Oct '09

08 Oct '09

Author: dchapyshev Date: Thu Oct 8 13:18:34 2009 New Revision: 43336 URL: http://svn.reactos.org/svn/reactos?rev=43336&view=rev Log: - Partially revert r42993 for imagelist See issue #4304 for more details. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Thu Oct 8 13:18:34 2009 @@ -156,7 +156,7 @@ * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) +IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; @@ -167,15 +167,14 @@ && (himl->cy >= cy)) return; - if (cx == 0) cx = himl->cx; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz); TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); @@ -249,7 +248,7 @@ nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); hdcBitmap = CreateCompatibleDC(0); @@ -351,7 +350,7 @@ else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -2305,7 +2304,7 @@ if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); + IMAGELIST_InternalExpandBitmaps (himl, 1, 0); nIndex = himl->cCurImage; himl->cCurImage++;

1 0

[janderwald] 43335: - When enumerating controls, cControls *tells* the number of controls not *cConnections*. Fix a crash in XP sndvol32 - Clear the entire struct, not just part of it - WdmAudMixerCapabilities just provides the index of a device, not its handle. Fixes displaying of duplicate mixer name in sndvol32 - Verify that a mixer line exists
by janderwald＠svn.reactos.org 08 Oct '09

08 Oct '09

Author: janderwald Date: Thu Oct 8 09:25:26 2009 New Revision: 43335 URL: http://svn.reactos.org/svn/reactos?rev=43335&view=rev Log: - When enumerating controls, cControls *tells* the number of controls not *cConnections*. Fix a crash in XP sndvol32 - Clear the entire struct, not just part of it - WdmAudMixerCapabilities just provides the index of a device, not its handle. Fixes displaying of duplicate mixer name in sndvol32 - Verify that a mixer line exists Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Thu Oct 8 09:25:26 2009 @@ -92,7 +92,7 @@ { MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); - for(Index = 0; Index < MixerLineSrc->Line.cConnections; Index++) + for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) { if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) { @@ -1530,7 +1530,7 @@ } /* initialize mixer destination line */ - RtlZeroMemory(DestinationLine, sizeof(MIXERLINEW)); + RtlZeroMemory(DestinationLine, sizeof(MIXERLINE_EXT)); DestinationLine->Line.cbStruct = sizeof(MIXERLINEW); DestinationLine->Line.dwSource = MAXULONG; DestinationLine->Line.dwLineID = DESTINATION_LINE; @@ -1702,14 +1702,14 @@ IN PWDMAUD_CLIENT ClientInfo, IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) { - if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + if ((ULONG)DeviceInfo->DeviceIndex >= DeviceExtension->MixerInfoCount) { /* invalid parameter */ return STATUS_INVALID_PARAMETER; } /* copy cached mixer caps */ - RtlMoveMemory(&DeviceInfo->u.MixCaps, &DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice].MixCaps, sizeof(MIXERCAPSW)); + RtlMoveMemory(&DeviceInfo->u.MixCaps, &DeviceExtension->MixerInfo[(ULONG)DeviceInfo->DeviceIndex].MixCaps, sizeof(MIXERCAPSW)); return STATUS_SUCCESS; } @@ -1842,7 +1842,11 @@ } MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); - ASSERT(MixerLineSrc); + if (!MixerLineSrc) + { + DPRINT1("Failed to find Line with id %u\n", DeviceInfo->u.MixLine.dwLineID); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } /* copy cached data */ RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); @@ -1938,7 +1942,7 @@ /* invalid parameter */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - + DPRINT1("MixerId %u ControlId %u\n",(ULONG)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID); Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); if (NT_SUCCESS(Status)) { @@ -1946,7 +1950,6 @@ } return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } - UNIMPLEMENTED; //DbgBreakPoint();

1 0

[sginsberg] 43334: MiReserveSystemPtes: Don't assert that allocation succeeded, just warn if we failed. All callers of the function handle allocation failure properly.
by sginsberg＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: sginsberg Date: Wed Oct 7 22:14:01 2009 New Revision: 43334 URL: http://svn.reactos.org/svn/reactos?rev=43334&view=rev Log: MiReserveSystemPtes: Don't assert that allocation succeeded, just warn if we failed. All callers of the function handle allocation failure properly. Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Wed Oct 7 22:14:01 2009 @@ -170,12 +170,26 @@ IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType) { PMMPTE PointerPte; - + // // Use the extended function // PointerPte = MiReserveAlignedSystemPtes(NumberOfPtes, SystemPtePoolType, 0); - ASSERT(PointerPte != NULL); + + // + // Check if allocation failed + // + if (!PointerPte) + { + // + // Warn that we are out of memory + // + DPRINT1("MiReserveSystemPtes: Failed to reserve %lu PTE(s)!\n", NumberOfPtes); + } + + // + // Return the PTE Pointer + // return PointerPte; }

1 0

[dgorbachev] 43333: Fix GCC 4.1.3 warning.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 22:04:17 2009 New Revision: 43333 URL: http://svn.reactos.org/svn/reactos?rev=43333&view=rev Log: Fix GCC 4.1.3 warning. Modified: trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=433… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Wed Oct 7 22:04:17 2009 @@ -68,7 +68,7 @@ KdpDebugBuffer, end, NULL, NULL); } - InterlockedExchangeAddUL(&KdpFreeBytes, num); + (VOID)InterlockedExchangeAddUL(&KdpFreeBytes, num); } }

1 0

[dgorbachev] 43332: Happy testing.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 21:58:15 2009 New Revision: 43332 URL: http://svn.reactos.org/svn/reactos?rev=43332&view=rev Log: Happy testing. Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Oct 7 21:58:15 2009 @@ -12,9 +12,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* * COPYRIGHT: See COPYING in the top level directory @@ -305,7 +305,7 @@ L"SystemPath", ArcPath); - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS*/ + /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, @@ -430,6 +430,12 @@ L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", L"ReactOS", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); + + /* ReactOS_LogFile */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_LogFile", L"\"ReactOS (Log file)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=FILE /SOS"); /* ReactOS_Ram */ CreateFreeLoaderEntry(IniCache, IniSection,

1 0

[dgorbachev] 43331: Fix logging to a file. In spite of limitations, it remains the only way to obtain desired logs for some people.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 21:57:40 2009 New Revision: 43331 URL: http://svn.reactos.org/svn/reactos?rev=43331&view=rev Log: Fix logging to a file. In spite of limitations, it remains the only way to obtain desired logs for some people. Modified: trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=433… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Wed Oct 7 21:57:40 2009 @@ -14,16 +14,17 @@ /* GLOBALS *******************************************************************/ -#define BufferSize 32*1024 - -HANDLE KdbLogFileHandle; -BOOLEAN KdpLogInitialized; -CHAR DebugBuffer[BufferSize]; -ULONG CurrentPosition; -WORK_QUEUE_ITEM KdpDebugLogQueue; +#define KdpBufferSize (1024 * 512) +BOOLEAN KdpLoggingEnabled = FALSE; +PCHAR KdpDebugBuffer = NULL; +volatile ULONG KdpCurrentPosition = 0; +volatile ULONG KdpFreeBytes = 0; +KSPIN_LOCK KdpDebugLogSpinLock; +KEVENT KdpLoggerThreadEvent; +HANDLE KdpLogFileHandle; + KSPIN_LOCK KdpSerialSpinLock; -BOOLEAN ItemQueued; -KD_PORT_INFORMATION SerialPortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0}; +KD_PORT_INFORMATION SerialPortInfo = { DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0 }; /* Current Port in use. FIXME: Do we support more then one? */ ULONG KdpPort; @@ -32,56 +33,103 @@ VOID NTAPI -KdpPrintToLogInternal(PVOID Context) -{ +KdpLoggerThread(PVOID Context) +{ + ULONG beg, end, num; IO_STATUS_BLOCK Iosb; - /* Write to the Debug Log */ - NtWriteFile(KdbLogFileHandle, - NULL, - NULL, - NULL, - &Iosb, - DebugBuffer, - CurrentPosition, - NULL, - NULL); - - /* Clear the Current Position */ - CurrentPosition = 0; - - /* A new item can be queued now */ - ItemQueued = FALSE; -} - -VOID -NTAPI -KdpPrintToLog(PCH String, - ULONG StringLength) -{ - /* Don't overflow */ - if ((CurrentPosition + StringLength) > BufferSize) return; - - /* Add the string to the buffer */ - RtlCopyMemory(&DebugBuffer[CurrentPosition], String, StringLength); - - /* Update the Current Position */ - CurrentPosition += StringLength; - - /* Make sure we are initialized and can queue */ - if (!KdpLogInitialized || (ItemQueued)) return; - - /* - * Queue the work item - * Note that we don't want to queue if we are > DISPATCH_LEVEL... - * The message is in the buffer and will simply be taken care of at - * the next time we are at <= DISPATCH, so it won't be lost. - */ - if (KeGetCurrentIrql() <= DISPATCH_LEVEL) - { - ExQueueWorkItem(&KdpDebugLogQueue, HyperCriticalWorkQueue); - ItemQueued = TRUE; - } + KdpLoggingEnabled = TRUE; + + while (TRUE) + { + KeWaitForSingleObject(&KdpLoggerThreadEvent, 0, KernelMode, FALSE, NULL); + + /* Bug */ + end = KdpCurrentPosition; + num = KdpFreeBytes; + beg = (end + num) % KdpBufferSize; + num = KdpBufferSize - num; + + /* Nothing to do? */ + if (num == 0) + continue; + + if (end > beg) + { + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, + KdpDebugBuffer + beg, num, NULL, NULL); + } + else + { + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, + KdpDebugBuffer + beg, KdpBufferSize - beg, NULL, NULL); + + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, + KdpDebugBuffer, end, NULL, NULL); + } + + InterlockedExchangeAddUL(&KdpFreeBytes, num); + } +} + +VOID +NTAPI +KdpPrintToLogFile(PCH String, + ULONG StringLength) +{ + ULONG beg, end, num; + KIRQL OldIrql; + + if (KdpDebugBuffer == NULL) return; + + /* Acquire the printing spinlock without waiting at raised IRQL */ + while (TRUE) + { + /* Wait when the spinlock becomes available */ + while (!KeTestSpinLock(&KdpDebugLogSpinLock)); + + /* Spinlock was free, raise IRQL */ + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + + /* Try to get the spinlock */ + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebugLogSpinLock)) + break; + + /* Someone else got the spinlock, lower IRQL back */ + KeLowerIrql(OldIrql); + } + + beg = KdpCurrentPosition; + num = KdpFreeBytes; + if (StringLength < num) + num = StringLength; + + if (num != 0) + { + end = (beg + num) % KdpBufferSize; + KdpCurrentPosition = end; + KdpFreeBytes -= num; + + if (end > beg) + { + RtlCopyMemory(KdpDebugBuffer + beg, String, num); + } + else + { + RtlCopyMemory(KdpDebugBuffer + beg, String, KdpBufferSize - beg); + RtlCopyMemory(KdpDebugBuffer, String + KdpBufferSize - beg, end); + } + } + + /* Release spinlock */ + KiReleaseSpinLock(&KdpDebugLogSpinLock); + + /* Lower IRQL */ + KeLowerIrql(OldIrql); + + /* Signal the logger thread */ + if (OldIrql <= DISPATCH_LEVEL && KdpLoggingEnabled) + KeSetEvent(&KdpLoggerThreadEvent, 0, FALSE); } VOID @@ -90,9 +138,11 @@ ULONG BootPhase) { NTSTATUS Status; + UNICODE_STRING FileName; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName; IO_STATUS_BLOCK Iosb; + HANDLE ThreadHandle; + KPRIORITY Priority; if (!KdpDebugMode.File) return; @@ -102,10 +152,20 @@ /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpInitDebugLog; - DispatchTable->KdpPrintRoutine = KdpPrintToLog; + DispatchTable->KdpPrintRoutine = KdpPrintToLogFile; /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + + } + else if (BootPhase == 1) + { + /* Allocate a buffer for debug log */ + KdpDebugBuffer = ExAllocatePool(NonPagedPool, KdpBufferSize); + KdpFreeBytes = KdpBufferSize; + + /* Initialize spinlock */ + KeInitializeSpinLock(&KdpDebugLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ DPRINT1("---------------------------------------------------------------\n"); @@ -117,7 +177,7 @@ } else if (BootPhase == 3) { - /* Setup the Log Name */ + /* Setup the log name */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\debug.log"); InitializeObjectAttributes(&ObjectAttributes, &FileName, @@ -125,9 +185,9 @@ NULL, NULL); - /* Create the Log File */ - Status = NtCreateFile(&KdbLogFileHandle, - FILE_ALL_ACCESS, + /* Create the log file */ + Status = NtCreateFile(&KdpLogFileHandle, + FILE_APPEND_DATA | SYNCHRONIZE, &ObjectAttributes, &Iosb, NULL, @@ -138,9 +198,26 @@ NULL, 0); - /* Allow it to be used */ - ExInitializeWorkItem(&KdpDebugLogQueue, &KdpPrintToLogInternal, NULL); - KdpLogInitialized = TRUE; + if (!NT_SUCCESS(Status)) return; + + KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); + + /* Create the logger thread */ + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + NULL, + KdpLoggerThread, + NULL); + + if (!NT_SUCCESS(Status)) return; + + Priority = 7; + NtSetInformationThread(ThreadHandle, + ThreadPriority, + &Priority, + sizeof(Priority)); } } @@ -160,7 +237,7 @@ /* Wait when the spinlock becomes available */ while (!KeTestSpinLock(&KdpSerialSpinLock)); - /* Spinlock was free, raise irql */ + /* Spinlock was free, raise IRQL */ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Try to get the spinlock */

1 0

[dgorbachev] 43330: Delete unused copy of GPL.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 21:56:35 2009 New Revision: 43330 URL: http://svn.reactos.org/svn/reactos?rev=43330&view=rev Log: Delete unused copy of GPL. Removed: trunk/reactos/boot/freeldr/COPYING Removed: trunk/reactos/boot/freeldr/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/COPYING?rev=4… ============================================================================== --- trunk/reactos/boot/freeldr/COPYING [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/COPYING (removed) @@ -1,339 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License.

1 0

[dgorbachev] 43329: Fix FreeLDR bug #4877. Patch by Gabriel.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 21:55:44 2009 New Revision: 43329 URL: http://svn.reactos.org/svn/reactos?rev=43329&view=rev Log: Fix FreeLDR bug #4877. Patch by Gabriel. Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Wed Oct 7 21:55:44 2009 @@ -270,6 +270,7 @@ /* Inform user we are loading files */ sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); + UiDrawBackdrop(); UiDrawProgressBarCenter(1, 100, ProgressString); /* Open the image file */

1 0

[mkupfer] 43328: - replace dropshadow from mouse settings by cursor shadow - bind cursor shadow to registry via sysparams - rename variable names and identifiers
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 21:42:02 2009 New Revision: 43328 URL: http://svn.reactos.org/svn/reactos?rev=43328&view=rev Log: - replace dropshadow from mouse settings by cursor shadow - bind cursor shadow to registry via sysparams - rename variable names and identifiers Modified: trunk/reactos/dll/cpl/main/lang/bg-BG.rc trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/el-GR.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/no-NO.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/sk-SK.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/lang/zh-CN.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/dll/cpl/main/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/bg-BG.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -81,7 +81,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Íà&ãëàñÿíå", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Ñÿíêà íà ïîêàçàëåöà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&Ñÿíêà íà ïîêàçàëåöà", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 //Ñìåíåíî 120, 200, 70, 15 -> 100, 200, 90, 15 PUSHBUTTON "Îò ïîä&ðàçáèðàíèòå", IDC_BUTTON_USE_DEFAULT_CURSOR, 100, 200, 85, 15 PUSHBUTTON "&Îáçîð", IDC_BUTTON_BROWSE_CURSOR, 195, 200, 40, 15 Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -85,7 +85,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Vl&astní", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Zobrazit stín pod ukazatelem", IDC_CHECK_DROP_SHADOW, 5, 200, 110, 10 + CHECKBOX "&Zobrazit stín pod ukazatelem", IDC_CHECK_CURSOR_SHADOW, 5, 200, 110, 10 PUSHBUTTON "Pouít &výchozí", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Procházet", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -81,7 +81,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "An&passen:", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Zeigerschatten &aktivieren", IDC_CHECK_DROP_SHADOW, 5, 200, 95, 10 + CHECKBOX "Zeigerschatten &aktivieren", IDC_CHECK_CURSOR_SHADOW, 5, 200, 95, 10 PUSHBUTTON "&Standard verwenden", IDC_BUTTON_USE_DEFAULT_CURSOR, 99, 200, 73, 15 PUSHBUTTON "&Durchsuchen...", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 56, 15 END Modified: trunk/reactos/dll/cpl/main/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/el-GR.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Åðåîåñãóßá", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Å&íåñãïðïßçóç óêéÜò äåßêôç", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Å&íåñãïðïßçóç óêéÜò äåßêôç", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&×ñÞóç ðñïåðéëïãÞò", IDC_BUTTON_USE_DEFAULT_CURSOR, 110, 200, 70, 15 PUSHBUTTON "&ÁíáæÞôçóç", IDC_BUTTON_BROWSE_CURSOR, 185, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 57, 60, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 198, 105, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 END Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Personali&zar", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Habilitar sombra del puntero", IDC_CHECK_DROP_SHADOW, 5, 200, 105, 10 + CHECKBOX "&Habilitar sombra del puntero", IDC_CHECK_CURSOR_SHADOW, 5, 200, 105, 10 PUSHBUTTON "&Predeterminada", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 60, 15 PUSHBUTTON "E&xaminar", IDC_BUTTON_BROWSE_CURSOR, 185, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Modifier", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Afficher l'ombre du curseur", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&Afficher l'ombre du curseur", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Par dé&faut", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Choisir", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Kustomisasi", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Hidupkan ba&yangan pointer", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Hidupkan ba&yangan pointer", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Gunakan Standa&r", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Lihat", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -81,7 +81,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Personalizza", -1, 5, 60, 48, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 108, 10 + CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_CURSOR_SHADOW, 5, 200, 108, 10 PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 199, 60, 15 PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 185, 199, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -80,7 +80,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Aanpassen", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Aanwijzerschaduw &inschakelen", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Aanwijzerschaduw &inschakelen", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Stan&daard gebruiken", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Bladeren", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/no-NO.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -80,7 +80,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Tilpass", -1, 5, 57, 60, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Aktiver pekerskygge", IDC_CHECK_DROP_SHADOW, 5, 198, 105, 10 + CHECKBOX "&Aktiver pekerskygge", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 PUSHBUTTON "Bruk St&andard", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 PUSHBUTTON "&Bla gjennom...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 END Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -85,7 +85,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Dostosuj:", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&W³¹cz cieñ wskanika", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&W³¹cz cieñ wskanika", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "U¿yj d&omylnego", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Przegl¹daj...", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -81,7 +81,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Particularizat", -1, 5, 57, 60, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Activare umbrÄ cursor", IDC_CHECK_DROP_SHADOW, 5, 198, 105, 10 + CHECKBOX "&Activare umbrÄ cursor", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 PUSHBUTTON "Folosire i&mplicite", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 PUSHBUTTON "&RÄsfoire...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 END Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -79,7 +79,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 195, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 235, 125, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Âêëþ÷èòü &òåíü óêàçàòåëÿ", IDC_CHECK_DROP_SHADOW, 5, 203, 108, 10 + CHECKBOX "Âêëþ÷èòü &òåíü óêàçàòåëÿ", IDC_CHECK_CURSOR_SHADOW, 5, 203, 108, 10 PUSHBUTTON "&Ïî óìîë÷àíèþ", IDC_BUTTON_USE_DEFAULT_CURSOR, 116, 200, 64, 14 PUSHBUTTON "&Îáçîð", IDC_BUTTON_BROWSE_CURSOR, 185, 200, 55, 14 END Modified: trunk/reactos/dll/cpl/main/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -86,7 +86,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -87,7 +87,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Óâ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Óâ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/main/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/zh-CN.rc [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -86,7 +86,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE LTEXT "×Ô¶¨Òå(&C):", -1, 5, 57, 60, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "ÆôÓÃÖ¸ÕëÒõÓ°(&E)", IDC_CHECK_DROP_SHADOW, 5, 198, 105, 10 + CHECKBOX "ÆôÓÃÖ¸ÕëÒõÓ°(&E)", IDC_CHECK_CURSOR_SHADOW, 5, 198, 105, 10 PUSHBUTTON "Ê¹ÓÃÄ¬ÈÏÖµ(&F)", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 PUSHBUTTON "ä¯ÀÀ(&B)...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 END Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -75,8 +75,8 @@ typedef struct _POINTER_DATA { - BOOL bDropShadow; - BOOL bOrigDropShadow; + BOOL bCursorShadow; + BOOL bOrigCursorShadow; INT cxCursor; INT cyCursor; @@ -1223,15 +1223,13 @@ EnumerateCursorSchemes(hwndDlg); LoadInitialCursorScheme(hwndDlg); - /* Get drop shadow setting */ - if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0)) - pPointerData->bDropShadow = FALSE; - - pPointerData->bOrigDropShadow = pPointerData->bDropShadow; - - if (pPointerData->bDropShadow) - { - SendDlgItemMessage(hwndDlg, IDC_CHECK_DROP_SHADOW, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + /* Get cursor shadow setting */ + SystemParametersInfo(SPI_GETCURSORSHADOW, 0, &pPointerData->bCursorShadow, 0); + pPointerData->bOrigCursorShadow = pPointerData->bCursorShadow; + + if (pPointerData->bCursorShadow) + { + SendDlgItemMessage(hwndDlg, IDC_CHECK_CURSOR_SHADOW, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } if ((INT)wParam == IDC_LISTBOX_CURSOR) @@ -1258,10 +1256,10 @@ { ApplyCursorScheme(hwndDlg); //#if (WINVER >= 0x0500) - if (pPointerData->bOrigDropShadow != pPointerData->bDropShadow) + if (pPointerData->bOrigCursorShadow != pPointerData->bCursorShadow) { - SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - pPointerData->bOrigDropShadow = pPointerData->bDropShadow; + SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + pPointerData->bOrigCursorShadow = pPointerData->bCursorShadow; } //#endif return TRUE; @@ -1269,7 +1267,7 @@ else if (lppsn->hdr.code == PSN_RESET) { //#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bOrigDropShadow), 0); + SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bOrigCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); //#endif } break; @@ -1352,23 +1350,23 @@ DeleteUserCursorScheme(hwndDlg); break; - case IDC_CHECK_DROP_SHADOW: - if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_DROP_SHADOW)) - { - pPointerData->bDropShadow = FALSE; + case IDC_CHECK_CURSOR_SHADOW: + if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_CURSOR_SHADOW)) + { + pPointerData->bCursorShadow = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); //#if (WINVER >= 0x0500) -// SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, 0); +// SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, 0); //#endif // PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } else { - pPointerData->bDropShadow = TRUE; + pPointerData->bCursorShadow = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } //#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), 0); + //SystemParametersInfo(SPI_SETCURSORSHADOW, 0, (PVOID)pPointerData->bCursorShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); //#endif PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/resource.h [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -76,7 +76,7 @@ #define IDC_LISTBOX_CURSOR 2015 #define IDC_COMBO_CURSOR_SCHEME 2030 #define IDC_BUTTON_DELETE_SCHEME 2033 -#define IDC_CHECK_DROP_SHADOW 2034 +#define IDC_CHECK_CURSOR_SHADOW 2034 #define IDC_IMAGE_SWAP_MOUSE 2035 #define IDC_IMAGE_DOUBLE_CLICK_SPEED 2036 #define IDC_ICON_MOUSE_SPEED 2037 Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -67,6 +67,7 @@ CURSORACCELERATION_INFO caiMouse; MOUSEKEYS mousekeys; BOOL bMouseClickLock; + BOOL bMouseCursorShadow; DWORD dwMouseClickLockTime; BOOL bMouseSonar; BOOL bMouseVanish; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Oct 7 21:42:02 2009 @@ -264,6 +264,7 @@ gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; + gspv.bMouseCursorShadow = (gspv.dwUserPrefMask & UPM_CURSORSHADOW) != 0; #if (_WIN32_WINNT >= 0x0600) gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -1305,6 +1306,7 @@ return SpiGetUserPref(UPM_CURSORSHADOW, pvParam, fl); case SPI_SETCURSORSHADOW: + gspv.bMouseCursorShadow = (BOOL)pvParam; return SpiSetUserPref(UPM_CURSORSHADOW, pvParam, fl); case SPI_GETUIEFFECTS:

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009