Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[zguo] 28427: Fix kdbg disasm bug, patch by SamB See issue #2408 for more details.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Aug 20 02:51:10 2007 New Revision: 28427 URL: http://svn.reactos.org/svn/reactos?rev=28427&view=rev Log: Fix kdbg disasm bug, patch by SamB See issue #2408 for more details. Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i386-di… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c Mon Aug 20 02:51:10 2007 @@ -62,7 +62,7 @@ va_start(ap, fmt); ret = vsprintf(buffer, fmt, ap); - DbgPrint(buffer); + DbgPrint("%s", buffer); va_end(ap); return(ret); }

17 years, 4 months

[janderwald] 28426: more.c should not close INVALID_HANDLE_VALUE patch by Apal remove tab and quit when failing to open file (tested with Windows XP SP2)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 20 00:16:10 2007 New Revision: 28426 URL: http://svn.reactos.org/svn/reactos?rev=28426&view=rev Log: more.c should not close INVALID_HANDLE_VALUE patch by Apal remove tab and quit when failing to open file (tested with Windows XP SP2) Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c Mon Aug 20 00:16:10 2007 @@ -116,25 +116,28 @@ buff=malloc(4096); - FlushConsoleInputBuffer (hKeyboard); + FlushConsoleInputBuffer (hKeyboard); if(argc > 1) { GetFullPathName(argv[1], MAX_PATH, szFullPath, NULL); hFile = CreateFile (szFullPath, GENERIC_READ, 0,NULL,OPEN_ALWAYS,0,0); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConOutPuts(_T("The file could not be opened")); + return 0; + } + } + else + { + hFile = hStdIn; } do { - if(hFile != INVALID_HANDLE_VALUE) - { - bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); - } - else - { - bRet = ReadFile(hStdIn,buff,4096,&dwRead,NULL); - } + bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); for(last=i=0;i<dwRead && bRet;i++) { @@ -161,7 +164,8 @@ free (buff); CloseHandle (hKeyboard); - CloseHandle (hFile); + if (hFile != hStdIn) + CloseHandle (hFile); return 0; }

17 years, 4 months

[cfinck] 28425: - mkhive's "registry.c" used wcsncmp for comparing two strings. But this function seems to work different on different hosts (probably due to different handling of wchar_t's or whatever). To avoid this problem, use memcmp now to compare the strings as it's done two lines later. This fixes the Live-CD on Linux/Unix hosts. (For the first time, Live-CDs created by our 64-Bit Debug Buildslave are usable :-) - Change __volatile to volatile in "winddk.h". This fixes compilation problem

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 19 23:37:47 2007 New Revision: 28425 URL: http://svn.reactos.org/svn/reactos?rev=28425&view=rev Log: - mkhive's "registry.c" used wcsncmp for comparing two strings. But this function seems to work different on different hosts (probably due to different handling of wchar_t's or whatever). To avoid this problem, use memcmp now to compare the strings as it's done two lines later. This fixes the Live-CD on Linux/Unix hosts. (For the first time, Live-CDs created by our 64-Bit Debug Buildslave are usable :-) - Change __volatile to volatile in "winddk.h". This fixes compilation problems under MSVC. - Make the prototype of RtlCompareMemory in "winnt.h" similar to the one in "winddk.h". Fixes a compilation problem in MSVC. - Define the prototype for xwcschr in "mkhive.h". Silences a warning in MSVC. - Add some casts to "reginf.c" to silence some warnings in MSVC. - Add a MSVC 2005 project file for mkhive. mkhive can be compiled under MSVC with this project file, when cmlib and inflib_host are compiled. - Remove the duplicate definition of CMLIB_HOST in "cmlib.mak". Added: trunk/reactos/tools/mkhive/mkhive.sln trunk/reactos/tools/mkhive/mkhive.vcproj Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun Aug 19 23:37:47 2007 @@ -1266,8 +1266,8 @@ { union { - __volatile ULONG_PTR Count; - __volatile PVOID Ptr; + volatile ULONG_PTR Count; + volatile PVOID Ptr; }; } EX_RUNDOWN_REF, *PEX_RUNDOWN_REF; @@ -1362,7 +1362,7 @@ ULONG Flags; union { struct _IRP *MasterIrp; - __volatile LONG IrpCount; + volatile LONG IrpCount; PVOID SystemBuffer; } AssociatedIrp; LIST_ENTRY ThreadListEntry; @@ -1384,7 +1384,7 @@ } AsynchronousParameters; LARGE_INTEGER AllocationSize; } Overlay; - __volatile PDRIVER_CANCEL CancelRoutine; + volatile PDRIVER_CANCEL CancelRoutine; PVOID UserBuffer; union { struct { @@ -2187,7 +2187,7 @@ PIO_TIMER Timer; ULONG Flags; ULONG Characteristics; - __volatile PVPB Vpb; + volatile PVPB Vpb; PVOID DeviceExtension; DEVICE_TYPE DeviceType; CCHAR StackSize; @@ -3147,8 +3147,8 @@ POWNER_ENTRY OwnerTable; SHORT ActiveCount; USHORT Flag; - __volatile PKSEMAPHORE SharedWaiters; - __volatile PKEVENT ExclusiveWaiters; + volatile PKSEMAPHORE SharedWaiters; + volatile PKEVENT ExclusiveWaiters; OWNER_ENTRY OwnerThreads[2]; ULONG ContentionCount; USHORT NumberOfSharedWaiters; @@ -3479,15 +3479,15 @@ ULONG Flags; UNICODE_STRING FileName; LARGE_INTEGER CurrentByteOffset; - __volatile ULONG Waiters; - __volatile ULONG Busy; + volatile ULONG Waiters; + volatile ULONG Busy; PVOID LastLock; KEVENT Lock; KEVENT Event; - __volatile PIO_COMPLETION_CONTEXT CompletionContext; + volatile PIO_COMPLETION_CONTEXT CompletionContext; KSPIN_LOCK IrpListLock; LIST_ENTRY IrpList; - __volatile PVOID FileObjectExtension; + volatile PVOID FileObjectExtension; } FILE_OBJECT; typedef struct _FILE_OBJECT *PFILE_OBJECT; @@ -4467,7 +4467,7 @@ typedef struct _IO_REMOVE_LOCK_COMMON_BLOCK { BOOLEAN Removed; BOOLEAN Reserved[3]; - __volatile LONG IoCount; + volatile LONG IoCount; KEVENT RemoveEvent; } IO_REMOVE_LOCK_COMMON_BLOCK; @@ -4478,7 +4478,7 @@ LONG AllocateTag; LIST_ENTRY LockList; KSPIN_LOCK Spin; - __volatile LONG LowMemoryCount; + volatile LONG LowMemoryCount; ULONG Reserved1[4]; PVOID Reserved2; PIO_REMOVE_LOCK_TRACKING_BLOCK Blocks; @@ -4651,7 +4651,7 @@ typedef struct _WORK_QUEUE_ITEM { LIST_ENTRY List; PWORKER_THREAD_ROUTINE WorkerRoutine; - __volatile PVOID Parameter; + volatile PVOID Parameter; } WORK_QUEUE_ITEM, *PWORK_QUEUE_ITEM; typedef enum _KBUGCHECK_CALLBACK_REASON { Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 19 23:37:47 2007 @@ -4017,6 +4017,7 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif +NTSYSAPI SIZE_T STDCALL RtlCompareMemory ( Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=28… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Sun Aug 19 23:37:47 2007 @@ -33,7 +33,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES -DCMLIB_HOST + -D__NO_CTYPE_INLINES $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h (original) +++ trunk/reactos/tools/mkhive/mkhive.h Sun Aug 19 23:37:47 2007 @@ -101,6 +101,13 @@ #define GCC_PACKED __attribute__((packed)) #endif//_MSC_VER +/* rtl.c */ +PWSTR +xwcschr( + PWSTR String, + WCHAR Char +); + #endif /* __MKHIVE_H__ */ /* EOF */ Added: trunk/reactos/tools/mkhive/mkhive.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.sln?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.sln (added) +++ trunk/reactos/tools/mkhive/mkhive.sln Sun Aug 19 23:37:47 2007 @@ -1,0 +1,20 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkhive", "mkhive.vcproj", "{4D03FFD1-EB34-41A1-908B-F8F7350118A7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Debug|Win32.Build.0 = Debug|Win32 + {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Release|Win32.ActiveCfg = Release|Win32 + {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/reactos/tools/mkhive/mkhive.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.vcproj… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.vcproj (added) +++ trunk/reactos/tools/mkhive/mkhive.vcproj Sun Aug 19 23:37:47 2007 @@ -1,0 +1,234 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="mkhive" + ProjectGUID="{4D03FFD1-EB34-41a1-908B-F8F7350118A7}" + RootNamespace="mkhive" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="true" + Optimization="0" + AdditionalIncludeDirectories="../../include/ddk;../../include/psdk;../../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib/cmlib.a ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostglue.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o ../../obj-i386/lib/rtl/rtl.a $(NOINHERIT)" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="kernel32.lib $(NOINHERIT)" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + > + <File + RelativePath=".\binhive.c" + > + </File> + <File + RelativePath=".\cmi.c" + > + </File> + <File + RelativePath=".\mkhive.c" + > + </File> + <File + RelativePath=".\reginf.c" + > + </File> + <File + RelativePath=".\registry.c" + > + </File> + <File + RelativePath=".\rtl.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + > + <File + RelativePath=".\binhive.h" + > + </File> + <File + RelativePath=".\cmi.h" + > + </File> + <File + RelativePath=".\mkhive.h" + > + </File> + <File + RelativePath=".\reginf.h" + > + </File> + <File + RelativePath=".\registry.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c (original) +++ trunk/reactos/tools/mkhive/reginf.c Sun Aug 19 23:37:47 2007 @@ -262,7 +262,7 @@ if (Str == NULL) return FALSE; - InfHostGetMultiSzField (Context, 5, Str, Size, NULL); + InfHostGetMultiSzField (Context, 5, Str, (ULONG)Size, NULL); } if (Flags & FLG_ADDREG_APPEND) @@ -291,7 +291,7 @@ if (Str == NULL) return FALSE; - InfHostGetStringField (Context, 5, Str, Size, NULL); + InfHostGetStringField (Context, 5, Str, (ULONG)Size, NULL); } } @@ -347,7 +347,7 @@ return FALSE; DPRINT("setting binary data %s len %lu\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, Size, NULL); + InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); } RegSetValueExA (KeyHandle, @@ -396,7 +396,7 @@ /* get key */ Length = strlen (Buffer); - if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - Length, NULL) != 0) + if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) *Buffer = 0; DPRINT("KeyName: <%s>\n", Buffer); Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c (original) +++ trunk/reactos/tools/mkhive/registry.c Sun Aug 19 23:37:47 2007 @@ -133,7 +133,7 @@ RtlInitUnicodeString(&KeyString, LocalKeyName); /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!wcsncmp(LocalKeyName, L"CurrentControlSet", 17) && + if (!memcmp(LocalKeyName, L"CurrentControlSet", 34) && ParentKey->NameSize == 12 && !memcmp(ParentKey->Name, L"SYSTEM", 12)) RtlInitUnicodeString(&KeyString, L"ControlSet001"); @@ -624,7 +624,7 @@ { UNICODE_STRING RootKeyName = RTL_CONSTANT_STRING(L"\\"); NTSTATUS Status; - HKEY ControlSetKey, LinkKey; + HKEY ControlSetKey; InitializeListHead(&CmiHiveListHead);

17 years, 4 months

Re: [ros-diffs] [cfinck] 28423: - Always include "wine/unicode.h" before all other headers, when we need the wchar_t type. unicode.h includes windef.h, which includes winnt.h, which has the handling for the wchar_t type. As it's the first included he

by Steven Edwards

On 8/19/07, cfinck(a)svn.reactos.org <cfinck(a)svn.reactos.org> wrote: > - Always include "wine/unicode.h" before all other headers, when we need the wchar_t type. Please stop changing the header order. If you need to do this then something is wrong. The Wine headers are mostly correct as far as the PSDK/WDK goes and if you build Wine on MSVC you DO NOT have to make these invasive changes to the source even when using the SDK headers. Fix the ROS headers or work around system limitations some other way. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

17 years, 4 months

[ekohl] 28424: - Implement the mouse keys dialog. - Fix a tiny bug in the mouse keys dialog resource. - Update file header.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 19 20:11:04 2007 New Revision: 28424 URL: http://svn.reactos.org/svn/reactos?rev=28424&view=rev Log: - Implement the mouse keys dialog. - Fix a tiny bug in the mouse keys dialog resource. - Update file header. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/resource.h trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Sun Aug 19 20:11:04 2007 @@ -1,19 +1,17 @@ /* $Id$ * - * PROJECT: ReactOS System Control Panel + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/sysdm.c - * PURPOSE: ReactOS System Control Panel + * FILE: dll/cpl/access/access.c + * PURPOSE: Main control panel code * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <commctrl.h> #include <cpl.h> - #include <stdlib.h> - #include "resource.h" #include "access.h" Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sun Aug 19 20:11:04 2007 @@ -1,12 +1,13 @@ -/* - * PROJECT: ReactOS System Control Panel +/* $Id$ + * + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/display.c - * PURPOSE: Memory, start-up and profiles settings + * PURPOSE: Display-related accessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <stdlib.h> #include <commctrl.h> Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Sun Aug 19 20:11:04 2007 @@ -1,13 +1,13 @@ /* $Id$ * - * PROJECT: ReactOS System Control Panel + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/general.c - * PURPOSE: Memory, start-up and profiles settings + * PURPOSE: General accessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <stdlib.h> #include <stdio.h> Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sun Aug 19 20:11:04 2007 @@ -1,13 +1,13 @@ /* $Id$ * - * PROJECT: ReactOS System Control Panel + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c - * PURPOSE: Memory, start-up and profiles settings + * FILE: dll/cpl/access/keyboard.c + * PURPOSE: Keyboard-related accessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <stdlib.h> #include <commctrl.h> Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sun Aug 19 20:11:04 2007 @@ -183,8 +183,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sun Aug 19 20:11:04 2007 @@ -186,8 +186,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sun Aug 19 20:11:04 2007 @@ -183,8 +183,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sun Aug 19 20:11:04 2007 @@ -186,8 +186,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sun Aug 19 20:11:04 2007 @@ -184,8 +184,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sun Aug 19 20:11:04 2007 @@ -184,8 +184,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sun Aug 19 20:11:04 2007 @@ -185,8 +185,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Aug 19 20:11:04 2007 @@ -183,8 +183,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sun Aug 19 20:11:04 2007 @@ -183,8 +183,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sun Aug 19 20:11:04 2007 @@ -185,8 +185,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sun Aug 19 20:11:04 2007 @@ -186,8 +186,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sun Aug 19 20:11:04 2007 @@ -183,8 +183,8 @@ AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Sun Aug 19 20:11:04 2007 @@ -1,13 +1,13 @@ /* $Id$ * - * PROJECT: ReactOS System Control Panel + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/mouse.c - * PURPOSE: Memory, start-up and profiles settings + * PURPOSE: Mouse-related accessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <stdlib.h> #include <commctrl.h> @@ -22,6 +22,12 @@ } GLOBAL_DATA, *PGLOBAL_DATA; +#define SPEEDTICKS 9 +#define ACCELTICKS 9 + +static INT nSpeedArray[SPEEDTICKS] = {10, 20, 30, 40, 60, 80, 120, 180, 360}; + + INT_PTR CALLBACK MouseKeysDlgProc(HWND hwndDlg, UINT uMsg, @@ -29,6 +35,7 @@ LPARAM lParam) { PGLOBAL_DATA pGlobalData; + INT i; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -38,11 +45,93 @@ pGlobalData = (PGLOBAL_DATA)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + CheckDlgButton(hwndDlg, + IDC_MOUSEKEYS_ACTIVATE_CHECK, + pGlobalData->mouseKeys.dwFlags & MKF_HOTKEYACTIVE ? BST_CHECKED : BST_UNCHECKED); + + /* Set the number of ticks for the speed trackbar */ + SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_SETRANGE, + TRUE, MAKELONG(0, SPEEDTICKS - 1)); + + /* Calculate the matching tick */ + for (i = 0; i < SPEEDTICKS; i++) + { + if (pGlobalData->mouseKeys.iMaxSpeed <= nSpeedArray[i]) + break; + } + + /* Set the thumb */ + SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_SETPOS, TRUE, i); + + /* Set the number of ticks for the accelleration trackbar */ + SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_ACCEL_TRACK, TBM_SETRANGE, + TRUE, MAKELONG(0, ACCELTICKS - 1)); + + /* Calculate the matching tick */ + i = (ACCELTICKS + 1) - pGlobalData->mouseKeys.iTimeToMaxSpeed / 500; + if (i > ACCELTICKS - 1) + i = ACCELTICKS - 1; + + if (i < 0) + i = 0; + + /* Set the thumb */ + SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_ACCEL_TRACK, TBM_SETPOS, TRUE, i); + + CheckDlgButton(hwndDlg, + IDC_MOUSEKEYS_SPEED_CHECK, + pGlobalData->mouseKeys.dwFlags & MKF_MODIFIERS ? BST_CHECKED : BST_UNCHECKED); + + CheckRadioButton(hwndDlg, + IDC_MOUSEKEYS_ON_RADIO, + IDC_MOUSEKEYS_OFF_RADIO, + pGlobalData->mouseKeys.dwFlags & MKF_REPLACENUMBERS ? IDC_MOUSEKEYS_ON_RADIO : IDC_MOUSEKEYS_OFF_RADIO); + + CheckDlgButton(hwndDlg, + IDC_MOUSEKEYS_STATUS_CHECK, + pGlobalData->mouseKeys.dwFlags & MKF_INDICATOR ? BST_CHECKED : BST_UNCHECKED); + break; + + case WM_HSCROLL: + switch (GetWindowLong((HWND) lParam, GWL_ID)) + { + case IDC_MOUSEKEYS_SPEED_TRACK: + i = SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_GETPOS, 0, 0); + if (i >= 0 && i < SPEEDTICKS) + pGlobalData->mouseKeys.iMaxSpeed = nSpeedArray[i]; + break; + + case IDC_MOUSEKEYS_ACCEL_TRACK: + i = SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_ACCEL_TRACK, TBM_GETPOS, 0, 0); + if (i >= 0 && i < ACCELTICKS) + pGlobalData->mouseKeys.iTimeToMaxSpeed = (ACCELTICKS + 1 - i) * 500; + break; + } break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_MOUSEKEYS_ACTIVATE_CHECK: + pGlobalData->mouseKeys.dwFlags ^= MKF_HOTKEYACTIVE; + break; + + case IDC_MOUSEKEYS_SPEED_CHECK: + pGlobalData->mouseKeys.dwFlags ^= MKF_MODIFIERS; + break; + + case IDC_MOUSEKEYS_ON_RADIO: + pGlobalData->mouseKeys.dwFlags |= MKF_REPLACENUMBERS; + break; + + case IDC_MOUSEKEYS_OFF_RADIO: + pGlobalData->mouseKeys.dwFlags &= ~MKF_REPLACENUMBERS; + break; + + case IDC_MOUSEKEYS_STATUS_CHECK: + pGlobalData->mouseKeys.dwFlags ^= MKF_INDICATOR; + break; + case IDOK: EndDialog(hwndDlg, TRUE); break; Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sun Aug 19 20:11:04 2007 @@ -78,8 +78,8 @@ #define IDC_MOUSEKEYS_SPEED_TRACK 266 #define IDC_MOUSEKEYS_ACCEL_TRACK 267 #define IDC_MOUSEKEYS_SPEED_CHECK 268 -#define IDC_MOUSEKEYS_OFF_RADIO 269 -#define IDC_MOUSEKEYS_ON_RADIO 270 +#define IDC_MOUSEKEYS_ON_RADIO 269 +#define IDC_MOUSEKEYS_OFF_RADIO 270 #define IDC_MOUSEKEYS_STATUS_CHECK 271 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Sun Aug 19 20:11:04 2007 @@ -1,12 +1,13 @@ /* $Id$ * - * PROJECT: ReactOS System Control Panel + * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/sound.c * PURPOSE: Sound-related acessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * Copyright 2007 Eric Kohl */ + #include <windows.h> #include <commctrl.h> #include <prsht.h>

17 years, 4 months

[cfinck] 28423: - Always include "wine/unicode.h" before all other headers, when we need the wchar_t type. unicode.h includes windef.h, which includes winnt.h, which has the handling for the wchar_t type. As it's the first included header, no other wchar_t type will be defined before. - Remove the wchar_t definition from the Makefile as the winnt.h header will define it as "unsigned short" automatically.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 19 19:38:21 2007 New Revision: 28423 URL: http://svn.reactos.org/svn/reactos?rev=28423&view=rev Log: - Always include "wine/unicode.h" before all other headers, when we need the wchar_t type. unicode.h includes windef.h, which includes winnt.h, which has the handling for the wchar_t type. As it's the first included header, no other wchar_t type will be defined before. - Remove the wchar_t definition from the Makefile as the winnt.h header will define it as "unsigned short" automatically. Modified: trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… ============================================================================== --- trunk/reactos/tools/unicode/cptable.c (original) +++ trunk/reactos/tools/unicode/cptable.c Sun Aug 19 19:38:21 2007 @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> +#include "wine/unicode.h" #include <stdlib.h> - -#include "wine/unicode.h" /* Everything below this line is generated automatically by cpmap.pl */ /* ### cpmap begin ### */ Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/mbtowc.c (original) +++ trunk/reactos/tools/unicode/mbtowc.c Sun Aug 19 19:38:21 2007 @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" #include <string.h> - -#include "wine/unicode.h" /* get the decomposition of a Unicode char */ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c (original) +++ trunk/reactos/tools/unicode/string.c Sun Aug 19 19:38:21 2007 @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" #include <limits.h> #include <stdio.h> - -#include "wine/unicode.h" extern const WCHAR wine_casemap_lower[]; extern const WCHAR wine_casemap_upper[]; Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Sun Aug 19 19:38:21 2007 @@ -96,7 +96,6 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk \ $(TOOLS_CFLAGS) Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=2… ============================================================================== --- trunk/reactos/tools/unicode/utf8.c (original) +++ trunk/reactos/tools/unicode/utf8.c Sun Aug 19 19:38:21 2007 @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" #include <string.h> - -#include "wine/unicode.h" /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */ static const char utf8_length[128] = Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/wctomb.c (original) +++ trunk/reactos/tools/unicode/wctomb.c Sun Aug 19 19:38:21 2007 @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" #include <string.h> - -#include "wine/unicode.h" /* search for a character in the unicode_compose_table; helper for compose() */ static inline int binary_search( WCHAR ch, int low, int high )

17 years, 4 months

[cfinck] 28422: Change the wchar_t logic once more to make it a bit simplier. A host can only have one special wchar_t definition, so we don't need to define all. Also _WCHAR_T_DEFINED is the only definition used for overriding the wchar_t setting by applications. So use the previous logic to check and define the wchar_t definitions for the host and at the end check for _WCHAR_T_DEFINED. In all cases, define _WCHAR_T_DEFINED. Additionally, __need_wchar_t has to be undefined after including "ctyp

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Aug 19 18:04:20 2007 New Revision: 28422 URL: http://svn.reactos.org/svn/reactos?rev=28422&view=rev Log: Change the wchar_t logic once more to make it a bit simplier. A host can only have one special wchar_t definition, so we don't need to define all. Also _WCHAR_T_DEFINED is the only definition used for overriding the wchar_t setting by applications. So use the previous logic to check and define the wchar_t definitions for the host and at the end check for _WCHAR_T_DEFINED. In all cases, define _WCHAR_T_DEFINED. Additionally, __need_wchar_t has to be undefined after including "ctype.h" as "ctype.h" defines it. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 19 18:04:20 2007 @@ -52,11 +52,13 @@ /* wchar_t checks * First check if wchar_t has already been defined by any host/OS */ -#ifndef _WCHAR_T_DEFINED #ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ +#define _WCHAR_T_DECLARED #ifndef _WCHAR_T /* for Mac OS X */ +#define _WCHAR_T #ifndef _WCHAR_T_ -#undef __need_wchar_t +#define _WCHAR_T_ +#ifndef _WCHAR_T_DEFINED /* If you want to override the wchar_t setting, define this */ #ifndef __cplusplus typedef unsigned short wchar_t; #endif @@ -65,25 +67,14 @@ #endif #endif -/* Now report that it has been defined to all known hosts/operating systems */ +/* Set _WCHAR_T_DEFINED for the case that this is checked later */ #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #endif -#ifndef _WCHAR_T_DECLARED -#define _WCHAR_T_DECLARED -#endif - -#ifndef _WCHAR_T -#define _WCHAR_T -#endif - -#ifndef _WCHAR_T_ -#define _WCHAR_T_ -#endif - - #include <ctype.h> +#undef __need_wchar_t + #include <winerror.h> #include <stddef.h> #include <sdkddkver.h>

17 years, 4 months

[spetreolle] 28421: update ncpa french translation

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Aug 19 16:49:29 2007 New Revision: 28421 URL: http://svn.reactos.org/svn/reactos?rev=28421&view=rev Log: update ncpa french translation Modified: trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/fr-FR.rc Sun Aug 19 16:49:29 2007 @@ -107,8 +107,8 @@ STRINGTABLE BEGIN - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" + IDS_ASSIGNED_DHCP "Assignée par DHCP" + IDS_ASSIGNED_MANUAL "Configurée manuellement" END STRINGTABLE

17 years, 4 months

[ekohl] 28420: Add resources for the mouse keys settings dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 19 14:52:59 2007 New Revision: 28420 URL: http://svn.reactos.org/svn/reactos?rev=28420&view=rev Log: Add resources for the mouse keys settings dialog. Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sun Aug 19 14:52:59 2007 @@ -164,7 +164,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sun Aug 19 14:52:59 2007 @@ -164,10 +164,32 @@ IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Maustasten Einstellungen" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) +CAPTION "Tastaturmaus Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sun Aug 19 14:52:59 2007 @@ -164,7 +164,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sun Aug 19 14:52:59 2007 @@ -167,7 +167,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sun Aug 19 14:52:59 2007 @@ -165,7 +165,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sun Aug 19 14:52:59 2007 @@ -165,7 +165,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sun Aug 19 14:52:59 2007 @@ -166,7 +166,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Aug 19 14:52:59 2007 @@ -164,7 +164,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sun Aug 19 14:52:59 2007 @@ -164,7 +164,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sun Aug 19 14:52:59 2007 @@ -166,7 +166,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sun Aug 19 14:52:59 2007 @@ -167,7 +167,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sun Aug 19 14:52:59 2007 @@ -164,7 +164,29 @@ CAPTION "Mouse Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sun Aug 19 14:52:59 2007 @@ -74,6 +74,14 @@ #define IDC_CONTRAST_ACTIVATE_CHECK 260 #define IDC_CONTRAST_COMBO 261 +#define IDC_MOUSEKEYS_ACTIVATE_CHECK 265 +#define IDC_MOUSEKEYS_SPEED_TRACK 266 +#define IDC_MOUSEKEYS_ACCEL_TRACK 267 +#define IDC_MOUSEKEYS_SPEED_CHECK 268 +#define IDC_MOUSEKEYS_OFF_RADIO 269 +#define IDC_MOUSEKEYS_ON_RADIO 270 +#define IDC_MOUSEKEYS_STATUS_CHECK 271 + #endif /* __CPL_RESOURCE_H */ /* EOF */

17 years, 4 months

[arty] 28419: Add async name functions, imported from wine. Modified for ReactOS, original copyright assigment: * Copyright (C) 1993, 1994, 1996, 1997 John Brezak, Erik Bos, Alex Korobka. * Copyright (C) 1999 Marcus Meissner async.c was original licensed under the GNU Lesser General Public License v2.1

by arty＠svn.reactos.org

Author: arty Date: Sun Aug 19 14:39:26 2007 New Revision: 28419 URL: http://svn.reactos.org/svn/reactos?rev=28419&view=rev Log: Add async name functions, imported from wine. Modified for ReactOS, original copyright assigment: * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka. * Copyright (C) 1999 Marcus Meissner async.c was original licensed under the GNU Lesser General Public License v2.1 Added: trunk/reactos/dll/win32/ws2_32/misc/async.c trunk/reactos/include/reactos/wine/winsock16.h Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Added: trunk/reactos/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/asyn… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/async.c (added) +++ trunk/reactos/dll/win32/ws2_32/misc/async.c Sun Aug 19 14:39:26 2007 @@ -1,0 +1,706 @@ +/* Async WINSOCK DNS services + * + * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka. + * Copyright (C) 1999 Marcus Meissner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * NOTE: If you make any changes to fix a particular app, make sure + * they don't break something else like Netscape or telnet and ftp + * clients and servers (www.winsite.com got a lot of those). + * + * FIXME: + * - Add WSACancel* and correct handle management. (works rather well for + * now without it.) + * - Verify & Check all calls for correctness + * (currently only WSAGetHostByName*, WSAGetServByPort* calls) + * - Check error returns. + * - mirc/mirc32 Finger @linux.kernel.org sometimes fails in threaded mode. + * (not sure why) + * - This implementation did ignore the "NOTE:" section above (since the + * whole stuff did not work anyway to other changes). + */ + +#include <windows.h> +#include <winsock.h> + +#define WS_FD_SETSIZE FD_SETSIZE +#define HAVE_GETPROTOBYNAME +#define HAVE_GETPROTOBYNUMBER +#define HAVE_GETSERVBYPORT +typedef struct hostent WS_hostent; +typedef struct servent WS_servent; +typedef struct protoent WS_protoent; + +#include "wine/config.h" +#include "wine/port.h" + +#ifndef __REACTOS__ +#include <stdarg.h> +#include <string.h> +#include <sys/types.h> +#ifdef HAVE_SYS_IPC_H +# include <sys/ipc.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#ifdef HAVE_SYS_FILIO_H +# include <sys/filio.h> +#endif +#if defined(__svr4__) +#include <sys/ioccom.h> +#ifdef HAVE_SYS_SOCKIO_H +# include <sys/sockio.h> +#endif +#endif + +#if defined(__EMX__) +# include <sys/so_ioctl.h> +#endif + +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif + +#ifdef HAVE_SYS_MSG_H +# include <sys/msg.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif +#include <ctype.h> +#include <fcntl.h> +#include <errno.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <stdlib.h> +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +# include <resolv.h> +#endif +#endif + +#define CALLBACK __stdcall + +#include "wine/winbase16.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winsock2.h" +#include "ws2spi.h" +#include "wownt32.h" +#include "wine/winsock16.h" +#include "winnt.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winsock); + + +/* protoptypes of some functions in socket.c + */ + +#define AQ_WIN16 0x00 +#define AQ_WIN32 0x04 +#define HB_WIN32(hb) (hb->flags & AQ_WIN32) +#define AQ_NUMBER 0x00 +#define AQ_NAME 0x08 +#define AQ_COPYPTR1 0x10 +#define AQ_DUPLOWPTR1 0x20 +#define AQ_MASKPTR1 0x30 +#define AQ_COPYPTR2 0x40 +#define AQ_DUPLOWPTR2 0x80 +#define AQ_MASKPTR2 0xC0 + +#define AQ_GETHOST 0 +#define AQ_GETPROTO 1 +#define AQ_GETSERV 2 +#define AQ_GETMASK 3 + +/* The handles used are pseudo-handles that can be simply casted. */ +/* 16-bit values are used internally (to be sure handle comparison works right in 16-bit apps). */ +#define WSA_H32(h16) ((HANDLE)(ULONG_PTR)(h16)) + +/* ----------------------------------- helper functions - */ + +static int list_size(char** l, int item_size) +{ + int i,j = 0; + if(l) + { for(i=0;l[i];i++) + j += (item_size) ? item_size : strlen(l[i]) + 1; + j += (i + 1) * sizeof(char*); } + return j; +} + +static int list_dup(char** l_src, char* ref, char* base, int item_size) +{ + /* base is either either equal to ref or 0 or SEGPTR */ + + char* p = ref; + char** l_to = (char**)ref; + int i,j,k; + + for(j=0;l_src[j];j++) ; + p += (j + 1) * sizeof(char*); + for(i=0;i<j;i++) + { l_to[i] = base + (p - ref); + k = ( item_size ) ? item_size : strlen(l_src[i]) + 1; + memcpy(p, l_src[i], k); p += k; } + l_to[i] = NULL; + return (p - ref); +} + +/* ----- hostent */ + +static int hostent_size(struct hostent* p_he) +{ + int size = 0; + if( p_he ) + { size = sizeof(struct hostent); + size += strlen(p_he->h_name) + 1; + size += list_size(p_he->h_aliases, 0); + size += list_size(p_he->h_addr_list, p_he->h_length ); } + return size; +} + +/* Copy hostent to p_to, fix up inside pointers using p_base (different for + * Win16 (linear vs. segmented). Return -neededsize on overrun. + */ +static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, int flag) +{ + char* p_name,*p_aliases,*p_addr,*p; + struct ws_hostent16 *p_to16 = (struct ws_hostent16*)p_to; + WS_hostent *p_to32 = (WS_hostent*)p_to; + int size = hostent_size(p_he) + + ( + (flag & AQ_WIN16) ? sizeof(struct ws_hostent16) : sizeof(WS_hostent) + - sizeof(struct hostent) + ); + + if (t_size < size) + return -size; + p = p_to; + p += (flag & AQ_WIN16) ? + sizeof(struct ws_hostent16) : sizeof(WS_hostent); + p_name = p; + strcpy(p, p_he->h_name); p += strlen(p) + 1; + p_aliases = p; + p += list_dup(p_he->h_aliases, p, p_base + (p - (char*)p_to), 0); + p_addr = p; + list_dup(p_he->h_addr_list, p, p_base + (p - (char*)p_to), p_he->h_length); + + if (flag & AQ_WIN16) + { + p_to16->h_addrtype = (INT16)p_he->h_addrtype; + p_to16->h_length = (INT16)p_he->h_length; + p_to16->h_name = (SEGPTR)(p_base + (p_name - p_to)); + p_to16->h_aliases = (SEGPTR)(p_base + (p_aliases - p_to)); + p_to16->h_addr_list = (SEGPTR)(p_base + (p_addr - p_to)); + } + else + { + p_to32->h_addrtype = p_he->h_addrtype; + p_to32->h_length = p_he->h_length; + p_to32->h_name = (p_base + (p_name - p_to)); + p_to32->h_aliases = (char **)(p_base + (p_aliases - p_to)); + p_to32->h_addr_list = (char **)(p_base + (p_addr - p_to)); + } + + return size; +} + +/* ----- protoent */ + +static int protoent_size(struct protoent* p_pe) +{ + int size = 0; + if( p_pe ) + { size = sizeof(struct protoent); + size += strlen(p_pe->p_name) + 1; + size += list_size(p_pe->p_aliases, 0); } + return size; +} + +/* Copy protoent to p_to, fix up inside pointers using p_base (different for + * Win16 (linear vs. segmented). Return -neededsize on overrun. + */ +static int WS_copy_pe(char *p_to,char *p_base,int t_size,struct protoent* p_pe, int flag) +{ + char* p_name,*p_aliases,*p; + struct ws_protoent16 *p_to16 = (struct ws_protoent16*)p_to; + WS_protoent *p_to32 = (WS_protoent*)p_to; + int size = protoent_size(p_pe) + + ( + (flag & AQ_WIN16) ? sizeof(struct ws_protoent16) : sizeof(WS_protoent) + - sizeof(struct protoent) + ); + + if (t_size < size) + return -size; + p = p_to; + p += (flag & AQ_WIN16) ? + sizeof(struct ws_protoent16) : sizeof(WS_protoent); + p_name = p; + strcpy(p, p_pe->p_name); p += strlen(p) + 1; + p_aliases = p; + list_dup(p_pe->p_aliases, p, p_base + (p - (char*)p_to), 0); + + if (flag & AQ_WIN16) + { + p_to16->p_proto = (INT16)p_pe->p_proto; + p_to16->p_name = (SEGPTR)(p_base) + (p_name - p_to); + p_to16->p_aliases = (SEGPTR)((p_base) + (p_aliases - p_to)); + } + else + { + p_to32->p_proto = p_pe->p_proto; + p_to32->p_name = (p_base) + (p_name - p_to); + p_to32->p_aliases = (char **)((p_base) + (p_aliases - p_to)); + } + + return size; +} + +/* ----- servent */ + +static int servent_size(struct servent* p_se) +{ + int size = 0; + if( p_se ) { + size += sizeof(struct servent); + size += strlen(p_se->s_proto) + strlen(p_se->s_name) + 2; + size += list_size(p_se->s_aliases, 0); + } + return size; +} + +/* Copy servent to p_to, fix up inside pointers using p_base (different for + * Win16 (linear vs. segmented). Return -neededsize on overrun. + * Take care of different Win16/Win32 servent structs (packing !) + */ +static int WS_copy_se(char *p_to,char *p_base,int t_size,struct servent* p_se, int flag) +{ + char* p_name,*p_aliases,*p_proto,*p; + struct ws_servent16 *p_to16 = (struct ws_servent16*)p_to; + WS_servent *p_to32 = (WS_servent*)p_to; + int size = servent_size(p_se) + + ( + (flag & AQ_WIN16) ? sizeof(struct ws_servent16) : sizeof(WS_servent) + - sizeof(struct servent) + ); + + if (t_size < size) + return -size; + p = p_to; + p += (flag & AQ_WIN16) ? + sizeof(struct ws_servent16) : sizeof(WS_servent); + p_name = p; + strcpy(p, p_se->s_name); p += strlen(p) + 1; + p_proto = p; + strcpy(p, p_se->s_proto); p += strlen(p) + 1; + p_aliases = p; + list_dup(p_se->s_aliases, p, p_base + (p - p_to), 0); + + if (flag & AQ_WIN16) + { + p_to16->s_port = (INT16)p_se->s_port; + p_to16->s_name = (SEGPTR)(p_base + (p_name - p_to)); + p_to16->s_proto = (SEGPTR)(p_base + (p_proto - p_to)); + p_to16->s_aliases = (SEGPTR)(p_base + (p_aliases - p_to)); + } + else + { + p_to32->s_port = p_se->s_port; + p_to32->s_name = (p_base + (p_name - p_to)); + p_to32->s_proto = (p_base + (p_proto - p_to)); + p_to32->s_aliases = (char **)(p_base + (p_aliases - p_to)); + } + + return size; +} + +static HANDLE16 __ws_async_handle = 0xdead; + +/* Generic async query struct. we use symbolic names for the different queries + * for readability. + */ +typedef struct _async_query { + HWND16 hWnd; + UINT16 uMsg; + LPCSTR ptr1; +#define host_name ptr1 +#define host_addr ptr1 +#define serv_name ptr1 +#define proto_name ptr1 + LPCSTR ptr2; +#define serv_proto ptr2 + int int1; +#define host_len int1 +#define proto_number int1 +#define serv_port int1 + int int2; +#define host_type int2 + SEGPTR sbuf; + INT16 sbuflen; + + HANDLE16 async_handle; + int flags; + int qt; + char xbuf[1]; +} async_query; + + +/**************************************************************************** + * The async query function. + * + * It is either called as a thread startup routine or directly. It has + * to free the passed arg from the process heap and PostMessageA the async + * result or the error code. + * + * FIXME: + * - errorhandling not verified. + */ +static DWORD WINAPI _async_queryfun(LPVOID arg) { + async_query *aq = (async_query*)arg; + int size = 0; + WORD fail = 0; + char *targetptr = (HB_WIN32(aq)?(char*)aq->sbuf:0/*(char*)MapSL(aq->sbuf)*/); + + switch (aq->flags & AQ_GETMASK) { + case AQ_GETHOST: { + struct hostent *he; + char *copy_hostent = targetptr; + char buf[100]; + if( !(aq->host_name)) { + aq->host_name = buf; + if( gethostname( buf, 100) == -1) { + fail = WSAENOBUFS; /* appropriate ? */ + break; + } + } + he = (aq->flags & AQ_NAME) ? + gethostbyname(aq->host_name): + gethostbyaddr(aq->host_addr,aq->host_len,aq->host_type); + if (!he) fail = WSAGetLastError(); + if (he) { + size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (size < 0) { + fail = WSAENOBUFS; + size = -size; + } + } + } + break; + case AQ_GETPROTO: { +#if defined(HAVE_GETPROTOBYNAME) && defined(HAVE_GETPROTOBYNUMBER) + struct protoent *pe; + char *copy_protoent = targetptr; + pe = (aq->flags & AQ_NAME)? + getprotobyname(aq->proto_name) : + getprotobynumber(aq->proto_number); + if (pe) { + size = WS_copy_pe(copy_protoent,(char*)aq->sbuf,aq->sbuflen,pe,aq->flags); + if (size < 0) { + fail = WSAENOBUFS; + size = -size; + } + } else { + if (aq->flags & AQ_NAME) + MESSAGE("protocol %s not found; You might want to add " + "this to /etc/protocols\n", debugstr_a(aq->proto_name) ); + else + MESSAGE("protocol number %d not found; You might want to add " + "this to /etc/protocols\n", aq->proto_number ); + fail = WSANO_DATA; + } +#else + fail = WSANO_DATA; +#endif + } + break; + case AQ_GETSERV: { + struct servent *se; + char *copy_servent = targetptr; + se = (aq->flags & AQ_NAME)? + getservbyname(aq->serv_name,aq->serv_proto) : +#ifdef HAVE_GETSERVBYPORT + getservbyport(aq->serv_port,aq->serv_proto); +#else + NULL; +#endif + if (se) { + size = WS_copy_se(copy_servent,(char*)aq->sbuf,aq->sbuflen,se,aq->flags); + if (size < 0) { + fail = WSAENOBUFS; + size = -size; + } + } else { + if (aq->flags & AQ_NAME) + MESSAGE("service %s protocol %s not found; You might want to add " + "this to /etc/services\n", debugstr_a(aq->serv_name) , + aq->serv_proto ? debugstr_a(aq->serv_proto ):"*"); + else + MESSAGE("service on port %d protocol %s not found; You might want to add " + "this to /etc/services\n", aq->serv_port, + aq->serv_proto ? debugstr_a(aq->serv_proto ):"*"); + fail = WSANO_DATA; + } + } + break; + } + PostMessageA(HWND_32(aq->hWnd),aq->uMsg,(WPARAM) aq->async_handle,size|(fail<<16)); + HeapFree(GetProcessHeap(),0,arg); + return 0; +} + +/**************************************************************************** + * The main async help function. + * + * It either starts a thread or just calls the function directly for platforms + * with no thread support. This relies on the fact that PostMessage() does + * not actually call the windowproc before the function returns. + */ +static HANDLE16 __WSAsyncDBQuery( + HWND hWnd, UINT uMsg,INT int1,LPCSTR ptr1, INT int2, LPCSTR ptr2, + void *sbuf, INT sbuflen, UINT flags +) +{ + async_query* aq; + char* pto; + LPCSTR pfm; + int xbuflen = 0; + + /* allocate buffer to copy protocol- and service name to */ + /* note: this is done in the calling thread so we can return */ + /* a decent error code if the Alloc fails */ + + switch (flags & AQ_MASKPTR1) { + case 0: break; + case AQ_COPYPTR1: xbuflen += int1; break; + case AQ_DUPLOWPTR1: xbuflen += strlen(ptr1) + 1; break; + } + + switch (flags & AQ_MASKPTR2) { + case 0: break; + case AQ_COPYPTR2: xbuflen += int2; break; + case AQ_DUPLOWPTR2: xbuflen += strlen(ptr2) + 1; break; + } + + if(!(aq = HeapAlloc(GetProcessHeap(),0,sizeof(async_query) + xbuflen))) { + SetLastError(WSAEWOULDBLOCK); /* insufficient resources */ + return 0; + } + + pto = aq->xbuf; + if (ptr1) switch (flags & AQ_MASKPTR1) { + case 0: break; + case AQ_COPYPTR1: memcpy(pto, ptr1, int1); ptr1 = pto; pto += int1; break; + case AQ_DUPLOWPTR1: pfm = ptr1; ptr1 = pto; do *pto++ = tolower(*pfm); while (*pfm++); break; + } + if (ptr2) switch (flags & AQ_MASKPTR2) { + case 0: break; + case AQ_COPYPTR2: memcpy(pto, ptr2, int2); ptr2 = pto; pto += int2; break; + case AQ_DUPLOWPTR2: pfm = ptr2; ptr2 = pto; do *pto++ = tolower(*pfm); while (*pfm++); break; + } + + aq->hWnd = HWND_16(hWnd); + aq->uMsg = uMsg; + aq->int1 = int1; + aq->ptr1 = ptr1; + aq->int2 = int2; + aq->ptr2 = ptr2; + /* avoid async_handle = 0 */ + aq->async_handle = (++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); + aq->flags = flags; + aq->sbuf = (SEGPTR)sbuf; + aq->sbuflen = sbuflen; + +#if 1 + if (CreateThread(NULL,0,_async_queryfun,aq,0,NULL) == INVALID_HANDLE_VALUE) +#endif + _async_queryfun(aq); + return __ws_async_handle; +} + + +/*********************************************************************** + * WSAAsyncGetHostByAddr (WINSOCK.102) + */ +HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr, + INT16 len, INT16 type, SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", + hWnd, uMsg, (unsigned)addr , len ); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,len,addr,type,NULL, + (void*)sbuf,buflen, + AQ_NUMBER|AQ_COPYPTR1|AQ_WIN16|AQ_GETHOST); +} + +/*********************************************************************** + * WSAAsyncGetHostByAddr (WS2_32.102) + */ +HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, + INT len, INT type, LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %04x, addr %08x[%i]\n", + hWnd, uMsg, (unsigned)addr , len ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen, + AQ_NUMBER|AQ_COPYPTR1|AQ_WIN32|AQ_GETHOST)); +} + +/*********************************************************************** + * WSAAsyncGetHostByName (WINSOCK.103) + */ +HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, + SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %04x, host %s, buffer %i\n", + hWnd, uMsg, (name)?name:"<null>", (int)buflen ); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,0,name,0,NULL, + (void*)sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN16|AQ_GETHOST); +} + +/*********************************************************************** + * WSAAsyncGetHostByName (WS2_32.103) + */ +HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, + LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %08x, host %s, buffer %i\n", + hWnd, uMsg, (name)?name:"<null>", (int)buflen ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST)); +} + +/*********************************************************************** + * WSAAsyncGetProtoByName (WINSOCK.105) + */ +HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, + SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %08x, protocol %s\n", + hWnd, uMsg, (name)?name:"<null>" ); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,0,name,0,NULL, + (void*)sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN16|AQ_GETPROTO); +} + +/*********************************************************************** + * WSAAsyncGetProtoByName (WS2_32.105) + */ +HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, + LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %08x, protocol %s\n", + hWnd, uMsg, (name)?name:"<null>" ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, + AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETPROTO)); +} + + +/*********************************************************************** + * WSAAsyncGetProtoByNumber (WINSOCK.104) + */ +HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number, + SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,number,NULL,0,NULL, + (void*)sbuf,buflen, + AQ_GETPROTO|AQ_NUMBER|AQ_WIN16); +} + +/*********************************************************************** + * WSAAsyncGetProtoByNumber (WS2_32.104) + */ +HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, + LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %04x, num %i\n", hWnd, uMsg, number ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen, + AQ_GETPROTO|AQ_NUMBER|AQ_WIN32)); +} + +/*********************************************************************** + * WSAAsyncGetServByName (WINSOCK.107) + */ +HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, + LPCSTR proto, SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", + hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>"); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,0,name,0,proto, + (void*)sbuf,buflen, + AQ_GETSERV|AQ_NAME|AQ_DUPLOWPTR1|AQ_DUPLOWPTR2|AQ_WIN16); +} + +/*********************************************************************** + * WSAAsyncGetServByName (WS2_32.107) + */ +HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, + LPCSTR proto, LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %04x, name %s, proto %s\n", + hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>"); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen, + AQ_GETSERV|AQ_NAME|AQ_DUPLOWPTR1|AQ_DUPLOWPTR2|AQ_WIN32)); +} + +/*********************************************************************** + * WSAAsyncGetServByPort (WINSOCK.106) + */ +HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port, + LPCSTR proto, SEGPTR sbuf, INT16 buflen) +{ + TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", + hWnd, uMsg, port, (proto)?proto:"<null>" ); + return __WSAsyncDBQuery(HWND_32(hWnd),uMsg,port,NULL,0,proto, + (void*)sbuf,buflen, + AQ_GETSERV|AQ_NUMBER|AQ_DUPLOWPTR2|AQ_WIN16); +} + +/*********************************************************************** + * WSAAsyncGetServByPort (WS2_32.106) + */ +HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, + LPCSTR proto, LPSTR sbuf, INT buflen) +{ + TRACE("hwnd %p, msg %04x, port %i, proto %s\n", + hWnd, uMsg, port, (proto)?proto:"<null>" ); + return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen, + AQ_GETSERV|AQ_NUMBER|AQ_DUPLOWPTR2|AQ_WIN32)); +} Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c Sun Aug 19 14:39:26 2007 @@ -1324,109 +1324,5 @@ } -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetHostByAddr(IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* addr, - IN INT len, - IN INT type, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetHostByName(IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetProtoByName(IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetProtoByNumber(IN HWND hWnd, - IN UINT wMsg, - IN INT number, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetServByName(IN HWND hWnd, - IN UINT wMsg, - IN CONST CHAR FAR* name, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - - -/* - * @unimplemented - */ -HANDLE -EXPORT -WSAAsyncGetServByPort(IN HWND hWnd, - IN UINT wMsg, - IN INT port, - IN CONST CHAR FAR* proto, - OUT CHAR FAR* buf, - IN INT buflen) -{ - UNIMPLEMENTED - - return (HANDLE)0; -} - /* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Sun Aug 19 14:39:26 2007 @@ -1,10 +1,13 @@ <module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll"> <importlibrary definition="ws2_32.def" /> <include base="ws2_32">include</include> + <include base="ReactOS">include/reactos</include> + <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="LE" /> <define name="__USE_W32API" /> + <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0500</define> <library>ntdll</library> <library>kernel32</library> @@ -24,6 +27,7 @@ <file>sndrcv.c</file> <file>stubs.c</file> <file>upcall.c</file> + <file>async.c</file> </directory> <file>ws2_32.rc</file> </module> Added: trunk/reactos/include/reactos/wine/winsock16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winso… ============================================================================== --- trunk/reactos/include/reactos/wine/winsock16.h (added) +++ trunk/reactos/include/reactos/wine/winsock16.h Sun Aug 19 14:39:26 2007 @@ -1,0 +1,110 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_WINSOCK16_H +#define __WINE_WINE_WINSOCK16_H + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <pshpack1.h> + +typedef UINT16 SOCKET16; + +typedef struct +{ + UINT16 fd_count; /* how many are SET? */ + SOCKET16 fd_array[WS_FD_SETSIZE]; /* an array of SOCKETs */ +} ws_fd_set16; + +/* ws_hostent16, ws_protoent16, ws_servent16, ws_netent16 + * are 1-byte aligned here ! */ +typedef struct ws_hostent16 +{ + SEGPTR h_name; /* official name of host */ + SEGPTR h_aliases; /* alias list */ + INT16 h_addrtype; /* host address type */ + INT16 h_length; /* length of address */ + SEGPTR h_addr_list; /* list of addresses from name server */ +} _ws_hostent16; + +typedef struct ws_protoent16 +{ + SEGPTR p_name; /* official protocol name */ + SEGPTR p_aliases; /* alias list */ + INT16 p_proto; /* protocol # */ +} _ws_protoent16; + +typedef struct ws_servent16 +{ + SEGPTR s_name; /* official service name */ + SEGPTR s_aliases; /* alias list */ + INT16 s_port; /* port # */ + SEGPTR s_proto; /* protocol to use */ +} _ws_servent16; + +typedef struct ws_netent16 +{ + SEGPTR n_name; /* official name of net */ + SEGPTR n_aliases; /* alias list */ + INT16 n_addrtype; /* net address type */ + INT n_net; /* network # */ +} _ws_netent16; + +typedef struct WSAData16 +{ + WORD wVersion; + WORD wHighVersion; + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; + WORD iMaxSockets; + WORD iMaxUdpDg; + SEGPTR lpVendorInfo; +} WSADATA16, *LPWSADATA16; + +#include <poppack.h> + +#define WS_FD_CLR16(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set16) +#define WS_FD_SET16(fd, set) __WS_FD_SET1((fd),(set), ws_fd_set16) +#define WS_FD_ZERO16(set) (((ws_fd_set16*)(set))->fd_count=0) +#define WS_FD_ISSET16(fd, set) __WSAFDIsSet16((SOCKET16)(fd), (ws_fd_set16*)(set)) + +#define INVALID_SOCKET16 ((SOCKET16)(~0)) + +INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * ); +INT16 WINAPI WSAStartup16(UINT16 wVersionRequired, LPWSADATA16 lpWSAData); +void WINAPI WSASetLastError16(INT16 iError); +INT16 WINAPI WSAUnhookBlockingHook16(void); +FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc); +HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 wMsg, LPCSTR name, LPCSTR proto, + SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 wMsg, INT16 port, + LPCSTR proto, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 wMsg, + LPCSTR name, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd, UINT16 wMsg, + INT16 number, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 wMsg, + LPCSTR name, SEGPTR buf, INT16 buflen); +HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 wMsg, LPCSTR addr, + INT16 len, INT16 type, SEGPTR buf, INT16 buflen); +INT16 WINAPI WSACancelAsyncRequest16(HANDLE16 hAsyncTaskHandle); +INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent); +INT16 WINAPI WSARecvEx16(SOCKET16 s, char *buf, INT16 len, INT16 *flags); + +#endif /* __WINE_WINE_WINSOCK16_H */

17 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007