Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [SNDVOL32] Add the small line dialog
by Eric Kohl 11 Mar '18

11 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ddb1bfd963c30c4146c1… commit 4ddb1bfd963c30c4146c1d795c4f11e0489b7e7e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 11 10:41:41 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 11 10:41:41 2018 +0100 [SNDVOL32] Add the small line dialog --- base/applications/sndvol32/lang/bg-BG.rc | 11 +++++++++++ base/applications/sndvol32/lang/cs-CZ.rc | 11 +++++++++++ base/applications/sndvol32/lang/de-DE.rc | 11 +++++++++++ base/applications/sndvol32/lang/el-GR.rc | 11 +++++++++++ base/applications/sndvol32/lang/en-US.rc | 11 +++++++++++ base/applications/sndvol32/lang/es-ES.rc | 11 +++++++++++ base/applications/sndvol32/lang/fr-FR.rc | 11 +++++++++++ base/applications/sndvol32/lang/he-IL.rc | 12 ++++++++++++ base/applications/sndvol32/lang/hu-HU.rc | 11 +++++++++++ base/applications/sndvol32/lang/id-ID.rc | 11 +++++++++++ base/applications/sndvol32/lang/it-IT.rc | 11 +++++++++++ base/applications/sndvol32/lang/ja-JP.rc | 11 +++++++++++ base/applications/sndvol32/lang/ko-KR.rc | 11 +++++++++++ base/applications/sndvol32/lang/lt-LT.rc | 11 +++++++++++ base/applications/sndvol32/lang/nl-NL.rc | 11 +++++++++++ base/applications/sndvol32/lang/no-NO.rc | 11 +++++++++++ base/applications/sndvol32/lang/pl-PL.rc | 11 +++++++++++ base/applications/sndvol32/lang/pt-BR.rc | 11 +++++++++++ base/applications/sndvol32/lang/ro-RO.rc | 11 +++++++++++ base/applications/sndvol32/lang/ru-RU.rc | 11 +++++++++++ base/applications/sndvol32/lang/sk-SK.rc | 11 +++++++++++ base/applications/sndvol32/lang/sq-AL.rc | 11 +++++++++++ base/applications/sndvol32/lang/sv-SE.rc | 11 +++++++++++ base/applications/sndvol32/lang/th-TH.rc | 11 +++++++++++ base/applications/sndvol32/lang/tr-TR.rc | 11 +++++++++++ base/applications/sndvol32/lang/uk-UA.rc | 11 +++++++++++ base/applications/sndvol32/lang/zh-CN.rc | 11 +++++++++++ base/applications/sndvol32/lang/zh-TW.rc | 11 +++++++++++ 28 files changed, 309 insertions(+) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index da3f5048cc..6694fde684 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -84,6 +84,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index 64d3f99a71..2849ce78a9 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -86,6 +86,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 36e0d759a9..a3f16f370e 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index f941785813..f7bf949bc8 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 1307367116..33562496c5 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index f8ae09f485..bac783a41d 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -83,6 +83,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index e20753a486..04a95e5e98 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 37736cecc7..b387768464 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -84,6 +84,18 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +EXSTYLE WS_EX_LAYOUTRTL +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW | WS_EX_LAYOUTRTL diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 6905588045..f2b1007969 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index f67ba04bbe..743b1e932c 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 516685361e..fc7273454e 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index f85dc190e2..94605c6af9 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "MS UI Gothic" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 281a01fdfe..f32d261f70 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "굴림" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 5114b3cc70..6a7d3e6955 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index dedd37bd67..06e9137e1e 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index 28c616ef2c..4b7729cf4e 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -80,6 +80,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 81a26b112e..7def443c89 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -88,6 +88,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 1118f94790..778b9dbf2c 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index ce8855db2e..8590291b49 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -81,6 +81,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 2585502167..389c82fd6e 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index e4217351cd..26a02534f9 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index 51b2152cf1..b3a6dbfb49 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -84,6 +84,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 1d7754e14e..3336f01a7b 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 9a31f4d203..1e1ac4f20a 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -88,6 +88,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 6f6c6ac851..3de3f9e409 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 5cd8e4ac4b..125ce1ed3c 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -88,6 +88,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index de6635c754..cf64e358e4 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "宋体" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index d6baf12d3e..8da7c8f92c 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -82,6 +82,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END +IDD_SMALL_LINE DIALOG 0, 0, 42, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "新細明體" +BEGIN + CTEXT "Line", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 1, 85, 41, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 42, 1, 1, 100 +END + IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW

1 0

01/01: [SNDVOL32] Add the normal line dialog
by Eric Kohl 11 Mar '18

11 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a7e1a7b7b9ddea9d0c7a… commit 8a7e1a7b7b9ddea9d0c7a0710442f28bc986c051 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 11 10:14:43 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 11 10:14:43 2018 +0100 [SNDVOL32] Add the normal line dialog --- base/applications/sndvol32/lang/bg-BG.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/cs-CZ.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/de-DE.rc | 18 ++++++++++++++++-- base/applications/sndvol32/lang/el-GR.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/en-US.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/es-ES.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/fr-FR.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/he-IL.rc | 15 +++++++++++++++ base/applications/sndvol32/lang/hu-HU.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/id-ID.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/it-IT.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/ja-JP.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/ko-KR.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/lt-LT.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/nl-NL.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/no-NO.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/pl-PL.rc | 18 ++++++++++++++++-- base/applications/sndvol32/lang/pt-BR.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/ro-RO.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/ru-RU.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/sk-SK.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/sq-AL.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/sv-SE.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/th-TH.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/tr-TR.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/uk-UA.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/zh-CN.rc | 14 ++++++++++++++ base/applications/sndvol32/lang/zh-TW.rc | 14 ++++++++++++++ base/applications/sndvol32/resources.h | 4 +++- 29 files changed, 400 insertions(+), 5 deletions(-) diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 6205be305e..da3f5048cc 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -59,6 +59,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Ляво/Дясно", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index 8681417b7d..64d3f99a71 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -61,6 +61,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Vyvážení", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 42343d4121..36e0d759a9 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -45,16 +45,30 @@ IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 80, 8 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 LTEXT "Balance", -1, 4, 25, 80, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 LTEXT "Lautstärke", -1, 4, 58, 80, 8 - CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 67, 30, 56 AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12 CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 5178745afa..f941785813 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index afacaa96b6..1307367116 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 5c696ac5bc..f8ae09f485 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -58,6 +58,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 821e947b91..e20753a486 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 1951b41711..37736cecc7 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -57,6 +57,21 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +STYLE WS_POPUP | WS_BORDER +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 + LTEXT "איזון", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER EXSTYLE WS_EX_LAYOUTRTL diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 3119f2c157..6905588045 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 318d1cce1f..f67ba04bbe 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index c93f33c4dc..516685361e 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Bilanciamento", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 83bb9a8b2d..f85dc190e2 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 9, "MS UI Gothic" diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 66e019d9c7..281a01fdfe 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 9, "굴림" diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 3dc8897aff..5114b3cc70 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index 55b6db4532..dedd37bd67 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index d806fba7b6..28c616ef2c 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -55,6 +55,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index c15526a596..81a26b112e 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -55,14 +55,28 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kanał główny", IDC_LINE_NAME, 4, 7, 78, 8 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 - LTEXT "Balans:", -1, 4, 25, 80, 8 + LTEXT "Balans", -1, 4, 25, 80, 8 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 - LTEXT "Głośność:", -1, 4, 58, 80, 8 + LTEXT "Głośność", -1, 4, 58, 80, 8 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12 CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balans", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 04a2b483b5..1118f94790 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balanço", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index 78f231ab8c..ce8855db2e 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -56,6 +56,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balans", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 9239fb94aa..2585502167 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Баланс", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 5f0c54be26..e4217351cd 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index af12369e14..51b2152cf1 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -59,6 +59,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balanca", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 774d83af4d..1d7754e14e 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balanse", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 4d622dc3fe..9a31f4d203 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -63,6 +63,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Balance", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 43aa0e4c6d..6f6c6ac851 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Denge", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 3c03eb5404..5cd8e4ac4b 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -63,6 +63,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "Баланс", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index 94b4c56533..de6635c754 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "平衡", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 9, "宋体" diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index ccd381ad1f..d6baf12d3e 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -57,6 +57,20 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END +IDD_NORMAL_LINE DIALOG 0, 0, 70, 150 +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 + LTEXT "平衡", -1, 4, 25, 60, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | 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_AUTOTICKS | 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 +END + IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER FONT 9, "新細明體" diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 58c2089912..eb4ef5fa2c 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -27,6 +27,8 @@ #define IDS_NOMIXERDEVICES 101 #define IDD_NORMAL_MASTER 200 +#define IDD_NORMAL_LINE 201 #define IDD_SMALL_MASTER 202 +#define IDD_SMALL_LINE 203 #define IDD_TRAY_MASTER 204 -#define IDD_PREFERENCES 205 +#define IDD_PREFERENCES 205

1 0

01/01: [SNDVOL32] Fix the layout of the normal master dialog - Fix the layout of the normal master dialog layout. - Change the name of the normal and tray master dialogs. - Add the WS_EX_LAYOUTRTL style to the hebrew dialogs.
by Eric Kohl 11 Mar '18

11 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f2feac70a7e744c8eafd… commit 6f2feac70a7e744c8eafdfd6f2c8c5306f185553 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 11 01:13:22 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 11 01:13:22 2018 +0100 [SNDVOL32] Fix the layout of the normal master dialog - Fix the layout of the normal master dialog layout. - Change the name of the normal and tray master dialogs. - Add the WS_EX_LAYOUTRTL style to the hebrew dialogs. --- base/applications/sndvol32/dialog.c | 2 +- base/applications/sndvol32/lang/bg-BG.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/cs-CZ.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/de-DE.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/el-GR.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/en-US.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/es-ES.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/fr-FR.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/he-IL.rc | 23 ++++++++++++----------- base/applications/sndvol32/lang/hu-HU.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/id-ID.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/it-IT.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/ja-JP.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/ko-KR.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/lt-LT.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/nl-NL.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/no-NO.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/pl-PL.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/pt-BR.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/ro-RO.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/ru-RU.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/sk-SK.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/sq-AL.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/sv-SE.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/th-TH.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/tr-TR.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/uk-UA.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/zh-CN.rc | 20 ++++++++++---------- base/applications/sndvol32/lang/zh-TW.rc | 20 ++++++++++---------- base/applications/sndvol32/resources.h | 6 +++--- base/applications/sndvol32/sndvol32.c | 2 +- 31 files changed, 287 insertions(+), 286 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 08fd6d197e..e736f4bb0a 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -404,7 +404,7 @@ EnumConnectionsCallback( /* is it selected */ if (Flags != 0x4) { - int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_MASTER : IDD_VOLUME_CTRL; + int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_MASTER : IDD_NORMAL_MASTER; /* 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 2b09b3f943..6205be305e 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -45,18 +45,18 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Обща", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Ляво/Дясно", -1, 10, 35, 80, 42 - LTEXT "Сила", -1, 30, 100, 45, 20 - CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 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 "За&глушаване", IDC_LINE_SWITCH, 4, 190, 110, 16, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Обща", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Ляво/Дясно", -1, 10, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Сила", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -70,7 +70,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index 77f4fef0b9..8681417b7d 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -47,18 +47,18 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Vyvážení", -1, 4, 35, 80, 42 - LTEXT "Hlasitost", -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 "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Vyvážení", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Hlasitost", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -72,7 +72,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 86520936a8..42343d4121 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Lautstärke", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 3fb6485dc8..5178745afa 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 19, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 1bd3703c40..afacaa96b6 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index 8672678eb7..5c696ac5bc 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -44,18 +44,18 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "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 - LTEXT "Volumen", -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 "&Silenciar", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Principal", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volumen", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -69,7 +69,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index a2fbf49aab..821e947b91 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 - 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 "&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 + LTEXT "Volume principal", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 6aa0e89c9f..1951b41711 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -42,23 +42,24 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "איזון", -1, 4, 35, 80, 42 - LTEXT "עוצמה", -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 "השתק", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "ראשי", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "איזון", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "עוצמה", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 STYLE WS_POPUP | WS_BORDER +EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN CTEXT "ראשי", IDC_LINE_NAME, 3, 3, 39, 8 @@ -68,9 +69,9 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP -EXSTYLE WS_EX_TOOLWINDOW +EXSTYLE WS_EX_TOOLWINDOW | WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" BEGIN CTEXT "עוצמה", -1, 0, 4, 50, 8 diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index d89e4aea2b..3119f2c157 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index 81ca6a3603..318d1cce1f 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index af90f32edb..c93f33c4dc 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 "Bilanciamento", -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 "&Disattiva", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Bilanciamento", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 8cbf97fae0..83bb9a8b2d 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 9, "MS UI Gothic" diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 03c4976fa0..66e019d9c7 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "취소", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 9, "굴림" 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 9, "굴림" diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 4ad2530513..3dc8897aff 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index f0de0b6a18..55b6db4532 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index d34821f074..d806fba7b6 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -41,18 +41,18 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -66,7 +66,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index 93095e8eab..c15526a596 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -49,18 +49,18 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kanał główny", IDC_LINE_NAME, 4, 6, 150, 21 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balans:", -1, 4, 35, 80, 42 - LTEXT "Głośność:", -1, 4, 90, 77, 108 - CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 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 "&Wycisz", IDC_LINE_SWITCH, 4, 190, 90, 16, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Kanał główny", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balans:", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Głośność:", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -74,7 +74,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 6e70068144..04a2b483b5 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 "Balanço", -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 "&Mudo", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balanço", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index 12b1bd2243..78f231ab8c 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -42,18 +42,18 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Volum general", 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 - LTEXT "Volum", -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 "A&muțește tot", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Volum general", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balans", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volum", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 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, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -67,7 +67,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index 5d5ffec888..9239fb94aa 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Главная", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Баланс", -1, 4, 35, 80, 42 - LTEXT "Громкость", -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 "В&ыкл. все", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Главная", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Баланс", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Громкость", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index 2737442928..5f0c54be26 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index 8d94ed8bc2..af12369e14 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -45,18 +45,18 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 "Balanca", -1, 4, 35, 80, 42 - LTEXT "Volumi", -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 "Heshtur", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balanca", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volumi", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -70,7 +70,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 3b58c81f6a..774d83af4d 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Huvud", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balanse", -1, 4, 35, 80, 42 - LTEXT "Volyme", -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 "&Tyst", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Huvud", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balanse", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volyme", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index 686e217751..4d622dc3fe 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -49,18 +49,18 @@ BEGIN PUSHBUTTON "ยกเลิก", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 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 + LTEXT "Master", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Balance", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Volume", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -74,7 +74,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index b159804d90..43aa0e4c6d 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ana", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Denge", -1, 4, 35, 80, 42 - LTEXT "Ses Düzeyi", -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 "S&essiz", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Ana", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Denge", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Ses Düzeyi", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 75d65f405b..3c03eb5404 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -49,18 +49,18 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Головна", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Баланс", -1, 4, 35, 80, 42 - LTEXT "Гучність", -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 "&Тиша", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "Головна", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "Баланс", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "Гучність", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -74,7 +74,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index d313046fa8..94b4c56533 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 9, "宋体" BEGIN - LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "平衡", -1, 4, 35, 80, 42 - LTEXT "音量", -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 "静音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "主要", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "平衡", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "音量", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 9, "宋体" diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index 0b4d765040..ccd381ad1f 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -43,18 +43,18 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 168, 226, 50, 14 END -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +IDD_NORMAL_MASTER DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 9, "新細明體" BEGIN - LTEXT "主要", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "平衡", -1, 4, 35, 80, 42 - LTEXT "音量", -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 "靜音(&M)", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 + LTEXT "主要", IDC_LINE_NAME, 4, 7, 78, 8 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 19, 82, 1 + LTEXT "平衡", -1, 4, 25, 80, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 35, 40, 17 + LTEXT "音量", -1, 4, 58, 80, 8 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 67, 30, 56 + AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 4, 123, 55, 12 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 90, 1, 1, 150 END IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 @@ -68,7 +68,7 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 END -IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 +IDD_TRAY_MASTER DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW FONT 9, "新細明體" diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 69aab744e3..58c2089912 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -26,7 +26,7 @@ #define IDS_SNDVOL32 100 #define IDS_NOMIXERDEVICES 101 -#define IDD_VOLUME_CTRL 200 -#define IDD_SMALL_MASTER 202 -#define IDD_TRAY_CTRL 204 +#define IDD_NORMAL_MASTER 200 +#define IDD_SMALL_MASTER 202 +#define IDD_TRAY_MASTER 204 #define IDD_PREFERENCES 205 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 29ae69aa4f..26b5ba99e7 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -1248,7 +1248,7 @@ _tWinMain(HINSTANCE hInstance, if (WindowMode == TRAY_MODE) { DialogBoxParam(hAppInstance, - MAKEINTRESOURCE(IDD_TRAY_CTRL), + MAKEINTRESOURCE(IDD_TRAY_MASTER), NULL, TrayDlgProc, 0);

1 0

01/01: [SNDVOL32] Add the small master dialog - Add the small master dialog. - Add support for tray (/t), small (/s) and normal (/n) dialog sizes. - Fix the font size calculation for the dialogs. - Fix the dialog unit to pixel conversion. - Fix the client window size calculation. - Do not leak font handles.
by Eric Kohl 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=849fdca3f9401795ad6d6… commit 849fdca3f9401795ad6d6231e55b5c6ec6f02abd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 10 21:10:40 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 10 21:11:08 2018 +0100 [SNDVOL32] Add the small master dialog - Add the small master dialog. - Add support for tray (/t), small (/s) and normal (/n) dialog sizes. - Fix the font size calculation for the dialogs. - Fix the dialog unit to pixel conversion. - Fix the client window size calculation. - Do not leak font handles. --- base/applications/sndvol32/dialog.c | 216 ++++++++++++++++++++----------- base/applications/sndvol32/lang/bg-BG.rc | 11 ++ base/applications/sndvol32/lang/cs-CZ.rc | 11 ++ base/applications/sndvol32/lang/de-DE.rc | 11 ++ base/applications/sndvol32/lang/el-GR.rc | 11 ++ base/applications/sndvol32/lang/en-US.rc | 11 ++ base/applications/sndvol32/lang/es-ES.rc | 11 ++ base/applications/sndvol32/lang/fr-FR.rc | 11 ++ base/applications/sndvol32/lang/he-IL.rc | 11 ++ base/applications/sndvol32/lang/hu-HU.rc | 11 ++ base/applications/sndvol32/lang/id-ID.rc | 11 ++ base/applications/sndvol32/lang/it-IT.rc | 11 ++ base/applications/sndvol32/lang/ja-JP.rc | 11 ++ base/applications/sndvol32/lang/ko-KR.rc | 11 ++ base/applications/sndvol32/lang/lt-LT.rc | 11 ++ base/applications/sndvol32/lang/nl-NL.rc | 11 ++ base/applications/sndvol32/lang/no-NO.rc | 11 ++ base/applications/sndvol32/lang/pl-PL.rc | 11 ++ base/applications/sndvol32/lang/pt-BR.rc | 11 ++ base/applications/sndvol32/lang/ro-RO.rc | 11 ++ base/applications/sndvol32/lang/ru-RU.rc | 11 ++ base/applications/sndvol32/lang/sk-SK.rc | 11 ++ base/applications/sndvol32/lang/sq-AL.rc | 11 ++ base/applications/sndvol32/lang/sv-SE.rc | 11 ++ base/applications/sndvol32/lang/th-TH.rc | 11 ++ base/applications/sndvol32/lang/tr-TR.rc | 11 ++ base/applications/sndvol32/lang/uk-UA.rc | 11 ++ base/applications/sndvol32/lang/zh-CN.rc | 11 ++ base/applications/sndvol32/lang/zh-TW.rc | 11 ++ base/applications/sndvol32/resources.h | 7 +- base/applications/sndvol32/sndvol32.c | 80 +++++++----- base/applications/sndvol32/sndvol32.h | 14 +- 32 files changed, 512 insertions(+), 113 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 5c74e22b33..08fd6d197e 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -7,11 +7,15 @@ #include "sndvol32.h" -#include <wingdi.h> -#define XLEFT (30) -#define XTOP (20) -#define DIALOG_VOLUME_SIZE (150) +VOID +ConvertRect(LPRECT lpRect, UINT xBaseUnit, UINT yBaseUnit) +{ + lpRect->left = MulDiv(lpRect->left, xBaseUnit, 4); + lpRect->right = MulDiv(lpRect->right, xBaseUnit, 4); + lpRect->top = MulDiv(lpRect->top, yBaseUnit, 8); + lpRect->bottom = MulDiv(lpRect->bottom, yBaseUnit, 8); +} LPVOID LoadDialogResource( @@ -66,7 +70,9 @@ AddDialogControl( IN LPRECT DialogOffset, IN PDLGITEMTEMPLATE DialogItem, IN DWORD DialogIdMultiplier, - IN HFONT hFont) + IN HFONT hFont, + UINT xBaseUnit, + UINT yBaseUnit) { RECT rect; LPWORD Offset; @@ -75,12 +81,18 @@ AddDialogControl( DWORD wID; /* initialize client rectangle */ - rect.left = DialogItem->x + DialogOffset->left; - rect.top = DialogItem->y + DialogOffset->top; - rect.right = DialogItem->cx; - rect.bottom = DialogItem->cy; + rect.left = DialogItem->x; + rect.top = DialogItem->y; + rect.right = DialogItem->x + DialogItem->cx; + rect.bottom = DialogItem->y + DialogItem->cy; - //MapDialogRect(hwndDialog, &rect); + /* Convert Dialog units to pixes */ + ConvertRect(&rect, xBaseUnit, yBaseUnit); + + rect.left += DialogOffset->left; + rect.right += DialogOffset->left; + rect.top += DialogOffset->top; + rect.bottom += DialogOffset->top; /* move offset after dialog item */ Offset = (LPWORD)(DialogItem + 1); @@ -140,8 +152,8 @@ AddDialogControl( DialogItem->style, rect.left, rect.top, - rect.right, - rect.bottom, + rect.right - rect.left, + rect.bottom - rect.top, hwndDialog, (HMENU)(wID), hAppInstance, @@ -207,35 +219,75 @@ VOID LoadDialogControls( IN PMIXER_WINDOW MixerWindow, LPRECT DialogOffset, - LPVOID DlgResource, - DWORD DialogIdMultiplier) + WORD ItemCount, + PDLGITEMTEMPLATE DialogItem, + DWORD DialogIdMultiplier, + UINT xBaseUnit, + UINT yBaseUnit) { - LPDLGTEMPLATE DialogHeader; - PDLGITEMTEMPLATE DialogItem; LPWORD Offset; - WORD FontSize; - WCHAR FontName[100]; - WORD Length, Index; - HFONT Font; - - /* get dialog header */ - DialogHeader = (LPDLGTEMPLATE)DlgResource; + WORD Index; /* sanity check */ - assert(DialogHeader->cdit); + assert(ItemCount); if (MixerWindow->Window) - MixerWindow->Window = (HWND*)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MixerWindow->Window, (MixerWindow->WindowCount + DialogHeader->cdit) * sizeof(HWND)); + MixerWindow->Window = (HWND*)HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MixerWindow->Window, (MixerWindow->WindowCount + ItemCount) * sizeof(HWND)); else - MixerWindow->Window = (HWND*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, DialogHeader->cdit * sizeof(HWND)); + MixerWindow->Window = (HWND*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ItemCount * sizeof(HWND)); if (!MixerWindow->Window) { /* no memory */ return; } - /* now walk past the dialog header */ - Offset = (LPWORD)(DialogHeader + 1); + /* enumerate now all controls */ + for (Index = 0; Index < ItemCount; Index++) + { + /* add controls */ + Offset = AddDialogControl(MixerWindow->hWnd, &MixerWindow->Window[MixerWindow->WindowCount], DialogOffset, DialogItem, DialogIdMultiplier, MixerWindow->hFont, xBaseUnit, yBaseUnit); + + /* sanity check */ + assert(Offset); + + /* move dialog item to new offset */ + DialogItem =(PDLGITEMTEMPLATE)Offset; + + /* increment window count */ + MixerWindow->WindowCount++; + } +} + +VOID +LoadDialog( + IN HMODULE hModule, + IN PMIXER_WINDOW MixerWindow, + IN LPCWSTR DialogResId, + IN DWORD Index) +{ + LPDLGTEMPLATE DlgTemplate; + PDLGITEMTEMPLATE DlgItem; + RECT dialogRect; + LPWORD Offset; + WORD FontSize; + WCHAR FontName[100]; + WORD Length; + int width; + + DWORD units = GetDialogBaseUnits(); + UINT xBaseUnit = LOWORD(units); + UINT yBaseUnit = HIWORD(units); + + /* first load the dialog resource */ + DlgTemplate = (LPDLGTEMPLATE)LoadDialogResource(hModule, DialogResId, NULL); + if (!DlgTemplate) + { + /* failed to load resource */ + return; + } + + /* Now walk past the dialog header */ + Offset = (LPWORD)(DlgTemplate + 1); /* FIXME: support menu */ assert(*Offset == 0); @@ -260,61 +312,62 @@ LoadDialogControls( /* copy font */ wcscpy(FontName, (LPWSTR)Offset); - Font = CreateFontW(FontSize+8, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, FontName); - assert(Font); + if (DlgTemplate->style & DS_SETFONT) + { + HDC hDC; - /* move offset after font name */ - Offset += Length; + hDC = GetDC(0); - /* offset is now at first dialog item control */ - DialogItem = (PDLGITEMTEMPLATE)Offset; + if (!MixerWindow->hFont) + { + int pixels = MulDiv(FontSize, GetDeviceCaps(hDC, LOGPIXELSY), 72); + MixerWindow->hFont = CreateFontW(-pixels, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, FontName); + } - /* enumerate now all controls */ - for(Index = 0; Index < DialogHeader->cdit; Index++) - { - /* add controls */ - Offset = AddDialogControl(MixerWindow->hWnd, &MixerWindow->Window[MixerWindow->WindowCount], DialogOffset, DialogItem, DialogIdMultiplier, Font); + if (MixerWindow->hFont) + { + SIZE charSize; + HFONT hOldFont; - /* sanity check */ - assert(Offset); + hOldFont = SelectObject(hDC, MixerWindow->hFont); + charSize.cx = GdiGetCharDimensions(hDC, NULL, &charSize.cy); + if (charSize.cx) + { + xBaseUnit = charSize.cx; + yBaseUnit = charSize.cy; + } + SelectObject(hDC, hOldFont); + } + } - /* move dialog item to new offset */ - DialogItem =(PDLGITEMTEMPLATE)Offset; +// assert(MixerWindow->hFont); - /* increment window count */ - MixerWindow->WindowCount++; - } -} + /* move offset after font name */ + Offset += Length; -VOID -LoadDialog( - IN HMODULE hModule, - IN PMIXER_WINDOW MixerWindow, - IN LPCWSTR DialogResId, - IN DWORD Index) -{ - LPVOID DlgResource; - RECT rect; + /* offset is now at first dialog item control */ + DlgItem = (PDLGITEMTEMPLATE)Offset; - /* first load the dialog resource */ - DlgResource = LoadDialogResource(hModule, DialogResId, NULL); + dialogRect.left = 0; + dialogRect.right = DlgTemplate->cx; + dialogRect.top = 0; + dialogRect.bottom = DlgTemplate->cy; - if (!DlgResource) - { - /* failed to load resource */ - return; - } + ConvertRect(&dialogRect, xBaseUnit, yBaseUnit); - /* get window size */ - GetClientRect(MixerWindow->hWnd, &rect); + width = dialogRect.right - dialogRect.left; - /* adjust client position */ - rect.left += (Index * DIALOG_VOLUME_SIZE); + dialogRect.left += MixerWindow->rect.right; + dialogRect.right += MixerWindow->rect.right; + dialogRect.top += MixerWindow->rect.top; + dialogRect.bottom += MixerWindow->rect.top; + MixerWindow->rect.right += width; + if ((dialogRect.bottom - dialogRect.top) > (MixerWindow->rect.bottom - MixerWindow->rect.top)) + MixerWindow->rect.bottom = MixerWindow->rect.top + dialogRect.bottom - dialogRect.top; /* now add the controls */ - LoadDialogControls(MixerWindow, &rect, DlgResource, Index); - + LoadDialogControls(MixerWindow, &dialogRect, DlgTemplate->cdit, DlgItem, Index, xBaseUnit, yBaseUnit); } BOOL @@ -328,7 +381,6 @@ EnumConnectionsCallback( WCHAR LineName[MIXER_LONG_NAME_CHARS]; DWORD Flags; DWORD wID; - RECT rect; UINT ControlCount = 0, Index; LPMIXERCONTROL Control = NULL; HWND hDlgCtrl; @@ -352,8 +404,10 @@ EnumConnectionsCallback( /* is it selected */ if (Flags != 0x4) { + int dlgId = (PrefContext->MixerWindow->Mode == SMALL_MODE) ? IDD_SMALL_MASTER : IDD_VOLUME_CTRL; + /* load dialog resource */ - LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(IDD_VOLUME_CTRL), PrefContext->Count); + LoadDialog(hAppInstance, PrefContext->MixerWindow, MAKEINTRESOURCE(dlgId), PrefContext->Count); /* get id */ wID = (PrefContext->Count + 1) * IDC_LINE_NAME; @@ -431,12 +485,6 @@ EnumConnectionsCallback( /* increment dialog count */ PrefContext->Count++; - - /* get application rectangle */ - GetWindowRect(PrefContext->MixerWindow->hWnd, &rect); - - /* now move the window */ - MoveWindow(PrefContext->MixerWindow->hWnd, rect.left, rect.top, (PrefContext->Count * DIALOG_VOLUME_SIZE), rect.bottom - rect.top, TRUE); } } } @@ -448,13 +496,26 @@ LoadDialogCtrls( PPREFERENCES_CONTEXT PrefContext) { HWND hDlgCtrl; + RECT statusRect; /* set dialog count to zero */ PrefContext->Count = 0; + SetRectEmpty(&PrefContext->MixerWindow->rect); + /* enumerate controls */ SndMixerEnumConnections(PrefContext->MixerWindow->Mixer, PrefContext->SelectedLine, EnumConnectionsCallback, (PVOID)PrefContext); + if (PrefContext->MixerWindow->hStatusBar) + { + GetWindowRect(PrefContext->MixerWindow->hStatusBar, &statusRect); + PrefContext->MixerWindow->rect.bottom += (statusRect.bottom - statusRect.top); + } + + /* now move the window */ + AdjustWindowRect(&PrefContext->MixerWindow->rect, WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, TRUE); + SetWindowPos(PrefContext->MixerWindow->hWnd, HWND_TOP, PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.top, PrefContext->MixerWindow->rect.right - PrefContext->MixerWindow->rect.left, PrefContext->MixerWindow->rect.bottom - PrefContext->MixerWindow->rect.top, SWP_NOMOVE | SWP_NOZORDER); + /* get last line separator */ hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, IDC_LINE_SEP * PrefContext->Count); @@ -463,7 +524,6 @@ LoadDialogCtrls( /* hide last separator */ ShowWindow(hDlgCtrl, SW_HIDE); } - } VOID diff --git a/base/applications/sndvol32/lang/bg-BG.rc b/base/applications/sndvol32/lang/bg-BG.rc index 6ac13cd18e..2b09b3f943 100644 --- a/base/applications/sndvol32/lang/bg-BG.rc +++ b/base/applications/sndvol32/lang/bg-BG.rc @@ -59,6 +59,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Обща", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "За&глушаване", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/cs-CZ.rc b/base/applications/sndvol32/lang/cs-CZ.rc index 1ac95bcda7..77f4fef0b9 100644 --- a/base/applications/sndvol32/lang/cs-CZ.rc +++ b/base/applications/sndvol32/lang/cs-CZ.rc @@ -61,6 +61,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Celková hlasitost", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/de-DE.rc b/base/applications/sndvol32/lang/de-DE.rc index 4df44041f7..86520936a8 100644 --- a/base/applications/sndvol32/lang/de-DE.rc +++ b/base/applications/sndvol32/lang/de-DE.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Stumm", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/el-GR.rc b/base/applications/sndvol32/lang/el-GR.rc index 4c8e33ca03..3fb6485dc8 100644 --- a/base/applications/sndvol32/lang/el-GR.rc +++ b/base/applications/sndvol32/lang/el-GR.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/en-US.rc b/base/applications/sndvol32/lang/en-US.rc index 3a5e80fac6..1bd3703c40 100644 --- a/base/applications/sndvol32/lang/en-US.rc +++ b/base/applications/sndvol32/lang/en-US.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/es-ES.rc b/base/applications/sndvol32/lang/es-ES.rc index ef7a74eeaf..8672678eb7 100644 --- a/base/applications/sndvol32/lang/es-ES.rc +++ b/base/applications/sndvol32/lang/es-ES.rc @@ -58,6 +58,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Principal", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Silenciar", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/fr-FR.rc b/base/applications/sndvol32/lang/fr-FR.rc index 7331e0ed92..a2fbf49aab 100644 --- a/base/applications/sndvol32/lang/fr-FR.rc +++ b/base/applications/sndvol32/lang/fr-FR.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volume principal", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Muet", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/he-IL.rc b/base/applications/sndvol32/lang/he-IL.rc index 3779376bc7..6aa0e89c9f 100644 --- a/base/applications/sndvol32/lang/he-IL.rc +++ b/base/applications/sndvol32/lang/he-IL.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "ראשי", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "השתק", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/hu-HU.rc b/base/applications/sndvol32/lang/hu-HU.rc index 759ce74b3a..d89e4aea2b 100644 --- a/base/applications/sndvol32/lang/hu-HU.rc +++ b/base/applications/sndvol32/lang/hu-HU.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/id-ID.rc b/base/applications/sndvol32/lang/id-ID.rc index cc6327bcfc..81ca6a3603 100644 --- a/base/applications/sndvol32/lang/id-ID.rc +++ b/base/applications/sndvol32/lang/id-ID.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/it-IT.rc b/base/applications/sndvol32/lang/it-IT.rc index 3678b5bf0a..af90f32edb 100644 --- a/base/applications/sndvol32/lang/it-IT.rc +++ b/base/applications/sndvol32/lang/it-IT.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Disattiva", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ja-JP.rc b/base/applications/sndvol32/lang/ja-JP.rc index 61a7b69e1a..8cbf97fae0 100644 --- a/base/applications/sndvol32/lang/ja-JP.rc +++ b/base/applications/sndvol32/lang/ja-JP.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "MS UI Gothic" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 1abeb34f03..03c4976fa0 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "굴림" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/lt-LT.rc b/base/applications/sndvol32/lang/lt-LT.rc index 7c44bf2eae..4ad2530513 100644 --- a/base/applications/sndvol32/lang/lt-LT.rc +++ b/base/applications/sndvol32/lang/lt-LT.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/nl-NL.rc b/base/applications/sndvol32/lang/nl-NL.rc index 18e0bb2889..f0de0b6a18 100644 --- a/base/applications/sndvol32/lang/nl-NL.rc +++ b/base/applications/sndvol32/lang/nl-NL.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/no-NO.rc b/base/applications/sndvol32/lang/no-NO.rc index ef4bde48b9..d34821f074 100644 --- a/base/applications/sndvol32/lang/no-NO.rc +++ b/base/applications/sndvol32/lang/no-NO.rc @@ -55,6 +55,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/pl-PL.rc b/base/applications/sndvol32/lang/pl-PL.rc index c2c09123bc..93095e8eab 100644 --- a/base/applications/sndvol32/lang/pl-PL.rc +++ b/base/applications/sndvol32/lang/pl-PL.rc @@ -63,6 +63,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Kanał główny", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Wycisz", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/pt-BR.rc b/base/applications/sndvol32/lang/pt-BR.rc index 146ffb6721..6e70068144 100644 --- a/base/applications/sndvol32/lang/pt-BR.rc +++ b/base/applications/sndvol32/lang/pt-BR.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mudo", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ro-RO.rc b/base/applications/sndvol32/lang/ro-RO.rc index 17cf0379e3..12b1bd2243 100644 --- a/base/applications/sndvol32/lang/ro-RO.rc +++ b/base/applications/sndvol32/lang/ro-RO.rc @@ -56,6 +56,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Volum general", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "A&muțește tot", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/ru-RU.rc b/base/applications/sndvol32/lang/ru-RU.rc index b9df68910a..5d5ffec888 100644 --- a/base/applications/sndvol32/lang/ru-RU.rc +++ b/base/applications/sndvol32/lang/ru-RU.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Главная", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "В&ыкл. все", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sk-SK.rc b/base/applications/sndvol32/lang/sk-SK.rc index b58b95ddad..2737442928 100644 --- a/base/applications/sndvol32/lang/sk-SK.rc +++ b/base/applications/sndvol32/lang/sk-SK.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sq-AL.rc b/base/applications/sndvol32/lang/sq-AL.rc index ac94cdb36d..8d94ed8bc2 100644 --- a/base/applications/sndvol32/lang/sq-AL.rc +++ b/base/applications/sndvol32/lang/sq-AL.rc @@ -59,6 +59,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "Heshtur", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/sv-SE.rc b/base/applications/sndvol32/lang/sv-SE.rc index 1695b69b1f..3b58c81f6a 100644 --- a/base/applications/sndvol32/lang/sv-SE.rc +++ b/base/applications/sndvol32/lang/sv-SE.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Huvud", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Tyst", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/th-TH.rc b/base/applications/sndvol32/lang/th-TH.rc index b8ab88c434..686e217751 100644 --- a/base/applications/sndvol32/lang/th-TH.rc +++ b/base/applications/sndvol32/lang/th-TH.rc @@ -63,6 +63,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Master", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Mute", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index ae98afc4cb..b159804d90 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Ana", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "S&essiz", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/uk-UA.rc b/base/applications/sndvol32/lang/uk-UA.rc index 19270442c7..75d65f405b 100644 --- a/base/applications/sndvol32/lang/uk-UA.rc +++ b/base/applications/sndvol32/lang/uk-UA.rc @@ -63,6 +63,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Головна", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "&Тиша", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/zh-CN.rc b/base/applications/sndvol32/lang/zh-CN.rc index d4cea71d42..d313046fa8 100644 --- a/base/applications/sndvol32/lang/zh-CN.rc +++ b/base/applications/sndvol32/lang/zh-CN.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "宋体" +BEGIN + CTEXT "主要", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "静音(&M)", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/lang/zh-TW.rc b/base/applications/sndvol32/lang/zh-TW.rc index d70bbd0a3e..0b4d765040 100644 --- a/base/applications/sndvol32/lang/zh-TW.rc +++ b/base/applications/sndvol32/lang/zh-TW.rc @@ -57,6 +57,17 @@ BEGIN CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END +IDD_SMALL_MASTER DIALOG 0, 0, 45, 100 +STYLE WS_POPUP | WS_BORDER +FONT 9, "新細明體" +BEGIN + CTEXT "主要", IDC_LINE_NAME, 3, 3, 39, 8 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 2, 12, 39, 18 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 30, 30, 50 + AUTOCHECKBOX "靜音(&M)", IDC_LINE_SWITCH, 1, 85, 44, 10 + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 45, 1, 1, 100 +END + IDD_TRAY_CTRL DIALOGEX 0, 0, 50, 80 STYLE DS_MODALFRAME | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW diff --git a/base/applications/sndvol32/resources.h b/base/applications/sndvol32/resources.h index 80f82e7b1f..69aab744e3 100644 --- a/base/applications/sndvol32/resources.h +++ b/base/applications/sndvol32/resources.h @@ -26,6 +26,7 @@ #define IDS_SNDVOL32 100 #define IDS_NOMIXERDEVICES 101 -#define IDD_VOLUME_CTRL 200 -#define IDD_PREFERENCES 201 -#define IDD_TRAY_CTRL 202 +#define IDD_VOLUME_CTRL 200 +#define IDD_SMALL_MASTER 202 +#define IDD_TRAY_CTRL 204 +#define IDD_PREFERENCES 205 diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 7531518d64..29ae69aa4f 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -820,7 +820,8 @@ MainWindowProc(HWND hwnd, } /* destroy old status bar */ - DestroyWindow(MixerWindow->hStatusBar); + if (MixerWindow->Mode == NORMAL_MODE) + DestroyWindow(MixerWindow->hStatusBar); /* update details */ Preferences.SelectedLine = Pref.SelectedLine; @@ -835,18 +836,20 @@ MainWindowProc(HWND hwnd, RebuildMixerWindowControls(&Preferences); /* create status window */ - MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS, - NULL, - hwnd, - 0); - - /* set status bar */ - if (MixerWindow->hStatusBar) + if (MixerWindow->Mode == NORMAL_MODE) { - SendMessage(MixerWindow->hStatusBar, - WM_SETTEXT, - 0, - (LPARAM)szProduct); + MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS, + NULL, + hwnd, + 0); + if (MixerWindow->hStatusBar) + { + /* Set status bar */ + SendMessage(MixerWindow->hStatusBar, + WM_SETTEXT, + 0, + (LPARAM)szProduct); + } } } break; @@ -999,16 +1002,19 @@ MainWindowProc(HWND hwnd, } /* create status window */ - MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS, - NULL, - hwnd, - 0); - if (MixerWindow->hStatusBar) + if (MixerWindow->Mode == NORMAL_MODE) { - SendMessage(MixerWindow->hStatusBar, - WM_SETTEXT, - 0, - (LPARAM)szProduct); + MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS, + NULL, + hwnd, + 0); + if (MixerWindow->hStatusBar) + { + SendMessage(MixerWindow->hStatusBar, + WM_SETTEXT, + 0, + (LPARAM)szProduct); + } } } break; @@ -1024,6 +1030,8 @@ MainWindowProc(HWND hwnd, { SndMixerDestroy(MixerWindow->Mixer); } + if (MixerWindow->hFont) + DeleteObject(MixerWindow->hFont); HeapFree(hAppHeap, 0, MixerWindow); } break; @@ -1080,7 +1088,9 @@ UnregisterApplicationClasses(VOID) } static HWND -CreateApplicationWindow(VOID) +CreateApplicationWindow( + WINDOW_MODE WindowMode, + BOOL bRecord) { HWND hWnd; @@ -1092,6 +1102,9 @@ CreateApplicationWindow(VOID) return NULL; } + MixerWindow->Mode = WindowMode; + + if (mixerGetNumDevs() > 0) { hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT, @@ -1139,10 +1152,14 @@ CreateApplicationWindow(VOID) static BOOL HandleCommandLine(LPTSTR cmdline, - PBOOL pTray) + PWINDOW_MODE pMode, + PBOOL pRecord) { TCHAR option; + *pRecord = FALSE; + *pMode = SMALL_MODE; + while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) { if (*cmdline++ == _T(' ')) @@ -1162,25 +1179,27 @@ HandleCommandLine(LPTSTR cmdline, case 'n': /* Normal size */ case 'N': - *pTray = FALSE; + *pMode = NORMAL_MODE; break; case 's': /* Small size */ case 'S': - *pTray = FALSE; + *pMode = SMALL_MODE; break; case 't': /* Tray size */ case 'T': - *pTray = TRUE; + *pMode = TRAY_MODE; break; case 'p': /* Play mode */ case 'P': + *pRecord = FALSE; break; case 'r': /* Record mode */ case 'R': + *pRecord = TRUE; break; default: @@ -1200,7 +1219,8 @@ _tWinMain(HINSTANCE hInstance, MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX Controls; - BOOL bTray = FALSE; + WINDOW_MODE WindowMode = SMALL_MODE; + BOOL bRecord = FALSE; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(nCmdShow); @@ -1208,7 +1228,7 @@ _tWinMain(HINSTANCE hInstance, hAppInstance = hInstance; hAppHeap = GetProcessHeap(); - HandleCommandLine(lpszCmdLine, &bTray); + HandleCommandLine(lpszCmdLine, &WindowMode, &bRecord); if (InitAppConfig()) { @@ -1225,7 +1245,7 @@ _tWinMain(HINSTANCE hInstance, InitCommonControlsEx(&Controls); - if (bTray) + if (WindowMode == TRAY_MODE) { DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_TRAY_CTRL), @@ -1237,7 +1257,7 @@ _tWinMain(HINSTANCE hInstance, { if (RegisterApplicationClasses()) { - hMainWnd = CreateApplicationWindow(); + hMainWnd = CreateApplicationWindow(WindowMode, bRecord); if (hMainWnd != NULL) { BOOL bRet; diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index f98f23d493..640ac20c8f 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -5,6 +5,7 @@ #include <windef.h> #include <winbase.h> +#include <wingdi.h> #include <winuser.h> #include <mmsystem.h> #include <commctrl.h> @@ -13,6 +14,13 @@ #include "resources.h" +typedef enum _WINDOW_MODE +{ + NORMAL_MODE, + SMALL_MODE, + TRAY_MODE +} WINDOW_MODE, *PWINDOW_MODE; + typedef struct _MIXER_WINDOW { HWND hWnd; @@ -20,9 +28,11 @@ typedef struct _MIXER_WINDOW struct _SND_MIXER *Mixer; UINT SelectedLine; UINT WindowCount; - HWND * Window; - + HWND *Window; + WINDOW_MODE Mode; + RECT rect; + HFONT hFont; } MIXER_WINDOW, *PMIXER_WINDOW; extern HINSTANCE hAppInstance;

1 0

01/01: [CONSRV] Silence a noisy DPRINT.
by Hermès Bélusca-Maïto 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bdebb1fed74de3f0573d… commit 8bdebb1fed74de3f0573d7a7e1e86b73ef5411a7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 10 20:37:08 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 10 20:37:08 2018 +0100 [CONSRV] Silence a noisy DPRINT. --- win32ss/user/winsrv/consrv/frontends/terminal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index d4f380ba3e..0ab20d82fa 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -262,7 +262,7 @@ ConSrvTermInitTerminal(IN OUT PTERMINAL This, FrontEnd->Console = Console; /** HACK HACK!! Copy FrontEnd into the console!! **/ - DPRINT1("Using FrontEndIFace HACK(1), should be removed after proper implementation!\n"); + DPRINT("Using FrontEndIFace HACK(1), should be removed after proper implementation!\n"); Console->FrontEndIFace = *FrontEnd; Status = FrontEnd->Vtbl->InitFrontEnd(FrontEnd, FrontEnd->Console);

1 0

02/02: [KMTESTS:CC] Fix MSVC build.
by Hermès Bélusca-Maïto 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab8470d8bb2cc01bf711a… commit ab8470d8bb2cc01bf711a5fae9d97d178d22b7db Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 10 18:51:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 10 18:51:21 2018 +0100 [KMTESTS:CC] Fix MSVC build. --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 6535f7f326..8fd6f6bd89 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -100,9 +100,9 @@ static CACHE_MANAGER_CALLBACKS Callbacks = { }; static CC_FILE_SIZES FileSizes = { - .AllocationSize.QuadPart = 0x4000, - .FileSize.QuadPart = 0x4000, - .ValidDataLength.QuadPart = 0x4000, + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000), // .AllocationSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000), // .FileSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000) // .ValidDataLength }; static

1 0

01/02: [PSDK:LM] Fix parameter types.
by Hermès Bélusca-Maïto 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6d7480287ef7f0baac66… commit e6d7480287ef7f0baac66fd5202a766dace282de Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 10 18:18:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 10 18:18:21 2018 +0100 [PSDK:LM] Fix parameter types. --- sdk/include/psdk/lmrepl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/include/psdk/lmrepl.h b/sdk/include/psdk/lmrepl.h index 0c3686310e..706ebba596 100644 --- a/sdk/include/psdk/lmrepl.h +++ b/sdk/include/psdk/lmrepl.h @@ -41,7 +41,7 @@ typedef struct _REPL_INFO_1002 { DWORD rp1002_guardtime; } REPL_INFO_1002,*PREPL typedef struct _REPL_INFO_1003 { DWORD rp1003_random; } REPL_INFO_1003,*PREPL_INFO_1003,*LPREPL_INFO_1003; NET_API_STATUS WINAPI NetReplGetInfo(LPCWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetReplSetInfo(LPCWSTR,DWORD,PBYTE,PDWORD); +NET_API_STATUS WINAPI NetReplSetInfo(LPCWSTR,DWORD,const LPBYTE,PDWORD); typedef struct _REPL_EDIR_INFO_0 { LPWSTR rped0_dirname; } REPL_EDIR_INFO_0,*PREPL_EDIR_INFO_0,*LPREPL_EDIR_INFO_0; @@ -72,14 +72,14 @@ typedef struct _REPL_IDIR_INFO_1 { DWORD rpid1_lockcount; DWORD rpid1_locktime; } REPL_IDIR_INFO_1,*PREPL_IDIR_INFO_1,*LPREPL_IDIR_INFO_1; -NET_API_STATUS WINAPI NetReplExportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD); +NET_API_STATUS WINAPI NetReplExportDirAdd(LPCWSTR,DWORD,const LPBYTE,PDWORD); NET_API_STATUS WINAPI NetReplExportDirDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetReplExportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetReplExportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD); +NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPCWSTR,LPCWSTR,DWORD,const LPBYTE,PDWORD); NET_API_STATUS WINAPI NetReplExportDirLock(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetReplExportDirUnlock(LPCWSTR,LPCWSTR,DWORD); -NET_API_STATUS WINAPI NetReplImportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD); +NET_API_STATUS WINAPI NetReplImportDirAdd(LPCWSTR,DWORD,const LPBYTE,PDWORD); NET_API_STATUS WINAPI NetReplImportDirDel(LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetReplImportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);

1 0

01/01: [PSDK] Fix the build for msvc 2010. Addendum to e129995 CORE-14434
by Mark Jansen 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8b9a43ae817ea1bee11a… commit a8b9a43ae817ea1bee11a766b57fda76400505cb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 10 12:21:03 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Mar 10 12:25:41 2018 +0100 [PSDK] Fix the build for msvc 2010. Addendum to e129995 CORE-14434 --- sdk/include/psdk/wincrypt.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sdk/include/psdk/wincrypt.h b/sdk/include/psdk/wincrypt.h index ffd664419b..789a7b0f83 100644 --- a/sdk/include/psdk/wincrypt.h +++ b/sdk/include/psdk/wincrypt.h @@ -1373,6 +1373,7 @@ typedef BOOL #define CALG_OID_INFO_CNG_ONLY 0xffffffff #define CALG_OID_INFO_PARAMETERS 0xfffffffe +#if defined(__GNUC__) #define CRYPT_OID_INFO_HASH_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','H','a','s','h','P','a','r','a','m','e','t','e','r','s',0} #define CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','P','a','r','a','m','e','t','e','r','s',0} #define CRYPT_OID_INFO_MGF1_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','M','g','f','1','P','a','r','a','m','e','t','e','r','s',0} @@ -1380,6 +1381,23 @@ typedef BOOL #define CRYPT_OID_INFO_OAEP_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','O','A','E','P','P','a','r','a','m','e','t','e','r','s',0} #define CRYPT_OID_INFO_ECC_WRAP_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','W','r','a','p','P','a','r','a','m','e','t','e','r','s',0} #define CRYPT_OID_INFO_NO_PARAMETERS_ALGORITHM (const WCHAR []){'C','r','y','p','t','O','I','D','I','n','f','o','N','o','P','a','r','a','m','e','t','e','r','s',0} +#elif defined(_MSC_VER) +#define CRYPT_OID_INFO_HASH_PARAMETERS_ALGORITHM L"CryptOIDInfoHashParameters" +#define CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM L"CryptOIDInfoECCParameters" +#define CRYPT_OID_INFO_MGF1_PARAMETERS_ALGORITHM L"CryptOIDInfoMgf1Parameters" +#define CRYPT_OID_INFO_NO_SIGN_ALGORITHM L"CryptOIDInfoNoSign" +#define CRYPT_OID_INFO_OAEP_PARAMETERS_ALGORITHM L"CryptOIDInfoOAEPParameters" +#define CRYPT_OID_INFO_ECC_WRAP_PARAMETERS_ALGORITHM L"CryptOIDInfoECCWrapParameters" +#define CRYPT_OID_INFO_NO_PARAMETERS_ALGORITHM L"CryptOIDInfoNoParameters" +#else +static const WCHAR CRYPT_OID_INFO_HASH_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','H','a','s','h','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR CRYPT_OID_INFO_ECC_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR CRYPT_OID_INFO_MGF1_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','M','g','f','1','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR CRYPT_OID_INFO_NO_SIGN_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','N','o','S','i','g','n',0}; +static const WCHAR CRYPT_OID_INFO_OAEP_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','O','A','E','P','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR CRYPT_OID_INFO_ECC_WRAP_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','E','C','C','W','r','a','p','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR CRYPT_OID_INFO_NO_PARAMETERS_ALGORITHM[] = {'C','r','y','p','t','O','I','D','I','n','f','o','N','o','P','a','r','a','m','e','t','e','r','s',0}; +#endif typedef struct _CRYPT_OID_INFO { DWORD cbSize;

1 0

01/01: [KMTESTS:CC] Add some tests for CcMapData To be extended.
by Pierre Schweitzer 10 Mar '18

10 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47a084303aba062daf07e… commit 47a084303aba062daf07e0e6e5f0c450c37a0f03 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Mar 10 11:13:32 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Mar 10 11:14:33 2018 +0100 [KMTESTS:CC] Add some tests for CcMapData To be extended. --- modules/rostests/kmtests/CMakeLists.txt | 4 +- modules/rostests/kmtests/kmtest/testlist.c | 2 + modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 15 + modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 332 ++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcMapData_user.c | 31 ++ 5 files changed, 383 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index c66ed9a38e..bb4ee5beba 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -135,6 +135,7 @@ list(APPEND KMTEST_SOURCE kernel32/FileAttributes_user.c kernel32/FindFile_user.c ntos_cc/CcCopyRead_user.c + ntos_cc/CcMapData_user.c ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c @@ -173,7 +174,8 @@ add_dependencies(kmtest_drivers ntcreatesection_drv poirp_drv tcpip_drv - cccopyread_drv) + cccopyread_drv + ccmapdata_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest) diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index d58024083b..99f500994f 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -7,6 +7,7 @@ #include <kmt_test.h> KMT_TESTFUNC Test_CcCopyRead; +KMT_TESTFUNC Test_CcMapData; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; @@ -35,6 +36,7 @@ KMT_TESTFUNC Test_TcpIpConnect; const KMT_TEST TestList[] = { { "CcCopyRead", Test_CcCopyRead }, + { "CcMapData", Test_CcMapData }, { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index c8ab792865..f4e4fe01de 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -15,3 +15,18 @@ add_importlibs(cccopyread_drv ntoskrnl hal) add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopyread_drv) + +# +# CcMapData +# +list(APPEND CCMAPDATA_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcMapData_drv.c) + +add_library(ccmapdata_drv SHARED ${CCMAPDATA_DRV_SOURCE}) +set_module_type(ccmapdata_drv kernelmodedriver) +target_link_libraries(ccmapdata_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ccmapdata_drv ntoskrnl hal) +add_target_compile_definitions(ccmapdata_drv KMT_STANDALONE_DRIVER) +#add_pch(ccmapdata_drv ../include/kmt_test.h) +add_rostests_file(TARGET ccmapdata_drv) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c new file mode 100644 index 0000000000..6535f7f326 --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -0,0 +1,332 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for CcMapData function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +static ULONG TestTestId = -1; +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; +static KMT_IRP_HANDLER TestIrpHandler; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"CcMapData"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +BOOLEAN +NTAPI +AcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromLazyWrite( + _In_ PVOID Context) +{ + return; +} + +BOOLEAN +NTAPI +AcquireForReadAhead( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromReadAhead( + _In_ PVOID Context) +{ + return; +} + +static CACHE_MANAGER_CALLBACKS Callbacks = { + AcquireForLazyWrite, + ReleaseFromLazyWrite, + AcquireForReadAhead, + ReleaseFromReadAhead, +}; + +static CC_FILE_SIZES FileSizes = { + .AllocationSize.QuadPart = 0x4000, + .FileSize.QuadPart = 0x4000, + .ValidDataLength.QuadPart = 0x4000, +}; + +static +PVOID +MapAndLockUserBuffer( + _In_ _Out_ PIRP Irp, + _In_ ULONG BufferLength) +{ + PMDL Mdl; + + if (Irp->MdlAddress == NULL) + { + Mdl = IoAllocateMdl(Irp->UserBuffer, BufferLength, FALSE, FALSE, Irp); + if (Mdl == NULL) + { + return NULL; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoFreeMdl(Mdl); + Irp->MdlAddress = NULL; + _SEH2_YIELD(return NULL); + } + _SEH2_END; + } + + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); +} + +static +VOID +PerformTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + PVOID Bcb; + BOOLEAN Ret; + PULONG Buffer; + PTEST_FCB Fcb; + LARGE_INTEGER Offset; + + ok_eq_pointer(TestFileObject, NULL); + ok_eq_pointer(TestDeviceObject, NULL); + ok_eq_ulong(TestTestId, -1); + + TestDeviceObject = DeviceObject; + TestTestId = TestId; + TestFileObject = IoCreateStreamFileObject(NULL, DeviceObject); + if (!skip(TestFileObject != NULL, "Failed to allocate FO\n")) + { + Fcb = ExAllocatePool(NonPagedPool, sizeof(TEST_FCB)); + if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + { + RtlZeroMemory(Fcb, sizeof(TEST_FCB)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + + TestFileObject->FsContext = Fcb; + TestFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + KmtStartSeh(); + CcInitializeCacheMap(TestFileObject, &FileSizes, FALSE, &Callbacks, NULL); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) + { + Ret = FALSE; + Offset.QuadPart = TestId * 0x1000; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_ulong(Buffer[(0x3000 - TestId * 0x1000) / sizeof(ULONG)], 0xDEADBABE); + + CcUnpinData(Bcb); + } + } + } + } +} + + +static +VOID +CleanupTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + ok_eq_pointer(TestDeviceObject, DeviceObject); + ok_eq_ulong(TestTestId, TestId); + + if (!skip(TestFileObject != NULL, "No test FO\n")) + { + if (CcIsFileCached(TestFileObject)) + { + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(TestFileObject, NULL, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + } + + if (TestFileObject->FsContext != NULL) + { + ExFreePool(TestFileObject->FsContext); + TestFileObject->FsContext = NULL; + TestFileObject->SectionObjectPointer = NULL; + } + + ObDereferenceObject(TestFileObject); + } + + TestFileObject = NULL; + TestDeviceObject = NULL; + TestTestId = -1; +} + + +static +NTSTATUS +TestMessageHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + switch (ControlCode) + { + case IOCTL_START_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + PerformTest(*(PULONG)Buffer, DeviceObject); + break; + + case IOCTL_FINISH_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + CleanupTest(*(PULONG)Buffer, DeviceObject); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + return Status; +} + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_READ) + { + PMDL Mdl; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Read.ByteOffset; + Length = IoStack->Parameters.Read.Length; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + ok(FlagOn(Irp->Flags, IRP_NOCACHE), "Not coming from Cc\n"); + + ok_irql(APC_LEVEL); + ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + RtlFillMemory(Buffer, Length, 0xBA); + + Status = STATUS_SUCCESS; + if (Offset.QuadPart <= 0x3000 && Offset.QuadPart + Length > 0x3000) + { + *(PULONG)((ULONG_PTR)Buffer + (ULONG_PTR)(0x3000 - Offset.QuadPart)) = 0xDEADBABE; + } + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Mdl->MdlFlags & MDL_IO_PAGE_READ) != 0, "Non paging IO\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + + Irp->IoStatus.Information = Length; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c new file mode 100644 index 0000000000..31847c0e89 --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite CcMapData test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +START_TEST(CcMapData) +{ + DWORD Ret; + ULONG TestId; + + KmtLoadDriver(L"CcMapData", FALSE); + KmtOpenDriver(); + + for (TestId = 0; TestId < 3; ++TestId) + { + Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + Ret = KmtSendUlongToDriver(IOCTL_FINISH_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + } + + KmtCloseDriver(); + KmtUnloadDriver(); +}

1 0

04/04: [DRWTSN32] Indicate the thread that crashed.
by Mark Jansen 09 Mar '18

09 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=516c5a9a4fd34d08c79bc… commit 516c5a9a4fd34d08c79bc62d9619c1dd06fcee76 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Mar 8 22:52:23 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Mar 10 00:04:57 2018 +0100 [DRWTSN32] Indicate the thread that crashed. --- base/applications/drwtsn32/main.cpp | 98 +++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/base/applications/drwtsn32/main.cpp b/base/applications/drwtsn32/main.cpp index 436a18bf30..f7cdc3aab0 100644 --- a/base/applications/drwtsn32/main.cpp +++ b/base/applications/drwtsn32/main.cpp @@ -48,6 +48,54 @@ static bool SortModules(const ModuleData& left, const ModuleData& right) return left.BaseAddress < right.BaseAddress; } +static void PrintThread(FILE* output, DumpData& data, DWORD tid, ThreadData& thread) +{ + thread.Update(); + + xfprintf(output, NEWLINE "State Dump for Thread Id 0x%x%s" NEWLINE NEWLINE, tid, + (tid == data.ThreadID) ? " (CRASH)" : ""); + + const CONTEXT& ctx = thread.Context; + if ((ctx.ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { +#if defined(_M_IX86) + xfprintf(output, "eax:%p ebx:%p ecx:%p edx:%p esi:%p edi:%p" NEWLINE, + ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, ctx.Esi, ctx.Edi); +#elif defined(_M_AMD64) + xfprintf(output, "rax:%p rbx:%p rcx:%p rdx:%p rsi:%p rdi:%p" NEWLINE, + ctx.Rax, ctx.Rbx, ctx.Rcx, ctx.Rdx, ctx.Rsi, ctx.Rdi); + xfprintf(output, "r8:%p r9:%p r10:%p r11:%p r12:%p r13:%p r14:%p r15:%p" NEWLINE, + ctx.R8, ctx.R9, ctx.R10, ctx.R11, ctx.R12, ctx.R13, ctx.R14, ctx.R15); +#else +#error Unknown architecture +#endif + } + + if ((ctx.ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { +#if defined(_M_IX86) + xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE, + ctx.Eip, ctx.Esp, ctx.Ebp); +#elif defined(_M_AMD64) + xfprintf(output, "rip:%p rsp:%p rbp:%p" NEWLINE, + ctx.Rip, ctx.Rsp, ctx.Rbp); +#else +#error Unknown architecture +#endif + } + + if ((ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) + { +#if defined(_M_IX86) || defined(_M_AMD64) + xfprintf(output, "dr0:%p dr1:%p dr2:%p dr3:%p dr6:%p dr7:%p" NEWLINE, + ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7); +#else +#error Unknown architecture +#endif + } + + PrintStackBacktrace(output, data, thread); +} void PrintBugreport(FILE* output, DumpData& data) { @@ -92,49 +140,17 @@ void PrintBugreport(FILE* output, DumpData& data) } BeginStackBacktrace(data); - for (ThreadMap::iterator it = data.Threads.begin(); it != data.Threads.end(); ++it) - { - it->second.Update(); - xfprintf(output, NEWLINE "State Dump for Thread Id 0x%x" NEWLINE NEWLINE, it->first); - const CONTEXT& ctx = it->second.Context; - if ((ctx.ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) - { -#if defined(_M_IX86) - xfprintf(output, "eax:%p ebx:%p ecx:%p edx:%p esi:%p edi:%p" NEWLINE, - ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, ctx.Esi, ctx.Edi); -#elif defined(_M_AMD64) - xfprintf(output, "rax:%p rbx:%p rcx:%p rdx:%p rsi:%p rdi:%p" NEWLINE, - ctx.Rax, ctx.Rbx, ctx.Rcx, ctx.Rdx, ctx.Rsi, ctx.Rdi); - xfprintf(output, "r8:%p r9:%p r10:%p r11:%p r12:%p r13:%p r14:%p r15:%p" NEWLINE, - ctx.R8, ctx.R9, ctx.R10, ctx.R11, ctx.R12, ctx.R13, ctx.R14, ctx.R15); -#else -#error Unknown architecture -#endif - } - if ((ctx.ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) - { -#if defined(_M_IX86) - xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE, - ctx.Eip, ctx.Esp, ctx.Ebp); -#elif defined(_M_AMD64) - xfprintf(output, "rip:%p rsp:%p rbp:%p" NEWLINE, - ctx.Rip, ctx.Rsp, ctx.Rbp); -#else -#error Unknown architecture -#endif - } - if ((ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS) - { -#if defined(_M_IX86) || defined(_M_AMD64) - xfprintf(output, "dr0:%p dr1:%p dr2:%p dr3:%p dr6:%p dr7:%p" NEWLINE, - ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7); -#else -#error Unknown architecture -#endif - } + // First print the thread that crashed + ThreadMap::iterator crash = data.Threads.find(data.ThreadID); + if (crash != data.Threads.end()) + PrintThread(output, data, crash->first, crash->second); - PrintStackBacktrace(output, data, it->second); + // Print the other threads + for (ThreadMap::iterator it = data.Threads.begin(); it != data.Threads.end(); ++it) + { + if (it->first != data.ThreadID) + PrintThread(output, data, it->first, it->second); } EndStackBacktrace(data); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
44
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 March 2018