Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[mkupfer] 43327: - revert SPI_SETCLICKLOCK - small optimization in mgsqueue
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 20:22:25 2009 New Revision: 43327 URL: http://svn.reactos.org/svn/reactos?rev=43327&view=rev Log: - revert SPI_SETCLICKLOCK - small optimization in mgsqueue Modified: trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c 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 20:22:25 2009 @@ -384,7 +384,7 @@ //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, &pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, (PVOID)pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); if (pButtonData->g_ClickLockEnabled) SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); #endif Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Oct 7 20:22:25 2009 @@ -274,21 +274,18 @@ if(Remove) { + CurInfo->LastBtnDownX = Msg->pt.x; + CurInfo->LastBtnDownY = Msg->pt.y; + CurInfo->ButtonsDown = Msg->message; if (Res) { CurInfo->LastBtnDown = 0; - CurInfo->LastBtnDownX = Msg->pt.x; - CurInfo->LastBtnDownY = Msg->pt.y; CurInfo->LastClkWnd = NULL; - CurInfo->ButtonsDown = Msg->message; } else { - CurInfo->LastBtnDownX = Msg->pt.x; - CurInfo->LastBtnDownY = Msg->pt.y; CurInfo->LastClkWnd = (HANDLE)Msg->hwnd; CurInfo->LastBtnDown = Msg->time; - CurInfo->ButtonsDown = Msg->message; } } 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 20:22:25 2009 @@ -529,7 +529,7 @@ SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl) { DWORD dwRegMask; - BOOL bValue = *(BOOL *)pvValue; + BOOL bValue = (BOOL)pvValue; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -1323,7 +1323,7 @@ return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_SETMOUSECLICKLOCK: - gspv.bMouseClickLock = *(BOOL*) pvParam; + gspv.bMouseClickLock = (BOOL)pvParam; return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_GETMOUSEVANISH:

1 0

[tkreuzer] 43326: Add test for NtUserSystemParametersInfo case SPI_SETMOUSECLICKLOCK
by tkreuzer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: tkreuzer Date: Wed Oct 7 18:58:53 2009 New Revision: 43326 URL: http://svn.reactos.org/svn/reactos?rev=43326&view=rev Log: Add test for NtUserSystemParametersInfo case SPI_SETMOUSECLICKLOCK Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Wed Oct 7 18:58:53 2009 @@ -17,8 +17,29 @@ //static const WCHAR* VAL_DRAGWIDTH = L"DragWidth"; //static const WCHAR* VAL_FNTSMOOTH = L"FontSmoothing"; static const WCHAR* VAL_PREFMASK = L"UserPreferencesMask"; -#define PREFMASK_MENUANIM 0x2 -#define PREFMASK_KBDCUES 0x20 + +enum +{ + UPM_ACTIVEWINDOWTRACKING = 0x01, + UPM_MENUANIMATION = 0x02, + UPM_COMBOBOXANIMATION = 0x04, + UPM_LISTBOXSMOOTHSCROLLING = 0x08, + UPM_GRADIENTCAPTIONS = 0x10, + UPM_KEYBOARDCUES = 0x20, + UPM_ACTIVEWNDTRKZORDER = 0x40, + UPM_HOTTRACKING = 0x80, + UPM_RESERVED = 0x100, + UPM_MENUFADE = 0x200, + UPM_SELECTIONFADE = 0x400, + UPM_TOOLTIPANIMATION = 0x800, + UPM_TOOLTIPFADE = 0x1000, + UPM_CURSORSHADOW = 0x2000, + UPM_CLICKLOCK = 0x8000, + // room for more + UPM_UIEFFECTS = 0x80000000, + UPM_DEFAULT = 0x80003E9E +} USERPREFMASKS; + //static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; //static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment"; @@ -401,6 +422,15 @@ TEST((dwUserPref & dwPrefMask) == 0); TEST((dwUserPref & (~dwPrefMask)) == (dwUserPrefOrg & (~dwPrefMask))); + /* Value 2 without Registry */ + NtUserSystemParametersInfo(uiSet, 0, (PVOID)2, 0); + NtUserSystemParametersInfo(uiGet, 0, &bTemp, 0); + TEST(bTemp == 1); + cbSize = sizeof(dwUserPref); + TEST(QueryUserRegValueW(KEY_DESKTOP, VAL_PREFMASK, &dwUserPref, &cbSize, NULL) == ERROR_SUCCESS); + TEST((dwUserPref & dwPrefMask) == 0); + TEST((dwUserPref & (~dwPrefMask)) == (dwUserPrefOrg & (~dwPrefMask))); + /* Value 1 with Registry */ NtUserSystemParametersInfo(uiSet, 0, (PVOID)1, SPIF_UPDATEINIFILE); NtUserSystemParametersInfo(uiGet, 0, &bTemp, 0); @@ -942,7 +972,7 @@ TEST(bTemp == 0); cbSize = sizeof(dwUserPrefMask); TEST(QueryUserRegValueW(KEY_DESKTOP, VAL_PREFMASK, &dwUserPrefMask, &cbSize, NULL) == ERROR_SUCCESS); - TEST((dwUserPrefMask & PREFMASK_MENUANIM) == 0); + TEST((dwUserPrefMask & UPM_MENUANIMATION) == 0); /* Value 1 */ NtUserSystemParametersInfo(SPI_SETMENUANIMATION, 0, (PVOID)1, SPIF_UPDATEINIFILE); @@ -950,7 +980,7 @@ TEST(bTemp == 1); cbSize = sizeof(dwUserPrefMask); TEST(QueryUserRegValueW(KEY_DESKTOP, VAL_PREFMASK, &dwUserPrefMask, &cbSize, NULL) == ERROR_SUCCESS); - TEST((dwUserPrefMask & PREFMASK_MENUANIM) != 0); + TEST((dwUserPrefMask & UPM_MENUANIMATION) != 0); /* Restore original values */ @@ -966,7 +996,7 @@ INT Test_SPI_SETKEYBOARDCUES(PTESTINFO pti) { - return Test_UserPref(pti, SPI_GETKEYBOARDCUES, SPI_SETKEYBOARDCUES, PREFMASK_KBDCUES); + return Test_UserPref(pti, SPI_GETKEYBOARDCUES, SPI_SETKEYBOARDCUES, UPM_KEYBOARDCUES); } // Test_SPI_SETACTIVEWNDTRKZORDER(pti); @@ -977,7 +1007,13 @@ // Test_SPI_SETTOOLTIPFADE(pti); // Test_SPI_SETCURSORSHADOW(pti); // Test_SPI_SETMOUSESONAR(pti); -// Test_SPI_SETMOUSECLICKLOCK(pti); + +INT +Test_SPI_SETMOUSECLICKLOCK(PTESTINFO pti) +{ + return Test_UserPref(pti, SPI_GETMOUSECLICKLOCK, SPI_SETMOUSECLICKLOCK, UPM_CLICKLOCK); +} + // Test_SPI_SETMOUSEVANISH(pti); // Test_SPI_SETFLATMENU(pti); // Test_SPI_SETDROPSHADOW(pti); @@ -1091,7 +1127,7 @@ // Test_SPI_SETTOOLTIPFADE(pti); // Test_SPI_SETCURSORSHADOW(pti); // Test_SPI_SETMOUSESONAR(pti); -// Test_SPI_SETMOUSECLICKLOCK(pti); + Test_SPI_SETMOUSECLICKLOCK(pti); // Test_SPI_SETMOUSEVANISH(pti); // Test_SPI_SETFLATMENU(pti); // Test_SPI_SETDROPSHADOW(pti);

1 0

[mkupfer] 43325: - some preparation for ClickLock implementation
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 16:25:52 2009 New Revision: 43325 URL: http://svn.reactos.org/svn/reactos?rev=43325&view=rev Log: - some preparation for ClickLock implementation Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Wed Oct 7 16:25:52 2009 @@ -41,6 +41,8 @@ typedef struct _SYSTEM_CURSORINFO { BOOL Enabled; + BOOL ClickLockActive; + DWORD ClickLockTime; // BOOL SwapButtons; UINT ButtonsDown; CURSORCLIP_INFO CursorClipInfo; 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 16:25:52 2009 @@ -263,6 +263,7 @@ gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); + gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; #if (_WIN32_WINNT >= 0x0600) gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -1322,6 +1323,7 @@ return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_SETMOUSECLICKLOCK: + gspv.bMouseClickLock = *(BOOL*) pvParam; return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_GETMOUSEVANISH: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Wed Oct 7 16:25:52 2009 @@ -537,6 +537,8 @@ CurInfo->LastBtnDown = 0; CurInfo->CurrentCursorObject = NULL; CurInfo->ShowingCursor = 0; + CurInfo->ClickLockActive = FALSE; + CurInfo->ClickLockTime = 0; /* // not used anymore

1 0

[fireball] 43324: [fastfat_new] - Implement FatiQueryNameInformation. It doesn't work right now due to missing file names in the FCB record. - Make a stub for FatSetFcbNames.
by fireball＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: fireball Date: Wed Oct 7 14:21:13 2009 New Revision: 43324 URL: http://svn.reactos.org/svn/reactos?rev=43324&view=rev Log: [fastfat_new] - Implement FatiQueryNameInformation. It doesn't work right now due to missing file names in the FCB record. - Make a stub for FatSetFcbNames. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Oct 7 14:21:13 2009 @@ -304,6 +304,10 @@ FatSetFullNameInFcb(PFCB Fcb, PUNICODE_STRING Name); +VOID NTAPI +FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); + /* ------------------------------------------------------------ rw.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Oct 7 14:21:13 2009 @@ -149,6 +149,9 @@ Fcb->Header.ValidDataLength.LowPart = FileHandle->Filesize; Fcb->FatHandle = FileHandle; + /* Set names */ + FatSetFcbNames(IrpContext, Fcb); + return Fcb; } @@ -241,4 +244,13 @@ } } +VOID +NTAPI +FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ + // Set the short name first + UNIMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Wed Oct 7 14:21:13 2009 @@ -61,10 +61,51 @@ FatiQueryNameInformation(IN PFAT_IRP_CONTEXT IrpContext, IN PFCB Fcb, IN PFILE_OBJECT FileObject, - IN OUT PFILE_INTERNAL_INFORMATION Buffer, + IN OUT PFILE_NAME_INFORMATION Buffer, IN OUT PLONG Length) { - UNIMPLEMENTED; + ULONG ByteSize; + ULONG Trim = 0; + BOOLEAN Overflow = FALSE; + + /* Deduct the minimum written length */ + *Length -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]); + + // Build full name if needed + //if (!Fcb->FullFileName.Buffer) + + DPRINT1("FullFileName %wZ\n", &Fcb->FullFileName); + + if (*Length < Fcb->FullFileName.Length - Trim) + { + /* Buffer can't fit all data */ + ByteSize = *Length; + Overflow = TRUE; + } + else + { + /* Deduct the amount of bytes we are going to write */ + ByteSize = Fcb->FullFileName.Length - Trim; + *Length -= ByteSize; + } + + /* Copy the name */ + RtlCopyMemory(Buffer->FileName, + Fcb->FullFileName.Buffer, + ByteSize); + + /* Set the length */ + Buffer->FileNameLength = Fcb->FullFileName.Length - Trim; + + /* Is this a shortname query? */ + if (Trim) + { + /* Yes, not supported atm */ + ASSERT(FALSE); + } + + /* Indicate overflow by passing -1 as the length */ + if (Overflow) *Length = -1; } NTSTATUS

1 0

[mkupfer] 43323: - load UserPreferencesMask from registry
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 13:17:11 2009 New Revision: 43323 URL: http://svn.reactos.org/svn/reactos?rev=43323&view=rev Log: - load UserPreferencesMask from registry Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c 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 13:17:11 2009 @@ -122,6 +122,18 @@ return iValue; } return _wtoi(awcBuffer); +} + +static +DWORD +SpiLoadUserPrefMask(DWORD dValue) +{ + DWORD Result; + if (!RegReadUserSetting(KEY_DESKTOP, VAL_USERPREFMASK, REG_BINARY, &Result, sizeof(Result))) + { + return dValue; + } + return Result; } static @@ -250,6 +262,7 @@ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); + gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); #if (_WIN32_WINNT >= 0x0600) gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -263,7 +276,6 @@ gspv.uiFocusBorderHeight = 1; gspv.bMenuDropAlign = 1; gspv.bDropShadow = 1; - gspv.dwUserPrefMask = UPM_DEFAULT; gspv.dwMenuShowDelay = 100; gspv.iScrSaverTimeout = 10;

1 0

[fireball] 43322: [fastfat_new] - Lower importance of some debug messages. - Add FCB locking routines. - Lock VCB and FCB in QueryInformation.
by fireball＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: fireball Date: Wed Oct 7 12:45:45 2009 New Revision: 43322 URL: http://svn.reactos.org/svn/reactos?rev=43322&view=rev Log: [fastfat_new] - Lower importance of some debug messages. - Add FCB locking routines. - Lock VCB and FCB in QueryInformation. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -163,20 +163,20 @@ /* Get current IRP stack location */ IrpSp = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("FatCommonCreate\n", 0 ); - DPRINT1("Irp = %08lx\n", Irp ); - DPRINT1("\t->Flags = %08lx\n", Irp->Flags ); - DPRINT1("\t->FileObject = %08lx\n", IrpSp->FileObject ); - DPRINT1("\t->RelatedFileObject = %08lx\n", IrpSp->FileObject->RelatedFileObject ); - DPRINT1("\t->FileName = %wZ\n", &IrpSp->FileObject->FileName ); - DPRINT1("\t->AllocationSize.LowPart = %08lx\n", Irp->Overlay.AllocationSize.LowPart ); - DPRINT1("\t->AllocationSize.HighPart = %08lx\n", Irp->Overlay.AllocationSize.HighPart ); - DPRINT1("\t->SystemBuffer = %08lx\n", Irp->AssociatedIrp.SystemBuffer ); - DPRINT1("\t->DesiredAccess = %08lx\n", IrpSp->Parameters.Create.SecurityContext->DesiredAccess ); - DPRINT1("\t->Options = %08lx\n", IrpSp->Parameters.Create.Options ); - DPRINT1("\t->FileAttributes = %04x\n", IrpSp->Parameters.Create.FileAttributes ); - DPRINT1("\t->ShareAccess = %04x\n", IrpSp->Parameters.Create.ShareAccess ); - DPRINT1("\t->EaLength = %08lx\n", IrpSp->Parameters.Create.EaLength ); + DPRINT("FatCommonCreate\n", 0 ); + DPRINT("Irp = %08lx\n", Irp ); + DPRINT("\t->Flags = %08lx\n", Irp->Flags ); + DPRINT("\t->FileObject = %08lx\n", IrpSp->FileObject ); + DPRINT("\t->RelatedFileObject = %08lx\n", IrpSp->FileObject->RelatedFileObject ); + DPRINT("\t->FileName = %wZ\n", &IrpSp->FileObject->FileName ); + DPRINT("\t->AllocationSize.LowPart = %08lx\n", Irp->Overlay.AllocationSize.LowPart ); + DPRINT("\t->AllocationSize.HighPart = %08lx\n", Irp->Overlay.AllocationSize.HighPart ); + DPRINT("\t->SystemBuffer = %08lx\n", Irp->AssociatedIrp.SystemBuffer ); + DPRINT("\t->DesiredAccess = %08lx\n", IrpSp->Parameters.Create.SecurityContext->DesiredAccess ); + DPRINT("\t->Options = %08lx\n", IrpSp->Parameters.Create.Options ); + DPRINT("\t->FileAttributes = %04x\n", IrpSp->Parameters.Create.FileAttributes ); + DPRINT("\t->ShareAccess = %04x\n", IrpSp->Parameters.Create.ShareAccess ); + DPRINT("\t->EaLength = %08lx\n", IrpSp->Parameters.Create.EaLength ); /* Apply a special hack for Win32, idea taken from FASTFAT reference driver from WDK */ if ((IrpSp->FileObject->FileName.Length > sizeof(WCHAR)) && @@ -359,7 +359,7 @@ { /* Not a root dir */ ParentDcb = Vcb->RootDcb; - DPRINT1("ParentDcb %p\n", ParentDcb); + DPRINT("ParentDcb %p\n", ParentDcb); } /* Check for backslash at the end */ @@ -515,7 +515,7 @@ ASSERT(FALSE); } - DPRINT1("FirstName %wZ, RemainingPart %wZ\n", &FirstName, &RemainingPart); + DPRINT("FirstName %wZ, RemainingPart %wZ\n", &FirstName, &RemainingPart); /* Break if came to the end */ if (!RemainingPart.Length) break; @@ -579,8 +579,6 @@ PFAT_IRP_CONTEXT IrpContext; NTSTATUS Status; - DPRINT1("FatCreate()\n"); - /* If it's called with our Disk FS device object - it's always open */ // TODO: Add check for CDROM FS device object if (DeviceObject == FatGlobalData.DiskDeviceObject) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -327,7 +327,7 @@ TypeOfOpen = (*Ccb == NULL ? EaFile : UserFileOpen); - DPRINT1("Referencing a file: %Z\n", &(*FcbOrDcb)->FullFileName); + DPRINT("Referencing a file: %Z\n", &(*FcbOrDcb)->FullFileName); break; @@ -394,6 +394,95 @@ ExReleaseResourceLite(&Vcb->Resource); } +BOOLEAN +NTAPI +FatAcquireExclusiveFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ +RetryLockingE: + /* Try to acquire the exclusive lock*/ + if (ExAcquireResourceExclusiveLite(Fcb->Header.Resource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + /* Wait same way MS's FASTFAT wait, i.e. + checking that there are outstanding async writes, + or someone is waiting on it*/ + if (Fcb->OutstandingAsyncWrites && + ((IrpContext->MajorFunction != IRP_MJ_WRITE) || + !FlagOn(IrpContext->Irp->Flags, IRP_NOCACHE) || + ExGetSharedWaiterCount(Fcb->Header.Resource) || + ExGetExclusiveWaiterCount(Fcb->Header.Resource))) + { + KeWaitForSingleObject(Fcb->OutstandingAsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + + /* Release the lock */ + FatReleaseFcb(IrpContext, Fcb); + + /* Retry */ + goto RetryLockingE; + } + + /* Return success */ + return TRUE; + } + + /* Return failure */ + return FALSE; +} + +BOOLEAN +NTAPI +FatAcquireSharedFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ +RetryLockingS: + /* Try to acquire the shared lock*/ + if (ExAcquireResourceSharedLite(Fcb->Header.Resource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + /* Wait same way MS's FASTFAT wait, i.e. + checking that there are outstanding async writes, + or someone is waiting on it*/ + if (Fcb->OutstandingAsyncWrites && + ((IrpContext->MajorFunction != IRP_MJ_WRITE) || + !FlagOn(IrpContext->Irp->Flags, IRP_NOCACHE) || + ExGetSharedWaiterCount(Fcb->Header.Resource) || + ExGetExclusiveWaiterCount(Fcb->Header.Resource))) + { + KeWaitForSingleObject(Fcb->OutstandingAsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + + /* Release the lock */ + FatReleaseFcb(IrpContext, Fcb); + + /* Retry */ + goto RetryLockingS; + } + + /* Return success */ + return TRUE; + } + + /* Return failure */ + return FALSE; +} + +VOID +NTAPI +FatReleaseFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ + /* Release FCB's resource */ + ExReleaseResourceLite(Fcb->Header.Resource); +} + PVOID FASTCALL FatMapUserBuffer(PIRP Irp) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -146,6 +146,18 @@ VOID NTAPI FatReleaseVcb(IN PFAT_IRP_CONTEXT IrpContext, IN PVCB Vcb); + +BOOLEAN NTAPI +FatAcquireExclusiveFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); + +BOOLEAN NTAPI +FatAcquireSharedFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); + +VOID NTAPI +FatReleaseFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); TYPE_OF_OPEN NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -283,6 +283,10 @@ FILE_BASIC_INFORMATION BasicInfo; /* FullFAT file handle */ FF_FILE *FatHandle; + /* The file has outstanding async writes */ + ULONG OutstandingAsyncWrites; + /* The outstanding async writes sync event */ + PKEVENT OutstandingAsyncEvent; union { struct Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -48,6 +48,17 @@ VOID NTAPI FatiQueryInternalInformation(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb, + IN PFILE_OBJECT FileObject, + IN OUT PFILE_INTERNAL_INFORMATION Buffer, + IN OUT PLONG Length) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +FatiQueryNameInformation(IN PFAT_IRP_CONTEXT IrpContext, IN PFCB Fcb, IN PFILE_OBJECT FileObject, IN OUT PFILE_INTERNAL_INFORMATION Buffer, @@ -70,6 +81,7 @@ PCCB Ccb; LONG Length; PVOID Buffer; + BOOLEAN VcbLocked = FALSE, FcbLocked = FALSE; NTSTATUS Status = STATUS_SUCCESS; /* Get IRP stack location */ @@ -93,7 +105,26 @@ DPRINT1("Vcb %p, Fcb %p, Ccb %p, open type %d\n", Vcb, Fcb, Ccb, FileType); - // TODO: Acquire FCB locks + /* Acquire VCB lock */ + if (InfoClass == FileNameInformation || + InfoClass == FileAllInformation) + { + if (!FatAcquireExclusiveVcb(IrpContext, Vcb)) + { + ASSERT(FALSE); + } + + /* Remember we locked the VCB */ + VcbLocked = TRUE; + } + + /* Acquire FCB lock */ + // FIXME: If not paging file + if (!FatAcquireSharedFcb(IrpContext, Fcb)) + { + ASSERT(FALSE); + } + FcbLocked = TRUE; switch (InfoClass) { @@ -103,6 +134,9 @@ case FileInternalInformation: FatiQueryInternalInformation(IrpContext, Fcb, FileObject, Buffer, &Length); break; + case FileNameInformation: + FatiQueryNameInformation(IrpContext, Fcb, FileObject, Buffer, &Length); + break; default: DPRINT1("Unimplemented information class %d requested\n", InfoClass); Status = STATUS_INVALID_PARAMETER; @@ -118,7 +152,9 @@ /* Set IoStatus.Information to amount of filled bytes */ Irp->IoStatus.Information = IrpSp->Parameters.QueryFile.Length - Length; - // TODO: Release FCB locks + /* Release FCB locks */ + if (FcbLocked) FatReleaseFcb(IrpContext, Fcb); + if (VcbLocked) FatReleaseVcb(IrpContext, Vcb); /* Complete request and return status */ FatCompleteRequest(IrpContext, Irp, Status); Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Wed Oct 7 12:45:45 2009 @@ -111,7 +111,6 @@ /* Leave FsRtl critical region */ FsRtlExitFileSystem(); - DPRINT1("FatRead()\n"); return Status; }

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