Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[janderwald] 28788: - verify provided boot_cmd - create also hdd images for manual boot cmds
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Mon Sep 3 01:47:07 2007 New Revision: 28788 URL: http://svn.reactos.org/svn/reactos?rev=28788&view=rev Log: - verify provided boot_cmd - create also hdd images for manual boot cmds Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 01:47:07 2007 @@ -135,7 +135,7 @@ } //--------------------------------------------------------------------------------------- - bool RosBootTest::createDefaultHDDImage() + bool RosBootTest::createHDDImage(string image) { string qemuimgdir; @@ -168,9 +168,8 @@ }; - getDefaultHDDImage(output); options[0] = (TCHAR*)qemuimgdir.c_str(); - options[2] = (TCHAR*)output.c_str(); + options[2] = (TCHAR*)image.c_str(); cerr << "Creating HDD Image ..." << output << endl; if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) @@ -271,7 +270,7 @@ * on windows we can get pid as return of CreateProcess */ m_PidFile = _T("output-i386"); - EnvironmentVariable::getValue(_T("ROS_OUTPUT"), pid); + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), m_PidFile); m_PidFile += _T("/pid.txt"); m_BootCmd += _T(" -pidfile "); m_BootCmd += m_PidFile; @@ -334,33 +333,61 @@ if (m_HDDImage.length()) { /* check if ROS_HDD_IMAGE points to hdd image */ - return isFileExisting(m_HDDImage); - } - - if (isDefaultHDDImageExisting()) - { - /* ROS_HDD_IMAGE is not set but theres - * a default existing image - * to use */ + if (!isFileExisting(m_HDDImage)) + { + /* create it */ + return createHDDImage(m_HDDImage); + } + return true; + } + else if (!m_BootCmd.length ()) + { + /* no hdd image provided + * but also no override by + * ROS_BOOT_CMD + */ getDefaultHDDImage(m_HDDImage); + return createHDDImage(m_HDDImage); + } + bool hdaboot = false; + string::size_type pos = m_BootCmd.find (_T("-boot c")); + if (pos != string::npos) + { + hdaboot = true; + } + + pos = m_BootCmd.find(_T("-hda ")); + if (pos != string::npos) + { + string hdd = m_BootCmd.substr(pos + 5, m_BootCmd.length() - pos - 5); + if (!hdd.length ()) + { + cerr << "Error: ROS_BOOT_CMD misses value of -hda option" << endl; + return false; + } + pos = m_BootCmd.find(" "); + if (pos != string::npos) + { + /// FIXME + /// sysreg assumes that the hdd image filename has no spaces + /// + hdd = hdd.substr(0, pos); + } + if (!isFileExisting(hdd)) + { + if (hdaboot) + { + cerr << "Error: ROS_BOOT_CMD specifies booting from hda but no valid hdd image " << hdd << " provided" << endl; + return false; + } + + /* the file does not exist create it */ + return createHDDImage(hdd); + } return true; } - if (!createDefaultHDDImage()) - { - /* failed to create hdd image */ - cerr << "Error: failed to create hdd image " << endl; - return false; - } - getDefaultHDDImage(m_HDDImage); - return true; - - /// - /// FIXME - /// scan m_BootCmd if theres -hda param provided - /// and check if it exists - - return true; + return false; } //---------------------------------------------------------------------------------------- bool RosBootTest::configureCDImage() Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 01:47:07 2007 @@ -86,7 +86,7 @@ void getDefaultHDDImage(string & img); bool isFileExisting(string filename); bool isDefaultHDDImageExisting(); - bool createDefaultHDDImage(); + bool createHDDImage(string filename); bool isQemuPathValid(); bool getQemuDir(string &); bool createBootCmd();

1 0

[janderwald] 28787: - hardcode the bios directory on linux system to /usr/share/qemu - store the pid.txt in ROS_OUTPUT - check on linux system if the emulator was successfully launched
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Mon Sep 3 01:11:12 2007 New Revision: 28787 URL: http://svn.reactos.org/svn/reactos?rev=28787&view=rev Log: - hardcode the bios directory on linux system to /usr/share/qemu - store the pid.txt in ROS_OUTPUT - check on linux system if the emulator was successfully launched Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 01:11:12 2007 @@ -230,6 +230,7 @@ bool RosBootTest::createBootCmd() { string pipe; + string qemudir; if (m_MaxMem.length() == 0) { @@ -240,15 +241,16 @@ #ifdef __LINUX__ pipe = _T("stdio"); m_Src = _T(""); + qemudir = _T("/usr/share/qemu"); #else pipe = _T("pipe:qemu"); m_Src = _T("\\\\.\\pipe\\qemu"); + if (!getQemuDir(qemudir)) + { + return false; + } #endif - string qemudir; - if (!getQemuDir(qemudir)) - { - return false; - } + m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -serial ") + pipe; @@ -268,7 +270,11 @@ * to terminate the emulator in case of errors * on windows we can get pid as return of CreateProcess */ - m_BootCmd += _T(" -pidfile pid.txt"); + m_PidFile = _T("output-i386"); + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), pid); + m_PidFile += _T("/pid.txt"); + m_BootCmd += _T(" -pidfile "); + m_BootCmd += m_PidFile; #endif m_BootCmd += _T(" -no-reboot "); @@ -478,11 +484,11 @@ return false; } } - cerr << "Opening Data Source:" << m_BootCmd << endl; #ifdef __LINUX__ + _tremove(m_PidFile.c_str ()); m_DataSource = new PipeReader(); m_Src = m_BootCmd; #else @@ -539,6 +545,7 @@ { m_DataSource->closeSource(); OsSupport::sleep(3 * CLOCKS_PER_SEC); + if (m_Pid) { OsSupport::terminateProcess (m_Pid); @@ -597,9 +604,25 @@ cleanup(); return false; } - -#ifndef __LINUX__ - OsSupport::sleep(3000); //FIXME + OsSupport::sleep(1000); +#ifdef __LINUX__ + + FILE * file = fopen(m_PidFile.c_str(), "r"); + if (!file) + { + cerr << "Error: failed to launch emulator" << endl; + cleanup(); + return false; + } + char buffer[128]; + if (!fread(buffer, sizeof(buffer), 1, file)) + { + cerr << "Error: pid file w/o pid!!! " << endl; + cleanup(); + return false; + } + m_Pid = atoi(buffer); + fclose(file); #endif bool ret = analyzeDebugData(); cleanup(); Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 01:11:12 2007 @@ -156,6 +156,7 @@ string m_MaxMem; string m_BootCmd; string m_Src; + string m_PidFile; DataSource * m_DataSource; OsSupport::ProcessID m_Pid;

1 0

[fireball] 28786: Dmitry Chapyshev <lentind@yandex.ru>: - Improve intl.cpl, include almost all code from intl_new branch (it's pending for deletion now) - ReactOS's intl.cpl now works and behaves similar to Windows XP's intl.cpl, only the last tab is unfinished - Tested in Windows and ReactOS (in ROS it obviously has reduced functionality, since some of needed registry entries are absent) - As a result, all other languages (other than en-us) need to be re-translated.
by fireball＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: fireball Date: Mon Sep 3 00:42:08 2007 New Revision: 28786 URL: http://svn.reactos.org/svn/reactos?rev=28786&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Improve intl.cpl, include almost all code from intl_new branch (it's pending for deletion now) - ReactOS's intl.cpl now works and behaves similar to Windows XP's intl.cpl, only the last tab is unfinished - Tested in Windows and ReactOS (in ROS it obviously has reduced functionality, since some of needed registry entries are absent) - As a result, all other languages (other than en-us) need to be re-translated. Added: trunk/reactos/dll/cpl/intl/advanced.c (with props) trunk/reactos/dll/cpl/intl/languages.c (with props) trunk/reactos/dll/cpl/intl/misc.c (with props) trunk/reactos/dll/cpl/intl/setupreg.c (with props) Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/resource.h trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Added: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… Added: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… Added: trunk/reactos/dll/cpl/intl/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/setupreg.c?re… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=28…

1 0

[hpoussin] 28785: Fix Linux build
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:46:23 2007 New Revision: 28785 URL: http://svn.reactos.org/svn/reactos?rev=28785&view=rev Log: Fix Linux build Modified: trunk/reactos/lib/inflib/inflib.mak Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Sun Sep 2 23:46:23 2007 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos + -Iinclude/reactos -Iinclude/psdk $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR)

1 0

[hpoussin] 28784: Remove local header debug.h, and use the global one
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:42:22 2007 New Revision: 28784 URL: http://svn.reactos.org/svn/reactos?rev=28784&view=rev Log: Remove local header debug.h, and use the global one Removed: trunk/reactos/dll/win32/kernel32/include/debug.h Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/file/backup.c trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/cnotify.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/delete.c trunk/reactos/dll/win32/kernel32/file/deviceio.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/file/hardlink.c trunk/reactos/dll/win32/kernel32/file/iocompl.c trunk/reactos/dll/win32/kernel32/file/lfile.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/file/tape.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/heap.c trunk/reactos/dll/win32/kernel32/mem/isbad.c trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/mem/procmem.c trunk/reactos/dll/win32/kernel32/mem/resnotify.c trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/atom.c trunk/reactos/dll/win32/kernel32/misc/chartype.c trunk/reactos/dll/win32/kernel32/misc/comm.c trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/dll/win32/kernel32/misc/error.c trunk/reactos/dll/win32/kernel32/misc/errormsg.c trunk/reactos/dll/win32/kernel32/misc/handle.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/perfcnt.c trunk/reactos/dll/win32/kernel32/misc/profile.c trunk/reactos/dll/win32/kernel32/misc/recovery.c trunk/reactos/dll/win32/kernel32/misc/res.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/dll/win32/kernel32/misc/timerqueue.c trunk/reactos/dll/win32/kernel32/misc/toolhelp.c trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/misc/version.c trunk/reactos/dll/win32/kernel32/process/cmdline.c trunk/reactos/dll/win32/kernel32/process/job.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/synch/condvar.c trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/event.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/synch/wait.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/fls.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> typedef struct _DBGSS_THREAD_DATA { Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; Modified: trunk/reactos/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ba… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/backup.c (original) +++ trunk/reactos/dll/win32/kernel32/file/backup.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c Sun Sep 2 23:42:22 2007 @@ -17,7 +17,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define SYMLINK_FLAG_RELATIVE 1 Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c Sun Sep 2 23:42:22 2007 @@ -19,7 +19,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBAL VARIABLES **********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/delete.c (original) +++ trunk/reactos/dll/win32/kernel32/file/delete.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c Sun Sep 2 23:42:22 2007 @@ -18,7 +18,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> UNICODE_STRING DllDirectory = {0, 0, NULL}; Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dosdev.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dosdev.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* TYPES ********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/hardlink.c (original) +++ trunk/reactos/dll/win32/kernel32/file/hardlink.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/iocompl.c (original) +++ trunk/reactos/dll/win32/kernel32/file/iocompl.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lfile.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lfile.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c Sun Sep 2 23:42:22 2007 @@ -16,7 +16,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c Sun Sep 2 23:42:22 2007 @@ -19,7 +19,7 @@ #include <malloc.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #define NDEBUG //#define USING_PROPER_NPFS_WAIT_SEMANTICS -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/pipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/pipe.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/tape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ta… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/tape.c (original) +++ trunk/reactos/dll/win32/kernel32/file/tape.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Sun Sep 2 23:42:22 2007 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define MAX_DOS_DRIVES 26 Removed: trunk/reactos/dll/win32/kernel32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/debug.h (original) +++ trunk/reactos/dll/win32/kernel32/include/debug.h (removed) @@ -1,25 +1,0 @@ -#ifndef _KERNEL32_INCLUDE_DEBUG_H -#define _KERNEL32_INCLUDE_DEBUG_H - -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef NDEBUG -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#else -#define DPRINT(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); -#endif - -#ifdef ASSERT -#undef ASSERT -#define ASSERT(x) do { if(!x) RtlAssert("#x", __FILE__,__LINE__, ""); } while(0); -#endif -#define DPRINT1(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT1 do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); - -#endif /* ndef _KERNEL32_INCLUDE_DEBUG_H */ Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/hea… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/heap.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/heap.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/pro… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/procmem.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/procmem.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/resnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/res… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/resnotify.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/resnotify.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c Sun Sep 2 23:42:22 2007 @@ -1,7 +1,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define ACTCTX_FLAGS_ALL (\ ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ Modified: trunk/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/at… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/atom.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/atom.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ch… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/chartype.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/chartype.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c Sun Sep 2 23:42:22 2007 @@ -41,7 +41,7 @@ #include <ntddser.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* BUILDCOMMDCB & BUILDCOMMDCBANDTIMEOUTS */ Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c Sun Sep 2 23:42:22 2007 @@ -29,7 +29,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Sun Sep 2 23:42:22 2007 @@ -17,7 +17,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/error.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/error.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/misc/errormsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/errormsg.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/errormsg.c Sun Sep 2 23:42:22 2007 @@ -28,7 +28,7 @@ #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #include "wine/unicode.h" #define TRACE DPRINT Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/handle.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/handle.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Sun Sep 2 23:42:22 2007 @@ -18,7 +18,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: these are included in winnls.h, however including this file causes alot of conflicting type errors. */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> typedef struct tagLOADPARMS32 { LPSTR lpEnvAddress; Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Sun Sep 2 23:42:22 2007 @@ -26,7 +26,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #include "lzexpand.h" #define HFILE_ERROR ((HFILE)-1) Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Sun Sep 2 23:42:22 2007 @@ -16,7 +16,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBAL VARIABLES ***********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pe… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/perfcnt.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/perfcnt.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c Sun Sep 2 23:42:22 2007 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> static const char bom_utf8[] = {0xEF,0xBB,0xBF}; Modified: trunk/reactos/dll/win32/kernel32/misc/recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/recovery.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/recovery.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/res.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/res.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Sun Sep 2 23:42:22 2007 @@ -6,7 +6,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define STUB \ Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define PV_NT351 0x00030033 Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/timerqueue.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/timerqueue.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/to… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/toolhelp.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Sun Sep 2 23:42:22 2007 @@ -21,7 +21,7 @@ #include <tlhelp32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* INTERNAL DEFINITIONS *******************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #endif #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <reactos/buildno.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/cmdline.c (original) +++ trunk/reactos/dll/win32/kernel32/process/cmdline.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/job.c (original) +++ trunk/reactos/dll/win32/kernel32/process/job.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define CMD_STRING L"cmd /c " Modified: trunk/reactos/dll/win32/kernel32/synch/condvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/condvar.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/condvar.c Sun Sep 2 23:42:22 2007 @@ -7,7 +7,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: Move these RTL declarations to the NDK */ NTSTATUS Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/critical.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/critical.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/mutex.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/mutex.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/sem.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/sem.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/timer.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/timer.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/wait.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/wait.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> typedef struct _FIBER /* Field offsets: */ { /* 32 bit 64 bit */ Modified: trunk/reactos/dll/win32/kernel32/thread/fls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fls.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/fls.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> -#include "../include/debug.h" +#include <debug.h> /* * @unimplemented Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: NDK */ #define HIGH_PRIORITY 31 Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/

1 0

[hpoussin] 28783: Use typedefs_host.h header when building inflib for host
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:23:43 2007 New Revision: 28783 URL: http://svn.reactos.org/svn/reactos?rev=28783&view=rev Log: Use typedefs_host.h header when building inflib for host Removed: trunk/reactos/lib/inflib/infhostglue.c Modified: trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/infhost.h trunk/reactos/lib/inflib/inflib.mak Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sun Sep 2 23:23:43 2007 @@ -8,13 +8,12 @@ /* Definitions native to the host on which we're building */ +#include <typedefs_host.h> + #include <stdarg.h> #include <stdio.h> #include <string.h> #include <errno.h> - -#define FALSE 0 -#define TRUE 1 #define FREE(Area) free(Area) #define MALLOC(Size) malloc(Size) @@ -28,13 +27,6 @@ #define INF_STATUS_BUFFER_OVERFLOW E2BIG #define INF_SUCCESS(x) (0 == (x)) -typedef char CHAR, *PCHAR; -typedef unsigned char UCHAR, *PUCHAR; -typedef void VOID, *PVOID; -typedef UCHAR BOOLEAN, *PBOOLEAN; -#include <typedefs64.h> -typedef LONG *PLONG; - typedef char TCHAR, *PTCHAR, *PTSTR; #define _T(x) x #define _tcsicmp strcasecmp @@ -45,10 +37,8 @@ #define STRFMT "%s" #ifdef _MSC_VER -#define strcasecmp stricmp +#define strcasecmp _stricmp #endif - -extern ULONG DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */ Modified: trunk/reactos/lib/inflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhost.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infhost.h (original) +++ trunk/reactos/lib/inflib/infhost.h Sun Sep 2 23:23:43 2007 @@ -13,7 +13,7 @@ extern "C" { #endif /* __cplusplus */ -#include <infcommon.h> +#include "infcommon.h" extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, Removed: trunk/reactos/lib/inflib/infhostglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostglue.c?r… ============================================================================== --- trunk/reactos/lib/inflib/infhostglue.c (original) +++ trunk/reactos/lib/inflib/infhostglue.c (removed) @@ -1,26 +1,0 @@ -/* - * PROJECT: .inf file parser - * LICENSE: GPL - See COPYING in the top level directory - * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> - */ - -/* INCLUDES *****************************************************************/ - -#include "inflib.h" - -#define NDEBUG -#include <debug.h> - -ULONG -DbgPrint(char *Fmt, ...) -{ - va_list Args; - - va_start(Args, Fmt); - vfprintf(stderr, Fmt, Args); - va_end(Args); - - return 0; -} - -/* EOF */ Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Sun Sep 2 23:23:43 2007 @@ -24,7 +24,6 @@ infput.c \ infhostgen.c \ infhostget.c \ - infhostglue.c \ infhostput.c \ ) @@ -32,8 +31,8 @@ $(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o)) INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST -D_M_IX86 \ - -I$(INFLIB_BASE) -Iinclude/reactos -DDBG + -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ + -Iinclude/reactos $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR) @@ -59,10 +58,6 @@ $(ECHO_CC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ -$(INFLIB_INT_)infhostglue.o: $(INFLIB_BASE_)infhostglue.c | $(INFLIB_INT) - $(ECHO_CC) - ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ - $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT) $(ECHO_CC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@

1 0

[hpoussin] 28782: Do not disable asserts
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:22:26 2007 New Revision: 28782 URL: http://svn.reactos.org/svn/reactos?rev=28782&view=rev Log: Do not disable asserts Modified: trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h (original) +++ trunk/reactos/tools/mkhive/registry.h Sun Sep 2 23:22:26 2007 @@ -62,9 +62,6 @@ #define ERROR_INVALID_PARAMETER 87L #define ERROR_MORE_DATA 234L #define ERROR_NO_MORE_ITEMS 259L - - -#define assert(x) /* * VOID

1 0

[ekohl] 28781: - Add the repeat key settings dialog. It does not work yet. - Update the bounce key settings dialog. - Update the general page.
by ekohl＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: ekohl Date: Sun Sep 2 23:12:41 2007 New Revision: 28781 URL: http://svn.reactos.org/svn/reactos?rev=28781&view=rev Log: - Add the repeat key settings dialog. It does not work yet. - Update the bounce key settings dialog. - Update the general page. Modified: 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/resource.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 Sep 2 23:12:41 2007 @@ -30,12 +30,16 @@ static VOID FillResetComboBox(HWND hwnd) { - TCHAR szBuffer[16]; + TCHAR szBuffer[32]; + TCHAR szMinutes[20]; INT i; + + if (LoadString(hApplet, IDS_MINUTES, szMinutes, 20) == 0) + lstrcpy(szMinutes, L"Minutes"); for (i = 0; i < 6; i++) { - _stprintf(szBuffer, _T("%u"), (i + 1) * 5); + _stprintf(szBuffer, _T("%u %s"), (i + 1) * 5, szMinutes); SendMessage(hwnd, CB_ADDSTRING, 0, 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 Sep 2 23:12:41 2007 @@ -10,6 +10,7 @@ #include <windows.h> #include <stdlib.h> +#include <stdio.h> #include <commctrl.h> #include <prsht.h> #include <tchar.h> @@ -119,9 +120,15 @@ static VOID SetDlgItemTime(HWND hwnd, INT nId, INT nTimeMs) { - TCHAR szBuffer[16]; - - wsprintf(szBuffer, _T("%d.%d"), nTimeMs / 1000, (nTimeMs % 1000) / 100); + TCHAR szBuffer[32]; + TCHAR szSeconds[20]; + + if (LoadString(hApplet, IDS_SECONDS, szSeconds, 20) == 0) + lstrcpy(szSeconds, L"Seconds"); + + _stprintf(szBuffer, _T("%d.%d %s"), + nTimeMs / 1000, (nTimeMs % 1000) / 100, + szSeconds); SetDlgItemText(hwnd, nId, szBuffer); } @@ -202,6 +209,44 @@ } +INT_PTR CALLBACK +RepeatKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, TRUE); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; + } + + return FALSE; +} + + /* Property page dialog callback */ INT_PTR CALLBACK FilterKeysDlgProc(HWND hwndDlg, @@ -279,6 +324,11 @@ break; case IDC_FILTER_REPEAT_BUTTON: + DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_REPEATKEYSOPTIONS), + hwndDlg, + (DLGPROC)RepeatKeysDlgProc, + (LPARAM)pGlobalData); break; case IDC_FILTER_STATUS_CHECK: 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 Sep 2 23:12:41 2007 @@ -85,9 +85,8 @@ BEGIN GROUPBOX "Automatické vypnutí",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Vypnout &funkce usnadnìní po neèinnosti delí ne:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Upozornìní",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Pøi zapnutí funkce zobrazit upozornìní.",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -224,17 +223,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,4 +292,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -88,8 +88,7 @@ BEGIN GROUPBOX "Automatischer Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - LTEXT "&Minuten",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) @@ -227,17 +226,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -253,4 +295,7 @@ IDS_SENTRY_TITLE "Aktive Titelleiste blinkt" IDS_SENTRY_WINDOW "Aktives Fenster blinkt" IDS_SENTRY_DISPLAY "Desktop blinkt" -END + + IDS_SECONDS "Sekunden" + IDS_MINUTES "Minuten" +END 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 Sep 2 23:12:41 2007 @@ -85,9 +85,8 @@ BEGIN GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notification",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -224,17 +223,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,4 +292,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -88,9 +88,8 @@ BEGIN GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notificación",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Dar mensage de aviso al activar unacaracterística",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -227,17 +226,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -253,4 +295,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -87,9 +87,8 @@ BEGIN GROUPBOX "Réinitialisation automatique",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Désactiver les fonctionnalités d'accessibilité après un délai d'inactivité de :",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Avertissement",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalité",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -226,17 +225,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -252,4 +294,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -86,9 +86,8 @@ BEGIN GROUPBOX "Automatikus visszaállítás",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Kapcsolja ki a kisegítõ lehetõségeket egy bizonyos idejû tétlenség után:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "&Figyelmeztetés",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Fi&gyelmeztetõ üzenet kiírása egy funkció bekapcsolásakor",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -225,17 +224,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -251,4 +293,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -87,9 +87,8 @@ BEGIN GROUPBOX "Otomatis Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Matikan fitur aksesibilitas setelah diam selama:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Pemberitahuan",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Berikan pesan peringatan ketika menghidupkan fitur ini",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -226,17 +225,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -252,4 +294,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -85,9 +85,8 @@ BEGIN GROUPBOX "Reset Automatico",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Avvisa con un messaggio quando si attiva una funzione",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -224,17 +223,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,4 +292,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -85,9 +85,8 @@ BEGIN GROUPBOX "©®Zbg",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "[U[âð³øÉ·éÜÅÌÒ¿Ô(&T):",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Êm",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "[U[âðLøÉµ½Æ«AbZ[Wðo·",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -224,17 +223,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,4 +292,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -87,9 +87,8 @@ BEGIN GROUPBOX "Beginwaarden automatisch instellen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Melding",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Waarsc&huwing weergeven als een functie wordt ingeschakeld",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -226,17 +225,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -252,4 +294,7 @@ IDS_SENTRY_TITLE "Flash the titlebar" IDS_SENTRY_WINDOW "Flash the active window" IDS_SENTRY_DISPLAY "Flash the desktop" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minutes" +END 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 Sep 2 23:12:41 2007 @@ -88,9 +88,8 @@ BEGIN GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minut",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Ostrzegaj kiedy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -227,17 +226,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -253,4 +295,7 @@ IDS_SENTRY_TITLE "Migaj¹cy pasek tytu³u" IDS_SENTRY_WINDOW "Migaj¹ce okno aktywne" IDS_SENTRY_DISPLAY "Migaj¹cy pulpit" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minut" +END 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 Sep 2 23:12:41 2007 @@ -85,9 +85,8 @@ BEGIN GROUPBOX "Àâòîìàòè÷åñêèé ñáðîñ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "&Îòêëþ÷àòü ïðè ïðîñòîå â òå÷åíèå:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Ìèíóòû",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) GROUPBOX "Óâåäîìëåíèå",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) AUTOCHECKBOX "Âûäàâàòü ñîîáùåíèå ïðè âêëþ÷åíèè &ðåæèìà",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 @@ -224,17 +223,60 @@ CAPTION "Advanced FilterKeys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(2) - - EDITTEXT IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETPADDING(3),14,ES_AUTOHSCROLL|ES_READONLY - LTEXT "seconds",-1,PROPSHEETPADDING(4)+3,LABELLINE(3)+2,PROPSHEETPADDING(6),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3),PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(5),LABELLINE(3)+2,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + + GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + + LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) + + LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) + LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,4 +292,7 @@ IDS_SENTRY_TITLE "Ïîäñâå÷èâàòü çàãîëîâê" IDS_SENTRY_WINDOW "Ïîäñâå÷èâàòü àêòèâíîå îêíî" IDS_SENTRY_DISPLAY "Ïîäñâå÷èâàòü ðàáî÷èé ñòîë" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Ìèíóòû" +END 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 Sep 2 23:12:41 2007 @@ -23,6 +23,7 @@ #define IDD_STICKYKEYSOPTIONS 105 #define IDD_FILTERKEYSOPTIONS 106 #define IDD_BOUNCEKEYSOPTIONS 107 +#define IDD_REPEATKEYSOPTIONS 108 #define IDD_TOGGLEKEYSOPTIONS 109 #define IDD_CONTRASTOPTIONS 110 @@ -35,6 +36,8 @@ #define IDS_SENTRY_TITLE 1502 #define IDS_SENTRY_WINDOW 1503 #define IDS_SENTRY_DISPLAY 1504 +#define IDS_SECONDS 1505 +#define IDS_MINUTES 1506 /* controls */ @@ -83,7 +86,17 @@ #define IDC_BOUNCE_TIME_TRACK 239 #define IDC_BOUNCE_TEST_EDIT 240 -#define IDC_TOGGLE_ACTIVATE_CHECK 246 +#define IDC_REPEAT_NOREPEAT_RADIO 241 +#define IDC_REPEAT_REPEAT_RADIO 242 +#define IDC_REPEAT_DELAY_EDIT 243 +#define IDC_REPEAT_DELAY_TRACK 244 +#define IDC_REPEAT_REPEAT_EDIT 245 +#define IDC_REPEAT_REPEAT_TRACK 246 +#define IDC_REPEAT_WAIT_EDIT 247 +#define IDC_REPEAT_WAIT_TRACK 248 +#define IDC_REPEAT_TEST_EDIT 249 + +#define IDC_TOGGLE_ACTIVATE_CHECK 250 #define IDC_CONTRAST_ACTIVATE_CHECK 260 #define IDC_CONTRAST_COMBO 261

1 0

[greatlrd] 28780: update ntgdibad.h before I forget thuse details that are need be done.
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 23:03:50 2007 New Revision: 28780 URL: http://svn.reactos.org/svn/reactos?rev=28780&view=rev Log: update ntgdibad.h before I forget thuse details that are need be done. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sun Sep 2 23:03:50 2007 @@ -147,13 +147,6 @@ LPCWSTR Description ); -/* Use NtGdiCreatePaletteInternal with palNumEntries at the end. */ -HPALETTE -STDCALL -NtGdiCreatePalette ( - CONST PLOGPALETTE lgpl - ); - /* Use NtGdiPolyPolyDraw with PolyPolyRgn. */ HRGN STDCALL @@ -626,3 +619,21 @@ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR) #endif /* WIN32K_NTGDI_BAD_INCLUDED */ + + +/* Follow thing need be rewriten + * + * Opengl icd are complete hacked in reactos and are using own way, this need be rewriten and be setup with the correct syscall + * and the opengl32 shall using correct syscall to optain then driver interface or using the correct version in gdi32. + * it mean whole icd are hacked in frist place and need be rewtiten from scrash. and it need enum the opengl correct way and + * export the driver correct + * + * DirectX aka ReactX alot api that have been implement in reactos win32k for ReactX shall move to a file call dxg.sys + * there from it will really doing the stuff. And we should setup loading of dxg.sys + * + * The Init of Gdi subsystem shall move into NtGdiInit() + * + * The Init of spooler are done in NtGdiInitSpool() + * + * The Init of the User subsystem shall move into NtUserInit() + */

1 0

[janderwald] 28779: - implement screenbuffer resizing(required for console scrolling support) - still quite buggy :)
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Sun Sep 2 22:21:36 2007 New Revision: 28779 URL: http://svn.reactos.org/svn/reactos?rev=28779&view=rev Log: - implement screenbuffer resizing(required for console scrolling support) - still quite buggy :) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Sep 2 22:21:36 2007 @@ -1627,13 +1627,51 @@ if (windx != Console->ActiveBuffer->MaxX || windy != Console->ActiveBuffer->MaxY) { - // - // TODO - // resize screen buffer - - - // Console->ActiveBuffer->MaxX = windx; - // Console->ActiveBuffer->MaxY = windy; + BYTE * Buffer = HeapAlloc(Win32CsrApiHeap, 0, windx * windy * 2); + if (Buffer) + { + DWORD Offset = 0; + DWORD BufferOffset = 0; + USHORT CurrentY; + BYTE * OldBuffer; + DWORD diff; + DWORD value = ((((DWORD)Console->ActiveBuffer->DefaultAttrib) << 16) | 0x20); + + OldBuffer = Console->ActiveBuffer->Buffer; + + for (CurrentY = 0; CurrentY < min(Console->ActiveBuffer->MaxY, windy); CurrentY++) + { + if (windx < Console->ActiveBuffer->MaxX) + { + /* reduce size */ + RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], windx * 2); + Offset += (windx * 2); + BufferOffset += (Console->ActiveBuffer->MaxX * 2); + } + else + { + /* enlarge size */ + diff = windx - Console->ActiveBuffer->MaxX; + + RtlCopyMemory(&Buffer[Offset], &OldBuffer[BufferOffset], Console->ActiveBuffer->MaxX * 2); + Offset += (Console->ActiveBuffer->MaxX * 2); + /* zero new part of it */ + memset(&Buffer[Offset], value, (diff * 2)); + Offset += (diff * 2); + BufferOffset += (Console->ActiveBuffer->MaxX * 2); + } + } + + if (windy > Console->ActiveBuffer->MaxY) + { + diff = windy - Console->ActiveBuffer->MaxX; + memset(&Buffer[Offset], value, diff * 2 * windx); + } + (void)InterlockedExchangePointer((PVOID volatile *)Console->ActiveBuffer->Buffer, Buffer); + HeapFree(Win32CsrApiHeap, 0, OldBuffer); + Console->ActiveBuffer->MaxX = windx; + Console->ActiveBuffer->MaxY = windy; + } } windx = LOWORD(pConInfo->WindowSize);

1 0

← Newer
1
...
51
52
53
54
55
56
57
58
59
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 September 2007