Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[greatlrd] 21856: fixing a typo from my side. sorry wax for the broken treed

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon May 8 22:15:46 2006 New Revision: 21856 URL: http://svn.reactos.ru/svn/reactos?rev=21856&view=rev Log: fixing a typo from my side. sorry wax for the broken treed Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdient… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon May 8 22:15:46 2006 @@ -158,7 +158,7 @@ } status = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); - if (status == TRUE) && (pDirectDrawGlobalInternal->hDD != 0) + if ((status == TRUE) && (pDirectDrawGlobalInternal->hDD != 0)) { pDirectDrawGlobalInternal->hDD = 0; }

18 years, 4 months

[greatlrd] 21855: sorry I broke the build, thx Brezenbak and w3seek point it out, small change from brezenbak to fix it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon May 8 21:35:09 2006 New Revision: 21855 URL: http://svn.reactos.ru/svn/reactos?rev=21855&view=rev Log: sorry I broke the build, thx Brezenbak and w3seek point it out, small change from brezenbak to fix it Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdient… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon May 8 21:35:09 2006 @@ -158,9 +158,9 @@ } status = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); - if (status == TRUE) && (pDirectDrawGlobalInternal->hDD != NULL) - { - pDirectDrawGlobalInternal->hDD = NULL; + if (status == TRUE) && (pDirectDrawGlobalInternal->hDD != 0) + { + pDirectDrawGlobalInternal->hDD = 0; } return status;

18 years, 4 months

[hpoussin] 21854: Fix bug 1448 and a possible buffer overflow. Thanks w3seek for his help during the debugging

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 8 21:14:19 2006 New Revision: 21854 URL: http://svn.reactos.ru/svn/reactos?rev=21854&view=rev Log: Fix bug 1448 and a possible buffer overflow. Thanks w3seek for his help during the debugging Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Mon May 8 21:14:19 2006 @@ -1998,11 +1998,12 @@ /* Allocate memory for file filter */ if (DirectoryPath != NULL) - /* "DirectoryPath\*.inf" form */ - len = strlenW(DirectoryPath) + 1 + strlenW(InfFileSpecification) + 1; + /* "DirectoryPath\" form */ + len = strlenW(DirectoryPath) + 1 + 1; else - /* "%WINDIR%\Inf\*.inf" form */ - len = MAX_PATH + 1 + strlenW(InfDirectory) + strlenW(InfFileSpecification) + 1; + /* "%WINDIR%\Inf\" form */ + len = MAX_PATH + 1 + strlenW(InfDirectory) + 1; + len += MAX_PATH; /* To contain file name or "*.inf" string */ pFullFileName = MyMalloc(len * sizeof(WCHAR)); if (pFullFileName == NULL) { @@ -2014,7 +2015,7 @@ if (DirectoryPath) { strcpyW(pFullFileName, DirectoryPath); - if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') + if (*pFullFileName && pFullFileName[strlenW(pFullFileName) - 1] != '\\') strcatW(pFullFileName, BackSlash); } else

18 years, 4 months

[greatlrd] 21853: fixing a bug in gdientry3, found it when I wrote the doc

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon May 8 20:50:33 2006 New Revision: 21853 URL: http://svn.reactos.ru/svn/reactos?rev=21853&view=rev Log: fixing a bug in gdientry3, found it when I wrote the doc Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdient… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon May 8 20:50:33 2006 @@ -144,6 +144,7 @@ STDCALL DdDeleteDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal) { + BOOL status; /* if pDirectDrawGlobal->hDD == NULL and pDirectDrawGlobalInternal->hDD == NULL return false */ @@ -155,8 +156,14 @@ } return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobalInternal->hDD); } - - return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); + + status = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); + if (status == TRUE) && (pDirectDrawGlobalInternal->hDD != NULL) + { + pDirectDrawGlobalInternal->hDD = NULL; + } + + return status; } /*

18 years, 4 months

[greatlrd] 21852: adding doc for how DdCreateDirectDrawObject (GdiEntry1) and DdDeleteDirectDrawObject (GdiEntry3) works in reactos. doc by request by some devlopers

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon May 8 20:48:10 2006 New Revision: 21852 URL: http://svn.reactos.ru/svn/reactos?rev=21852&view=rev Log: adding doc for how DdCreateDirectDrawObject (GdiEntry1) and DdDeleteDirectDrawObject (GdiEntry3) works in reactos. doc by request by some devlopers Added: trunk/reactos/media/doc/DdCreateDirectDrawObject.txt (with props) trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt (with props) Modified: trunk/reactos/media/doc/LPC.txt (contents, props changed) trunk/reactos/media/doc/books.txt (contents, props changed) trunk/reactos/media/doc/irp cancel boilerplate.c (contents, props changed) trunk/reactos/media/doc/locks.txt (contents, props changed) trunk/reactos/media/doc/memcpy_optimize.txt (props changed) Added: trunk/reactos/media/doc/DdCreateDirectDrawObject.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/DdCreateDirectDra… ============================================================================== --- trunk/reactos/media/doc/DdCreateDirectDrawObject.txt (added) +++ trunk/reactos/media/doc/DdCreateDirectDrawObject.txt Mon May 8 20:48:10 2006 @@ -1,0 +1,32 @@ +DdCreateDirectDrawObject + +When IN HDC is not NULL +1. we need check the IN HDC is NULL or not +2. if it not null we need create a directdraw handler + and store it to pDirectDrawGlobal->hDD +3. if the directdraw handle is null return false + we did fail to create directdraw HAL +4. if the directdraw handle was not null we return true + we did susses to create directdraw HAL + +When IN HDC is NULL +Now we come to if IN HDC is null basic we need create + a hdc and cashe some data +1. if internal cache of directdraw handle is not null (pDirectDrawGlobalInternal->hDD) + we take it and fill to the public directdraw handler (pDirectDrawGlobal->hDD) + and return susses. + +2. if no internal cache of directdraw handle is found we need create it + by using CreateDC for tempary HDC that will be cache in the win32k later + +3. we need check see if we got a tempary HDC or not, if we fail getting tempary + HDC return FALSE + +4. Now we trying create directdraw handler it being cache to (pDirectDrawGlobalInternal->hDD) + and it also set same handler to the public (pDirectDrawGlobal->hDD) +5. if it fails to create directdraw handle return false + we did fail to create directdraw HAL +6. if it susses create directdraw handle return true + we did susses to create directdraw HAL + +To create a directdraw handler you need call the NtGdiDdCreateDirectDrawObject with a hdc Propchange: trunk/reactos/media/doc/DdCreateDirectDrawObject.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/DdCreateDirectDrawObject.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/DdDeleteDirectDra… ============================================================================== --- trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt (added) +++ trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt Mon May 8 20:48:10 2006 @@ -1,0 +1,16 @@ +DdDeleteDirectDrawObject + +we need release directdraw handler the cache or not cache handler +1. check see if DirectDrawGlobal->hDD is NULL or not + +2. if both cache directdraw handler and public handler is NULL + then we need return false, fail to release it or it was already release + +3. if public directdraw handler is not null we need release it + and return if we susses or not. + +4. we need check if we need rest the internal cache if public being release + + +use NtGdiDdDeleteDirectDrawObject((HANDLE)DirectDrawGlobal->hDD); +to release a directdraw handler. Propchange: trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/DdDeleteDirectDrawObject.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/media/doc/LPC.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/LPC.txt?rev=21852… ============================================================================== --- trunk/reactos/media/doc/LPC.txt (original) +++ trunk/reactos/media/doc/LPC.txt Mon May 8 20:48:10 2006 @@ -1,53 +1,53 @@ -============================================================== -= = -= NOTES FROM THE UNDERGROUND = -= = -============================================================== -Below are some of Alex's notes on the mysterious LPC Subsystem - -========================= -1. Sizes, sizes, sizes... -========================= - -There are four imporant LPC Sizes to keep in mind. Try to understand them: - -/* - * This determines the absolute maximum message size (0x100 bytes). For - * larger values, use a section-backed message. - */ -#define PORT_MAXIMUM_MESSAGE_LENGTH 256 - -/* - * This determines the maximum length of an LPC request. It is the largest - * amount of bytes that an LPC request can take. To calculate this, assume - * that this is a CONNECTION_REQUEST message, which includes the additionnal - * LPCP_CONNECTION_MESSAGE structure as well. Therefore, we add the kernel LPC, - * header, the maximum port size and the size of the connection request - * structure. This gives a value of 0x15C. However, one must note that NT - * allocates the Lookaside List using a 16-byte aligned value, making this - * number 0x160. - */ -#define LPCP_MAX_MESSAGE_SIZE ROUND_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ - sizeof(LPCP_MESSAGE) + \ - sizeof(LPCP_CONNECTION_MESSAGE), 16) - -/* - * Now, for an actual LPC Request size, we remove the kernel LPC header, which - * yields the size of the actual LPC Data that follows the Header, making this - * number 0x148. - */ -#define LPC_MAX_MESSAGE_LENGTH (LPCP_MAX_MESSAGE_SIZE - \ - FIELD_OFFSET(LPCP_MESSAGE, Request)) - -/* - * Finally, we'll calculate the maximum size of the Connection Info, giving us - * 0x104 - */ -#define LPC_MAX_DATA_LENGTH (LPC_MAX_MESSAGE_LENGTH - \ - sizeof(PORT_MESSAGE) - \ - sizeof(LPCP_CONNECTION_MESSAGE)) - -========================== -2. Structures -========================== +============================================================== += = += NOTES FROM THE UNDERGROUND = += = +============================================================== +Below are some of Alex's notes on the mysterious LPC Subsystem + +========================= +1. Sizes, sizes, sizes... +========================= + +There are four imporant LPC Sizes to keep in mind. Try to understand them: + +/* + * This determines the absolute maximum message size (0x100 bytes). For + * larger values, use a section-backed message. + */ +#define PORT_MAXIMUM_MESSAGE_LENGTH 256 + +/* + * This determines the maximum length of an LPC request. It is the largest + * amount of bytes that an LPC request can take. To calculate this, assume + * that this is a CONNECTION_REQUEST message, which includes the additionnal + * LPCP_CONNECTION_MESSAGE structure as well. Therefore, we add the kernel LPC, + * header, the maximum port size and the size of the connection request + * structure. This gives a value of 0x15C. However, one must note that NT + * allocates the Lookaside List using a 16-byte aligned value, making this + * number 0x160. + */ +#define LPCP_MAX_MESSAGE_SIZE ROUND_UP(PORT_MAXIMUM_MESSAGE_LENGTH + \ + sizeof(LPCP_MESSAGE) + \ + sizeof(LPCP_CONNECTION_MESSAGE), 16) + +/* + * Now, for an actual LPC Request size, we remove the kernel LPC header, which + * yields the size of the actual LPC Data that follows the Header, making this + * number 0x148. + */ +#define LPC_MAX_MESSAGE_LENGTH (LPCP_MAX_MESSAGE_SIZE - \ + FIELD_OFFSET(LPCP_MESSAGE, Request)) + +/* + * Finally, we'll calculate the maximum size of the Connection Info, giving us + * 0x104 + */ +#define LPC_MAX_DATA_LENGTH (LPC_MAX_MESSAGE_LENGTH - \ + sizeof(PORT_MESSAGE) - \ + sizeof(LPCP_CONNECTION_MESSAGE)) + +========================== +2. Structures +========================== SOON. TODO. Propchange: trunk/reactos/media/doc/LPC.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/LPC.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/media/doc/books.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/books.txt?rev=218… ============================================================================== --- trunk/reactos/media/doc/books.txt (original) +++ trunk/reactos/media/doc/books.txt Mon May 8 20:48:10 2006 @@ -1,18 +1,18 @@ -References (Rex's at least) - -Baker, Art. The Windows NT Device Driver Book. Prentice Hall, 1997. -Borate, Dabak & Phadke. Undocumented Windows NT. M&T Books, 1999. -Brain, Marshall. Win32 System Services. Prentice Hall, 1996. -Cant, Chris. Writing Windows WDM Device Drivers. R&D Books, 1999. -Canton & Sanchez. IBM Microcomputers: A Programmer's Handbook. McGraw Hill, 1990. -Davis & Wallace. Windows Undocumented File Formats. R&D Books, 1997. -Mason & Viscarola. Windows NT Device Driver Development. Macmillan, 1999. -Mitchell, Stan. Inside the Windows 95 File System. O'Reilly, 1997. -Murray, James D. Windows NT Event Logging. O'Reilly, 1998. -Nagar, Rajeev. Windows NT File System Internals. O'Reilly, 1997. -Osbourne, Sandra. Windows NT Registry: A Settings Reference. New Riders, 1998. -Pietrek, Matt. Windows 95 System Programming Secrets. IDG, 1995. -Richter, Jeffery. Advanced Windows, 3rd ed. Microsoft, 1997. -Simon, Richard J. Windows NT Win32 API Superbible. Waite Group, 1996. -Solomon, David A. Inside Windows NT, 2nd Ed. Microsoft, 1998. -"The NT Insider." Open Systems Resources, 1999-2000. +References (Rex's at least) + +Baker, Art. The Windows NT Device Driver Book. Prentice Hall, 1997. +Borate, Dabak & Phadke. Undocumented Windows NT. M&T Books, 1999. +Brain, Marshall. Win32 System Services. Prentice Hall, 1996. +Cant, Chris. Writing Windows WDM Device Drivers. R&D Books, 1999. +Canton & Sanchez. IBM Microcomputers: A Programmer's Handbook. McGraw Hill, 1990. +Davis & Wallace. Windows Undocumented File Formats. R&D Books, 1997. +Mason & Viscarola. Windows NT Device Driver Development. Macmillan, 1999. +Mitchell, Stan. Inside the Windows 95 File System. O'Reilly, 1997. +Murray, James D. Windows NT Event Logging. O'Reilly, 1998. +Nagar, Rajeev. Windows NT File System Internals. O'Reilly, 1997. +Osbourne, Sandra. Windows NT Registry: A Settings Reference. New Riders, 1998. +Pietrek, Matt. Windows 95 System Programming Secrets. IDG, 1995. +Richter, Jeffery. Advanced Windows, 3rd ed. Microsoft, 1997. +Simon, Richard J. Windows NT Win32 API Superbible. Waite Group, 1996. +Solomon, David A. Inside Windows NT, 2nd Ed. Microsoft, 1998. +"The NT Insider." Open Systems Resources, 1999-2000. Propchange: trunk/reactos/media/doc/books.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/books.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/media/doc/irp cancel boilerplate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/irp%20cancel%20bo… ============================================================================== --- trunk/reactos/media/doc/irp cancel boilerplate.c (original) +++ trunk/reactos/media/doc/irp cancel boilerplate.c Mon May 8 20:48:10 2006 @@ -1,103 +1,103 @@ - - -/* -Boiler plate for irp cancelation, for irp queues you manage yourself --Gunnar -*/ - - - -CancelRoutine( - DEV_OBJ Dev, - Irp - ) -{ - //don't need this since we have our own sync. protecting irp cancellation - IoReleaseCancelSpinLock(Irp->CancelIrql); - - theLock = Irp->Tail.Overlay.DriverContext[3]; - - Lock(theLock); - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - Unlock(theLock); - - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - -} - - -QUEUE_BOLIERPLATE -{ - Lock(theLock); - - Irp->Tail.Overlay.DriverContext[3] = &theLock; - - IoSetCancelRoutine(Irp, CancelRoutine); - if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) - { - /* - Irp has already been cancelled (before we got to queue it), - and we got to remove the cancel routine before the canceler could, - so we cancel/complete the irp ourself. - */ - - Unlock(theLock); - - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return FALSE; - } - - //else were ok - - - Irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(Irp); - - InsertTailList(Queue); - - Unlock(theLock); - -} - - -DEQUEUE_BOILERPLATE -{ - Lock(theLock); - - Irp = RemoveHeadList(Queue); - - if (!IoSetCancelRoutine(Irp, NULL)) - { - /* - Cancel routine WILL be called after we release the spinlock. It will try to remove - the irp from the list and cancel/complete this irp. Since we allready removed it, - make its ListEntry point to itself. - */ - - InitializeListHead(&Irp->Tail.Overlay.ListEntry); - - Unlock(theLock); - - return; - } - - - /* - Cancel routine will NOT be called, canceled or not. - The Irp might have been canceled (Irp->Cancel flag set) but we don't care, - since we are to complete this Irp now anyways. - */ - - Unlock(theLock); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - -} + + +/* +Boiler plate for irp cancelation, for irp queues you manage yourself +-Gunnar +*/ + + + +CancelRoutine( + DEV_OBJ Dev, + Irp + ) +{ + //don't need this since we have our own sync. protecting irp cancellation + IoReleaseCancelSpinLock(Irp->CancelIrql); + + theLock = Irp->Tail.Overlay.DriverContext[3]; + + Lock(theLock); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + +QUEUE_BOLIERPLATE +{ + Lock(theLock); + + Irp->Tail.Overlay.DriverContext[3] = &theLock; + + IoSetCancelRoutine(Irp, CancelRoutine); + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + /* + Irp has already been cancelled (before we got to queue it), + and we got to remove the cancel routine before the canceler could, + so we cancel/complete the irp ourself. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return FALSE; + } + + //else were ok + + + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + + InsertTailList(Queue); + + Unlock(theLock); + +} + + +DEQUEUE_BOILERPLATE +{ + Lock(theLock); + + Irp = RemoveHeadList(Queue); + + if (!IoSetCancelRoutine(Irp, NULL)) + { + /* + Cancel routine WILL be called after we release the spinlock. It will try to remove + the irp from the list and cancel/complete this irp. Since we allready removed it, + make its ListEntry point to itself. + */ + + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + + Unlock(theLock); + + return; + } + + + /* + Cancel routine will NOT be called, canceled or not. + The Irp might have been canceled (Irp->Cancel flag set) but we don't care, + since we are to complete this Irp now anyways. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} Propchange: trunk/reactos/media/doc/irp cancel boilerplate.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/irp cancel boilerplate.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/media/doc/locks.txt URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/locks.txt?rev=218… ============================================================================== --- trunk/reactos/media/doc/locks.txt (original) +++ trunk/reactos/media/doc/locks.txt Mon May 8 20:48:10 2006 @@ -1,39 +1,39 @@ -Next-Gen (NT 5.2) Executive Locks in NTOSKRNL. ------------------------------- -1a. Rundown Protection -USED IN: Thread/Process Ps* Code. -EXAMPLES: NtSetInformationProcess/Thread, PspCreateThread/Process, PspSuspend/ResumeThread... -REPLACES: Unlocked access and/or PsLock/UnlockProcess. -ROS STATUS: Implemented. Code needs cleanup. Not yet tested. Not yet used. - -1b. Cache-Aware Rundown Protection -USED IN: Unknown. Functions exported for drivers. -EXAMPLES: None. -REPLACES: Nothing. -ROS STATUS: Unimplemented. - -2. Guarded Mutex -USED IN: Configuration Manager, MCB Functions (FsRtl), Binary Hive Module (Hv), PnP (Notifications), LPC, Jobs (Ps), Device Map (Ob), and Memory Management (Address Space/Virtual Memory). -EXAMPLES: Too many. -REPLACES: Anything that used FAST_MUTEX. -ROS STATUS: Implemented, slightly tested; appears to still contain a bug. - -3. Fast Referencing -USED IN: Tokens. -EXAMPLES: R: PsReferencePrimary/EffectiveToken. D: Failure code of anything that calls those two functions. -REPLACES: Normal referencing. -ROS STATUS: Hackplemented stubs. - -4a. Pushlocks -USED IN: Configuration Manager (Cm), Handle Table (Ex), Binary Hive Module (Hv), Memory Management (Address Space/Virtual Memory), Object Namespace (Directories/Names) (Ob), Impersonation (Ps). -EXAMPLES: Too many. -REPLACES: Anything that used ERESOURCE. -ROS STATUS: Implemented (missing Block/([Timed]Wait)Unblock) and slightly tested. - -4b. Cache-Aware Pushlocks -USED IN: AWE (Mm). -EXAMPLES: None. -REPLACES: Executive Resources. -ROS STATUS: Unimplemented. - +Next-Gen (NT 5.2) Executive Locks in NTOSKRNL. +------------------------------ +1a. Rundown Protection +USED IN: Thread/Process Ps* Code. +EXAMPLES: NtSetInformationProcess/Thread, PspCreateThread/Process, PspSuspend/ResumeThread... +REPLACES: Unlocked access and/or PsLock/UnlockProcess. +ROS STATUS: Implemented. Code needs cleanup. Not yet tested. Not yet used. + +1b. Cache-Aware Rundown Protection +USED IN: Unknown. Functions exported for drivers. +EXAMPLES: None. +REPLACES: Nothing. +ROS STATUS: Unimplemented. + +2. Guarded Mutex +USED IN: Configuration Manager, MCB Functions (FsRtl), Binary Hive Module (Hv), PnP (Notifications), LPC, Jobs (Ps), Device Map (Ob), and Memory Management (Address Space/Virtual Memory). +EXAMPLES: Too many. +REPLACES: Anything that used FAST_MUTEX. +ROS STATUS: Implemented, slightly tested; appears to still contain a bug. + +3. Fast Referencing +USED IN: Tokens. +EXAMPLES: R: PsReferencePrimary/EffectiveToken. D: Failure code of anything that calls those two functions. +REPLACES: Normal referencing. +ROS STATUS: Hackplemented stubs. + +4a. Pushlocks +USED IN: Configuration Manager (Cm), Handle Table (Ex), Binary Hive Module (Hv), Memory Management (Address Space/Virtual Memory), Object Namespace (Directories/Names) (Ob), Impersonation (Ps). +EXAMPLES: Too many. +REPLACES: Anything that used ERESOURCE. +ROS STATUS: Implemented (missing Block/([Timed]Wait)Unblock) and slightly tested. + +4b. Cache-Aware Pushlocks +USED IN: AWE (Mm). +EXAMPLES: None. +REPLACES: Executive Resources. +ROS STATUS: Unimplemented. + TODO: Kernel Locks (Queued and In-Stack Spinlocks) Propchange: trunk/reactos/media/doc/locks.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/doc/locks.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/media/doc/memcpy_optimize.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision

18 years, 4 months

[arty] 21851: tcpip: make sure to clean up failed adapter bindings ndis: manage global adapter list correctly ncpa: wip code from my old tree ... it can now be used to set a static ip addr at least. more to come

by arty＠svn.reactos.org

Author: arty Date: Mon May 8 15:00:26 2006 New Revision: 21851 URL: http://svn.reactos.ru/svn/reactos?rev=21851&view=rev Log: tcpip: make sure to clean up failed adapter bindings ndis: manage global adapter list correctly ncpa: wip code from my old tree ... it can now be used to set a static ip addr at least. more to come Modified: trunk/reactos/dll/cpl/ncpa/en.rc trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/tcpip_properties.c trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/dll/cpl/ncpa/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/en.rc?rev=2185… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/en.rc (original) +++ trunk/reactos/dll/cpl/ncpa/en.rc Mon May 8 15:00:26 2006 @@ -77,7 +77,7 @@ LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP -} +END STRINGTABLE Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=218… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Mon May 8 15:00:26 2006 @@ -322,22 +322,24 @@ if(_tcscmp(tpszTCPIPClsID,tpszClsIDText)==0) { - IP_ADAPTER_INFO Adapters[64]; + IP_ADAPTER_INFO *Adapters = LocalAlloc( LMEM_FIXED, sizeof(IP_ADAPTER_INFO) * 64 ); IP_ADAPTER_INFO *pAdapter; TCHAR *tpszCfgInstanceID; - DWORD dwSize = sizeof(Adapters); - memset(&Adapters,0x00,sizeof(Adapters)); + DWORD dwSize = sizeof(*Adapters) * 64; + memset(Adapters,0x00,dwSize); if(GetAdaptersInfo(Adapters,&dwSize)!=ERROR_SUCCESS) - break;; + break; pAdapter = Adapters; tpszCfgInstanceID = (TCHAR*)pPage->lParam; while(pAdapter) { - TCHAR tpszAdatperName[MAX_PATH]; - swprintf(tpszAdatperName,L"%S",pAdapter->AdapterName); - DPRINT("IPHLPAPI returned: %S\n", tpszAdatperName); - if(_tcscmp(tpszAdatperName,tpszCfgInstanceID)==0) + TCHAR tpszAdatperName[MAX_PATH]; + swprintf(tpszAdatperName,L"%S",pAdapter->AdapterName); + DPRINT("IPHLPAPI returned: %S\n", tpszAdatperName); + if(_tcscmp(tpszAdatperName,tpszCfgInstanceID)==0) { + memcpy(Adapters,pAdapter,sizeof(*pAdapter)); + pAdapter = Adapters; DisplayTCPIPProperties(hwndDlg,pAdapter); break; } else Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_properti… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Mon May 8 15:00:26 2006 @@ -1,10 +1,29 @@ /* - * PROJECT: ReactOS Network Control Panel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/tcpip_properties.c - * PURPOSE: ReactOS Network Control Panel - * COPYRIGHT: Copyright 2004 Gero Kuehn (reactos.filter(a)gkware.com) - * Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> + * ReactOS + * Copyright (C) 2004 ReactOS Team + * + * 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. + */ +/* $Id$ + * + * PROJECT: ReactOS Network Control Panel + * FILE: lib/cpl/system/tcpip_properties.c + * PURPOSE: ReactOS Network Control Panel + * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) + * UPDATE HISTORY: + * 08-15-2004 Created */ #include <stdlib.h> @@ -30,368 +49,263 @@ #endif + #include "resource.h" #include "ncpa.h" -#define NDEBUG -#include <debug.h> - -typedef struct _TCPIP_PROPERTIES_DATA { - DWORD AdapterIndex; - char *AdapterName; - BOOL DhcpEnabled; - DWORD IpAddress; - DWORD SubnetMask; - DWORD Gateway; - DWORD Dns1; - DWORD Dns2; - BOOL OldDhcpEnabled; - DWORD OldIpAddress; - DWORD OldSubnetMask; - DWORD OldGateway; - DWORD OldDns1; - DWORD OldDns2; -} TCPIP_PROPERTIES_DATA, *PTCPIP_PROPERTIES_DATA; - -void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); -DWORD APIENTRY DhcpNotifyConfigChange(LPWSTR ServerName, LPWSTR AdapterName, - BOOL NewIpAddress, DWORD IpIndex, - DWORD IpAddress, DWORD SubnetMask, - int DhcpAction); - - -static void -ManualDNS(HWND Dlg, BOOL Enabled) { - CheckDlgButton(Dlg, IDC_FIXEDDNS, - Enabled ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(Dlg, IDC_AUTODNS, - Enabled ? BST_UNCHECKED : BST_CHECKED); - EnableWindow(GetDlgItem(Dlg, IDC_DNS1), Enabled); - EnableWindow(GetDlgItem(Dlg, IDC_DNS2), Enabled); - if (! Enabled) { - SendDlgItemMessage(Dlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); - SendDlgItemMessage(Dlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); +extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam); + +void EnableDHCP( HWND hwndDlg, BOOL Enabled ) { + CheckDlgButton(hwndDlg,IDC_USEDHCP,Enabled ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg,IDC_NODHCP,Enabled ? BST_UNCHECKED : BST_CHECKED); +} + +void ManualDNS( HWND hwndDlg, BOOL Enabled ) { + CheckDlgButton(hwndDlg,IDC_FIXEDDNS,Enabled ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg,IDC_AUTODNS,Enabled ? BST_UNCHECKED : BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg,IDC_DNS1),Enabled); + EnableWindow(GetDlgItem(hwndDlg,IDC_DNS2),Enabled); +} + +BOOL GetAddressFromField( HWND hwndDlg, UINT CtlId, + DWORD *dwIPAddr, + const char **AddressString ) { + LRESULT lResult; + struct in_addr inIPAddr; + + *AddressString = NULL; + + lResult = SendMessage(GetDlgItem(hwndDlg, IDC_IPADDR), IPM_GETADDRESS, 0, + (ULONG_PTR)dwIPAddr); + if( lResult != 4 ) return FALSE; + + *dwIPAddr = htonl(*dwIPAddr); + inIPAddr.s_addr = *dwIPAddr; + *AddressString = inet_ntoa(inIPAddr); + if( !*AddressString ) return FALSE; + + return TRUE; +} + + + +BOOL InternTCPIPSettings( HWND hwndDlg ) { + PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); + IP_ADAPTER_INFO *pInfo = NULL; + TCHAR pszRegKey[MAX_PATH]; + HKEY hKey = NULL; + DWORD IpAddress, NetMask, Gateway, Disposition; + const char *AddressString; + BOOL RetVal = FALSE; + BOOL DhcpEnabled = FALSE; + MIB_IPFORWARDROW RowToAdd = { 0 }; + + DbgPrint("TCPIP_PROPERTIES: InternTCPIPSettings\n"); + + if(pPage) + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + + DbgPrint("TCPIP_PROPERTIES: pPage: 0x%x pInfo: 0x%x\n", pPage, pInfo); + + if( !pPage || !pInfo ) goto cleanup; + + DbgPrint("TCPIP_PROPERTIES: AdapterName: %s\n", pInfo->AdapterName); + + _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Parameters\\Interfaces\\%S"),pInfo->AdapterName); + if(RegCreateKeyEx + (HKEY_LOCAL_MACHINE,pszRegKey,0,NULL, + REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&hKey,&Disposition)!=ERROR_SUCCESS) { + DbgPrint("TCPIP_PROPERTIES: Could not open HKLM\\%S\n", pszRegKey); + goto cleanup; } -} - -static void -EnableDHCP(HWND Dlg, BOOL Enabled) { - CheckDlgButton(Dlg, IDC_USEDHCP, Enabled ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(Dlg, IDC_NODHCP, Enabled ? BST_UNCHECKED : BST_CHECKED); - EnableWindow(GetDlgItem(Dlg, IDC_IPADDR), ! Enabled); - EnableWindow(GetDlgItem(Dlg, IDC_SUBNETMASK), ! Enabled); - EnableWindow(GetDlgItem(Dlg, IDC_DEFGATEWAY), ! Enabled); - EnableWindow(GetDlgItem(Dlg, IDC_AUTODNS), Enabled); - if (Enabled) { - SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0); - SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0); - SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0); + + if( !GetAddressFromField + ( hwndDlg, IDC_IPADDR, &IpAddress, &AddressString ) || + RegSetValueEx + ( hKey, _T("IPAddress"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + DbgPrint("TCPIP_PROPERTIES: IpAddress: %x\n", IpAddress); + + if( !GetAddressFromField + ( hwndDlg, IDC_SUBNETMASK, &NetMask, &AddressString ) || + RegSetValueEx + ( hKey, _T("SubnetMask"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + DbgPrint("TCPIP_PROPERTIES: NetMask: %x\n", NetMask); + + if( !GetAddressFromField + ( hwndDlg, IDC_DEFGATEWAY, &Gateway, &AddressString ) || + RegSetValueEx + ( hKey, _T("DefaultGateway"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + if( DhcpEnabled ) { + DbgPrint("TCPIP_PROPERTIES: Lease address\n"); + DhcpLeaseIpAddress( pInfo->Index ); } else { - ManualDNS(Dlg, TRUE); + /* If not on DHCP then add a default gateway, assuming one was specified */ + DbgPrint("TCPIP_PROPERTIES: Adding gateway entry\n"); + DhcpReleaseIpAddressLease( pInfo->Index ); + DhcpStaticRefreshParams( pInfo->Index, IpAddress, NetMask ); + + RowToAdd.dwForwardMask = 0; + RowToAdd.dwForwardMetric1 = 1; + RowToAdd.dwForwardNextHop = Gateway; + + CreateIpForwardEntry( &RowToAdd ); } -} - -static void -ShowError(HWND Parent, UINT MsgId) + + DbgPrint("TCPIP_PROPERTIES: Done changing settings\n"); + +cleanup: + if( hKey ) RegCloseKey( hKey ); + + return RetVal; +} + +INT_PTR CALLBACK +TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - WCHAR Error[32], Msg[64]; - - if (0 == LoadStringW((HINSTANCE) GetWindowLongPtrW(Parent, GWLP_HINSTANCE), - IDS_ERROR, Error, sizeof(Error) / sizeof(Error[0]))) { - wcscpy(Error, L"Error"); - } - if (0 == LoadStringW((HINSTANCE) GetWindowLongPtrW(Parent, GWLP_HINSTANCE), - MsgId, Msg, sizeof(Msg) / sizeof(Msg[0]))) { - wcscpy(Msg, L"Unknown error"); - } - MessageBoxW(Parent, Msg, Error, MB_OK | MB_ICONSTOP); -} - -static BOOL -ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) -{ - DWORD IpAddress; - - DlgData->DhcpEnabled = (BST_CHECKED == - IsDlgButtonChecked(Dlg, IDC_USEDHCP)); - if (! DlgData->DhcpEnabled) { - if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, - 0, (LPARAM) &IpAddress)) { - ShowError(Dlg, IDS_ENTER_VALID_IPADDRESS); - SetFocus(GetDlgItem(Dlg, IDC_IPADDR)); - return FALSE; + PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); + IP_ADAPTER_INFO *pInfo = NULL; + int StaticDNS = 0; + char *NextDNSServer; + + if(pPage) + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + + switch(uMsg) + { + case WM_INITDIALOG: + { + pPage = (PROPSHEETPAGE *)lParam; + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + EnableWindow(GetDlgItem(hwndDlg,IDC_ADVANCED),FALSE); + SetWindowLongPtr(hwndDlg,GWL_USERDATA, (LPARAM)pPage); + + EnableDHCP( hwndDlg, pInfo->DhcpEnabled ); + + { + DWORD dwIPAddr; + IP_ADDR_STRING *pString; + pString = &pInfo->IpAddressList; + while(pString->Next) + pString = pString->Next; + dwIPAddr = ntohl(inet_addr(pString->IpAddress.String)); + SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0,dwIPAddr); + dwIPAddr = ntohl(inet_addr(pString->IpMask.String)); + SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0,dwIPAddr); + + pString = &pInfo->GatewayList; + while(pString->Next) + pString = pString->Next; + dwIPAddr = ntohl(inet_addr(pString->IpAddress.String)); + SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0,dwIPAddr); + } - DlgData->IpAddress = htonl(IpAddress); - if (4 != SendMessageW(GetDlgItem(Dlg, IDC_SUBNETMASK), IPM_GETADDRESS, - 0, (LPARAM) &IpAddress)) { - ShowError(Dlg, IDS_ENTER_VALID_SUBNET); - SetFocus(GetDlgItem(Dlg, IDC_SUBNETMASK)); - return FALSE; - } - DlgData->SubnetMask = htonl(IpAddress); - if (4 != SendMessageW(GetDlgItem(Dlg, IDC_DEFGATEWAY), IPM_GETADDRESS, - 0, (LPARAM) &IpAddress)) { - DlgData->Gateway = INADDR_NONE; - } else { - DlgData->Gateway = htonl(IpAddress); - } - ASSERT(BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)); - } else { - DlgData->IpAddress = INADDR_NONE; - DlgData->SubnetMask = INADDR_NONE; - DlgData->Gateway = INADDR_NONE; - } - - if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) { - if (4 != SendMessageW(GetDlgItem(Dlg, IDC_DNS1), IPM_GETADDRESS, - 0, (LPARAM) &IpAddress)) { - DlgData->Dns1 = INADDR_NONE; - } else { - DlgData->Dns1 = htonl(IpAddress); - } - if (4 != SendMessageW(GetDlgItem(Dlg, IDC_DNS2), IPM_GETADDRESS, - 0, (LPARAM) &IpAddress)) { - DlgData->Dns2 = INADDR_NONE; - } else { - DlgData->Dns2 = htonl(IpAddress); - } - } else { - DlgData->Dns1 = INADDR_NONE; - DlgData->Dns2 = INADDR_NONE; - } - - return TRUE; -} - -static BOOL -InternTCPIPSettings(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) { - BOOL Changed; - BOOL IpChanged; - int DhcpAction; - LPWSTR AdapterName; - - if (! ValidateAndStore(Dlg, DlgData)) { - /* Should never happen, we should have validated at PSN_KILLACTIVE */ - ASSERT(FALSE); - return FALSE; - } - - Changed = FALSE; - if (DlgData->DhcpEnabled) { - Changed = ! DlgData->OldDhcpEnabled; - IpChanged = FALSE; - DhcpAction = 1; - } else { - Changed = DlgData->OldDhcpEnabled || - DlgData->IpAddress != DlgData->OldIpAddress || - DlgData->SubnetMask != DlgData->OldSubnetMask; - IpChanged = DlgData->OldDhcpEnabled || - DlgData->IpAddress != DlgData->OldIpAddress; - DhcpAction = 2; - } - - if (Changed) { - AdapterName = HeapAlloc(GetProcessHeap(), 0, - (strlen(DlgData->AdapterName) + 1) * - sizeof(WCHAR)); - if (NULL == AdapterName) { - ShowError(Dlg, IDS_OUT_OF_MEMORY); - return FALSE; - } - MultiByteToWideChar(CP_THREAD_ACP, 0, DlgData->AdapterName, -1, - AdapterName, strlen(DlgData->AdapterName) + 1); - if (0 == DhcpNotifyConfigChange(NULL, AdapterName, IpChanged, - DlgData->AdapterIndex, - DlgData->IpAddress, - DlgData->SubnetMask, DhcpAction)) { - HeapFree(GetProcessHeap(), 0, AdapterName); - ShowError(Dlg, IDS_CANNOT_SAVE_CHANGES); - return FALSE; - } - HeapFree(GetProcessHeap(), 0, AdapterName); - } - - /* FIXME Save default gateway and DNS entries */ - return TRUE; -} - -static INT_PTR CALLBACK -TCPIPPropertyPageProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - LPPROPSHEETPAGEW Page; - PTCPIP_PROPERTIES_DATA DlgData; - LPNMHDR Nmhdr; - - DlgData = (PTCPIP_PROPERTIES_DATA) GetWindowLongPtrW(Dlg, GWL_USERDATA); - switch(uMsg) { - case WM_INITDIALOG: - Page = (LPPROPSHEETPAGEW) lParam; - DlgData = (PTCPIP_PROPERTIES_DATA) Page->lParam; - SetWindowLongPtrW(Dlg, GWL_USERDATA, Page->lParam); - - EnableWindow(GetDlgItem(Dlg, IDC_ADVANCED), FALSE); - - EnableDHCP(Dlg, DlgData->OldDhcpEnabled); - - if (! DlgData->OldDhcpEnabled) { - if (INADDR_NONE != DlgData->OldIpAddress) { - SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, - ntohl(DlgData->OldIpAddress)); - } - if (INADDR_NONE != DlgData->OldSubnetMask) { - SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, - ntohl(DlgData->OldSubnetMask)); - } - if (INADDR_NONE != DlgData->OldGateway) { - SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, - ntohl(DlgData->OldGateway)); + TCHAR pszRegKey[MAX_PATH]; + HKEY hKey; + _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Parameters\\Interfaces\\%S"),pInfo->AdapterName); + if(RegOpenKey(HKEY_LOCAL_MACHINE,pszRegKey,&hKey)==ERROR_SUCCESS) + { + char pszDNS[MAX_PATH]; + DWORD dwSize = sizeof(pszDNS); + DWORD dwType = REG_SZ; + DWORD dwIPAddr; + RegQueryValueExA(hKey,"NameServer",NULL,&dwType,(BYTE*)pszDNS,&dwSize); + RegCloseKey(hKey); + + NextDNSServer = pszDNS; + + while( NextDNSServer && StaticDNS < 2 ) { + dwIPAddr = ntohl(inet_addr(NextDNSServer)); + if( dwIPAddr != INADDR_NONE ) { + SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS,IPM_SETADDRESS,0,dwIPAddr); + StaticDNS++; + } + NextDNSServer = strchr( pszDNS, ',' ); + if( NextDNSServer ) + NextDNSServer++; + } + + ManualDNS( hwndDlg, StaticDNS ); } } - - if (INADDR_NONE != DlgData->OldDns1) { - SendDlgItemMessage(Dlg, IDC_DNS1, IPM_SETADDRESS, 0, - ntohl(DlgData->OldDns1)); - if (INADDR_NONE != DlgData->OldDns2) { - SendDlgItemMessage(Dlg, IDC_DNS2, IPM_SETADDRESS, 0, - ntohl(DlgData->OldDns2)); - } - } - ManualDNS(Dlg, INADDR_NONE != DlgData->OldDns1); - break; - + } + break; + case WM_DESTROY: case WM_COMMAND: - switch(LOWORD(wParam)) { + switch(LOWORD(wParam)) + { case IDC_FIXEDDNS: - ManualDNS(Dlg, TRUE); - return TRUE; + ManualDNS( hwndDlg, TRUE ); + break; case IDC_AUTODNS: - ManualDNS(Dlg, FALSE); - return TRUE; + ManualDNS( hwndDlg, FALSE ); + break; case IDC_USEDHCP: - EnableDHCP(Dlg, TRUE); - return TRUE; + EnableDHCP( hwndDlg, TRUE ); + break; case IDC_NODHCP: - EnableDHCP(Dlg, FALSE); - return TRUE; - } - break; - - case WM_NOTIFY: - Nmhdr = (LPNMHDR) lParam; - - switch(Nmhdr->code) { - case PSN_KILLACTIVE: - /* Do validation here, must set FALSE to continue */ - SetWindowLongPtrW(Dlg, DWL_MSGRESULT, - (LONG_PTR) ! ValidateAndStore(Dlg, DlgData)); - return TRUE; - - case PSN_APPLY: + EnableDHCP( hwndDlg, FALSE ); + break; + + case 0: /* Set the IP Address and DNS Information so we won't * be doing all this for nothing */ - SetWindowLongPtrW(Dlg, DWL_MSGRESULT, - InternTCPIPSettings(Dlg, DlgData) ? - PSNRET_NOERROR : PSNRET_INVALID); - return TRUE; + InternTCPIPSettings( hwndDlg ); + LocalFree((void *)pPage->lParam); + LocalFree(pPage); + break; } break; } - return FALSE; } -static BOOL -LoadDataFromInfo(PTCPIP_PROPERTIES_DATA DlgData, IP_ADAPTER_INFO *Info) +void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo) { - IP_ADDR_STRING *pString; - WCHAR RegKey[MAX_PATH]; - HKEY hKey; - char Dns[MAX_PATH]; - DWORD Size; - DWORD Type; - char *NextDnsServer; - - DlgData->AdapterName = Info->AdapterName; - DlgData->AdapterIndex = Info->Index; - - DlgData->OldDhcpEnabled = Info->DhcpEnabled; - - pString = &Info->IpAddressList; - while (NULL != pString->Next) { - pString = pString->Next; - } - DlgData->OldIpAddress = inet_addr(pString->IpAddress.String); - DlgData->OldSubnetMask = inet_addr(pString->IpMask.String); - pString = &Info->GatewayList; - while (NULL != pString->Next) { - pString = pString->Next; - } - DlgData->OldGateway = inet_addr(pString->IpAddress.String); - - DlgData->OldDns1 = INADDR_NONE; - DlgData->OldDns2 = INADDR_NONE; - swprintf(RegKey, - L"SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Parameters\\Interfaces\\%S", - Info->AdapterName); - if (ERROR_SUCCESS == RegOpenKeyW(HKEY_LOCAL_MACHINE, RegKey, &hKey)) { - Size = sizeof(Dns); - RegQueryValueExA(hKey, "NameServer", NULL, &Type, (BYTE *)Dns, - &Size); - RegCloseKey(hKey); - - if ('\0' != Dns[0]) { - DlgData->OldDns1 = inet_addr(Dns); - NextDnsServer = strchr(Dns, ','); - if (NULL != NextDnsServer && '\0' != *NextDnsServer) { - DlgData->OldDns2 = inet_addr(NextDnsServer); - } - } - } - - return TRUE; -} - -void -DisplayTCPIPProperties(HWND hParent, IP_ADAPTER_INFO *pInfo) -{ - PROPSHEETPAGEW psp[1]; - PROPSHEETHEADERW psh; - INITCOMMONCONTROLSEX cce; - TCPIP_PROPERTIES_DATA DlgData; - - if (! LoadDataFromInfo(&DlgData, pInfo)) - { - ShowError(hParent, IDS_CANNOT_LOAD_CONFIG); - return; - } - - cce.dwSize = sizeof(INITCOMMONCONTROLSEX); - cce.dwICC = ICC_INTERNET_CLASSES; - InitCommonControlsEx(&cce); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW; - psh.hwndParent = hParent; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = NULL;//Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = NULL; - - InitPropSheetPage(&psp[0], IDD_TCPIPPROPERTIES, TCPIPPropertyPageProc); - psp[0].lParam = (LPARAM) &DlgData; - - if (PropertySheetW(&psh) == -1) - { - ShowError(hParent, IDS_CANNOT_CREATE_PROPSHEET); - } - - return; -} + PROPSHEETPAGE *psp = LocalAlloc( LMEM_FIXED, sizeof(PROPSHEETPAGE) ); + PROPSHEETHEADER psh; + INITCOMMONCONTROLSEX cce; + + DbgPrint("TCPIP_PROPERTIES: psp = %x\n", psp); + + cce.dwSize = sizeof(INITCOMMONCONTROLSEX); + cce.dwICC = ICC_INTERNET_CLASSES; + InitCommonControlsEx(&cce); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW; + psh.hwndParent = hParent; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = NULL;//Caption; + psh.nPages = 1; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; + + DbgPrint("TCPIP_PROPERTIES: About to InitPropSheetPage (pInfo: %x)\n", pInfo); + + InitPropSheetPage(psp, IDD_TCPIPPROPERTIES, TCPIPPropertyPageProc, (LPARAM)pInfo); + + DbgPrint("TCPIP_PROPERTIES: About to realize property sheet\n", psp); + + if (PropertySheet(&psh) == -1) + { + MessageBox(hParent,_T("Unable to create property sheet"),_T("Error"),MB_ICONSTOP); + } + + return; +} Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/includ… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h Mon May 8 15:00:26 2006 @@ -500,6 +500,13 @@ #define MAX(value1, value2) \ ((value1 > value2)? value1 : value2) +#define ExInterlockedRemoveEntryList(_List,_Lock) \ + { KIRQL OldIrql; \ + KeAcquireSpinLock(_Lock, &OldIrql); \ + RemoveEntryList(_List); \ + KeReleaseSpinLock(_Lock, OldIrql); \ + } + #endif /* __NDISSYS_H */ /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c Mon May 8 15:00:26 2006 @@ -1331,6 +1331,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1340,6 +1341,7 @@ { ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); Adapter->NdisMiniportBlock.AllocatedResources = NULL; + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1420,6 +1422,7 @@ SelectedMediumIndex >= MEDIA_ARRAY_SIZE) { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return (NTSTATUS)NdisStatus; } @@ -1461,6 +1464,7 @@ NDIS_DbgPrint(MIN_TRACE, ("error: unsupported media\n")); ASSERT(FALSE); /* FIXME - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); */ + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_UNSUCCESSFUL; } @@ -1472,6 +1476,7 @@ ExFreePool(Adapter->LookaheadBuffer); Adapter->LookaheadBuffer = NULL; } + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return (NTSTATUS)NdisStatus; } Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/datal… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c Mon May 8 15:00:26 2006 @@ -906,7 +906,7 @@ AppendUnicodeString( OutName, &PartialRegistryKey, FALSE ); } -VOID BindAdapter( +BOOLEAN BindAdapter( PLAN_ADAPTER Adapter, PNDIS_STRING RegistryPath) /* @@ -937,7 +937,7 @@ sizeof(ULONG)); if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_DATALINK, ("Could not set lookahead buffer size (0x%X).\n", NdisStatus)); - return; + return FALSE; } /* Bind the adapter to IP layer */ @@ -953,7 +953,7 @@ if (!IF) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return; + return FALSE; } /* @@ -973,6 +973,9 @@ Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); + } else { + IPDestroyInterface( IF ); + return FALSE; } DefaultMask.Type = IP_ADDRESS_V4; @@ -1010,11 +1013,12 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_DATALINK, ("Could not set packet filter (0x%X).\n", NdisStatus)); IPDestroyInterface(IF); - return; + return FALSE; } Adapter->Context = IF; Adapter->State = LAN_STATE_STARTED; + return TRUE; } @@ -1097,6 +1101,7 @@ if (NdisStatus == NDIS_STATUS_PENDING) KeWaitForSingleObject(&IF->Event, UserRequest, KernelMode, FALSE, NULL); else if (NdisStatus != NDIS_STATUS_SUCCESS) { + TI_DbgPrint(DEBUG_DATALINK,("denying adapter %wZ\n", AdapterName)); exFreePool(IF); return NdisStatus; } @@ -1133,6 +1138,7 @@ &IF->MTU, sizeof(UINT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { + TI_DbgPrint(DEBUG_DATALINK,("denying adapter %wZ (NDISCall)\n", AdapterName)); exFreePool(IF); return NdisStatus; } @@ -1193,7 +1199,11 @@ &AdapterListLock); /* Bind adapter to IP layer */ - BindAdapter(IF, RegistryPath); + if( !BindAdapter(IF, RegistryPath) ) { + TI_DbgPrint(DEBUG_DATALINK,("denying adapter %wZ (BindAdapter)\n", AdapterName)); + exFreePool(IF); + return NDIS_STATUS_NOT_ACCEPTED; + } TI_DbgPrint(DEBUG_DATALINK, ("Leaving.\n")); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Mon May 8 15:00:26 2006 @@ -1505,7 +1505,12 @@ (PIP_SET_ADDRESS)Irp->AssociatedIrp.SystemBuffer; IF_LIST_ITER(IF); + TI_DbgPrint(MID_TRACE,("Setting IP Address for adapter %d\n", + IpAddrChange->NteIndex)); + ForEachInterface(IF) { + TI_DbgPrint(MID_TRACE,("Looking at adapter %d\n", IF->Index)); + if( IF->Unicast.Address.IPv4Address == IpAddrChange->Address ) { Status = STATUS_DUPLICATE_OBJECTID; break; Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c Mon May 8 15:00:26 2006 @@ -60,17 +60,23 @@ KIRQL OldIrql; UINT i; + TI_DbgPrint(DEBUG_INFO,("Removing TDI entry 0x%x\n", Interface)); + TcpipAcquireSpinLock( &EntityListLock, &OldIrql ); /* Remove entities that have this interface as context * In the future, this might include AT_ENTITY types, too */ for( i = 0; i < EntityCount; i++ ) { + TI_DbgPrint(DEBUG_INFO,("--> examining TDI entry 0x%x\n", EntityList[i].context)); if( EntityList[i].context == Interface ) { - if( i != EntityCount-1 ) + if( i != EntityCount-1 ) { memcpy( &EntityList[i], &EntityList[--EntityCount], sizeof(EntityList[i]) ); + } else { + EntityCount--; + } } } Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Mon May 8 15:00:26 2006 @@ -14,7 +14,7 @@ #ifndef NDEBUG DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); #else -DWORD DebugTraceLevel = 0; +DWORD DebugTraceLevel = DEBUG_DATALINK; #endif /* NDEBUG */ PDEVICE_OBJECT TCPDeviceObject = NULL;

18 years, 4 months

[cwittich] 21850: fix indentation

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon May 8 12:54:47 2006 New Revision: 21850 URL: http://svn.reactos.ru/svn/reactos?rev=21850&view=rev Log: fix indentation Modified: trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Mon May 8 12:54:47 2006 @@ -345,12 +345,12 @@ } break; } - case WM_CTLCOLORSTATIC: - { - if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_YEARTEXT)) - return (int) GetSysColorBrush(COLOR_WINDOW); - break; - } + case WM_CTLCOLORSTATIC: + { + if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_YEARTEXT)) + return (int) GetSysColorBrush(COLOR_WINDOW); + break; + } case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; @@ -359,12 +359,12 @@ { case IDC_YEAR: switch (lpnm->code) - { + { case UDN_DELTAPOS: { short wYear; - LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; - wYear = SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); + LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; + wYear = SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); ChangeMonthCalDate(GetDlgItem(hwndDlg, @@ -374,7 +374,7 @@ wYear + updown->iDelta); break; } - } + } break; case IDC_TIMEPICKER: switch (lpnm->code) @@ -426,11 +426,11 @@ 0); break; } - case WM_DESTROY: + case WM_DESTROY: { KillTimer(hwndDlg, ID_TIMER); break; - } + } } return FALSE;

18 years, 4 months

[greatlrd] 21849: if u update En.rc please update all other langues files, use the english text if no translatesion is not availbal, other wise it will bsd in windows or in reactos and we get diffent functions on each langues. DO NOT DO THIS MISTAKE

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon May 8 09:11:37 2006 New Revision: 21849 URL: http://svn.reactos.ru/svn/reactos?rev=21849&view=rev Log: if u update En.rc please update all other langues files, use the english text if no translatesion is not availbal, other wise it will bsd in windows or in reactos and we get diffent functions on each langues. DO NOT DO THIS MISTAKE Modified: trunk/reactos/dll/cpl/main/De.rc trunk/reactos/dll/cpl/main/Es.rc trunk/reactos/dll/cpl/main/Hu.rc trunk/reactos/dll/cpl/main/Ja.rc trunk/reactos/dll/cpl/main/Nl.rc trunk/reactos/dll/cpl/main/Ru.rc Modified: trunk/reactos/dll/cpl/main/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/De.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/De.rc (original) +++ trunk/reactos/dll/cpl/main/De.rc Mon May 8 09:11:37 2006 @@ -17,10 +17,133 @@ BEGIN END +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + + STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" IDS_CPLDESCRIPTION_1 "Mauseinstellungen ändern." IDS_CPLNAME_2 "Tastatur" IDS_CPLDESCRIPTION_2 "Tastatureinstellungen ändern." + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END Modified: trunk/reactos/dll/cpl/main/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Es.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/Es.rc (original) +++ trunk/reactos/dll/cpl/main/Es.rc Mon May 8 09:11:37 2006 @@ -15,10 +15,133 @@ BEGIN END +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + + STRINGTABLE BEGIN IDS_CPLNAME_1 "Raton" IDS_CPLDESCRIPTION_1 "Ajusta las propiedades del raton." IDS_CPLNAME_2 "Teclado" IDS_CPLDESCRIPTION_2 "Ajusta las propiedades del teclado." + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END Modified: trunk/reactos/dll/cpl/main/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Hu.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/Hu.rc (original) +++ trunk/reactos/dll/cpl/main/Hu.rc Mon May 8 09:11:37 2006 @@ -15,10 +15,133 @@ BEGIN END +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + + STRINGTABLE BEGIN IDS_CPLNAME_1 "Egér" IDS_CPLDESCRIPTION_1 "Egér beállítások." IDS_CPLNAME_2 "Billentyûzet" IDS_CPLDESCRIPTION_2 "Billentyûzet beállítások." + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END Modified: trunk/reactos/dll/cpl/main/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Ja.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/Ja.rc (original) +++ trunk/reactos/dll/cpl/main/Ja.rc Mon May 8 09:11:37 2006 @@ -1,4 +1,125 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Speed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Keyboard Speed Page",-1,73,74,90,8 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END STRINGTABLE BEGIN @@ -6,4 +127,20 @@ IDS_CPLDESCRIPTION_1 "}EXÌÝèðJX^}CYµÜ·B" IDS_CPLNAME_2 "L[{[h" IDS_CPLDESCRIPTION_2 "L[{[hÌÝèðJX^}CYµÜ·B" + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END Modified: trunk/reactos/dll/cpl/main/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Nl.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/Nl.rc (original) +++ trunk/reactos/dll/cpl/main/Nl.rc Mon May 8 09:11:37 2006 @@ -1,4 +1,124 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Speed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Keyboard Speed Page",-1,73,74,90,8 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END STRINGTABLE BEGIN @@ -6,4 +126,20 @@ IDS_CPLDESCRIPTION_1 "De instellingen voor de muis wijzigen." IDS_CPLNAME_2 "Toetsenbord" IDS_CPLDESCRIPTION_2 "De instellingen voor het toetsenbord wijzigen." + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END Modified: trunk/reactos/dll/cpl/main/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Ru.rc?rev=2184… ============================================================================== --- trunk/reactos/dll/cpl/main/Ru.rc (original) +++ trunk/reactos/dll/cpl/main/Ru.rc Mon May 8 09:11:37 2006 @@ -15,10 +15,133 @@ BEGIN END +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Click Lock" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Short", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Button" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Button configuration", -1, 5, 5, 230, 70 + CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_OWNERDRAW, 155, 15, 75, 57, WS_EX_STATICEDGE + LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 140, 30 + GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 + LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 + LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 + LTEXT "Fast", -1, 140, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "ClickLock", -1, 5, 150, 230, 70 + CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scheme", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Customize", -1, 5, 60, 40, 10 + CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_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 + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Save Scheme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointer Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Motion", -1, 5, 5, 230, 60 + LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 + LTEXT "Slow", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Fast", -1, 170, 30, 20, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 15, 15, 15, 15 + CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Snap To", -1, 5, 65, 230, 40 + CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 + GROUPBOX "Visibility", -1, 5, 105, 230, 90 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 + LTEXT "Short", -1, 60, 130, 30, 10 + LTEXT "Long", -1, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Wheel" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 + CONTROL "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + + STRINGTABLE BEGIN IDS_CPLNAME_1 "Ìûøü" IDS_CPLDESCRIPTION_1 "Èçìåíåíèå íàñòðîåê ìûøè." IDS_CPLNAME_2 "Êëàâèàòóðà" IDS_CPLDESCRIPTION_2 "Èçìåíåíèå íàñòðîåê êëàâèàòóðû." + IDS_ARROW "Normal Select" + IDS_HELP "Help Select" + IDS_APPSTARTING "Working in Background" + IDS_WAIT "Busy" + IDS_CROSSHAIR "Precision Select" + IDS_IBEAM "Text Select" + IDS_NWPEN "Handwriting" + IDS_NO "Unavailable" + IDS_SIZENS "Vertical Resize" + IDS_SIZENWSE "Diagonal Resize 1" + IDS_SIZENESW "Diagonal Resize 2" + IDS_SIZEALL "Move" + IDS_UPARROW "Alternative Select" + IDS_HAND "Link Select" + IDS_NONE "(None)" + IDS_SYSTEM_SCHEME "(system scheme)" END

18 years, 4 months

[arty] 21848: Sorry, turn off extra debugging. We need a better framework for that.

by arty＠svn.reactos.org

Author: arty Date: Mon May 8 06:46:21 2006 New Revision: 21848 URL: http://svn.reactos.ru/svn/reactos?rev=21848&view=rev Log: Sorry, turn off extra debugging. We need a better framework for that. Modified: trunk/reactos/drivers/network/ndis/ndis/main.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c Mon May 8 06:46:21 2006 @@ -17,8 +17,7 @@ #ifdef DBG /* See debug.h for debug/trace constants */ -//ULONG DebugTraceLevel = MIN_TRACE; -ULONG DebugTraceLevel = (ULONG)-1; +ULONG DebugTraceLevel = MIN_TRACE; #endif /* DBG */

18 years, 4 months

[arty] 21847: Fix device registration. The actual reason it didn't work was that we weren't adding the device to the list until after calling the BindAdapter method.

by arty＠svn.reactos.org

Author: arty Date: Mon May 8 06:45:40 2006 New Revision: 21847 URL: http://svn.reactos.ru/svn/reactos?rev=21847&view=rev Log: Fix device registration. The actual reason it didn't work was that we weren't adding the device to the list until after calling the BindAdapter method. Modified: trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c Mon May 8 06:45:40 2006 @@ -17,8 +17,8 @@ #ifdef DBG /* See debug.h for debug/trace constants */ -ULONG DebugTraceLevel = MIN_TRACE; -//ULONG DebugTraceLevel = DEBUG_ULTRA; +//ULONG DebugTraceLevel = MIN_TRACE; +ULONG DebugTraceLevel = (ULONG)-1; #endif /* DBG */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c Mon May 8 06:45:40 2006 @@ -507,28 +507,26 @@ KeAcquireSpinLock(&AdapterListLock, &OldIrql); { - do + CurrentEntry = AdapterListHead.Flink; + + while (CurrentEntry != &AdapterListHead) { - CurrentEntry = AdapterListHead.Flink; - - while (CurrentEntry != &AdapterListHead) - { - Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry); - - ASSERT(Adapter); - - NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); - NDIS_DbgPrint(DEBUG_MINIPORT, ("DeviceName = %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); - - if (RtlCompareUnicodeString(AdapterName, &Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) - { - break; - } - - Adapter = NULL; - CurrentEntry = CurrentEntry->Flink; - } - } while (0); + Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry); + + ASSERT(Adapter); + + NDIS_DbgPrint(DEBUG_MINIPORT, ("Examining adapter 0x%lx\n", Adapter)); + NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); + NDIS_DbgPrint(DEBUG_MINIPORT, ("DeviceName = %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); + + if (RtlCompareUnicodeString(AdapterName, &Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) + { + break; + } + + Adapter = NULL; + CurrentEntry = CurrentEntry->Flink; + } } KeReleaseSpinLock(&AdapterListLock, OldIrql); @@ -1295,6 +1293,13 @@ * Prepare wrapper context used by HW and configuration routines. */ + NDIS_DbgPrint(DEBUG_MINIPORT, ("Start Device %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); + + NDIS_DbgPrint(MAX_TRACE, ("Inserting adapter 0x%x into adapter list\n", Adapter)); + + /* Put adapter in global adapter list */ + ExInterlockedInsertTailList(&AdapterListHead, &Adapter->ListEntry, &AdapterListLock); + Status = IoOpenDeviceRegistryKey( Adapter->NdisMiniportBlock.PhysicalDeviceObject, PLUGPLAY_REGKEY_DRIVER, KEY_ALL_ACCESS, &WrapperContext.RegistryHandle); @@ -1476,9 +1481,6 @@ /* Put adapter in adapter list for this miniport */ ExInterlockedInsertTailList(&Adapter->NdisMiniportBlock.DriverHandle->DeviceList, &Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock); - /* Put adapter in global adapter list */ - ExInterlockedInsertTailList(&AdapterListHead, &Adapter->ListEntry, &AdapterListLock); - return STATUS_SUCCESS; }

18 years, 4 months

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006