Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[akhaldi] 51303: [CMAKE] - Disable incremental linking and edit-and-continue.
by akhaldi＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: akhaldi Date: Sat Apr 9 17:20:36 2011 New Revision: 51303 URL: http://svn.reactos.org/svn/reactos?rev=51303&view=rev Log: [CMAKE] - Disable incremental linking and edit-and-continue. Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sat Apr 9 17:20:36 2011 @@ -188,9 +188,9 @@ SET(CMAKE_CL_64 1) ENDIF(CMAKE_FORCE_WIN64) -IF("${MSVC_VERSION}" GREATER 1599) - SET(MSVC_INCREMENTAL_DEFAULT ON) -ENDIF() +#IF("${MSVC_VERSION}" GREATER 1599) +# SET(MSVC_INCREMENTAL_DEFAULT ON) +#ENDIF() # No support for old versions if(MSVC_VERSION LESS 1310) @@ -208,8 +208,8 @@ #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug) -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") -SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") +SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") @@ -240,10 +240,10 @@ ENDIF() IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) # for release and minsize release default to no incremental linking

1 0

[akhaldi] 51302: [CMAKE] * Fix a typo.
by akhaldi＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: akhaldi Date: Sat Apr 9 16:46:28 2011 New Revision: 51302 URL: http://svn.reactos.org/svn/reactos?rev=51302&view=rev Log: [CMAKE] * Fix a typo. Modified: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt Modified: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbd/… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:46:28 2011 @@ -8,4 +8,4 @@ set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) -add_importlib_target(usbd.spec usbd.sys) +add_importlib_target(usbd.spec)

1 0

[akhaldi] 51301: [CMAKE] * msvc compatibility fixes for usbehci.
by akhaldi＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: akhaldi Date: Sat Apr 9 16:37:27 2011 New Revision: 51301 URL: http://svn.reactos.org/svn/reactos?rev=51301&view=rev Log: [CMAKE] * msvc compatibility fixes for usbehci. Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c branches/cmake-bringup/drivers/usb/usbehci/hwiface.c branches/cmake-bringup/drivers/usb/usbehci/pdo.c Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/fdo.c [iso-8859-1] Sat Apr 9 16:37:27 2011 @@ -22,6 +22,9 @@ ULONG OpRegisters; PEHCI_HOST_CONTROLLER hcd; LONG i; + ULONG CurrentAddr, OffSet; + PQUEUE_HEAD CompletedQH, NextQH; + PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; @@ -44,10 +47,7 @@ if (CStatus & (EHCI_STS_INT | EHCI_ERROR_INT)) { DPRINT("Asyn Complete!\n"); - ULONG CurrentAddr, OffSet; - PQUEUE_HEAD CompletedQH, NextQH; - PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD; - + /* AsyncListAddr Register will have the next QueueHead to execute */ CurrentAddr = GetAsyncListQueueRegister(hcd); Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/hwiface.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/hwiface.c [iso-8859-1] Sat Apr 9 16:37:27 2011 @@ -58,11 +58,12 @@ DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd) { KIRQL OldIrql; + PQUEUE_HEAD QueueHead, FirstQueueHead; KeAcquireSpinLock(&hcd->Lock, &OldIrql); - PQUEUE_HEAD QueueHead = (PQUEUE_HEAD)hcd->CommonBufferVA; - PQUEUE_HEAD FirstQueueHead = QueueHead; + QueueHead = (PQUEUE_HEAD)hcd->CommonBufferVA; + FirstQueueHead = QueueHead; DPRINT1("Dumping QueueHead List!!!!!!!!!!!!!\n"); while (1) { Modified: branches/cmake-bringup/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/pdo.c [iso-8859-1] Sat Apr 9 16:37:27 2011 @@ -360,6 +360,8 @@ PIO_STACK_LOCATION Stack; ULONG_PTR Information = Irp->IoStatus.Information; NTSTATUS Status = Irp->IoStatus.Status; + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; @@ -514,8 +516,6 @@ case IRP_MN_QUERY_CAPABILITIES: { DPRINT("Ehci: PDO Query Capabilities\n"); - PDEVICE_CAPABILITIES DeviceCapabilities; - ULONG i; DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities;

1 0

[akhaldi] 51299: [CMAKE] - Add USB modules to build.
by akhaldi＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: akhaldi Date: Sat Apr 9 16:01:04 2011 New Revision: 51299 URL: http://svn.reactos.org/svn/reactos?rev=51299&view=rev Log: [CMAKE] - Add USB modules to build. Added: branches/cmake-bringup/drivers/usb/usbehci/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/usbhub/CMakeLists.txt (with props) branches/cmake-bringup/drivers/usb/usbstor/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/usb/CMakeLists.txt branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt Modified: branches/cmake-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/CMake… ============================================================================== --- branches/cmake-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:01:04 2011 @@ -1,3 +1,6 @@ add_subdirectory(nt4compat) add_subdirectory(usbd) +add_subdirectory(usbehci) +#add_subdirectory(usbhub) Compiles, just skipped in trunk +#add_subdirectory(usbstor) Compiles, just skipped in trunk Modified: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbd/… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:01:04 2011 @@ -8,3 +8,4 @@ set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) +add_importlib_target(usbd.spec usbd.sys) Added: branches/cmake-bringup/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:01:04 2011 @@ -1,0 +1,21 @@ + +list(APPEND SOURCE + usbehci.c + hardware.c + physmem.c + hwiface.c + transfer.c + fdo.c + pdo.c + common.c + misc.c + irp.c + usbiffn.c + usbehci.rc) + +add_library(usbehci SHARED ${SOURCE}) + +set_module_type(usbehci kernelmodedriver) +add_importlibs(usbehci ntoskrnl hal) + +add_cab_target(usbehci 2) Propchange: branches/cmake-bringup/drivers/usb/usbehci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbhu… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbhub/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:01:04 2011 @@ -1,0 +1,15 @@ + +list(APPEND SOURCE + createclose.c + fdo.c + misc.c + pdo.c + usbhub.c + usbhub.rc) + +add_library(usbhub SHARED ${SOURCE}) + +set_module_type(usbhub kernelmodedriver) +add_importlibs(usbhub ntoskrnl hal usbd) + +add_cab_target(usbhub 2) Propchange: branches/cmake-bringup/drivers/usb/usbhub/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbst… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbstor/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Sat Apr 9 16:01:04 2011 @@ -1,0 +1,10 @@ + +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(usbstor SHARED usbstor.c usbstor.rc) + +set_module_type(usbstor kernelmodedriver) +add_importlibs(usbstor ntoskrnl hal) +add_cab_target(usbstor 2) Propchange: branches/cmake-bringup/drivers/usb/usbstor/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 51298: [SNDVOL32] - Remove 'E'
by janderwald＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: janderwald Date: Sat Apr 9 15:28:46 2011 New Revision: 51298 URL: http://svn.reactos.org/svn/reactos?rev=51298&view=rev Log: [SNDVOL32] - Remove 'E' Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] Sat Apr 9 15:28:46 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Îòêàç", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGE0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN

1 0

[dreimer] 51297: Partial revert, as explained on ML. Sry...
by dreimer＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: dreimer Date: Sat Apr 9 15:21:22 2011 New Revision: 51297 URL: http://svn.reactos.org/svn/reactos?rev=51297&view=rev Log: Partial revert, as explained on ML. Sry... Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc trunk/reactos/base/applications/sndvol32/lang/de-DE.rc trunk/reactos/base/applications/sndvol32/lang/el-GR.rc trunk/reactos/base/applications/sndvol32/lang/en-US.rc trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc trunk/reactos/base/applications/sndvol32/lang/id-ID.rc trunk/reactos/base/applications/sndvol32/lang/it-IT.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc trunk/reactos/base/applications/sndvol32/lang/no-NO.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc trunk/reactos/base/applications/sndvol32/lang/th-TH.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Îòêàç", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOGE0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -48,7 +48,7 @@ PUSHBUTTON "Storno", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/de-DE.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/el-GR.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "¢êõñï", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -46,7 +46,7 @@ PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -46,7 +46,7 @@ PUSHBUTTON "Mégse", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/id-ID.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Batal", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/it-IT.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Annulla", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "LZ", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 9, "MS UI Gothic" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -45,7 +45,7 @@ PUSHBUTTON "Ãë¼Ò", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -44,7 +44,7 @@ PUSHBUTTON "Atsisakyti", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Annuleren", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/no-NO.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -42,7 +42,7 @@ PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -50,7 +50,7 @@ PUSHBUTTON "Anuluj", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -48,7 +48,7 @@ PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -44,7 +44,7 @@ PUSHBUTTON "Îòìåíà", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -46,7 +46,7 @@ PUSHBUTTON "Zrui", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -62,7 +62,7 @@ PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/th-TH.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -50,7 +50,7 @@ PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] Sat Apr 9 15:21:22 2011 @@ -50,7 +50,7 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN

1 0

[dreimer] 51296: - Sync all resource files with the English one. - Translate the new Dialog in the German one. - Normally we use BEGIN and END, no {} - DIALOG -> DIALOGEX
by dreimer＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: dreimer Date: Sat Apr 9 14:46:37 2011 New Revision: 51296 URL: http://svn.reactos.org/svn/reactos?rev=51296&view=rev Log: - Sync all resource files with the English one. - Translate the new Dialog in the German one. - Normally we use BEGIN and END, no {} - DIALOG -> DIALOGEX Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc trunk/reactos/base/applications/sndvol32/lang/de-DE.rc trunk/reactos/base/applications/sndvol32/lang/el-GR.rc trunk/reactos/base/applications/sndvol32/lang/en-US.rc trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc trunk/reactos/base/applications/sndvol32/lang/id-ID.rc trunk/reactos/base/applications/sndvol32/lang/it-IT.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc trunk/reactos/base/applications/sndvol32/lang/no-NO.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc trunk/reactos/base/applications/sndvol32/lang/th-TH.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc Modified: trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/bg-BG.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ñâîéñòâà" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Ñìåñèòåëíî óñòðîéñòâî:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "Äîáðå", IDOK, 114,226,50,14 PUSHBUTTON "Îòêàç", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -32,7 +32,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Monosti" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Smìovací zaøízení:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -47,3 +47,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Storno", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/de-DE.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschaften" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixer:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Lautstärke", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/el-GR.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Éäéüôçôåò" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ÓõóêåõÞ ìßîçò:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "¢êõñï", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/en-US.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixer device:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -42,10 +42,10 @@ PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 LTEXT "Balance", -1, 4, 35, 80, 42 @@ -54,4 +54,4 @@ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 -} +END Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -30,7 +30,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Propiedades" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Dispositivo me&zclador:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -45,3 +45,17 @@ PUSHBUTTON "Aceptar", IDOK, 114,226,50,14 PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Propriétés" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Périphérique de mixage :", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -42,10 +42,10 @@ PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 LTEXT "Balance", -1, 4, 35, 80, 42 @@ -54,4 +54,4 @@ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 CHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 -} +END Modified: trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -30,7 +30,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Tulajdonságok" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Keverõ eszköz:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -45,3 +45,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Mégse", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/id-ID.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Properti" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixer device:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Batal", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/it-IT.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Proprietà" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixer:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Annulla", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "vpeB" -FONT 9, "MS UI Gothic", 0, 0, 0x0 +FONT 9, "MS UI Gothic" BEGIN LTEXT "~LT[ foCX(&M):", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "LZ", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -29,7 +29,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "¼Ó¼º" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "¹Í¼ ÀåÄ¡(&M):", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -44,3 +44,17 @@ PUSHBUTTON "È®ÀÎ", IDOK, 114,226,50,14 PUSHBUTTON "Ãë¼Ò", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/lt-LT.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -28,7 +28,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nustatymai" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Garsø maiðymo árenginys:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -43,3 +43,17 @@ PUSHBUTTON "Gerai", IDOK, 114,226,50,14 PUSHBUTTON "Atsisakyti", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschappen" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixerapparaat:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Annuleren", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/no-NO.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -26,7 +26,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Egenskaper" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mikser enhet:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -41,3 +41,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -34,7 +34,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "W³aciwoci" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "Urz¹dzenie &miksuj¹ce", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -50,10 +50,10 @@ PUSHBUTTON "Anuluj", IDCANCEL, 168,226,50,14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Kana³ g³ówny", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 LTEXT "Balans", -1, 4, 35, 80, 42 @@ -62,4 +62,4 @@ CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 CHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 12 CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 -} +END Modified: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -32,7 +32,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Propriedades" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dispositivo de &mixagem:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -47,3 +47,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -28,7 +28,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ñâîéñòâà" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Ìèêøåð:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -43,3 +43,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Îòìåíà", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/sk-SK.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -30,7 +30,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Vlastnosti" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Zariadenie zmieavaèa:", -1, 7,4,43,16 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -45,3 +45,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Zrui", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -46,7 +46,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inställningar" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mixerenhet:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -61,3 +61,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/th-TH.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -34,7 +34,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "¤Ø³ÊÁºÑµÔ" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "ÍØ»¡Ã³ì&»ÃÑºáµè§àÊÕÂ§:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -49,3 +49,17 @@ PUSHBUTTON "µ¡Å§", IDOK, 114,226,50,14 PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END Modified: trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] Sat Apr 9 14:46:37 2011 @@ -34,7 +34,7 @@ IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Âëàñòèâîñò³" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Ì³êøåð:", -1, 7,8,48,9 COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -49,3 +49,17 @@ PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 168,226,50,14 END + +IDD_VOLUME_CTRL DIALOGEX 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Balance", -1, 4, 35, 80, 42 + LTEXT "Volume", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +END

1 0

[gadamopoulos] 51295: [win32k] - Rewrite GetKeyState based on wine. Now it's results are based on whether or nor the message queue has processed a keyboard message and not the actual state of the k...
by gadamopoulos＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: gadamopoulos Date: Sat Apr 9 12:44:45 2011 New Revision: 51295 URL: http://svn.reactos.org/svn/reactos?rev=51295&view=rev Log: [win32k] - Rewrite GetKeyState based on wine. Now it's results are based on whether or nor the message queue has processed a keyboard message and not the actual state of the keyboard.c - TODO: ensure it works corectly and use this implementation in most other places in win32k when we need to check the state of a key. To ensure nothing breaks, this change affects only GetKeyState Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Sat Apr 9 12:44:45 2011 @@ -27,6 +27,22 @@ #define KBL_PRELOAD 2 #define KBL_RESET 4 +/* Key States */ +#define KS_DOWN_MASK 0xc0 +#define KS_DOWN_BIT 0x80 +#define KS_LOCK_BIT 0x01 +/* Lock modifiers */ +#define CAPITAL_BIT 0x80000000 +#define NUMLOCK_BIT 0x40000000 +#define MOD_BITS_MASK 0x3fffffff +#define MOD_KCTRL 0x02 +/* Scan Codes */ +#define SC_KEY_UP 0x8000 +/* lParam bits */ +#define LP_EXT_BIT (1<<24) +/* From kbdxx.c -- Key changes with numlock */ +#define KNUMP 0x400 + INIT_FUNCTION NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Apr 9 12:44:45 2011 @@ -108,6 +108,9 @@ /* extra message information */ LPARAM ExtraInfo; + /* state of each key */ + UCHAR KeyState[256]; + /* messages that are currently dispatched by other threads */ LIST_ENTRY DispatchingMessagesHead; /* messages that are currently dispatched by this message queue, required for cleanup */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sat Apr 9 12:44:45 2011 @@ -33,27 +33,7 @@ #define NDEBUG #include <debug.h> - -/* Lock modifiers */ -#define CAPITAL_BIT 0x80000000 -#define NUMLOCK_BIT 0x40000000 -#define MOD_BITS_MASK 0x3fffffff -#define MOD_KCTRL 0x02 -/* Key States */ -#define KS_DOWN_MASK 0xc0 -#define KS_DOWN_BIT 0x80 -#define KS_LOCK_BIT 0x01 -/* Scan Codes */ -#define SC_KEY_UP 0x8000 -/* lParam bits */ -#define LP_EXT_BIT (1<<24) -/* From kbdxx.c -- Key changes with numlock */ -#define KNUMP 0x400 - - BYTE gQueueKeyStateTable[256]; - - /* FUNCTIONS *****************************************************************/ @@ -351,40 +331,6 @@ return 0; } - - -DWORD FASTCALL UserGetKeyState(DWORD key) -{ - DWORD ret = 0; - - if( key < 0x100 ) - { - ret = ((DWORD)(gQueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | - (gQueueKeyStateTable[key] & KS_LOCK_BIT); - } - - return ret; -} - - -SHORT -APIENTRY -NtUserGetKeyState( - INT key) -{ - DECLARE_RETURN(DWORD); - - DPRINT("Enter NtUserGetKeyState\n"); - UserEnterExclusive(); - - RETURN(UserGetKeyState(key)); - -CLEANUP: - DPRINT("Leave NtUserGetKeyState, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - DWORD FASTCALL UserGetAsyncKeyState(DWORD key) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Apr 9 12:44:45 2011 @@ -39,6 +39,106 @@ 256); return(STATUS_SUCCESS); +} + +DWORD FASTCALL UserGetKeyState(DWORD key) +{ + DWORD ret = 0; + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE MessageQueue; + + pti = PsGetCurrentThreadWin32Thread(); + MessageQueue = pti->MessageQueue; + + if( key < 0x100 ) + { + ret = ((DWORD)(MessageQueue->KeyState[key] & KS_DOWN_BIT) << 8 ) | + (MessageQueue->KeyState[key] & KS_LOCK_BIT); + } + + return ret; +} + +/* change the input key state for a given key */ +static void set_input_key_state( PUSER_MESSAGE_QUEUE MessageQueue, UCHAR key, BOOL down ) +{ + if (down) + { + if (!(MessageQueue->KeyState[key] & KS_DOWN_BIT)) + { + MessageQueue->KeyState[key] ^= KS_LOCK_BIT; + } + MessageQueue->KeyState[key] |= KS_DOWN_BIT; + } + else + { + MessageQueue->KeyState[key] &= ~KS_DOWN_BIT; + } +} + +/* update the input key state for a keyboard message */ +static void update_input_key_state( PUSER_MESSAGE_QUEUE MessageQueue, MSG* msg ) +{ + UCHAR key; + BOOL down = 0; + + switch (msg->message) + { + case WM_LBUTTONDOWN: + down = 1; + /* fall through */ + case WM_LBUTTONUP: + set_input_key_state( MessageQueue, VK_LBUTTON, down ); + break; + case WM_MBUTTONDOWN: + down = 1; + /* fall through */ + case WM_MBUTTONUP: + set_input_key_state( MessageQueue, VK_MBUTTON, down ); + break; + case WM_RBUTTONDOWN: + down = 1; + /* fall through */ + case WM_RBUTTONUP: + set_input_key_state( MessageQueue, VK_RBUTTON, down ); + break; + case WM_XBUTTONDOWN: + down = 1; + /* fall through */ + case WM_XBUTTONUP: + if (msg->wParam == XBUTTON1) + set_input_key_state( MessageQueue, VK_XBUTTON1, down ); + else if (msg->wParam == XBUTTON2) + set_input_key_state( MessageQueue, VK_XBUTTON2, down ); + break; + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + down = 1; + /* fall through */ + case WM_KEYUP: + case WM_SYSKEYUP: + key = (UCHAR)msg->wParam; + set_input_key_state( MessageQueue, key, down ); + switch(key) + { + case VK_LCONTROL: + case VK_RCONTROL: + down = (MessageQueue->KeyState[VK_LCONTROL] | MessageQueue->KeyState[VK_RCONTROL]) & KS_DOWN_BIT; + set_input_key_state( MessageQueue, VK_CONTROL, down ); + break; + case VK_LMENU: + case VK_RMENU: + down = (MessageQueue->KeyState[VK_LMENU] | MessageQueue->KeyState[VK_RMENU]) & KS_DOWN_BIT; + set_input_key_state( MessageQueue, VK_MENU, down ); + break; + case VK_LSHIFT: + case VK_RSHIFT: + down = (MessageQueue->KeyState[VK_LSHIFT] | MessageQueue->KeyState[VK_RSHIFT]) & KS_DOWN_BIT; + set_input_key_state( MessageQueue, VK_SHIFT, down ); + break; + } + break; + } } HANDLE FASTCALL @@ -1294,6 +1394,7 @@ if (Remove) { + update_input_key_state(MessageQueue, pMsg); RemoveEntryList(&CurrentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, QS_INPUT); MsqDestroyMessage(CurrentMessage); @@ -1714,4 +1815,19 @@ return NULL; } +SHORT +APIENTRY +NtUserGetKeyState(INT key) +{ + DWORD Ret; + + UserEnterExclusive(); + + Ret = UserGetKeyState(key); + + UserLeave(); + + return Ret; +} + /* EOF */

1 0

[khornicek] 51294: Updated Czech translations for ping, charmap, reactos, usetup, console, desk and shell32 by Radek Liska (radekliska at gmail dot com) with some subtle modifications by me. See is...
by khornicek＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: khornicek Date: Sat Apr 9 12:18:34 2011 New Revision: 51294 URL: http://svn.reactos.org/svn/reactos?rev=51294&view=rev Log: Updated Czech translations for ping, charmap, reactos, usetup, console, desk and shell32 by Radek Liska (radekliska at gmail dot com) with some subtle modifications by me. See issue #6067 for more details. Added: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc trunk/reactos/base/applications/network/ping/ping.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/dll/cpl/console/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,6 +1,6 @@ /* FILE: applications/charmap/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-02-29 + * UPDATED: 2011-03-31 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -10,7 +10,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN - LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + LTEXT "Písmo:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS PUSHBUTTON "Nápovìda", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 Added: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,0 +1,40 @@ +/* FILE: base/applications/network/ping/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2011-03-31 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE "\nPouití: ping [-t] [-n poèet] [-l velikost] [-w timeout] cíl\n\n\ +Options:\n\ + -t Opakovanì zasílá poadavky o ozvìnu zadanému cíli a do zastavení.\n\ + Ukonèení stisknutím Ctrl+C.\n\ + -n poèet Poèet poadavkù o ozvìnu, které budou zaslány.\n\ + -l velikost Velikost vyrovnávací pamìti.\n\ + -w timeout Doba v milisekundách, po kterou se bude èekat na odpovìï.\n\n\0" + + IDS_PING_WITH_BYTES "\nPing na %1 [%2] s %3!d! bajty dat:\n\n\0" + IDS_PING_STATISTICS "\nStatistika pro %1:\n\0" + IDS_PACKETS_SENT_RECEIVED_LOST " Pakety: Odesláno = %1!d!, Pøijato = %2!d!, Ztraceno = %3!d! (%4!d!%% ztráta),\n\0" + IDS_APPROXIMATE_ROUND_TRIP "Pøibliná doba do pøijetí odezvy v milisekundách:\n\0" + IDS_MIN_MAX_AVERAGE " Minimum = %1, Maximum = %2, Prùmìr = %3\n\0" + IDS_NOT_ENOUGH_RESOURCES "Není k dispozici dostatek volných zdrojù.\n\0" + IDS_UNKNOWN_HOST "Neznámý hostitel %1.\n\0" + IDS_SETSOCKOPT_FAILED "setsockopt selhalo (%1!d!).\n\0" + IDS_COULD_NOT_CREATE_SOCKET "Nebylo moné vytvoøit socket (#%1!d!).\n\0" + IDS_COULD_NOT_INIT_WINSOCK "Nebylo moné inicializovat knihovnu winsock.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "Je nutno zadat název nebo IP adresu cíle.\n\0" + IDS_BAD_PARAMETER "Nesprávný parametr %1.\n\0" + IDS_BAD_OPTION_FORMAT "Nesprávný formát volby %1.\n\0" + IDS_BAD_OPTION "Nesprávná volba %1.\n\0" + IDS_BAD_VALUE_OPTION_L "Nesprávná hodnota volby -l, platný rozsah je od 0 do %1!d!.\n\0" + IDS_REPLY_FROM "Odpovìï od %1: bajtù=%2!d! èas%3%4 TTL=%5!d!\n\0" + IDS_DEST_UNREACHABLE "Cíl je nedostupný.\n\0" + IDS_COULD_NOT_TRANSMIT "Nebylo moné pøenést data (%1!d!).\n\0" + IDS_COULD_NOT_RECV "Nebylo moné pøijmout data (%1!d!).\n\0" + IDS_REQUEST_TIMEOUT "Èasový limit ádosti vyprel.\n\0" + IDS_MS "ms\0" + IDS_1MS "1ms\0" +END Propchange: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -8,6 +8,7 @@ #define REACTOS_STR_ORIGINAL_COPYRIGHT "Casper S. Hornstrup (chorns(a)users.sourceforge.net)\0" #include <reactos/version.rc> +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,119 +1,123 @@ -// Kario was here +/* FILE: dll/cpl/console/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * THANKS TO: kario for introducing the file + * UPDATED: 2011-03-31 + */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "ReactOS nelze instalovat pøímo z tohoto CD! Prosím restartujte poèítaè z tohoto CD aby jste nainstalovali ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Vítejte v prùvodci instalace systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Systém ReactOS zatím nelze nainstalovat pøímo z tohoto CD! Pro instalaci restartuje poèítaè z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Klepnutím na Dokonèit ukonèíte instalaci.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "Jazyk instalace:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "Klávesnice èi metoda zadávání:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Po klepnutí na Dalí bude moné zvolit typ instalace.", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Typ instalace", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Nainstalovat systém ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Opravit nebo aktualizovat ji nainstalovaný systém ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Po klepnutí na Dalí bude moné nastavit zaøízení.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "Nastavení zaøízení", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Poèítaè:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 - LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 - LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + LTEXT "Klávesnice:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Po klepnutí na Dalí bude moné nastavit instalaèní zaøízení.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Oddíl, do kterého bude systém ReactOS nainstalován", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Vytvoøit", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Ovladaè", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Pokroèilé volby...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Po klepnutí na Dalí bude moné zkontrolovat vechna nastavení.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Create Partition" +CAPTION "Vytvoøit oddíl" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 - LTEXT "Size:",IDC_STATIC, 13,24,27,9 + CONTROL "Vytvoøit a naformátovat oddíl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Velikost:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP LTEXT "GB",IDC_UNIT, 117,24,14,9 - LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + LTEXT "Souborový systém:",IDC_STATIC,13,46,35,9 CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP - PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Storno",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Advanced Partition Settings" +CAPTION "Pokroèilá nastavení oddílu" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Instalaèní sloka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalace zavadìèe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + CONTROL "Nainstalovat zavadìè na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Nainstalovat zavadìè na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Zavadìè neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Storno", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + CONTROL "Shrnutí instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Klepnutím na Dalí zahájíte instalaèní proces.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalace ReactOS" +CAPTION "Instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + CONTROL "Akce instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Instalace souborù...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -121,34 +125,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Dokonèení instalace systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "Dokonèení první èásti instalace systému ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "První èást instalace systému ReactOS byla úspìnì dokonèena.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Po klepnutí na Dokonèit bude poèítaè restartován.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Pokud je v mechanice instalaèní CD, vyjmìte jej. Poté kliknutím na Dokonèit restartujte poèítaè.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Language Selection" - IDS_LANGSUBTITLE "Choose language for setup and final system." - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_LANGTITLE "Výbìr jazyka" + IDS_LANGSUBTITLE "Volba jazyka, který bude pouit pøi instalaci a ve výsledném systému." + IDS_TYPETITLE "Vítejte v prùvodci instalace systému ReactOS" + IDS_TYPESUBTITLE "Volba typu instalace." + IDS_DEVICETITLE "Nastavení základních zaøízení" + IDS_DEVICESUBTITLE "Volba nastavení obrazovky a klávesnice." + IDS_DRIVETITLE "Nastavení instalaèního oddílu a systémové sloky" + IDS_DRIVESUBTITLE "Pøíprava instalaèního oddílu, systémové sloky a zavadìèe." + IDS_PROCESSTITLE "Pøíprava oddílu, kopírování souborù a nastavení systému" + IDS_PROCESSSUBTITLE "Vytvoøení a naformátování oddílu, kopírování souborù, instalace a nastavení zavadìèe" + IDS_RESTARTTITLE "První èást instalace dokonèena" + IDS_RESTARTSUBTITLE "První èást instalace byla dokonèena, po restartování poèítaèe se bude pokraèovat druhou èástí" + IDS_SUMMARYTITLE "Shrnutí instalace" + IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ovìøení pøed tím, ne zaène instalace" + IDS_ABORTSETUP "Systém ReactOS není na tomto poèítaèi kompletnì nainstalovaný. Pokud nyní ukonèíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukonèit?" + IDS_ABORTSETUP2 "Pøeruit instalaci?" END /* EOF */ Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,7 +1,7 @@ /* FILE: setup/usetup/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * THANKS TO: preston - * UPDATED: 2010-12-12 + * THANKS TO: preston for bugfix advice at line 842 + * UPDATED: 2011-03-31 */ #pragma once @@ -43,7 +43,7 @@ { 8, 13, - "\x07 Tento jazyk bude defaultn¡m jazykem v nainstalovanm systmu.", + "\x07 Tento jazyk bude vìchoz¡m jazykem v nainstalovanm systmu.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,6 +1,6 @@ /* FILE: dll/cpl/console/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-07-27 + * UPDATED: 2011-03-31 */ #include <commctrl.h> @@ -34,15 +34,15 @@ IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Font" +CAPTION "Písmo" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Náhled okna:", -1, 10, 10, 94, 10 LTEXT "Velikost:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL - LTEXT "&Font:", -1, 10, 105, 33, 10 - CHECKBOX "&Tuèné fonty", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LTEXT "&Písmo:", -1, 10, 105, 33, 10 + CHECKBOX "&Tuèná písma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 @@ -141,5 +141,5 @@ IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole." IDS_APPLY_SHORTCUT_ALL "Zmìnit zá&stupce, který spustil toto okno" IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Rastrové fonty" + IDS_RASTERFONTS "Rastrová písma" END Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,6 +1,6 @@ /* FILE: dll/cpl/desk/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-07-27 + * UPDATED: 2011-03-31 * THANKS TO: potapnik, who translated major part of this file */ @@ -105,24 +105,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Efekty" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Pouít následující &efekt pøechodu pro nabídky a popisky:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "Pouít následující metodu vyhlazování &hran obrazovkových písem:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Pouít velké &ikony",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Zobrazovat &stíny pod nabídkami",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Zobrazovat &obsah okna bìhem pøesouvání",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Nezobrazovat podtrení písmen u klávesových zkratek, dokud nestisknu klávesu Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -134,7 +134,7 @@ LTEXT "Taením nastavte ikony monitorù, aby odpovídaly fyzickému uspoøádání vaich monitorù.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Obrazovka:",1820,3,100,38,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + LTEXT "<není>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 30,130,58,17 @@ -185,19 +185,19 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" + IDS_SLIDEEFFECT "Efekt vysunutí" + IDS_FADEEFFECT "Efekt pøechodu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standardní" IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Nìkolik monitorù)" + IDS_MULTIPLEMONITORS "(Více monitorù)" IDS_UNKNOWNMONITOR "(Neznámý monitor)" IDS_ADVANCEDTITLEFMT "%s a %s" END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Apr 9 12:18:34 2011 @@ -1,6 +1,6 @@ /* FILE: dll/win32/shell32/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2010-05-25 + * UPDATED: 2011-03-31 * THANKS TO: navaraf, who translated major part of this file */ @@ -539,7 +539,7 @@ PUSHBUTTON "&Zavøít", IDCANCEL, 118, 198, 60, 14 LTEXT "&Kapacita:", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Souborový systém", -1, 7, 35, 170, 9 + LTEXT "Souborový systé&m", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 LTEXT "&Velikost alokaèní jednotky", -1, 7, 64, 170, 9 @@ -597,7 +597,7 @@ IDS_SHV_COLUMN13 "Kategorie" IDS_SHV_COLUMN_DELFROM "Pùvodní umístìní" IDS_SHV_COLUMN_DELDATE "Odstranìno" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_FONTTYPE "Druh písma" //fonttype IDS_SHV_COLUMN_WORKGROUP "Pracovní skupina" IDS_SHV_NETWORKLOCATION "Síové umístìní" IDS_SHV_COLUMN_DOCUMENTS "Dokumenty" @@ -739,8 +739,8 @@ IDS_FILE_FOLDER "%u souborù, %u sloek" IDS_PRINTERS "Tiskárny" - IDS_FONTS "Fonty" - IDS_INSTALLNEWFONT "Nainstalovat nový font..." + IDS_FONTS "Písma" + IDS_INSTALLNEWFONT "Nainstalovat nové písmo..." IDS_DEFAULT_CLUSTER_SIZE "Výchozí alokaèní velikost" IDS_COPY_OF "Kopie "

1 0

[mkupfer] 51293: Command Prompt with translated window title - German translation added - other languages need to be translated (.rc files prepared)
by mkupfer＠svn.reactos.org 09 Apr '11

09 Apr '11

Author: mkupfer Date: Sat Apr 9 12:01:36 2011 New Revision: 51293 URL: http://svn.reactos.org/svn/reactos?rev=51293&view=rev Log: Command Prompt with translated window title - German translation added - other languages need to be translated (.rc files prepared) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc trunk/reactos/subsystems/win32/csrss/win32csr/resource.h Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -73,12 +73,21 @@ SECURITY_ATTRIBUTES SecurityAttributes; PCSRSS_SCREEN_BUFFER NewBuffer; BOOL GuiMode; + WCHAR Title[255]; + HINSTANCE hInst; Console->Title.MaximumLength = Console->Title.Length = 0; Console->Title.Buffer = NULL; - //FIXME - RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); + hInst = GetModuleHandleW(L"win32csr"); + if (LoadStringW(hInst,IDS_COMMAND_PROMPT,Title,sizeof(Title)/sizeof(Title[0]))) + { + RtlCreateUnicodeString(&Console->Title, Title); + } + else + { + RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); + } Console->ReferenceCount = 0; Console->LineBuffer = NULL; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -59,4 +59,6 @@ IDS_SCROLLPAGE_DOWN "Äîëíà ñòðàíèöà" IDS_SCROLLUP "Ïðåëèñòâàíå íàãîðå" IDS_SCROLLDOWN "Ïðåëèñòâàíå íàäîëó" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Seite nach unten" IDS_SCROLLUP "Nach oben scrollen" IDS_SCROLLDOWN "Nach unten scrollen" + + IDS_COMMAND_PROMPT "Eingabeaufforderung" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Åðüìåíç óåëßäá" IDS_SCROLLUP "Êýëéóç ðÜíù" IDS_SCROLLDOWN "Êýëéóç êÜôù" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Page down" IDS_SCROLLUP "Scroll up" IDS_SCROLLDOWN "Scroll down" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -58,4 +58,6 @@ IDS_SCROLLPAGE_DOWN "Bajar página" IDS_SCROLLUP "Desplazar arriba" IDS_SCROLLDOWN "Desplazar abajo" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -55,4 +55,6 @@ IDS_SCROLLPAGE_DOWN "Page suivante" IDS_SCROLLUP "Défiler en haut" IDS_SCROLLDOWN "Défiler en bas" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Halaman Turun" IDS_SCROLLUP "Gulung Naik" IDS_SCROLLDOWN "Gulung Turun" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -62,4 +62,6 @@ IDS_SCROLLPAGE_DOWN "Pagina giù" IDS_SCROLLUP "Scorri sù" IDS_SCROLLDOWN "Scorri giù" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Page down" IDS_SCROLLUP "ãÉXN[" IDS_SCROLLDOWN "ºÉXN[" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -44,4 +44,6 @@ IDS_SCROLLPAGE_DOWN "Side ned" IDS_SCROLLUP "Rull opp" IDS_SCROLLDOWN "Rull ned" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -58,4 +58,6 @@ IDS_SCROLLPAGE_DOWN "Nastêpna strona" IDS_SCROLLUP "Przewiñ do góry" IDS_SCROLLDOWN "Przewiñ na dó³" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "Âíèç ñòðàíèöû" IDS_SCROLLUP "Ïðîêðóòèòü ââåðõ" IDS_SCROLLDOWN "Scroll Down" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -57,4 +57,6 @@ IDS_SCROLLPAGE_DOWN "O stránku niie" IDS_SCROLLUP "Rolova nahor" IDS_SCROLLDOWN "Rolova nadol" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -61,4 +61,6 @@ IDS_SCROLLPAGE_DOWN "Íàñòóïíà ñòîð³íêà" IDS_SCROLLUP "Ïðîêðóòèòè äîãîðè" IDS_SCROLLDOWN "Ïðîêðóòèòè äîíèçó" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "ÏÂÒ»Ò³" IDS_SCROLLUP "ÏòÉÏ¹ö¶¯" IDS_SCROLLDOWN "ÏòÏÂ¹ö¶¯" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -53,4 +53,6 @@ IDS_SCROLLPAGE_DOWN "¤U¤@¶" IDS_SCROLLUP "¦V¤Wºu°Ê" IDS_SCROLLDOWN "¦V¤Uºu°Ê" + + IDS_COMMAND_PROMPT "Command Prompt" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] Sat Apr 9 12:01:36 2011 @@ -48,4 +48,6 @@ #define IDS_SCROLLUP 309 #define IDS_SCROLLDOWN 310 +#define IDS_COMMAND_PROMPT 500 + /* EOF */

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011