Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [UDFS] Correctly check SeSinglePrivilegeCheck() return value

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17af7f0c2741f2a8173a0… commit 17af7f0c2741f2a8173a0bd091e97b9bd14d5777 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jan 30 01:54:42 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 10 10:16:55 2019 +0100 [UDFS] Correctly check SeSinglePrivilegeCheck() return value SeSinglePrivilegeCheck() returns a BOOLEAN, not a NTSTATUS. CORE-14271 --- drivers/filesystems/udfs/create.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index e841a04d03..75f209f4b5 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -742,9 +742,9 @@ op_vol_accs_dnd: // we should check appropriate privilege if OpenForBackup requested if(OpenForBackup) { - RC = SeSinglePrivilegeCheck(SeExports->SeBackupPrivilege, UserMode); - if(!NT_SUCCESS(RC)) - try_return(RC); + if (!SeSinglePrivilegeCheck(SeExports->SeBackupPrivilege, UserMode)) { + try_return(RC = STATUS_PRIVILEGE_NOT_HELD); + } } // The FSD might wish to implement the open-by-id option. The "id"

5 years, 10 months

[reactos] 02/02: [SDK:CMAKE] Fix LINK command-line from the VS IDE for CMake VSSolution configurations, when using MSVC "linker script" files.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b473cbeee2dd4398df1d… commit 1b473cbeee2dd4398df1d446e223e52e06b6ccb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 10 00:47:43 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 00:47:43 2019 +0100 [SDK:CMAKE] Fix LINK command-line from the VS IDE for CMake VSSolution configurations, when using MSVC "linker script" files. MSBuild, via the VS IDE, uses response files when calling CL or LINK. We cannot specify a custom response file on the linker command-line, since specifying response files from within response files is forbidden. We therefore have to pre-process, at configuration time, the linker script so as to retrieve the custom linker options to be appended to the linker command-line. --- sdk/cmake/msvc.cmake | 51 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 7f0ec9851b..4d76d91437 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -575,16 +575,43 @@ function(add_linker_script _target _linker_script_file) else() set(_no_std_includes_flag "/X") endif() - add_custom_command( - #OUTPUT ${_generated_file} - TARGET ${_target} PRE_LINK - COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" > "${_generated_file}" - DEPENDS ${_file_full_path} - VERBATIM) - set_source_files_properties(${_generated_file} PROPERTIES GENERATED TRUE) - add_target_link_flags(${_target} "@${_generated_file}") - - # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) - # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html - add_target_property(${_target} LINK_DEPENDS ${_generated_file}) + if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) + # MSBuild, via the VS IDE, uses response files when calling CL or LINK. + # We cannot specify a custom response file on the linker command-line, + # since specifying response files from within response files is forbidden. + # We therefore have to pre-process, at configuration time, the linker + # script so as to retrieve the custom linker options to be appended + # to the linker command-line. + execute_process( + COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" + # OUTPUT_FILE "${_generated_file}" + OUTPUT_VARIABLE linker_options + ERROR_QUIET + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + RESULT_VARIABLE linker_rsp_result + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT linker_rsp_result EQUAL 0) + message(FATAL_ERROR "Generating pre-processed linker options for target '${_target}' failed with error ${linker_rsp_result}.") + endif() + # file(STRINGS ${_generated_file} linker_options NEWLINE_CONSUME) + string(REGEX REPLACE "[\r\n]+" " " linker_options "${linker_options}") + add_target_link_flags(${_target} ${linker_options}) + else() + # Generate at compile-time a linker response file and append it + # to the linker command-line. + add_custom_command( + # OUTPUT ${_generated_file} + TARGET ${_target} PRE_LINK # PRE_BUILD + COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" > "${_generated_file}" + DEPENDS ${_file_full_path} + VERBATIM) + set_source_files_properties(${_generated_file} PROPERTIES GENERATED TRUE) + # add_custom_target("${_target}_${_file_name}" ALL DEPENDS ${_generated_file}) + # add_dependencies(${_target} "${_target}_${_file_name}") + add_target_link_flags(${_target} "@${_generated_file}") + + # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) + # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html + add_target_property(${_target} LINK_DEPENDS ${_generated_file}) + endif() endfunction()

5 years, 10 months

[reactos] 01/02: [FREELDR][SDK:CMAKE] Move the `MSVC "linker script" file' functionality out of FreeLdr's cmake file and place it in the dedicated files instead.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d0cd6e9372501bf24c75… commit 7d0cd6e9372501bf24c7540fd9bd48ea8614fe49 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 10 00:43:31 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 00:43:31 2019 +0100 [FREELDR][SDK:CMAKE] Move the `MSVC "linker script" file' functionality out of FreeLdr's cmake file and place it in the dedicated files instead. --- boot/freeldr/freeldr/CMakeLists.txt | 68 ------------------------------------- sdk/cmake/gcc.cmake | 10 +++++- sdk/cmake/msvc.cmake | 48 ++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 69 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 6fb59604c2..74a9b444c2 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -5,74 +5,6 @@ if(SEPARATE_DBG) set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif() -if(NOT MSVC) -### -### For GCC -### -function(add_linker_script _target _linker_script_file) - get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) - add_target_link_flags(${_target} "-Wl,-T,${_file_full_path}") - - # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) - # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html - add_target_property(${_target} LINK_DEPENDS ${_file_full_path}) -endfunction() - -else() -### -### For MSVC -### -function(add_linker_script _target _linker_script_file) - get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) - get_filename_component(_file_name ${_linker_script_file} NAME) - set(_generated_file_path_prefix "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_target}.dir/${_file_name}") - - # Generate the ASM module containing sections specifications and layout. - set(_generated_file "${_generated_file_path_prefix}.S") - add_custom_command( - OUTPUT ${_generated_file} - COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" - DEPENDS ${_file_full_path}) - set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM" GENERATED TRUE) - add_asm_files(${_target}_freeldr_linker_file ${_generated_file}) - - # Generate the C module containing extra sections specifications and layout, - # as well as comment-type linker #pragma directives. - set(_generated_file "${_generated_file_path_prefix}.c") - add_custom_command( - OUTPUT ${_generated_file} - COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" - DEPENDS ${_file_full_path}) - set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "C" GENERATED TRUE) - list(APPEND ${_target}_freeldr_linker_file ${_generated_file}) - - # Add both files to the sources of the target. - target_sources(${_target} PRIVATE "${${_target}_freeldr_linker_file}") - - # Create the additional linker response file. - set(_generated_file "${_generated_file_path_prefix}.rsp") - if(USE_CLANG_CL) - set(_no_std_includes_flag "-nostdinc") - else() - set(_no_std_includes_flag "/X") - endif() - add_custom_command( - #OUTPUT ${_generated_file} - TARGET ${_target} PRE_LINK - COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" > "${_generated_file}" - DEPENDS ${_file_full_path} - VERBATIM) - set_source_files_properties(${_generated_file} PROPERTIES GENERATED TRUE) - add_target_link_flags(${_target} "@${_generated_file}") - - # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) - # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html - add_target_property(${_target} LINK_DEPENDS ${_generated_file}) -endfunction() - -endif() - - if(MSVC) # We don't need hotpatching replace_compile_flags("/hotpatch" " ") diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index da203e5aa1..4c83f508f7 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -452,7 +452,6 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres set_source_files_properties(${_object_file} ${_binary_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_binary_file}) - endfunction() function(allow_warnings __module) @@ -463,3 +462,12 @@ endfunction() macro(add_asm_files _target) list(APPEND ${_target} ${ARGN}) endmacro() + +function(add_linker_script _target _linker_script_file) + get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) + add_target_link_flags(${_target} "-Wl,-T,${_file_full_path}") + + # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) + # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html + add_target_property(${_target} LINK_DEPENDS ${_file_full_path}) +endfunction() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index b0c5f18a45..7f0ec9851b 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -540,3 +540,51 @@ macro(add_asm_files _target) list(APPEND ${_target} ${ARGN}) endif() endmacro() + +function(add_linker_script _target _linker_script_file) + get_filename_component(_file_full_path ${_linker_script_file} ABSOLUTE) + get_filename_component(_file_name ${_linker_script_file} NAME) + set(_generated_file_path_prefix "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_target}.dir/${_file_name}") + + # Generate the ASM module containing sections specifications and layout. + set(_generated_file "${_generated_file_path_prefix}.S") + add_custom_command( + OUTPUT ${_generated_file} + COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" + DEPENDS ${_file_full_path}) + set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM" GENERATED TRUE) + add_asm_files(${_target}_linker_file ${_generated_file}) + + # Generate the C module containing extra sections specifications and layout, + # as well as comment-type linker #pragma directives. + set(_generated_file "${_generated_file_path_prefix}.c") + add_custom_command( + OUTPUT ${_generated_file} + COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" + DEPENDS ${_file_full_path}) + set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "C" GENERATED TRUE) + list(APPEND ${_target}_linker_file ${_generated_file}) + + # Add both files to the sources of the target. + target_sources(${_target} PRIVATE "${${_target}_linker_file}") + + # Create the additional linker response file. + set(_generated_file "${_generated_file_path_prefix}.rsp") + if(USE_CLANG_CL) + set(_no_std_includes_flag "-nostdinc") + else() + set(_no_std_includes_flag "/X") + endif() + add_custom_command( + #OUTPUT ${_generated_file} + TARGET ${_target} PRE_LINK + COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /D__LINKER__ /EP /c "${_file_full_path}" > "${_generated_file}" + DEPENDS ${_file_full_path} + VERBATIM) + set_source_files_properties(${_generated_file} PROPERTIES GENERATED TRUE) + add_target_link_flags(${_target} "@${_generated_file}") + + # Unfortunately LINK_DEPENDS is ignored in non-Makefile generators (for now...) + # See also http://www.cmake.org/pipermail/cmake/2010-May/037206.html + add_target_property(${_target} LINK_DEPENDS ${_generated_file}) +endfunction()

5 years, 10 months

[reactos] 01/01: [FREELDR] Fix VSSolution configuring and build

by Oleksandr Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5c5ba17e5d2298adc280… commit a5c5ba17e5d2298adc280455a7fcf62e6c963f55 Author: Oleksandr Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Feb 4 04:53:09 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 10 00:25:04 2019 +0100 [FREELDR] Fix VSSolution configuring and build "configure.cmd VSSolution" was failing due to add_asm_files macro expansion. It was using the same 'freeldr_linker_file' variable name as a temporary filename base twice. This patch uses '_target' parameter to make those variable names differ. --- boot/freeldr/freeldr/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 5d0bba0ba9..6fb59604c2 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -34,7 +34,7 @@ function(add_linker_script _target _linker_script_file) COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" DEPENDS ${_file_full_path}) set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM" GENERATED TRUE) - add_asm_files(freeldr_linker_file ${_generated_file}) + add_asm_files(${_target}_freeldr_linker_file ${_generated_file}) # Generate the C module containing extra sections specifications and layout, # as well as comment-type linker #pragma directives. @@ -44,10 +44,10 @@ function(add_linker_script _target _linker_script_file) COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" DEPENDS ${_file_full_path}) set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "C" GENERATED TRUE) - list(APPEND freeldr_linker_file ${_generated_file}) + list(APPEND ${_target}_freeldr_linker_file ${_generated_file}) # Add both files to the sources of the target. - target_sources(${_target} PRIVATE ${freeldr_linker_file}) + target_sources(${_target} PRIVATE "${${_target}_freeldr_linker_file}") # Create the additional linker response file. set(_generated_file "${_generated_file_path_prefix}.rsp")

5 years, 10 months

[reactos] 01/01: [SNDVOL32] Fix the positions and sizes of the separators of the normal line dialog and load the master dialogs for speakers or headphones.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1093e87508a4ba09cf28… commit d1093e87508a4ba09cf2805fc7bafff1160c1e4b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 10 00:14:05 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 10 00:14:05 2019 +0100 [SNDVOL32] Fix the positions and sizes of the separators of the normal line dialog and load the master dialogs for speakers or headphones. --- base/applications/sndvol32/dialog.c | 8 +++++++- base/applications/sndvol32/lang/bg-BG.rc | 4 ++-- base/applications/sndvol32/lang/cs-CZ.rc | 4 ++-- base/applications/sndvol32/lang/de-DE.rc | 4 ++-- base/applications/sndvol32/lang/el-GR.rc | 4 ++-- base/applications/sndvol32/lang/en-US.rc | 4 ++-- base/applications/sndvol32/lang/es-ES.rc | 4 ++-- base/applications/sndvol32/lang/fr-FR.rc | 4 ++-- base/applications/sndvol32/lang/he-IL.rc | 4 ++-- base/applications/sndvol32/lang/hu-HU.rc | 4 ++-- base/applications/sndvol32/lang/id-ID.rc | 4 ++-- base/applications/sndvol32/lang/it-IT.rc | 4 ++-- base/applications/sndvol32/lang/ja-JP.rc | 4 ++-- base/applications/sndvol32/lang/ko-KR.rc | 4 ++-- base/applications/sndvol32/lang/lt-LT.rc | 4 ++-- base/applications/sndvol32/lang/nl-NL.rc | 4 ++-- base/applications/sndvol32/lang/no-NO.rc | 4 ++-- base/applications/sndvol32/lang/pl-PL.rc | 4 ++-- base/applications/sndvol32/lang/pt-BR.rc | 4 ++-- base/applications/sndvol32/lang/ro-RO.rc | 4 ++-- base/applications/sndvol32/lang/ru-RU.rc | 4 ++-- base/applications/sndvol32/lang/sk-SK.rc | 4 ++-- base/applications/sndvol32/lang/sq-AL.rc | 4 ++-- base/applications/sndvol32/lang/sv-SE.rc | 4 ++-- base/applications/sndvol32/lang/th-TH.rc | 4 ++-- base/applications/sndvol32/lang/tr-TR.rc | 4 ++-- base/applications/sndvol32/lang/uk-UA.rc | 4 ++-- base/applications/sndvol32/lang/zh-CN.rc | 4 ++-- base/applications/sndvol32/lang/zh-TW.rc | 4 ++-- 29 files changed, 63 insertions(+), 57 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index b3d52d57ed7..53a12740271 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -434,7 +434,13 @@ EnumConnectionsCallback( /* is it selected */ if (Flags != 0x4) { - int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_MASTER : IDD_NORMAL_MASTER; + int dlgId; + + if ((Line->dwComponentType == MIXERLINE_COMPONENTTYPE_DST_SPEAKERS) || + (Line->dwComponentType == MIXERLINE_COMPONENTTYPE_DST_HEADPHONES)) + dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_MASTER : IDD_NORMAL_MASTER; + else + dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_LINE : IDD_NORMAL_LINE; /* load dialog resource */ LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(dlgId), PrefContext->Count); diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 736d2a6c8d2..5e8505fa499 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -64,13 +64,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Ляво/Дясно", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Сила", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index 56072a3a732..c15c99fbca8 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -66,13 +66,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Vyvážení", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Hlasitost", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 3aa5b5ec5c3..4541f7f1e01 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Lautstärke", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 9591f80e2c9..8bcbb89d193 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 1e0ae8e801d..543cb2dab83 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index b49f1063bd6..8c781ac828b 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -63,13 +63,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volumen", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index e4922eb937b..d856549b772 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 582c5b7e791..a01eced4072 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -63,13 +63,13 @@ EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "איזון", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "עוצמה", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index c3f80942c10..0a128f1fd18 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index ed55a028d8b..f9bb31d4bc4 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 73c9552ec20..40b4f6aff50 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Bilanciamento", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 69a82699c49..0aacbcd6293 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 9, "MS UI Gothic" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index dc119290089..d27fc4cf740 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 9, "굴림" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index bbed46d6c8d..9ab0e776e9e 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index bd66d672f6f..59ad09e249b 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index a41a513a712..413bb6f3b2a 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -60,13 +60,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index cf0de1f73b1..913aafe04bc 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -68,13 +68,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balans", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Głośność", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 069a928ba17..0918e2c2229 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balanço", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index 5cf871908f3..5154b07d4ca 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balans", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volum", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 19512b83f10..a0efe18b2a0 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Баланс", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Громкость", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 50ace06b406..389672c26bd 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index 12f755d62e5..ee5a3593479 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -64,13 +64,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balanca", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volumi", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index dce65176d3c..8cee0490969 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balanse", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volyme", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 2f9019fbf1e..c0bb9a95649 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -68,13 +68,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Balance", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Volume", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 27a5fa36e76..8bc678ec7cb 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Denge", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Ses Düzeyi", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index a2184f0ede5..78663d5cc24 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -68,13 +68,13 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "Баланс", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "Гучність", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index e64b23bfeac..c1ef52d7c42 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 9, "宋体" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "平衡", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "音量", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index aa53341fd8e..24445dad485 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -62,13 +62,13 @@ STYLE WS_POPUP | WS_BORDER FONT 9, "新細明體" BEGIN LTEXT "Line", IDC_LINE_NAME, 4, 7, 60, 8 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 62, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 72, 1 LTEXT "平衡", -1, 4, 25, 60, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 40, 17 LTEXT "音量", -1, 4, 58, 60, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 67, 30, 56 AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 1, 1, 150 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 70, 25, 1, 125 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100

5 years, 10 months

[reactos] 01/01: [NTOSKRNL] Fix parsing loop

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4320047c3f1e7d4e0d9f… commit f4320047c3f1e7d4e0d9f17d1cfa596d9801bb48 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 9 13:59:11 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 9 13:59:11 2019 +0100 [NTOSKRNL] Fix parsing loop --- ntoskrnl/ex/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index a5901d856d6..fdd9f2d7e41 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1312,6 +1312,8 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) i = 0; break; } + + ++i; } if (i == 0)

5 years, 10 months

[reactos] 01/01: [NTOSKRNL] Add a first implementation of !handle command in KDBG

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2991f6e76e8b7587cca19… commit 2991f6e76e8b7587cca1993a332879ee37cf415c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 9 13:45:19 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 9 13:46:35 2019 +0100 [NTOSKRNL] Add a first implementation of !handle command in KDBG It allows dumping all the handles (filtered by PID/Process) and it displays basic information about file and key handles --- ntoskrnl/ex/handle.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdb_cli.c | 2 + 2 files changed, 229 insertions(+) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index a0ea5fb448c..a5901d856d6 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -1282,3 +1282,230 @@ ExEnumHandleTable(IN PHANDLE_TABLE HandleTable, KeLeaveCriticalRegion(); return Result; } + +#if DBG && defined(KDBG) +BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) +{ + USHORT i; + char *endptr; + HANDLE ProcessId; + EXHANDLE ExHandle; + PLIST_ENTRY Entry; + PEPROCESS Process; + WCHAR KeyPath[MAX_PATH]; + PFILE_OBJECT FileObject; + PHANDLE_TABLE HandleTable; + POBJECT_HEADER ObjectHeader; + PHANDLE_TABLE_ENTRY TableEntry; + ULONG NeededLength, NameLength; + PCM_KEY_CONTROL_BLOCK Kcb, CurrentKcb; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + + if (Argc > 1) + { + /* Get EPROCESS address or PID */ + i = 0; + while (Argv[1][i]) + { + if (!isdigit(Argv[1][i])) + { + i = 0; + break; + } + } + + if (i == 0) + { + if (!KdbpGetHexNumber(Argv[1], (PVOID)&Process)) + { + KdbpPrint("Invalid parameter: %s\n", Argv[1]); + return TRUE; + } + + /* In the end, we always want a PID */ + ProcessId = PsGetProcessId(Process); + } + else + { + ProcessId = (HANDLE)strtoul(Argv[1], &endptr, 10); + if (*endptr != '\0') + { + KdbpPrint("Invalid parameter: %s\n", Argv[1]); + return TRUE; + } + } + } + else + { + ProcessId = PsGetCurrentProcessId(); + } + + for (Entry = HandleTableListHead.Flink; + Entry != &HandleTableListHead; + Entry = Entry->Flink) + { + /* Only return matching PID + * 0 matches everything + */ + HandleTable = CONTAINING_RECORD(Entry, HANDLE_TABLE, HandleTableList); + if (ProcessId != 0 && HandleTable->UniqueProcessId != ProcessId) + { + continue; + } + + KdbpPrint("\n"); + + KdbpPrint("Handle table at %p with %d entries in use\n", HandleTable, HandleTable->HandleCount); + + ExHandle.Value = 0; + while ((TableEntry = ExpLookupHandleTableEntry(HandleTable, ExHandle))) + { + if ((TableEntry->Object) && + (TableEntry->NextFreeTableEntry != -2)) + { + ObjectHeader = ObpGetHandleObject(TableEntry); + + KdbpPrint("%p: Object: %p GrantedAccess: %x Entry: %p\n", ExHandle.Value, &ObjectHeader->Body, TableEntry->GrantedAccess, TableEntry); + KdbpPrint("Object: %p Type: (%x) ", &ObjectHeader->Body, ObjectHeader->Type); + if (ObjectHeader->Type == IoFileObjectType) + { + KdbpPrint("File"); + } + else if (ObjectHeader->Type == ExEventObjectType) + { + KdbpPrint("Event"); + } + else if (ObjectHeader->Type == ExEventPairObjectType) + { + KdbpPrint("EventPair"); + } + else if (ObjectHeader->Type == ExMutantObjectType) + { + KdbpPrint("Mutant"); + } + else if (ObjectHeader->Type == ExSemaphoreObjectType) + { + KdbpPrint("Semaphore"); + } + else if (ObjectHeader->Type == ExTimerType) + { + KdbpPrint("Timer"); + } + else if (ObjectHeader->Type == ExWindowStationObjectType) + { + KdbpPrint("WindowStation"); + } + else if (ObjectHeader->Type == ExDesktopObjectType) + { + KdbpPrint("Desktop"); + } + else if (ObjectHeader->Type == ObpDirectoryObjectType) + { + KdbpPrint("Directory"); + } + else if (ObjectHeader->Type == CmpKeyObjectType) + { + KdbpPrint("Key"); + } + else if (ObjectHeader->Type == MmSectionObjectType) + { + KdbpPrint("Section"); + } + else if (ObjectHeader->Type == PsThreadType) + { + KdbpPrint("Thread"); + } + else if (ObjectHeader->Type == LpcPortObjectType) + { + KdbpPrint("ALPC Port"); + } + KdbpPrint("\n"); + KdbpPrint("\tObjectHeader: %p\n", ObjectHeader); + KdbpPrint("\t\tHandleCount: %u PointerCount: %u\n", ObjectHeader->HandleCount, ObjectHeader->PointerCount); + + /* Specific objects debug prints */ + + /* For file, display path */ + if (ObjectHeader->Type == IoFileObjectType) + { + FileObject = (PFILE_OBJECT)&ObjectHeader->Body; + + KdbpPrint("\t\t\tName: %wZ\n", &FileObject->FileName); + } + + /* For directory, and win32k objects, display object name */ + else if (ObjectHeader->Type == ObpDirectoryObjectType || + ObjectHeader->Type == ExWindowStationObjectType || + ObjectHeader->Type == ExDesktopObjectType) + { + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + if (ObjectNameInfo != NULL && ObjectNameInfo->Name.Buffer != NULL) + { + KdbpPrint("\t\t\tName: %wZ\n", &ObjectNameInfo->Name); + } + } + + /* For registry keys, display full path */ + else if (ObjectHeader->Type == CmpKeyObjectType) + { + Kcb = ((PCM_KEY_BODY)&ObjectHeader->Body)->KeyControlBlock; + if (!Kcb->Delete) + { + CurrentKcb = Kcb; + + /* See: CmpQueryNameInformation() */ + + while (CurrentKcb != NULL) + { + if (CurrentKcb->NameBlock->Compressed) + NeededLength += CmpCompressedNameSize(CurrentKcb->NameBlock->Name, CurrentKcb->NameBlock->NameLength); + else + NeededLength += CurrentKcb->NameBlock->NameLength; + + NeededLength += sizeof(OBJ_NAME_PATH_SEPARATOR); + + CurrentKcb = CurrentKcb->ParentKcb; + } + + if (NeededLength < MAX_PATH * sizeof(WCHAR)) + { + CurrentKcb = Kcb; + + while (CurrentKcb != NULL) + { + if (CurrentKcb->NameBlock->Compressed) + { + NameLength = CmpCompressedNameSize(CurrentKcb->NameBlock->Name, CurrentKcb->NameBlock->NameLength); + CmpCopyCompressedName(&KeyPath[(NeededLength - NameLength)/sizeof(WCHAR)], + NameLength, + CurrentKcb->NameBlock->Name, + CurrentKcb->NameBlock->NameLength); + } + else + { + NameLength = CurrentKcb->NameBlock->NameLength; + RtlCopyMemory(&KeyPath[(NeededLength - NameLength)/sizeof(WCHAR)], + CurrentKcb->NameBlock->Name, + NameLength); + } + + NeededLength -= NameLength; + NeededLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + KeyPath[NeededLength/sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + + CurrentKcb = CurrentKcb->ParentKcb; + } + } + + KdbpPrint("\t\t\tName: %S\n", KeyPath); + } + } + } + + ExHandle.Value += INDEX_TO_HANDLE_VALUE(1); + } + } + + return TRUE; +} +#endif diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index ed40fe3661c..5ef7f616af0 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -97,6 +97,7 @@ BOOLEAN ExpKdbgExtPoolFind(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtFileCache(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtIrpFind(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]); #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); @@ -194,6 +195,7 @@ static const struct { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, + { "!handle", "!handle [Handle]", "Displays info about handles", ExpKdbgExtHandle }, }; /* FUNCTIONS *****************************************************************/

5 years, 10 months

[reactos] 01/01: [mvdm] Fix missing pointer dereference

by Andrew Cook

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bfe6a5376cf3145ece2c… commit 5bfe6a5376cf3145ece2ce9d7f790b31ec23684e Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Sat Feb 9 15:08:08 2019 +1100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 9 11:53:55 2019 +0100 [mvdm] Fix missing pointer dereference Original code compared against the pointer value rather than the first byte --- subsystems/mvdm/ntvdm/console/console.c | 2 +- subsystems/mvdm/ntvdm/emulator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/console/console.c b/subsystems/mvdm/ntvdm/console/console.c index db2a4682735..7901a25dad7 100644 --- a/subsystems/mvdm/ntvdm/console/console.c +++ b/subsystems/mvdm/ntvdm/console/console.c @@ -169,7 +169,7 @@ UpdateVdmMenuDisks(VOID) if (GlobalSettings.FloppyDisks[i].Length != 0 && GlobalSettings.FloppyDisks[i].Buffer && - GlobalSettings.FloppyDisks[i].Buffer != L'\0') + *GlobalSettings.FloppyDisks[i].Buffer != L'\0') { /* Update item text */ _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); diff --git a/subsystems/mvdm/ntvdm/emulator.c b/subsystems/mvdm/ntvdm/emulator.c index 2a6b186f277..68ff9f3cba8 100644 --- a/subsystems/mvdm/ntvdm/emulator.c +++ b/subsystems/mvdm/ntvdm/emulator.c @@ -592,7 +592,7 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { if (GlobalSettings.FloppyDisks[i].Length != 0 && GlobalSettings.FloppyDisks[i].Buffer && - GlobalSettings.FloppyDisks[i].Buffer != '\0') + *GlobalSettings.FloppyDisks[i].Buffer != L'\0') { if (!MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE)) { @@ -611,7 +611,7 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { if (GlobalSettings.HardDisks[i].Length != 0 && GlobalSettings.HardDisks[i].Buffer && - GlobalSettings.HardDisks[i].Buffer != L'\0') + *GlobalSettings.HardDisks[i].Buffer != L'\0') { if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) {

5 years, 10 months

[reactos] 01/01: [CRYPTEXT] Add a minimal shell extension that will show the certificate dialog

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb7a0344cdfcd7764f9fe… commit fb7a0344cdfcd7764f9fe30df1d12791234b7dfb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 9 01:44:39 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 9 01:44:39 2019 +0100 [CRYPTEXT] Add a minimal shell extension that will show the certificate dialog --- boot/bootdata/hivecls.inf | 4 +++ dll/shellext/CMakeLists.txt | 1 + dll/shellext/cryptext/CMakeLists.txt | 17 ++++++++++ dll/shellext/cryptext/cryptext.c | 63 ++++++++++++++++++++++++++++++++++++ dll/shellext/cryptext/cryptext.spec | 2 ++ dll/shellext/cryptext/precomp.h | 18 +++++++++++ 6 files changed, 105 insertions(+) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 446da702532..37d81fd4b12 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -76,6 +76,10 @@ HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153 HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1""" HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" +; Certificate +HKCR,".cer","",0x00000000,"cerfile" +HKCR,"cerfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe cryptext.dll,CryptExtOpenCER %1" + ; ReactOS Command Script Files HKCR,".cmd","",0x00000000,"cmdfile" HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index e11df360013..0f57882163f 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(acppage) +add_subdirectory(cryptext) add_subdirectory(deskadp) add_subdirectory(deskmon) add_subdirectory(devcpux) diff --git a/dll/shellext/cryptext/CMakeLists.txt b/dll/shellext/cryptext/CMakeLists.txt new file mode 100644 index 00000000000..faa2301ce9a --- /dev/null +++ b/dll/shellext/cryptext/CMakeLists.txt @@ -0,0 +1,17 @@ + +spec2def(cryptext.dll cryptext.spec) + +list(APPEND SOURCE + cryptext.c + precomp.h) + +add_library(cryptext SHARED + ${SOURCE} + cryptext.spec + ${CMAKE_CURRENT_BINARY_DIR}/cryptext.def) + +set_module_type(cryptext win32dll UNICODE) +target_link_libraries(cryptext uuid) +add_importlibs(cryptext cryptui crypt32 user32 msvcrt kernel32 ntdll) +add_pch(cryptext precomp.h SOURCE) +add_cd_file(TARGET cryptext DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/cryptext/cryptext.c b/dll/shellext/cryptext/cryptext.c new file mode 100644 index 00000000000..8825f41b91b --- /dev/null +++ b/dll/shellext/cryptext/cryptext.c @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS CryptExt Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: cryptext implementation + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + + +BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} + +EXTERN_C +VOID WINAPI CryptExtOpenCERW(HWND hWnd, HINSTANCE hInst, LPCWSTR file, DWORD nCmdShow) +{ + PCCERT_CONTEXT pvContext; + if (file) + { + if (CryptQueryObject(CERT_QUERY_OBJECT_FILE, file, CERT_QUERY_CONTENT_FLAG_CERT, CERT_QUERY_FORMAT_FLAG_ALL, + 0, NULL, NULL, NULL, NULL, NULL, (CONST VOID**)&pvContext)) + { + CRYPTUI_VIEWCERTIFICATE_STRUCT CertViewInfo = {0}; + CertViewInfo.dwSize = sizeof(CertViewInfo); + CertViewInfo.pCertContext = pvContext; + CryptUIDlgViewCertificate(&CertViewInfo, NULL); + CertFreeCertificateContext(pvContext); + } + else + { + MessageBoxW(NULL, L"This is not a valid certificate", NULL, MB_OK); + } + } +} + +EXTERN_C +VOID WINAPI CryptExtOpenCER(HWND hWnd, HINSTANCE hInst, LPCSTR file, DWORD nCmdShow) +{ + LPWSTR fileW; + int len; + + if (file) + { + + len = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); + fileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (fileW) + { + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, len); + CryptExtOpenCERW(hWnd, hInst, fileW, nCmdShow); + HeapFree(GetProcessHeap(), 0, fileW); + } + } +} diff --git a/dll/shellext/cryptext/cryptext.spec b/dll/shellext/cryptext/cryptext.spec new file mode 100644 index 00000000000..b89f1dbc0a9 --- /dev/null +++ b/dll/shellext/cryptext/cryptext.spec @@ -0,0 +1,2 @@ +@ stdcall CryptExtOpenCER(ptr ptr str long) +@ stdcall CryptExtOpenCERW(ptr ptr wstr long) diff --git a/dll/shellext/cryptext/precomp.h b/dll/shellext/cryptext/precomp.h new file mode 100644 index 00000000000..e9df5d3270b --- /dev/null +++ b/dll/shellext/cryptext/precomp.h @@ -0,0 +1,18 @@ +#ifndef CRYPTEXT_PRECOMP_H +#define CRYPTEXT_PRECOMP_H + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <wincrypt.h> +#include <winuser.h> +#include <cryptuiapi.h> + + +#endif /* CRYPTEXT_PRECOMP_H */

5 years, 10 months

[reactos] 01/01: [LDR] Check forwarded imports against the manifest before trying to load them CORE-15729

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27cc4c6a08e1c0dda3f87… commit 27cc4c6a08e1c0dda3f874a68244ee6b0541f4b4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 7 20:57:04 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Feb 8 21:24:01 2019 +0100 [LDR] Check forwarded imports against the manifest before trying to load them CORE-15729 --- dll/ntdll/ldr/ldrpe.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dll/ntdll/ldr/ldrpe.c b/dll/ntdll/ldr/ldrpe.c index 1f7fa312366..ecba954687b 100644 --- a/dll/ntdll/ldr/ldrpe.c +++ b/dll/ntdll/ldr/ldrpe.c @@ -1133,13 +1133,44 @@ FailurePath: /* Make sure the conversion was OK */ if (NT_SUCCESS(Status)) { - /* Load the forwarder, free the temp string */ - Status = LdrpLoadDll(FALSE, + WCHAR StringBuffer[MAX_PATH]; + UNICODE_STRING StaticString, *RedirectedImportName; + BOOLEAN Redirected = FALSE; + + RtlInitEmptyUnicodeString(&StaticString, StringBuffer, sizeof(StringBuffer)); + + /* Check if the SxS Assemblies specify another file */ + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + &TempUString, + &LdrApiDefaultExtension, + &StaticString, + NULL, + &RedirectedImportName, + NULL, + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + if (ShowSnaps) + { + DPRINT1("LDR: %Z got redirected to %wZ\n", &ForwarderName, RedirectedImportName); + } + /* Let Ldrp know */ + Redirected = TRUE; + } + else + { + RedirectedImportName = &TempUString; + } + + /* Load the forwarder */ + Status = LdrpLoadDll(Redirected, NULL, NULL, - &TempUString, + RedirectedImportName, &ForwarderHandle, FALSE); + RtlFreeUnicodeString(&TempUString); }

5 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2019