Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 01/01: [GDIPLUS] Fix a regression painting gradient CORE-15479

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=daadcc61414330c909625… commit daadcc61414330c909625c08fe2b909c0bf5621f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 13 17:14:41 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 13 17:14:41 2019 +0100 [GDIPLUS] Fix a regression painting gradient CORE-15479 patch is import of Wine commit 0937186f7d15fed60f77fa2014d650f4d0b6b20b by Nikolay Sivov --- dll/win32/gdiplus/brush.c | 67 ++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dll/win32/gdiplus/brush.c b/dll/win32/gdiplus/brush.c index d06832045a..f726023982 100644 --- a/dll/win32/gdiplus/brush.c +++ b/dll/win32/gdiplus/brush.c @@ -428,8 +428,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, GpLineGradient **line) { GpPointF start, end; + float far_x, angle; GpStatus stat; - float far_x, far_y; TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); @@ -437,45 +437,33 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, if(!line || !rect) return InvalidParameter; - far_x = rect->X + rect->Width; - far_y = rect->Y + rect->Height; - switch (mode) { - case LinearGradientModeHorizontal: - start.X = min(rect->X, far_x); - start.Y = rect->Y; - end.X = max(rect->X, far_x); - end.Y = rect->Y; - break; case LinearGradientModeVertical: - start.X = rect->X; - start.Y = min(rect->Y, far_y); - end.X = rect->X; - end.Y = max(rect->Y, far_y); + angle = 90.0f; break; case LinearGradientModeForwardDiagonal: - start.X = min(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = max(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 45.0f; break; case LinearGradientModeBackwardDiagonal: - start.X = max(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = min(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 135.0f; break; + case LinearGradientModeHorizontal: + far_x = rect->X + rect->Width; + + start.X = min(rect->X, far_x); + start.Y = rect->Y; + end.X = max(rect->X, far_x); + end.Y = rect->Y; + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); + if (stat == Ok) + (*line)->rect = *rect; + return stat; default: return InvalidParameter; } - stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); - - if (stat == Ok) - (*line)->rect = *rect; - - return stat; + return GdipCreateLineBrushFromRectWithAngle(rect, startcolor, endcolor, angle, TRUE, wrap, line); } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, @@ -503,9 +491,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect GpLineGradient **line) { GpStatus stat; - LinearGradientMode mode; - REAL exofs, eyofs; + REAL exofs, eyofs, far_x, far_y; REAL sin_angle, cos_angle, sin_cos_angle; + GpPointF start, end; TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); @@ -544,12 +532,25 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect cos_angle = cosf(angle); sin_cos_angle = sin_angle * cos_angle; + far_x = rect->X + rect->Width; + far_y = rect->Y + rect->Height; + if (sin_cos_angle >= 0) - mode = LinearGradientModeForwardDiagonal; + { + start.X = min(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = max(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } else - mode = LinearGradientModeBackwardDiagonal; + { + start.X = max(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = min(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } - stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line); + stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); if (stat == Ok) {

5 years, 8 months

[reactos] 01/01: [MMSYS] Fix the main volume trackbar

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ec2fd4c3ea9d5139f59e… commit 0ec2fd4c3ea9d5139f59e3dd9d9921df28be4715 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 13 15:38:06 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 13 15:38:06 2019 +0100 [MMSYS] Fix the main volume trackbar - Increase the height of the trackbar in order to make it fully visible. - Remove the selection range code. - Set a range from 0 to 500 and fix the volume calculations accordingly. - Set a tick frequency of 50 and a page size of 100. - Play the default sound on TB_ENDTRACK notifications. --- dll/cpl/mmsys/lang/bg-BG.rc | 2 +- dll/cpl/mmsys/lang/cs-CZ.rc | 2 +- dll/cpl/mmsys/lang/de-DE.rc | 2 +- dll/cpl/mmsys/lang/el-GR.rc | 2 +- dll/cpl/mmsys/lang/en-US.rc | 2 +- dll/cpl/mmsys/lang/es-ES.rc | 2 +- dll/cpl/mmsys/lang/fr-FR.rc | 2 +- dll/cpl/mmsys/lang/he-IL.rc | 2 +- dll/cpl/mmsys/lang/id-ID.rc | 2 +- dll/cpl/mmsys/lang/it-IT.rc | 2 +- dll/cpl/mmsys/lang/ja-JP.rc | 2 +- dll/cpl/mmsys/lang/nl-NL.rc | 2 +- dll/cpl/mmsys/lang/no-NO.rc | 2 +- dll/cpl/mmsys/lang/pl-PL.rc | 2 +- dll/cpl/mmsys/lang/pt-BR.rc | 2 +- dll/cpl/mmsys/lang/ro-RO.rc | 2 +- dll/cpl/mmsys/lang/ru-RU.rc | 2 +- dll/cpl/mmsys/lang/sk-SK.rc | 2 +- dll/cpl/mmsys/lang/sq-AL.rc | 2 +- dll/cpl/mmsys/lang/tr-TR.rc | 2 +- dll/cpl/mmsys/lang/uk-UA.rc | 2 +- dll/cpl/mmsys/lang/zh-CN.rc | 2 +- dll/cpl/mmsys/lang/zh-TW.rc | 2 +- dll/cpl/mmsys/volume.c | 36 ++++++++++++++++-------------------- 24 files changed, 39 insertions(+), 43 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index 82f053f033..68401bf7f2 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Сила на устройството", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Слабо", -1, 62, 66, 30, 17 LTEXT "Силно", -1, 195, 66, 30, 17 AUTOCHECKBOX "За&глушено", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index e7b6479915..54083af812 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -14,7 +14,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Hlasitost zařízení", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Nízká", -1, 62, 66, 30, 17 LTEXT "Vysoká", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Ztlumit", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 28bdb81d28..4aec9627c8 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Gerätelautstärke", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Niedrig", -1, 62, 66, 30, 17 LTEXT "Hoch", -1, 195, 66, 30, 17 AUTOCHECKBOX "Stu&mm schalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index 2886f2ecee..bbb48d7302 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Low", -1, 62, 66, 30, 9 LTEXT "High", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index e6d0407fff..dee8b78851 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Low", -1, 62, 66, 30, 9 LTEXT "High", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index 42d472d12e..e5f2df82f6 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Volumen del dispositivo ", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Bajo", -1, 62, 66, 30, 17 LTEXT "Alto", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Silencio", IDC_MUTE_CHECKBOX, 30, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index c9658ab956..9eb336404f 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Volume du périphérique", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Faible", -1, 62, 66, 30, 17 LTEXT "Élevé", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 70083edb3a..893e207e6b 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -11,7 +11,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "עוצמת התקן", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "נמוך", -1, 62, 66, 30, 9 LTEXT "גבוה", -1, 195, 66, 30, 9 AUTOCHECKBOX "השתק", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index 7e417647ca..13619732a3 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Low", -1, 62, 66, 30, 9 LTEXT "High", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index 388b0b87b3..9ad8e067a2 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Volume del dispositivo", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Basso", -1, 62, 66, 30, 17 LTEXT "Alto", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index 6e581bc18f..d7e045dde5 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "デバイスの音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "低", -1, 62, 66, 30, 9 LTEXT "高", -1, 195, 66, 30, 9 AUTOCHECKBOX "ミュート(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index 4c432a9534..a2e5164de0 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Laag", -1, 62, 62, 30, 17 LTEXT "Hoog", -1, 195, 62, 30, 17 AUTOCHECKBOX "&Dempen", IDC_MUTE_CHECKBOX, 25, 78, 190, 10 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index aa381129bc..e89585fba4 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Enhets volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Lavt", -1, 62, 66, 30, 17 LTEXT "Høyt", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Demp", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index a1fc6077ac..1388a788e1 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -22,7 +22,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Głośność urządzenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Mała", -1, 62, 66, 30, 17 LTEXT "Duża", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Wycisz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index b40b26baca..fcd4bea426 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Low", -1, 62, 66, 30, 9 LTEXT "High", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index fde0871fce..97a78fc4a0 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -14,7 +14,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Redus", -1, 62, 66, 30, 17 LTEXT "Ridicat", -1, 195, 66, 30, 17 AUTOCHECKBOX "A&muțește tot", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index 83fd057b68..4a6be2ec09 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -9,7 +9,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 19 GROUPBOX "Громкость микшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "ниже", -1, 62, 66, 30, 9 LTEXT "выше", -1, 195, 66, 30, 9 AUTOCHECKBOX "В&ыключить звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index 672dcf51dc..f843795c1b 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -14,7 +14,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Hlasitosť zariadenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "nízka", -1, 62, 66, 30, 17 LTEXT "vysoká", -1, 195, 66, 30, 17 AUTOCHECKBOX "S&tlmiť", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index 23fcc1c2f7..981d5819eb 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -13,7 +13,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Volumi Pjesës", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Poshtë", -1, 62, 66, 30, 9 LTEXT "Lart", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 4442122911..7c8a9b4dae 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -11,7 +11,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "Düşük", -1, 62, 66, 30, 9 LTEXT "Yüksek", -1, 195, 66, 30, 9 AUTOCHECKBOX "&Sessiz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index 143c3faf95..cdab3fb8db 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -17,7 +17,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "Гучність мікшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "нижче", -1, 62, 66, 30, 17 LTEXT "вище", -1, 195, 66, 30, 17 AUTOCHECKBOX "&Вимкнути звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 88890b7a86..7fb7a74bea 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -17,7 +17,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "设备音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "低", -1, 62, 66, 30, 17 LTEXT "高", -1, 195, 66, 30, 17 AUTOCHECKBOX "静音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 8f238d7284..1e3a06e696 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -15,7 +15,7 @@ BEGIN LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 GROUPBOX "裝置音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 - CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 LTEXT "低", -1, 62, 66, 30, 17 LTEXT "高", -1, 195, 66, 30, 17 AUTOCHECKBOX "靜音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index ccaafc36ea..98f1d0150d 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -11,7 +11,10 @@ #include <shellapi.h> -#define VOLUME_DIVIDER 0xFFF +#define VOLUME_MIN 0 +#define VOLUME_MAX 500 +#define VOLUME_TICFREQ 50 +#define VOLUME_PAGESIZE 100 typedef struct _IMGINFO { @@ -35,7 +38,7 @@ typedef struct _GLOBAL_DATA DWORD volumeMinimum; DWORD volumeMaximum; DWORD volumeValue; - + DWORD volumeStep; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -168,6 +171,7 @@ GetVolumeControl(PGLOBAL_DATA pGlobalData) pGlobalData->volumeMinimum = mxc.Bounds.dwMinimum; pGlobalData->volumeMaximum = mxc.Bounds.dwMaximum; pGlobalData->volumeControlID = mxc.dwControlID; + pGlobalData->volumeStep = (pGlobalData->volumeMaximum - pGlobalData->volumeMinimum) / (VOLUME_MAX - VOLUME_MIN); } @@ -303,12 +307,10 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) GetVolumeValue(pGlobalData); SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, 0, (LPARAM)mxc.szPname); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, - (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeMaximum/VOLUME_DIVIDER)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, (WPARAM)FALSE, (LPARAM)1); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, - (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETTICFREQ, VOLUME_TICFREQ, 0); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, 0, VOLUME_PAGESIZE); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->volumeValue - pGlobalData->volumeMinimum) / pGlobalData->volumeStep); } VOID @@ -344,8 +346,6 @@ VolumeDlgProc(HWND hwndDlg, pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch(uMsg) { case MM_MIXM_LINE_CHANGE: @@ -366,8 +366,7 @@ VolumeDlgProc(HWND hwndDlg, case MM_MIXM_CONTROL_CHANGE: { GetVolumeValue(pGlobalData); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->volumeValue - pGlobalData->volumeMinimum) / pGlobalData->volumeStep); break; } case WM_INITDIALOG: @@ -455,10 +454,11 @@ VolumeDlgProc(HWND hwndDlg, HWND hVolumeTrackbar = GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR); if (hVolumeTrackbar == (HWND)lParam) { - pGlobalData->volumeValue = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_GETPOS, 0, 0)*VOLUME_DIVIDER; + pGlobalData->volumeValue = ((DWORD)SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_GETPOS, 0, 0) * pGlobalData->volumeStep) + pGlobalData->volumeMinimum; SetVolumeValue(pGlobalData); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)TRUE, - (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); + + if (LOWORD(wParam) == TB_ENDTRACK) + PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ALIAS_ID | SND_ASYNC); } break; } @@ -472,11 +472,7 @@ VolumeDlgProc(HWND hwndDlg, break; case WM_NOTIFY: - if (((LPNMHDR)lParam)->code == (UINT)NM_RELEASEDCAPTURE) - { - PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ALIAS_ID | SND_ASYNC); - } - else if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { SaveData(hwndDlg); }

5 years, 8 months

[reactos] 01/01: [MMSYS] Play default sound when the volume trackbar is released.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcadedb306280af94f6d3… commit fcadedb306280af94f6d34ddb51ed35e9a45631a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 13 14:05:00 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 13 14:05:00 2019 +0100 [MMSYS] Play default sound when the volume trackbar is released. This works on Windows XP but it might not work on ReactOS because of unimplemented features of PlaySound(). --- dll/cpl/mmsys/volume.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index 6374c12edc..ccaafc36ea 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -472,7 +472,11 @@ VolumeDlgProc(HWND hwndDlg, break; case WM_NOTIFY: - if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + if (((LPNMHDR)lParam)->code == (UINT)NM_RELEASEDCAPTURE) + { + PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ALIAS_ID | SND_ASYNC); + } + else if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { SaveData(hwndDlg); }

5 years, 8 months

[reactos] 01/01: [MMSYS] Replace the sound event list ListView by a TreeView.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cf2a78473ccfda6ee01c… commit 5cf2a78473ccfda6ee01c602bbea40513fa63837 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 12 22:11:37 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 13 10:37:21 2019 +0100 [MMSYS] Replace the sound event list ListView by a TreeView. CORE-15584 --- dll/cpl/mmsys/lang/bg-BG.rc | 2 +- dll/cpl/mmsys/lang/cs-CZ.rc | 2 +- dll/cpl/mmsys/lang/de-DE.rc | 2 +- dll/cpl/mmsys/lang/el-GR.rc | 2 +- dll/cpl/mmsys/lang/en-US.rc | 2 +- dll/cpl/mmsys/lang/es-ES.rc | 2 +- dll/cpl/mmsys/lang/fr-FR.rc | 2 +- dll/cpl/mmsys/lang/he-IL.rc | 2 +- dll/cpl/mmsys/lang/id-ID.rc | 2 +- dll/cpl/mmsys/lang/it-IT.rc | 2 +- dll/cpl/mmsys/lang/ja-JP.rc | 2 +- dll/cpl/mmsys/lang/nl-NL.rc | 2 +- dll/cpl/mmsys/lang/no-NO.rc | 2 +- dll/cpl/mmsys/lang/pl-PL.rc | 2 +- dll/cpl/mmsys/lang/pt-BR.rc | 2 +- dll/cpl/mmsys/lang/ro-RO.rc | 2 +- dll/cpl/mmsys/lang/ru-RU.rc | 2 +- dll/cpl/mmsys/lang/sk-SK.rc | 2 +- dll/cpl/mmsys/lang/sq-AL.rc | 2 +- dll/cpl/mmsys/lang/tr-TR.rc | 2 +- dll/cpl/mmsys/lang/uk-UA.rc | 2 +- dll/cpl/mmsys/lang/zh-CN.rc | 2 +- dll/cpl/mmsys/lang/zh-TW.rc | 2 +- dll/cpl/mmsys/sounds.c | 162 +++++++++++++++++++++++--------------------- 24 files changed, 107 insertions(+), 101 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index e48b5f0993..82f053f033 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "Из&триване", IDC_DELETE_BTN, 186, 70, 52, 15 LTEXT "За да промените звуците, цъкнете на събитие в списъка и му задайте звук. Можете да запишете промените като нова звукова наредба.", -1, 8, 90, 230, 40 LTEXT "&Събития:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Звуци", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index eea5eb7eee..e7b6479915 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -39,7 +39,7 @@ BEGIN PUSHBUTTON "&Smazat", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Zvuky lze měnit kliknutím na programovou událost v následujícím seznamu a vybráním zvuku, který má být přehrán. Změny lze uložit jako nové zvukové schéma.", -1, 8, 90, 230, 40 LTEXT "&Události programů:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Zvuky:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index ca2d7d0484..28bdb81d28 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Um Klänge zu ändern, klicken Sie auf ein Programmereignis in der folgenden Liste und wählen Sie einen Klang aus. Sie können Änderungen als neue Klangschemata speichern.", -1, 8, 90, 230, 40 LTEXT "&Programmereignisse:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Klänge:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 135, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 148, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index d9a2f50591..2886f2ecee 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Delete", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 27 LTEXT "&Program events:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index c689dd5198..e6d0407fff 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Delete", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 27 LTEXT "&Program events:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index 668d2caf8e..42d472d12e 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Para cambiar los sonidos, haga clic en un suceso de la siguiente lista y elija un sonido que desea utilizar. Puede guardar los cambios como una combinación nueva de sonidos.", -1, 8, 90, 230, 40 LTEXT "&Sucesos de programa:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "S&onidos:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 9206bf67cb..c9658ab956 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "Supprimer", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.", -1, 8, 90, 230, 40 LTEXT "Évènements des programmes :", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sons :", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 268b1b2927..70083edb3a 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -36,7 +36,7 @@ BEGIN PUSHBUTTON "מחק", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 27 LTEXT "אירועי תכניות:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "צלילים:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index 9fc372717e..7e417647ca 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Delete", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 27 LTEXT "&Program events:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index fc3e064ef8..388b0b87b3 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Per cambiare i suoni, cliccare un evento nella lista seguente e poi scegliere il suono da usare. Potete salvare le modifiche in un nuovo schema di suoni.", -1, 8, 90, 230, 40 LTEXT "&Eventi:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Suoni:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index 8af0418cc1..6e581bc18f 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "音声を変更するには、以下のリストからプログラムイベントをクリックして適用する音声を選択して下さい。変更を新しい音声スキームとして保存できます。", -1, 8, 90, 230, 27 LTEXT "プログラムイベント(&P):", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "音声(&S):", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index 53391686be..4c432a9534 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 173, 70, 65, 15 LTEXT "Klik als u het geluid van een programmagebeurtenis wilt wijzigen op de gebeurtenis in de onderstaande lijst en slecteer eeen geluid. U kunt de wijzigingen in een nieuw schema opslaan.", -1, 8, 90, 230, 40 LTEXT "&Programmagebeurtenissen:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 132, 230, 58, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Geluiden:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index bdfd1bfb6c..aa381129bc 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Slett", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Hvis du vil endre lyder, klikker du på en programhendelse i listen nedenfor, og velger deretter en lyd som skal brukes. Du kan lagre endringer som et nytt lydoppsett.", -1, 8, 90, 230, 40 LTEXT "&Programhendelser:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Lyder:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 72d2c828b2..a1fc6077ac 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -47,7 +47,7 @@ BEGIN PUSHBUTTON "U&suń", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Aby zmienić dźwięk, kliknij na zdarzenie z listy poniżej a następnie wybierz dźwięk. Zmiany możesz zapisać w nowym lub obecnym schemacie dźwiękowym.", -1, 8, 90, 230, 40 LTEXT "&Zdarzenia:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Dźwięki:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index ecc106b266..b40b26baca 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Delete", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 27 LTEXT "&Program events:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Sounds:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index 1a8dc81fa2..fde0871fce 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -39,7 +39,7 @@ BEGIN PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Pentru a schimba sunetele, selectați un eveniment din lista de mai jos, apoi alegeți sunetul corespunzător care va fi emis. Modificările pot fi păstrate într-o nouă colecție de sunete.", -1, 8, 90, 230, 40 LTEXT "E&venimente:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "S&unete:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index df27b624c5..83fd057b68 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -34,7 +34,7 @@ BEGIN PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Чтобы изменить звуковое сопровождение, щелкните на событии в списке и выберите нужный звук. Изменения можно сохранить как новую звуковую схему.", -1, 8, 90, 230, 28 LTEXT "Программные &события:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Звуки:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index 4276c4c0b0..672dcf51dc 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -39,7 +39,7 @@ BEGIN PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.", -1, 8, 90, 230, 40 LTEXT "&Udalosti programov:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Zvuky:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index f18054667e..23fcc1c2f7 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -38,7 +38,7 @@ BEGIN PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Për të ndryshuar zërin, klikoni një ngjarje programi në listën e mëposhtme dhe pastaj përzgjidhni një tingull për të aplikuar. Ju mund të ruani ndryshimet si një skemë të re.", -1, 8, 90, 230, 27 LTEXT "Evente &Programi:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Zëri:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index e07876448b..4442122911 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -36,7 +36,7 @@ BEGIN PUSHBUTTON "S&il", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Sesleri değiştirmek için aşağıdaki dizelgede bir izlence olayına tıklayınız, sonra uygulamak için bir ses seçiniz. Değişiklikleri yeni bir ses düzeni olarak saklayabilirsiniz.", -1, 8, 90, 230, 27 LTEXT "İ&zlence Olayları:", -1, 8, 118, 150, 9 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "S&esler:", IDC_TEXT_SOUND, 8, 194, 80, 9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index 61067d326f..143c3faf95 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -42,7 +42,7 @@ BEGIN PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Щоб змінити звуковий супровід, клацніть подію у списку та виберіть потрібний звук. Зміни можна зберегти як нову звукову схему.", -1, 8, 90, 230, 40 LTEXT "&Програмні події:", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "&Звуки:", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 1e828a4cfb..88890b7a86 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -42,7 +42,7 @@ BEGIN PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "要改变声音，请单击下列表中的程序事件然后选择声音。您可将更改保存为新声音方案。", -1, 8, 90, 230, 40 LTEXT "程序事件(&P):", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "声音(&S):", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index cff8ce3eb8..8f238d7284 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -40,7 +40,7 @@ BEGIN PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "要改變聲音，請單擊下列表中的程式事件然後選擇聲音。您可將更改儲存為新聲音方案。", -1, 8, 90, 230, 40 LTEXT "程式事件(&P):", -1, 8, 118, 150, 17 - CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE + CONTROL "", IDC_SCHEME_LIST, "SysTreeView32", TVS_DISABLEDRAGDROP| TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE| WS_BORDER | WS_TABSTOP, 8, 130, 230, 60 LTEXT "聲音(&S):", IDC_TEXT_SOUND, 8, 194, 80, 17, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168, 205, 15, 15, WS_DISABLED | BS_ICON diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index a4e6feadf5..4976e2322f 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -812,11 +812,11 @@ ShowSoundScheme(HWND hwndDlg) LRESULT lIndex; PSOUND_SCHEME_CONTEXT pScheme; PAPP_MAP pAppMap; - LV_ITEM listItem; - LV_COLUMN dummy; + PLABEL_MAP pLabelMap; HWND hDlgCtrl, hList; - RECT rect; - int ItemIndex; + TVINSERTSTRUCT tvItem; + HTREEITEM hTreeItem; + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); hList = GetDlgItem(hwndDlg, IDC_SCHEME_LIST); @@ -835,29 +835,35 @@ ShowSoundScheme(HWND hwndDlg) _tcscpy(szDefault, pScheme->szName); - /* add column for app */ - GetClientRect(hList, &rect); - ZeroMemory(&dummy, sizeof(dummy)); - dummy.mask = LVCF_WIDTH; - dummy.iSubItem = 0; - dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); - (void)ListView_InsertColumn(hList, 0, &dummy); - ItemIndex = 0; - pAppMap = s_App; while (pAppMap) { - PLABEL_MAP pLabelMap = pAppMap->LabelMap; + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.hParent = TVI_ROOT; + tvItem.hInsertAfter = TVI_FIRST; + + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM; + tvItem.item.state = TVIS_EXPANDED; + tvItem.item.stateMask = TVIS_EXPANDED; + tvItem.item.pszText = pAppMap->szDesc; + tvItem.item.lParam = (LPARAM)NULL; + + hTreeItem = TreeView_InsertItem(hList, &tvItem); + + pLabelMap = pAppMap->LabelMap; while (pLabelMap) { - ZeroMemory(&listItem, sizeof(listItem)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - listItem.pszText = pLabelMap->szDesc; - listItem.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); - listItem.iItem = ItemIndex; - listItem.iImage = -1; - (void)ListView_InsertItem(hList, &listItem); - ItemIndex++; + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.hParent = /*TVI_ROOT;*/ hTreeItem; + tvItem.hInsertAfter = TVI_SORT; + + tvItem.item.mask = TVIF_STATE | TVIF_TEXT | TVIF_PARAM; + tvItem.item.state = TVIS_EXPANDED; + tvItem.item.stateMask = TVIS_EXPANDED; + tvItem.item.pszText = pLabelMap->szDesc; + tvItem.item.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); + + TreeView_InsertItem(hList, &tvItem); pLabelMap = pLabelMap->Next; } @@ -1036,7 +1042,7 @@ SoundsDlgProc(HWND hwndDlg, { if (HIWORD(wParam) == CBN_SELENDOK) { - (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); + (void)TreeView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); ShowSoundScheme(hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); @@ -1051,23 +1057,26 @@ SoundsDlgProc(HWND hwndDlg, if (HIWORD(wParam) == CBN_SELENDOK) { PLABEL_CONTEXT pLabelContext; - INT SelCount; - LVITEM item; + HTREEITEM hItem; + TVITEM item; LRESULT lIndex; - SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); - if (SelCount == -1) + + hItem = TreeView_GetSelection(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); + if (hItem == NULL) { break; } + lIndex = ComboBox_GetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); if (lIndex == CB_ERR) { break; } + ZeroMemory(&item, sizeof(item)); - item.mask = LVIF_PARAM; - item.iItem = SelCount; - if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + item.mask = TVIF_PARAM; + item.hItem = hItem; + if (TreeView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) { LRESULT lResult; pLabelContext = (PLABEL_CONTEXT)item.lParam; @@ -1107,7 +1116,6 @@ SoundsDlgProc(HWND hwndDlg, } case WM_NOTIFY: { - LVITEM item; PLABEL_CONTEXT pLabelContext; TCHAR * ptr; @@ -1120,66 +1128,64 @@ SoundsDlgProc(HWND hwndDlg, ApplyChanges(hwndDlg); break; } - case LVN_ITEMCHANGED: + case TVN_SELCHANGED: { - LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; + LPNMTREEVIEW nm = (LPNMTREEVIEW)lParam; + LRESULT lCount, lIndex, lResult; - if ((nm->uNewState & LVIS_SELECTED) == 0) + pLabelContext = (PLABEL_CONTEXT)nm->itemNew.lParam; + if (pLabelContext == NULL) { + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); return FALSE; } - ZeroMemory(&item, sizeof(item)); - item.mask = LVIF_PARAM; - item.iItem = nm->iItem; - if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), TRUE); + + if (_tcslen(pLabelContext->szValue) == 0) { - LRESULT lCount, lIndex, lResult; - pLabelContext = (PLABEL_CONTEXT)item.lParam; - if (!pLabelContext) - { - return FALSE; - } - EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), TRUE); - if (_tcslen(pLabelContext->szValue) == 0) - { - lIndex = ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); - break; + lIndex = ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + break; + } - } - EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); - lCount = ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); - for (lIndex = 0; lIndex < lCount; lIndex++) - { - lResult = ComboBox_GetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); - if (lResult == CB_ERR || lResult == 0) - continue; + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); - if (!_tcscmp((TCHAR*)lResult, pLabelContext->szValue)) - { - ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); - return FALSE; - } - } - ptr = _tcsrchr(pLabelContext->szValue, _T('\\')); - if (ptr) - { - ptr++; - } - else - { - ptr = pLabelContext->szValue; - } - lIndex = ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), ptr); - if (lIndex != CB_ERR) + lCount = ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = ComboBox_GetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); + if (lResult == CB_ERR || lResult == 0) + continue; + + if (!_tcscmp((TCHAR*)lResult, pLabelContext->szValue)) { - ComboBox_SetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex, _tcsdup(pLabelContext->szValue)); ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); + return FALSE; } } + + ptr = _tcsrchr(pLabelContext->szValue, _T('\\')); + if (ptr) + { + ptr++; + } + else + { + ptr = pLabelContext->szValue; + } + + lIndex = ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), ptr); + if (lIndex != CB_ERR) + { + ComboBox_SetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex, _tcsdup(pLabelContext->szValue)); + ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); + } break; } }

5 years, 8 months

[reactos] 01/01: [HALX86] Removed reduntant INIT_FUNCTION attribute from HalpGetSystemInterruptVector. (#1234)

by Extravert-ir

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b4108b2c6b005c921ec6… commit 2b4108b2c6b005c921ec6410e359268b79d9c2e5 Author: Extravert-ir <Extravert34(a)gmail.com> AuthorDate: Sun Jan 13 03:01:31 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 13 01:01:31 2019 +0100 [HALX86] Removed reduntant INIT_FUNCTION attribute from HalpGetSystemInterruptVector. (#1234) This fixes livecd crashes started since 71fefa32db013317842fd9224b63bcf5f72f2e32. --- hal/halx86/include/bus.h | 1 - hal/halx86/legacy/bus/sysbus.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hal/halx86/include/bus.h b/hal/halx86/include/bus.h index 755595c3ae..def39ebf80 100644 --- a/hal/halx86/include/bus.h +++ b/hal/halx86/include/bus.h @@ -610,7 +610,6 @@ HalpTranslateIsaBusAddress( OUT PPHYSICAL_ADDRESS TranslatedAddress ); -INIT_FUNCTION ULONG NTAPI HalpGetSystemInterruptVector( diff --git a/hal/halx86/legacy/bus/sysbus.c b/hal/halx86/legacy/bus/sysbus.c index ec2019dfd6..fccb823398 100644 --- a/hal/halx86/legacy/bus/sysbus.c +++ b/hal/halx86/legacy/bus/sysbus.c @@ -139,7 +139,6 @@ HalpGetRootInterruptVector(IN ULONG BusInterruptLevel, return SystemVector; } -INIT_FUNCTION ULONG NTAPI HalpGetSystemInterruptVector(IN PBUS_HANDLER BusHandler,

5 years, 8 months

[reactos] 01/01: [MMSYS] Fix tab-stop for group controls and comboboxes (#1231)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4575747d61ffb913f081a… commit 4575747d61ffb913f081a5ed2e4fec93e586b252 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jan 12 23:18:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 12 21:18:10 2019 +0100 [MMSYS] Fix tab-stop for group controls and comboboxes (#1231) CORE-15581 --- dll/cpl/mmsys/lang/bg-BG.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/cs-CZ.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/de-DE.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/el-GR.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/en-US.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/es-ES.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/fr-FR.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/he-IL.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/id-ID.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/it-IT.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/ja-JP.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/nl-NL.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/no-NO.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/pl-PL.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/pt-BR.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/ro-RO.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/ru-RU.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/sk-SK.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/sq-AL.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/tr-TR.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/uk-UA.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/zh-CN.rc | 28 ++++++++++++++-------------- dll/cpl/mmsys/lang/zh-TW.rc | 28 ++++++++++++++-------------- 23 files changed, 322 insertions(+), 322 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index f1477d509d..e48b5f0993 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Сила на устройството", -1, 7, 30, 230, 100 + GROUPBOX "Сила на устройството", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Слабо", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "За&глушено", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Поставяне на &значе за звука в задачната лента", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "Разш&ирени...", IDC_ADVANCED_BTN, 154, 105, 80, 15 - GROUPBOX "Настройки на говорителя", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Настройки на говорителя", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Чрез долните настройки можете да укажете силата и други свойства на всеки говорител поотделно.", -1, 70, 155, 150, 36 PUSHBUTTON "Сила на &говорителя...", IDC_SPEAKER_VOL_BTN, 72, 195, 80, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Звук" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Възпроизвеждане на звук", -1, 7, 7, 230, 60 + GROUPBOX "Възпроизвеждане на звук", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "Под&разбирано устройство:", -1, 50, 20, 170, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Сила...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Разши&рени...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Запис на звук", -1, 7, 75, 230, 60 + GROUPBOX "Запис на звук", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "&Подразбрано устройство:", -1, 50, 88, 170, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "С&ила...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Разшир&ени...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Възпроизвеждане на МИДИ", -1, 7, 145, 230, 60 + GROUPBOX "Възпроизвеждане на МИДИ", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Подраз&брано устройство:", -1, 50, 158, 170, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Си&ла...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "&За...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "Из&ползване само на подразбирани устройства", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 220, 10 + AUTOCHECKBOX "Из&ползване само на подразбирани устройства", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 220, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Глас" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Тези настройки са за за силата и другите възможности на избраното устройството за възпроизвеждане или запис на глас.", -1, 8, 7, 230, 40 - GROUPBOX "Възпроизвеждане на глас", -1, 7, 37, 230, 60 + GROUPBOX "Възпроизвеждане на глас", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "Под&разбрано устройство:", -1, 50, 50, 170, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Сила...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Разши&рени...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Запис на глас", -1, 7, 105, 230, 60 + GROUPBOX "Запис на глас", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "&Подразбрано устройство:", -1, 50, 118, 170, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "С&ила...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Разшир&ени...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Проба на оборудването...", IDC_TEST_HARDWARE, 130, 175, 100, 15 + PUSHBUTTON "&Проба на оборудването...", IDC_TEST_HARDWARE, 130, 175, 100, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index f37c8cd068..eea5eb7eee 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Hlasitost zařízení", -1, 7, 30, 230, 100 + GROUPBOX "Hlasitost zařízení", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Nízká", -1, 62, 66, 30, 17 @@ -20,7 +20,7 @@ BEGIN AUTOCHECKBOX "&Ztlumit", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umístit &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Upřesnit...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Nastavení reproduktorů", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Nastavení reproduktorů", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Nastavení níže lze použít ke změnění hlasitosti jednotlivých reproduktorů a dalších nastavení.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hlasitost reproduktorů...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -51,25 +51,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zvuk" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Přehrávání zvuku", -1, 7, 7, 230, 60 + GROUPBOX "Přehrávání zvuku", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Výchozí zařízení:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Hlasitost...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Upřesnit...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Záznam zvuku", -1, 7, 75, 230, 60 + GROUPBOX "Záznam zvuku", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Vý&chozí zařízení:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "H&lasitost...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "U&přesnit...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Přehrávání MIDI hudby", -1, 7, 145, 230, 60 + GROUPBOX "Přehrávání MIDI hudby", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Výcho&zí zařízení:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Hl&asitost...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "&O produktu...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "Používa&t jen výchozí zařízení", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "Používa&t jen výchozí zařízení", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -78,19 +78,19 @@ CAPTION "Hlas" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Tato nastavení ovlivňují hlasitost a rozšířené volby pro přehrávání hlasu a zvolené záznamové zařízení.", -1, 8, 7, 230, 40 - GROUPBOX "Přehrávání hlasu", -1, 7, 37, 230, 60 + GROUPBOX "Přehrávání hlasu", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Výchozí zařízení:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Hlasitost...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Upřesnit...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Záznam hlasu", -1, 7, 105, 230, 60 + GROUPBOX "Záznam hlasu", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Vý&chozí zařízení:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "H&lasitost...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "U&přesnit...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Otestovat hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Otestovat hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 3169faef83..ca2d7d0484 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Gerätelautstärke", -1, 7, 30, 230, 100 + GROUPBOX "Gerätelautstärke", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Niedrig", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "Stu&mm schalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Lautsprechereinstellungen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Lautsprechereinstellungen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Verwenden Sie die unteren Einstellungen um die Lautstärke einzelner Geräte und andere Einstellungen zu verändern.", -1, 70, 155, 150, 36 PUSHBUTTON "&Lautstärke...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Soundwiedergabe", -1, 7, 7, 230, 60 + GROUPBOX "Soundwiedergabe", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Standardgerät:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Lautstärke...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Erweitert...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Tonaufnahme", -1, 7, 75, 230, 60 + GROUPBOX "Tonaufnahme", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "S&tandardgerät:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "L&autstärke...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "E&rweitert...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI-Wiedergabe", -1, 7, 145, 230, 60 + GROUPBOX "MIDI-Wiedergabe", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "St&andardgerät:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "La&utstärke...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "Ü&ber...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Nur Standardgeräte verwenden", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Nur Standardgeräte verwenden", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Stimme" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Diese Einstellungen legen die Lautstärke und die erweiterten Einstellungen für Stimmenwiedergabe und -aufnahme des gewählten Gerätes fest.", -1, 8, 7, 230, 40 - GROUPBOX "Stimmenwiedergabe", -1, 7, 37, 230, 60 + GROUPBOX "Stimmenwiedergabe", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Standardgerät:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Lautstärke..", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Erweitert...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Stimmenaufnahme", -1, 7, 105, 230, 60 + GROUPBOX "Stimmenaufnahme", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "S&tandardgerät:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "L&autstärke..", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "E&rweitert...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Hardware testen...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Hardware testen...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index 097243e0e4..d9a2f50591 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Device volume", -1, 7, 30, 230, 100 + GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7, 7, 230, 60 + GROUPBOX "Sound playback", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Default device:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Sound recording", -1, 7, 75, 230, 60 + GROUPBOX "Sound recording", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&efault device:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60 + GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "De&fault device:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voice" FONT 8, "MS Shell Dlg" BEGIN LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.", -1, 8, 7, 230, 40 - GROUPBOX "Voice playback", -1, 7, 37, 230, 60 + GROUPBOX "Voice playback", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Default device:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Voice recording", -1, 7, 105, 230, 60 + GROUPBOX "Voice recording", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "D&efault device:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index 9cd4cb6dba..c689dd5198 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Device volume", -1, 7, 30, 230, 100 + GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7, 7, 230, 60 + GROUPBOX "Sound playback", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Default device:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Sound recording", -1, 7, 75, 230, 60 + GROUPBOX "Sound recording", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&efault device:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60 + GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "De&fault device:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voice" FONT 8, "MS Shell Dlg" BEGIN LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.", -1, 8, 7, 230, 40 - GROUPBOX "Voice playback", -1, 7, 37, 230, 60 + GROUPBOX "Voice playback", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Default device:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Voice recording", -1, 7, 105, 230, 60 + GROUPBOX "Voice recording", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "D&efault device:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index f749e50600..668d2caf8e 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Volumen del dispositivo ", -1, 7, 30, 230, 100 + GROUPBOX "Volumen del dispositivo ", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Bajo", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Silencio", IDC_MUTE_CHECKBOX, 30, 78, 140, 10 AUTOCHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 30, 92, 180, 10 PUSHBUTTON "Propiedades avan&zadas...", IDC_ADVANCED_BTN, 140, 105, 88, 15 - GROUPBOX "Configuración del altavoz ", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Configuración del altavoz ", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Utilice esta configuración para cambiar el volumen del altavoz y otras configuraciones.", -1, 70, 155, 150, 36 PUSHBUTTON "Vol&umen de altavoz...", IDC_SPEAKER_VOL_BTN, 60, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Reproducción de sonido ", -1, 7, 7, 230, 60 + GROUPBOX "Reproducción de sonido ", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "Dispositivo p&redeterminado:", -1, 50, 20, 100, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volumen...", IDC_VOLUME1_BTN, 85, 47, 60, 15 PUSHBUTTON "Opciones avan&zadas...", IDC_ADV2_BTN, 150, 47, 80, 15 - GROUPBOX "Grabación de sonido ", -1, 7, 75, 230, 60 + GROUPBOX "Grabación de sonido ", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Dispositivo pre&determinado:", -1, 50, 88, 100, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olumen...", IDC_VOLUME2_BTN, 85, 115, 60, 15 PUSHBUTTON "Opcione&s avanzadas...", IDC_ADV1_BTN, 150, 115, 80, 15 - GROUPBOX "Reproducción de música MIDI ", -1, 7, 145, 230, 60 + GROUPBOX "Reproducción de música MIDI ", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Dispositivo prede&terminado:", -1, 50, 158, 100, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&men...", IDC_VOLUME3_BTN, 85, 185, 60, 15 PUSHBUTTON "&Acerca de...", IDC_ADV3_BTN, 150, 185, 80, 15 - AUTOCHECKBOX "&Usar sólo dispositivos predeterminados", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Usar sólo dispositivos predeterminados", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voz" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Esta configuración controla el volumen y las opciones avanzadas del dispositivo de reproducción de voz o del dispositivo de grabación de voz seleccionados.", -1, 8, 7, 230, 40 - GROUPBOX "Reproducción de voz ", -1, 7, 37, 230, 60 + GROUPBOX "Reproducción de voz ", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Dispositivo predeterminado:", -1, 50, 50, 100, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volumen...", IDC_VOLUME4_BTN, 85, 77, 60, 15 PUSHBUTTON "Opciones &avanzadas...", IDC_ADV4_BTN, 150, 77, 80, 15 - GROUPBOX "Grabación de voz ", -1, 7, 105, 230, 60 + GROUPBOX "Grabación de voz ", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Dispositivo predet&erminado:", -1, 50, 118, 100, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Vol&umen...", IDC_VOLUME5_BTN, 85, 145, 60, 15 PUSHBUTTON "&Opciones avanzadas...", IDC_ADV5_BTN, 150, 145, 80, 15 - PUSHBUTTON "&Prueba de hardware...", IDC_TEST_HARDWARE, 150, 175, 80, 15 + PUSHBUTTON "&Prueba de hardware...", IDC_TEST_HARDWARE, 150, 175, 80, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index ad6a397c97..9206bf67cb 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Volume du périphérique", -1, 7, 30, 230, 100 + GROUPBOX "Volume du périphérique", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Faible", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 175, 10 PUSHBUTTON "A&vancé...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Paramètres des enceintes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Paramètres des enceintes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Utilisez les paramètres ci-dessous pour changer le volume de chaque enceinte et modifier d'autres réglagles.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lecture sonore", -1, 7, 7, 230, 60 + GROUPBOX "Lecture sonore", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "Périphérique par &défaut :", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Ava&ncé...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Enregistrement sonore", -1, 7, 75, 230, 60 + GROUPBOX "Enregistrement sonore", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Périphérique par d&éfaut :", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Avan&cé...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Lecture de la musique MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Lecture de la musique MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Périphérique par dé&faut :", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "À propos de...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Utiliser uniquement les périphériques par défaut", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Utiliser uniquement les périphériques par défaut", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voix" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ces paramètres contrôlent le volume et les options avancées pour le périphérique de lecture ou d'enregistrement de la voix que vous avez sélectionné.", -1, 8, 7, 230, 40 - GROUPBOX "Lecture de la voix", -1, 7, 37, 230, 60 + GROUPBOX "Lecture de la voix", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "Périphérique par &défaut :", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Ava&ncé...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Enregistrement de la voix", -1, 7, 105, 230, 60 + GROUPBOX "Enregistrement de la voix", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Périphérique par d&éfaut :", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Avan&cé...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Tester le matériel...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Tester le matériel...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 02d4aac0fe..268b1b2927 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "עוצמת התקן", -1, 7, 30, 230, 100 + GROUPBOX "עוצמת התקן", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "נמוך", -1, 62, 66, 30, 9 @@ -17,7 +17,7 @@ BEGIN AUTOCHECKBOX "השתק", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "שים סמל עוצמה בשורת המשימות", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "מתקדם...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "הגדרות רמקולים", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "הגדרות רמקולים", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "עוצמת רמקולים...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -48,25 +48,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "שמע" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "נגינת שמע", -1, 7, 7, 230, 60 + GROUPBOX "נגינת שמע", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "התקן ברירת מחדל:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "עוצמה...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "מתקדם...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "הקלטת שמע", -1, 7, 75, 230, 60 + GROUPBOX "הקלטת שמע", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "התקן ברירת מחדל:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "עוצמה...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "מתקדם...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "נגינת מוזיקת MIDI", -1, 7, 145, 230, 60 + GROUPBOX "נגינת מוזיקת MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "התקן ברירת מחדל:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "עוצמה...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "אודות...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "השתמש רק בהתקני ברירת מחדל.", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "השתמש רק בהתקני ברירת מחדל.", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -75,19 +75,19 @@ CAPTION "קול" FONT 8, "MS Shell Dlg" BEGIN LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.", -1, 8, 7, 230, 40 - GROUPBOX "נגינת קול", -1, 7, 37, 230, 60 + GROUPBOX "נגינת קול", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "התקן ברירת מחדל:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "עוצמה...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "מתקדם...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "הקלטת קול", -1, 7, 105, 230, 60 + GROUPBOX "הקלטת קול", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "התקן ברירת מחדל:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "עוצמה...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "מתקדם...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "בדוק חומרה...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "בדוק חומרה...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index 289aa87912..9fc372717e 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Device volume", -1, 7, 30, 230, 100 + GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7, 7, 230, 60 + GROUPBOX "Sound playback", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Default device:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Sound recording", -1, 7, 75, 230, 60 + GROUPBOX "Sound recording", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&efault device:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60 + GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "De&fault device:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voice" FONT 8, "MS Shell Dlg" BEGIN LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.", -1, 8, 7, 230, 40 - GROUPBOX "Voice playback", -1, 7, 37, 230, 60 + GROUPBOX "Voice playback", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Default device:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Voice recording", -1, 7, 105, 230, 60 + GROUPBOX "Voice recording", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "D&efault device:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index 5f14b42293..fc3e064ef8 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Volume del dispositivo", -1, 7, 30, 230, 100 + GROUPBOX "Volume del dispositivo", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Basso", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Avanzate...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Impostazione altoparlanti", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Impostazione altoparlanti", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Usare le impostazioni seguenti per modificare per i singoli altoparlanti il volume ed altre impostazioni.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Riproduzione suoni", -1, 7, 7, 230, 60 + GROUPBOX "Riproduzione suoni", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Dispositivo preimpostato:", -1, 50, 20, 180, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Ava&zate...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Registrazione dei suoni", -1, 7, 75, 230, 60 + GROUPBOX "Registrazione dei suoni", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&ispositivo preimpostato:", -1, 50, 88, 180, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Avaza&te...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Riproduzione musica MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Riproduzione musica MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "D&ispositivo preimpostato:", -1, 50, 158, 180, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "Informazioni su...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Usa solo dispositivi preimpostati", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Usa solo dispositivi preimpostati", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voce" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Queste impostazioni controllano il volume e le impostazioni avanzate della riproduzione e della registrazione vocale per il dispositivo selezionato.", -1, 8, 7, 230, 40 - GROUPBOX "Riproduzione vocale", -1, 7, 37, 230, 60 + GROUPBOX "Riproduzione vocale", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "D&ispositivo preimpostato:", -1, 50, 50, 180, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Avanzate...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Registrazione vocale", -1, 7, 105, 230, 60 + GROUPBOX "Registrazione vocale", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "&Dispositivo preimpostato:", -1, 50, 118, 180, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Ava&nzate...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index 463b3e67cb..8af0418cc1 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -7,7 +7,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "デバイスの音量", -1, 7, 30, 230, 100 + GROUPBOX "デバイスの音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "低", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "ミュート(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "タスクバーに音量アイコンを置く(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "上級者向け(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "スピーカーの設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "スピーカーの設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "個別のスピーカーの音量やその他の設定を変更するために下の設定をお使い下さい。", -1, 70, 155, 150, 36 PUSHBUTTON "スピーカー音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "オーディオ" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "音声プレイバック", -1, 7, 7, 230, 60 + GROUPBOX "音声プレイバック", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "既定のデバイス(&D):", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "上級者向け(&N)...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "音声録音", -1, 7, 75, 230, 60 + GROUPBOX "音声録音", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "既定のデバイス(&E):", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "上級者向け(&C)...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI音楽プレイバック", -1, 7, 145, 230, 60 + GROUPBOX "MIDI音楽プレイバック", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "既定のデバイス(&F):", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&M)...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "これについて(&B)...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "既定のデバイスのみを使う(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "既定のデバイスのみを使う(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "音声" FONT 9, "MS UI Gothic" BEGIN LTEXT "これらの設定は、あなたが選択した音声プレイバックと録音デバイスの、音量とその他のオプションを制御します。", -1, 8, 7, 230, 40 - GROUPBOX "音声プレイバック", -1, 7, 37, 230, 60 + GROUPBOX "音声プレイバック", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "既定のデバイス(&D):", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "上級者向け(&N)...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "音声録音", -1, 7, 105, 230, 60 + GROUPBOX "音声録音", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "既定のデバイス(&E):", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "上級者向け(&C)...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "ハードウェアのテスト(&T)...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "ハードウェアのテスト(&T)...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index d0647f67f6..53391686be 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Volume", -1, 7, 30, 230, 100 + GROUPBOX "Volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Laag", -1, 62, 62, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Dempen", IDC_MUTE_CHECKBOX, 25, 78, 190, 10 AUTOCHECKBOX "P&ictogram voor het volume in het systeemvak plaatsen", IDC_ICON_IN_TASKBAR, 25, 92, 190, 10 PUSHBUTTON "Ge&avanceerd...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Luidsprekerinstellingen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Luidsprekerinstellingen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Met de onderstaande knoppen kunt u het\nvolume en andere instellingen van de\nluidsprekers wijzigen.", -1, 70, 155, 150, 36 PUSHBUTTON "&Luidsprekervolume..", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Afspelen van geluid", -1, 7, 7, 230, 60 + GROUPBOX "Afspelen van geluid", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "Standaa&rdapparaat:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Geavanceerd...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Opnemen van geluid", -1, 7, 75, 230, 60 + GROUPBOX "Opnemen van geluid", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Stan&daardapparaat:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Vo&lume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "G&eavanceerd...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Afspelen van MIDI-muziek", -1, 7, 145, 230, 60 + GROUPBOX "Afspelen van MIDI-muziek", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Sta&ndaardapparaat:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Vol&ume...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "&Info...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Alleen standaardapparaten gebruiken", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Alleen standaardapparaten gebruiken", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Spraak" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Deze instellingen bepalen het volume en de geavanceerde instellingen voor het afspelen en opnemen van spraak van het geselecteerde apparaat.", -1, 8, 7, 230, 40 - GROUPBOX "Spraak afspelen", -1, 7, 37, 230, 60 + GROUPBOX "Spraak afspelen", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "Stan&daardapparaat:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Geavanceerd...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Spraak opnemen", -1, 7, 105, 230, 60 + GROUPBOX "Spraak opnemen", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Sta&ndaardapparaat:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "G&eavanceerd...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Hardware testen...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Hardware testen...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index 32178c507f..bdfd1bfb6c 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Enhets volum", -1, 7, 30, 230, 100 + GROUPBOX "Enhets volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Lavt", -1, 62, 66, 30, 17 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Demp", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Plasser volum &ikon i oppgavelinjen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vansert...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Høytaller innstilling", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Høytaller innstilling", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Bruk innstillingen under for å endre individuell høytaller volum og andre innstillinger.", -1, 70, 155, 150, 36 PUSHBUTTON "&Høytallervolum...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avspilling" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lyd avspilling", -1, 7, 7, 230, 60 + GROUPBOX "Lyd avspilling", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Standard enhet:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volum...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Ava&nsert...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Lyd opptak", -1, 7, 75, 230, 60 + GROUPBOX "Lyd opptak", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "S&tandardenhet:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olum...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Avan&sert...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI musikk avspilling", -1, 7, 145, 230, 60 + GROUPBOX "MIDI musikk avspilling", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "St&andardenhet:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&m...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "O&m...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Bruk bare standard-enheter", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Bruk bare standard-enheter", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Stemme" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Disse innstillingene kontrollerer volumet og avansert valg for stemme avspilling eller opptak enhet som du valgte.", -1, 8, 7, 230, 40 - GROUPBOX "Stemme avspilling", -1, 7, 37, 230, 60 + GROUPBOX "Stemme avspilling", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Standard enhet:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volum...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Ava&nsert...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Stemme opptak", -1, 7, 105, 230, 60 + GROUPBOX "Stemme opptak", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "S&tandardenhet:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olum...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Avan&sert...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test maskinvare...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test maskinvare...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 68db26875b..72d2c828b2 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -20,7 +20,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Głośność urządzenia", -1, 7, 30, 230, 100 + GROUPBOX "Głośność urządzenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Mała", -1, 62, 66, 30, 17 @@ -28,7 +28,7 @@ BEGIN AUTOCHECKBOX "&Wycisz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umieść &ikonę głośności w zasobniku systemowym", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "&Zaawansowane...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Ustawienia głośników", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Ustawienia głośników", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Użyj ustawień poniżej aby zmienić indywidualny poziom głośności i dostosować ustawienia zaawansowane.", -1, 70, 155, 150, 36 PUSHBUTTON "&Głośniki...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -59,25 +59,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Odtwarzanie dźwięku", -1, 7, 7, 230, 60 + GROUPBOX "Odtwarzanie dźwięku", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "Urządzen&ie domyślne:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Głośność...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Zaa&wansowane", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Nagrywanie dźwięku", -1, 7, 75, 230, 60 + GROUPBOX "Nagrywanie dźwięku", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "U&rządzenie domyślne:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Gł&ośność....", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Zaawan&sowane", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Odtwarzanie MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Odtwarzanie MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Urzą&dzenie domyślne:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Głoś&ność....", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "In&formacje", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Użyj wyłącznie urządzeń domyślnych", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Użyj wyłącznie urządzeń domyślnych", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -86,19 +86,19 @@ CAPTION "Głos" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Te ustawienia regulują głośność i zaawansowaną konfigurację dla odwtarzania i nagrywania głosu za pomocą wybranych urządzeń.", -1, 8, 7, 230, 40 - GROUPBOX "Odtwarzanie głosu", -1, 7, 37, 230, 60 + GROUPBOX "Odtwarzanie głosu", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Urządzenie domyślne:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Głośność....", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Zaawansowane", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Nagrywanie głosu", -1, 7, 105, 230, 60 + GROUPBOX "Nagrywanie głosu", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "U&rządzenie domyślne:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Gł&ośność....", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Zaa&wansowane", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test sprzętu", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test sprzętu", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index 0b0cc7e367..ecc106b266 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Device volume", -1, 7, 30, 230, 100 + GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sound playback", -1, 7, 7, 230, 60 + GROUPBOX "Sound playback", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Default device:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Sound recording", -1, 7, 75, 230, 60 + GROUPBOX "Sound recording", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&efault device:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60 + GROUPBOX "MIDI music playback", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "De&fault device:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Use only default devices", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Voice" FONT 8, "MS Shell Dlg" BEGIN LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.", -1, 8, 7, 230, 40 - GROUPBOX "Voice playback", -1, 7, 37, 230, 60 + GROUPBOX "Voice playback", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Default device:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Voice recording", -1, 7, 105, 230, 60 + GROUPBOX "Voice recording", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "D&efault device:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index caf06959cf..1a8dc81fa2 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Volum", -1, 7, 30, 230, 100 + GROUPBOX "Volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Redus", -1, 62, 66, 30, 17 @@ -20,7 +20,7 @@ BEGIN AUTOCHECKBOX "A&muțește tot", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Afișează pictogramă în &zona de notificare", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "A&vansate…", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Opțiuni difuzoare", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Opțiuni difuzoare", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Folosiți opțiunile de mai jos pentru a ajusta volumul fiecărui difuzor în parte sau pentru alte modificări în configurația difuzoarelor.", -1, 70, 155, 150, 36 PUSHBUTTON "V&olum difuzoare…", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -51,25 +51,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lectură sunet", -1, 7, 7, 230, 60 + GROUPBOX "Lectură sunet", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Dispozitiv implicit:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olum…", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "A&vansate…", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Înregistrare sunet", -1, 7, 75, 230, 60 + GROUPBOX "Înregistrare sunet", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Dispo&zitiv implicit:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Vol&um…", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Avansat&e…", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Muzică MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Muzică MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Dispozitiv impli&cit:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&m…", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "Desp&re…", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Permite doar dispozitivele implicite", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Permite doar dispozitivele implicite", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -78,19 +78,19 @@ CAPTION "Voce" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Aceste opțiuni determină volumul și reglajele avansate ale dispozitivelor alese pentru lectura sau înregistrarea vocii.", -1, 8, 7, 230, 40 - GROUPBOX "Lectură voce", -1, 7, 37, 230, 60 + GROUPBOX "Lectură voce", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Dispozitiv implicit:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olum…", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "A&vansate…", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Înregistrare voce", -1, 7, 105, 230, 60 + GROUPBOX "Înregistrare voce", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Dispo&zitiv implicit:", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Vol&um…", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Avansat&e…", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "Testa&re…", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "Testa&re…", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index efa4f6c407..df27b624c5 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 19 - GROUPBOX "Громкость микшера", -1, 7, 30, 230, 100 + GROUPBOX "Громкость микшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "ниже", -1, 62, 66, 30, 9 @@ -15,7 +15,7 @@ BEGIN AUTOCHECKBOX "В&ыключить звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Отображать &значок на панели задач", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Дополнительно...", IDC_ADVANCED_BTN, 155, 110, 75, 15 - GROUPBOX "Настройки динамиков", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Настройки динамиков", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Расположенные ниже кнопки позволяют выполнить индивидуальную настройку громкости динамиков и других параметров.", -1, 70, 155, 150, 36 PUSHBUTTON "Гром&кость...", IDC_SPEAKER_VOL_BTN, 70, 200, 80, 15 @@ -46,25 +46,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Аудио" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Воспроизведение звука", -1, 7, 7, 230, 60 + GROUPBOX "Воспроизведение звука", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Используемое по умолчанию устройство:", -1, 50, 20, 180, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Громкость...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Настройка...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Запись звука", -1, 7, 75, 230, 60 + GROUPBOX "Запись звука", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "И&спользуемое по умолчанию устройство:", -1, 50, 88, 180, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гро&мкость...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Н&астройка...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Воспроизведение MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Воспроизведение MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Ис&пользуемое по умолчанию устройство:", -1, 50, 158, 180, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гром&кость...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "Св&едения...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "Использовать то&лько устройства по умолчанию", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 180, 10 + AUTOCHECKBOX "Использовать то&лько устройства по умолчанию", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 180, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -73,19 +73,19 @@ CAPTION "Речь" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Можно изменить громкость и другие параметры для выбранных вами устройств воспроизведения и записи речи.", -1, 8, 7, 230, 30 - GROUPBOX "Воспроизведение речи", -1, 7, 37, 230, 60 + GROUPBOX "Воспроизведение речи", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Используемое по умолчанию устройство:", -1, 50, 50, 180, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Громкость...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Дополнительно...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Запись речи", -1, 7, 105, 230, 60 + GROUPBOX "Запись речи", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "И&спользуемое по умолчанию утройство:", -1, 50, 118, 180, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гро&мкость...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Допо&лнительно...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Проверка...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Проверка...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index 59c5725b74..4276c4c0b0 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Hlasitosť zariadenia", -1, 7, 30, 230, 100 + GROUPBOX "Hlasitosť zariadenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "nízka", -1, 62, 66, 30, 17 @@ -20,7 +20,7 @@ BEGIN AUTOCHECKBOX "S&tlmiť", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umiestniť &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Spresniť...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Nastavenie reproduktorov", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Nastavenie reproduktorov", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Tieto možnosti použite na zmenu hlasitosti jednotlivých reproduktorov a iných nastavení.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hlasitosť reproduktorov...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -51,25 +51,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zvuk" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Prehrávanie zvuku", -1, 7, 7, 230, 60 + GROUPBOX "Prehrávanie zvuku", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Default device:", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Nahrávanie zvuku", -1, 7, 75, 230, 60 + GROUPBOX "Nahrávanie zvuku", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "D&efault device:", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Prehrávanie hudobného záznamu MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Prehrávanie hudobného záznamu MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "De&fault device:", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Použiť iba predvolené zariadenia", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Použiť iba predvolené zariadenia", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -78,19 +78,19 @@ CAPTION "Hlas" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Tieto nastavenia ovládajú hlasitosť a rozšírené možnosti pre Vami zvolené prehrávacie alebo nahrávacie zariadenie.", -1, 8, 7, 230, 40 - GROUPBOX "Prehrávanie", -1, 7, 37, 230, 60 + GROUPBOX "Prehrávanie", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Default device:", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Nahrávanie", -1, 7, 105, 230, 60 + GROUPBOX "Nahrávanie", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "D&efault device:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Test hardware...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index 44a33db73f..f18054667e 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -11,7 +11,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Volumi Pjesës", -1, 7, 30, 230, 100 + GROUPBOX "Volumi Pjesës", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Poshtë", -1, 62, 66, 30, 9 @@ -19,7 +19,7 @@ BEGIN AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Vendos &ikonen volumit në tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Konfigurimi Boxeve", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Konfigurimi Boxeve", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Përdor konfigurimet e mëposhtme për të ndryshuar volumin individual to boxeve dhe konfigurimet të tjera.", -1, 70, 155, 150, 36 PUSHBUTTON "&Volumi boxeve...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -50,25 +50,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Audio" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ridëgjim zëri", -1, 7, 7, 230, 60 + GROUPBOX "Ridëgjim zëri", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Pajisje parazgjedhur:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volumi...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "Ava&cuar...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Regjistrim zëri", -1, 7, 75, 230, 60 + GROUPBOX "Regjistrim zëri", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Pajisje parazgjedhur:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olumi...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Avan&cuar...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Ridëgjo musik MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Ridëgjo musik MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Pajisje parazgjedhur:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Volu&mi...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "Rr&eth...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Përdor vetem Pajisje parazgjedhur", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Përdor vetem Pajisje parazgjedhur", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -77,19 +77,19 @@ CAPTION "Zë" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Këto konfigurime kontrollojne volumin dhe opsione të avancuara për ridëgjimin e zërit ose pajisjes regjistrimi që keni zgjedhur.", -1, 8, 7, 230, 40 - GROUPBOX "Ridegjim zëri", -1, 7, 37, 230, 60 + GROUPBOX "Ridegjim zëri", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Pajisje parazgjedhur:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Volumi...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "Ava&ncuar...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Regjistrim zëri", -1, 7, 105, 230, 60 + GROUPBOX "Regjistrim zëri", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Pajisje parazgjedhur:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "V&olumi...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Avan&cuar...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Testo pajisjet...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Testo pajisjet...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 105b642ee3..e07876448b 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 20 - GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100 + GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Düşük", -1, 62, 66, 30, 9 @@ -17,7 +17,7 @@ BEGIN AUTOCHECKBOX "&Sessiz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "&Görev Çubuğunda Ses Düzeyi Simgesini Yerleştir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&elişmiş...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Hoparlör Ayarları", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Hoparlör Ayarları", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Tek hoparlörün, ses düzeyini ve diğer ayarlarını değiştirmek için aşağıdaki ayarları kullanınız.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hoparlör Ses Düzeyi...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -48,25 +48,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ses" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ses Çalma", -1, 7, 7, 230, 60 + GROUPBOX "Ses Çalma", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Ön Tanımlı Aygıt:", -1, 50, 20, 80, 9 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Ses Düzeyi...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Gelişmiş...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Ses Saklama", -1, 7, 75, 230, 60 + GROUPBOX "Ses Saklama", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Ö&ntanımlı Aygıt:", -1, 50, 88, 80, 9 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "S&es Düzeyi...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Ge&lişmiş...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI Mûsikisi Çalma", -1, 7, 145, 230, 60 + GROUPBOX "MIDI Mûsikisi Çalma", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "Ön&tanımlı Aygıt:", -1, 50, 158, 80, 9 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Ses &Düzeyi...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "&Üzerine...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Yalnızca Ön Tanımlı Aygıtları Kullan", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Yalnızca Ön Tanımlı Aygıtları Kullan", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -75,19 +75,19 @@ CAPTION "İnsan Sesi" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bu ayarlar, seçtiğiniz insan sesi çalma veyâ insan sesi saklama aygıtı için ses düzeyini ve gelişmiş seçenekleri denetler.", -1, 8, 7, 230, 40 - GROUPBOX "İnsan Sesi Çalma", -1, 7, 37, 230, 60 + GROUPBOX "İnsan Sesi Çalma", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "&Ön Tanımlı Aygıt:", -1, 50, 50, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Ses Düzeyi...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Gelişmiş...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "İnsan Sesi Saklama", -1, 7, 105, 230, 60 + GROUPBOX "İnsan Sesi Saklama", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Ö&ntanımlı Aygıt:", -1, 50, 118, 80, 9 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "S&es Düzeyi...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Ge&lişmiş...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Donanımı Sına...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Donanımı Sına...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index 10f42229fb..61067d326f 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "Гучність мікшера", -1, 7, 30, 230, 100 + GROUPBOX "Гучність мікшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "нижче", -1, 62, 66, 30, 17 @@ -23,7 +23,7 @@ BEGIN AUTOCHECKBOX "&Вимкнути звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Пока&зувати значок гучності на панелі завдань", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Додатково...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "Налаштування динаміків", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "Налаштування динаміків", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "За допомогою розташованих нижче кнопок можна виконати індивідуальну настройку гучності динаміків та інших параметрів.", -1, 70, 155, 150, 36 PUSHBUTTON "&Гучність динаміків...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -54,25 +54,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Аудіо" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Відтворення звуку", -1, 7, 7, 230, 60 + GROUPBOX "Відтворення звуку", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "&Пристрій за замовчуванням:", -1, 50, 20, 140, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Гучність...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "&Додатково...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "Запис звуку", -1, 7, 75, 230, 60 + GROUPBOX "Запис звуку", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "Пр&истрій за замовчуванням:", -1, 50, 88, 140, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гу&чність...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "Д&одатково...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "Відтворення MIDI", -1, 7, 145, 230, 60 + GROUPBOX "Відтворення MIDI", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "При&стрій за замовчуванням:", -1, 50, 158, 140, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гучніст&ь...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "&Відомості...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "&Лише пристрої за замовчуванням", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "&Лише пристрої за замовчуванням", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -81,19 +81,19 @@ CAPTION "Мовлення" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ці параметри керують гучністю та додатковою настройкою вибраних пристроїв відтворення або запису мовлення.", -1, 8, 7, 230, 40 - GROUPBOX "Відтворення мовлення", -1, 7, 37, 230, 60 + GROUPBOX "Відтворення мовлення", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "Пристрій &за замовчуванням:", -1, 50, 50, 140, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "&Гучність...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "&Додатково...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "Запис мовлення", -1, 7, 105, 230, 60 + GROUPBOX "Запис мовлення", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "Пр&истрій за замовчуванням:", -1, 50, 118, 140, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "Гу&чність...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "Дод&атково...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "&Перевірка...", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "&Перевірка...", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 88ea861070..1e828a4cfb 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -15,7 +15,7 @@ FONT 9, "宋体" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "设备音量", -1, 7, 30, 230, 100 + GROUPBOX "设备音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "低", -1, 62, 66, 30, 17 @@ -23,7 +23,7 @@ BEGIN AUTOCHECKBOX "静音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "将音量图标放入任务栏(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高级(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "扬声器设置", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "扬声器设置", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "用下列设置更改每个扬声器音量和其他设置。", -1, 70, 155, 150, 36 PUSHBUTTON "扬声器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -54,25 +54,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "音频" FONT 9, "宋体" BEGIN - GROUPBOX "声音播放", -1, 7, 7, 230, 60 + GROUPBOX "声音播放", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "默认设备(&D):", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "高级(&D)...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "录音", -1, 7, 75, 230, 60 + GROUPBOX "录音", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "默认设备(&E):", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "高级(&C)...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI 音乐播放", -1, 7, 145, 230, 60 + GROUPBOX "MIDI 音乐播放", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "默认设备(&F):", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&M)...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "关于(&B)...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "仅使用默认设备(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "仅使用默认设备(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -81,19 +81,19 @@ CAPTION "语声" FONT 9, "宋体" BEGIN LTEXT "这些设置控制声音播放或您选择的录音设备的音量和高级选项。", -1, 8, 7, 230, 40 - GROUPBOX "声音播放", -1, 7, 37, 230, 60 + GROUPBOX "声音播放", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "默认设备(&D):", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "高级(&N)...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "录音", -1, 7, 105, 230, 60 + GROUPBOX "录音", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "默认设备(&E):", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "高级(&C)...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "测试硬件...(&T)", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "测试硬件...(&T)", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index b44f7238db..cff8ce3eb8 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -13,7 +13,7 @@ FONT 9, "新細明體" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32 LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36 - GROUPBOX "裝置音量", -1, 7, 30, 230, 100 + GROUPBOX "裝置音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "低", -1, 62, 66, 30, 17 @@ -21,7 +21,7 @@ BEGIN AUTOCHECKBOX "靜音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "將音量圖示放入工作列(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高階(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 - GROUPBOX "揚聲器設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 + GROUPBOX "揚聲器設定", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "用下列設定更改每個揚聲器音量和其他設定。", -1, 70, 155, 150, 36 PUSHBUTTON "揚聲器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 @@ -52,25 +52,25 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "音訊" FONT 9, "新細明體" BEGIN - GROUPBOX "聲音播放", -1, 7, 7, 230, 60 + GROUPBOX "聲音播放", -1, 7, 7, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32 LTEXT "默認裝置(&D):", -1, 50, 20, 80, 17 - COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME1_BTN, 85, 47, 70, 15 PUSHBUTTON "高階(&D)...", IDC_ADV2_BTN, 160, 47, 70, 15 - GROUPBOX "錄音", -1, 7, 75, 230, 60 + GROUPBOX "錄音", -1, 7, 75, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 88, 32, 32 LTEXT "默認裝置(&E):", -1, 50, 88, 80, 17 - COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME2_BTN, 85, 115, 70, 15 PUSHBUTTON "高階(&C)...", IDC_ADV1_BTN, 160, 115, 70, 15 - GROUPBOX "MIDI 音樂播放", -1, 7, 145, 230, 60 + GROUPBOX "MIDI 音樂播放", -1, 7, 145, 230, 60, WS_GROUP ICON IDI_MIDICON, IDI_MIDICON, 15, 158, 32, 32 LTEXT "默認裝置(&F):", -1, 50, 158, 80, 17 - COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&M)...", IDC_VOLUME3_BTN, 85, 185, 70, 15 PUSHBUTTON "關於(&B)...", IDC_ADV3_BTN, 160, 185, 70, 15 - AUTOCHECKBOX "僅使用默認裝置(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10 + AUTOCHECKBOX "僅使用默認裝置(&U)", IDC_DEFAULT_DEV_CHECKBOX, 7, 212, 140, 10, WS_GROUP | WS_TABSTOP END IDD_VOICE DIALOGEX 0, 0, 246, 228 @@ -79,19 +79,19 @@ CAPTION "語聲" FONT 9, "新細明體" BEGIN LTEXT "這些設定控制聲音播放或您選擇的錄音裝置的音量和高階選項。", -1, 8, 7, 230, 40 - GROUPBOX "聲音播放", -1, 7, 37, 230, 60 + GROUPBOX "聲音播放", -1, 7, 37, 230, 60, WS_GROUP ICON IDI_CPLICON, IDI_CPLICON, 15, 50, 32, 32 LTEXT "默認裝置(&D):", -1, 50, 50, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&V)...", IDC_VOLUME4_BTN, 85, 77, 70, 15 PUSHBUTTON "高階(&N)...", IDC_ADV4_BTN, 160, 77, 70, 15 - GROUPBOX "錄音", -1, 7, 105, 230, 60 + GROUPBOX "錄音", -1, 7, 105, 230, 60, WS_GROUP ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15, 118, 32, 32 LTEXT "默認裝置(&E):", -1, 50, 118, 80, 17 - COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST | WS_TABSTOP PUSHBUTTON "音量(&O)...", IDC_VOLUME5_BTN, 85, 145, 70, 15 PUSHBUTTON "高階(&C)...", IDC_ADV5_BTN, 160, 145, 70, 15 - PUSHBUTTON "測試硬體...(&T)", IDC_TEST_HARDWARE, 160, 175, 70, 15 + PUSHBUTTON "測試硬體...(&T)", IDC_TEST_HARDWARE, 160, 175, 70, 15, WS_GROUP | WS_TABSTOP END IDD_HARDWARE DIALOGEX 0, 0, 246, 228

5 years, 8 months

[reactos] 01/01: [CMAKE] MSVC cmake settings improvements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e673f311854a125c3347… commit 5e673f311854a125c3347ae00c924d347972003c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 12 16:57:51 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 12 18:09:51 2019 +0100 [CMAKE] MSVC cmake settings improvements. - Always use string pooling when building: this helps reducing the size of the binaries due to string redundancy coming from the usage of __FILE__ / __RELFILE__ in the debugging helper macros. Note also that GCC builds use string pooling by default. - Use suitable add_compile_flags() command. - Add some explanative comments for some settings. Some numbers (obtained with my local builds): Before / After => Reduction =========================== freeldr.sys : 443 KB ( 453.632 bytes) / 364 KB ( 372.736 bytes) => ~ 18% win32k.sys : 1877 KB (1.922.048 bytes) / 1562 KB (1.599.488 bytes) => ~ 17% ntoskrnl.exe : 2253 KB (2.307.072 bytes) / 1902 KB (1.947.136 bytes) => ~ 15.6% kernel32.dll : 3008 KB (3.080.192 bytes) / 2906 KB (2.975.744 bytes) => ~ 3.4% --- sdk/cmake/config-amd64.cmake | 2 +- sdk/cmake/config-arm.cmake | 2 +- sdk/cmake/msvc.cmake | 27 +++++++++++++++++++-------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake index 95d9fe2f93..76439fbb6d 100644 --- a/sdk/cmake/config-amd64.cmake +++ b/sdk/cmake/config-amd64.cmake @@ -6,7 +6,7 @@ set(OARCH "athlon64" CACHE STRING "Generate instructions for this CPU type. Specify one of: k8 opteron athlon64 athlon-fx") -set (OPTIMIZE "1" CACHE STRING +set(OPTIMIZE "1" CACHE STRING "What level of optimization to use. 0 = off 1 = Default option, optimize for size (-Os) with some additional options diff --git a/sdk/cmake/config-arm.cmake b/sdk/cmake/config-arm.cmake index c260fc1900..7fd6a5d5ae 100644 --- a/sdk/cmake/config-arm.cmake +++ b/sdk/cmake/config-arm.cmake @@ -7,7 +7,7 @@ set(OARCH "armv7-a" CACHE STRING "Generate instructions for this CPU type. Specify one of: armv5te armv7-a") -set (OPTIMIZE "1" CACHE STRING +set(OPTIMIZE "1" CACHE STRING "What level of optimization to use. 0 = off 1 = Default option, optimize for size (-Os) with some additional options diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 747b23b199..b0c5f18a45 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -7,17 +7,22 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/Ox /Ob2 /Ot /Oy /GT /GF") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") elseif(OPTIMIZE STREQUAL "1") - add_definitions(/O1) + add_compile_flags("/O1") elseif(OPTIMIZE STREQUAL "2") - add_definitions(/O2) + add_compile_flags("/O2") elseif(OPTIMIZE STREQUAL "3") - add_definitions(/Ot /Ox /GS-) + add_compile_flags("/Ot /Ox /GS-") elseif(OPTIMIZE STREQUAL "4") - add_definitions(/Os /Ox /GS-) + add_compile_flags("/Os /Ox /GS-") elseif(OPTIMIZE STREQUAL "5") - add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) + add_compile_flags("/GF /Gy /Ob2 /Os /Ox /GS-") endif() +# Always use string pooling: this helps reducing the binaries size since a lot +# of redundancy come from the usage of __FILE__ / __RELFILE__ in the debugging +# helper macros. Note also that GCC builds use string pooling by default. +add_compile_flags("/GF") + # Enable function level linking and comdat folding add_compile_flags("/Gy") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") @@ -29,11 +34,14 @@ endif() add_definitions(/Dinline=__inline /D__STDC__=1) +# Ignore any "standard" include paths, and do not use any default CRT library. if(NOT USE_CLANG_CL) add_compile_flags("/X /Zl") endif() -add_compile_flags("/GR- /EHs-c- /GS- /W3") +# Disable RTTI, exception handling and buffer security checks by default. +# These require run-time support that may not always be available. +add_compile_flags("/GR- /EHs-c- /GS-") if(USE_CLANG_CL) set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: ") @@ -55,6 +63,9 @@ if(MSVC_VERSION GREATER 1899) add_compile_flags("/Zc:threadSafeInit-") endif () +# Generate Warnings Level 3 +add_compile_flags("/W3") + # Disable overly sensitive warnings as well as those that generally aren't # useful to us. # - C4244: implicit integer truncation @@ -381,7 +392,7 @@ function(generate_import_lib _libname _dllname _spec_file) # Add our library if(MSVC_IDE) add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}.obj) - set_source_files_properties(${_asm_stubs_file}.obj PROPERTIES EXTERNAL_OBJECT 1) + set_source_files_properties(${_asm_stubs_file}.obj PROPERTIES EXTERNAL_OBJECT TRUE) set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "C") else() # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other @@ -522,7 +533,7 @@ macro(add_asm_files _target) OUTPUT ${_preprocessed_asm_file} ${_object_file} COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${_pp_asm_compile_command} DEPENDS ${_source_file_full_path}) - set_source_files_properties(${_object_file} PROPERTIES EXTERNAL_OBJECT 1) + set_source_files_properties(${_object_file} PROPERTIES EXTERNAL_OBJECT TRUE) list(APPEND ${_target} ${_object_file}) endforeach() else()

5 years, 8 months

[reactos] 05/05: [ACPICA] Update to version 20190108. CORE-15593

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=363f5f26b1570d8f1e13e… commit 363f5f26b1570d8f1e13ea09d84e2acfe2ba184a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 12 13:24:57 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 12 16:27:54 2019 +0100 [ACPICA] Update to version 20190108. CORE-15593 --- drivers/bus/acpi/acpica/dispatcher/dsargs.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dscontrol.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsdebug.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsinit.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsmethod.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsmthdat.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsobject.c | 3 +- drivers/bus/acpi/acpica/dispatcher/dsopcode.c | 8 ++-- drivers/bus/acpi/acpica/dispatcher/dspkginit.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsutils.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswexec.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswload.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswload2.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswscope.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswstate.c | 2 +- drivers/bus/acpi/acpica/events/evevent.c | 2 +- drivers/bus/acpi/acpica/events/evglock.c | 2 +- drivers/bus/acpi/acpica/events/evgpe.c | 2 +- drivers/bus/acpi/acpica/events/evgpeblk.c | 2 +- drivers/bus/acpi/acpica/events/evgpeinit.c | 2 +- drivers/bus/acpi/acpica/events/evgpeutil.c | 2 +- drivers/bus/acpi/acpica/events/evhandler.c | 2 +- drivers/bus/acpi/acpica/events/evmisc.c | 2 +- drivers/bus/acpi/acpica/events/evregion.c | 2 +- drivers/bus/acpi/acpica/events/evrgnini.c | 2 +- drivers/bus/acpi/acpica/events/evsci.c | 2 +- drivers/bus/acpi/acpica/events/evxface.c | 2 +- drivers/bus/acpi/acpica/events/evxfevnt.c | 2 +- drivers/bus/acpi/acpica/events/evxfgpe.c | 2 +- drivers/bus/acpi/acpica/events/evxfregn.c | 2 +- drivers/bus/acpi/acpica/executer/exconcat.c | 2 +- drivers/bus/acpi/acpica/executer/exconfig.c | 2 +- drivers/bus/acpi/acpica/executer/exconvrt.c | 2 +- drivers/bus/acpi/acpica/executer/excreate.c | 2 +- drivers/bus/acpi/acpica/executer/exdebug.c | 2 +- drivers/bus/acpi/acpica/executer/exdump.c | 2 +- drivers/bus/acpi/acpica/executer/exfield.c | 2 +- drivers/bus/acpi/acpica/executer/exfldio.c | 2 +- drivers/bus/acpi/acpica/executer/exmisc.c | 2 +- drivers/bus/acpi/acpica/executer/exmutex.c | 2 +- drivers/bus/acpi/acpica/executer/exnames.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg1.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg2.c | 4 +- drivers/bus/acpi/acpica/executer/exoparg3.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg6.c | 2 +- drivers/bus/acpi/acpica/executer/exprep.c | 2 +- drivers/bus/acpi/acpica/executer/exregion.c | 2 +- drivers/bus/acpi/acpica/executer/exresnte.c | 2 +- drivers/bus/acpi/acpica/executer/exresolv.c | 2 +- drivers/bus/acpi/acpica/executer/exresop.c | 2 +- drivers/bus/acpi/acpica/executer/exserial.c | 2 +- drivers/bus/acpi/acpica/executer/exstore.c | 2 +- drivers/bus/acpi/acpica/executer/exstoren.c | 2 +- drivers/bus/acpi/acpica/executer/exstorob.c | 2 +- drivers/bus/acpi/acpica/executer/exsystem.c | 2 +- drivers/bus/acpi/acpica/executer/extrace.c | 2 +- drivers/bus/acpi/acpica/executer/exutils.c | 3 +- drivers/bus/acpi/acpica/hardware/hwacpi.c | 2 +- drivers/bus/acpi/acpica/hardware/hwesleep.c | 2 +- drivers/bus/acpi/acpica/hardware/hwgpe.c | 2 +- drivers/bus/acpi/acpica/hardware/hwpci.c | 2 +- drivers/bus/acpi/acpica/hardware/hwregs.c | 2 +- drivers/bus/acpi/acpica/hardware/hwsleep.c | 2 +- drivers/bus/acpi/acpica/hardware/hwtimer.c | 2 +- drivers/bus/acpi/acpica/hardware/hwvalid.c | 2 +- drivers/bus/acpi/acpica/hardware/hwxface.c | 2 +- drivers/bus/acpi/acpica/hardware/hwxfsleep.c | 2 +- drivers/bus/acpi/acpica/include/acapps.h | 4 +- drivers/bus/acpi/acpica/include/acbuffer.h | 2 +- drivers/bus/acpi/acpica/include/acclib.h | 2 +- drivers/bus/acpi/acpica/include/accommon.h | 2 +- drivers/bus/acpi/acpica/include/acconfig.h | 2 +- drivers/bus/acpi/acpica/include/acconvert.h | 2 +- drivers/bus/acpi/acpica/include/acdebug.h | 2 +- drivers/bus/acpi/acpica/include/acdisasm.h | 2 +- drivers/bus/acpi/acpica/include/acdispat.h | 2 +- drivers/bus/acpi/acpica/include/acevents.h | 2 +- drivers/bus/acpi/acpica/include/acexcep.h | 2 +- drivers/bus/acpi/acpica/include/acglobal.h | 3 +- drivers/bus/acpi/acpica/include/achware.h | 2 +- drivers/bus/acpi/acpica/include/acinterp.h | 2 +- drivers/bus/acpi/acpica/include/aclocal.h | 2 +- drivers/bus/acpi/acpica/include/acmacros.h | 2 +- drivers/bus/acpi/acpica/include/acnames.h | 2 +- drivers/bus/acpi/acpica/include/acnamesp.h | 2 +- drivers/bus/acpi/acpica/include/acobject.h | 2 +- drivers/bus/acpi/acpica/include/acopcode.h | 2 +- drivers/bus/acpi/acpica/include/acoutput.h | 4 +- drivers/bus/acpi/acpica/include/acparser.h | 2 +- drivers/bus/acpi/acpica/include/acpi.h | 2 +- drivers/bus/acpi/acpica/include/acpiosxf.h | 2 +- drivers/bus/acpi/acpica/include/acpixf.h | 14 +++++- drivers/bus/acpi/acpica/include/acpredef.h | 2 +- drivers/bus/acpi/acpica/include/acresrc.h | 2 +- drivers/bus/acpi/acpica/include/acrestyp.h | 2 +- drivers/bus/acpi/acpica/include/acstruct.h | 2 +- drivers/bus/acpi/acpica/include/actables.h | 2 +- drivers/bus/acpi/acpica/include/actbinfo.h | 2 +- drivers/bus/acpi/acpica/include/actbl.h | 2 +- drivers/bus/acpi/acpica/include/actbl1.h | 2 +- drivers/bus/acpi/acpica/include/actbl2.h | 2 +- drivers/bus/acpi/acpica/include/actbl3.h | 2 +- drivers/bus/acpi/acpica/include/actypes.h | 2 +- drivers/bus/acpi/acpica/include/acutils.h | 2 +- drivers/bus/acpi/acpica/include/acuuid.h | 2 +- drivers/bus/acpi/acpica/include/amlcode.h | 2 +- drivers/bus/acpi/acpica/include/amlresrc.h | 2 +- .../bus/acpi/acpica/include/platform/accygwin.h | 2 +- .../bus/acpi/acpica/include/platform/acdragonfly.h | 2 +- .../acpi/acpica/include/platform/acdragonflyex.h | 2 +- drivers/bus/acpi/acpica/include/platform/acefi.h | 2 +- drivers/bus/acpi/acpica/include/platform/acefiex.h | 2 +- drivers/bus/acpi/acpica/include/platform/acenv.h | 2 +- drivers/bus/acpi/acpica/include/platform/acenvex.h | 2 +- .../bus/acpi/acpica/include/platform/acfreebsd.h | 2 +- drivers/bus/acpi/acpica/include/platform/acgcc.h | 2 +- drivers/bus/acpi/acpica/include/platform/acgccex.h | 2 +- drivers/bus/acpi/acpica/include/platform/achaiku.h | 2 +- drivers/bus/acpi/acpica/include/platform/acintel.h | 2 +- drivers/bus/acpi/acpica/include/platform/aclinux.h | 2 +- .../bus/acpi/acpica/include/platform/aclinuxex.h | 2 +- .../bus/acpi/acpica/include/platform/acmacosx.h | 2 +- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 2 +- .../bus/acpi/acpica/include/platform/acmsvcex.h | 2 +- .../bus/acpi/acpica/include/platform/acnetbsd.h | 2 +- drivers/bus/acpi/acpica/include/platform/acos2.h | 2 +- drivers/bus/acpi/acpica/include/platform/acqnx.h | 2 +- drivers/bus/acpi/acpica/include/platform/acwin.h | 2 +- drivers/bus/acpi/acpica/include/platform/acwin64.h | 2 +- drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +- drivers/bus/acpi/acpica/namespace/nsalloc.c | 2 +- drivers/bus/acpi/acpica/namespace/nsarguments.c | 2 +- drivers/bus/acpi/acpica/namespace/nsconvert.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdumpdv.c | 2 +- drivers/bus/acpi/acpica/namespace/nseval.c | 2 +- drivers/bus/acpi/acpica/namespace/nsinit.c | 2 +- drivers/bus/acpi/acpica/namespace/nsload.c | 2 +- drivers/bus/acpi/acpica/namespace/nsnames.c | 2 +- drivers/bus/acpi/acpica/namespace/nsobject.c | 2 +- drivers/bus/acpi/acpica/namespace/nsparse.c | 2 +- drivers/bus/acpi/acpica/namespace/nspredef.c | 2 +- drivers/bus/acpi/acpica/namespace/nsprepkg.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair2.c | 2 +- drivers/bus/acpi/acpica/namespace/nssearch.c | 2 +- drivers/bus/acpi/acpica/namespace/nsutils.c | 2 +- drivers/bus/acpi/acpica/namespace/nswalk.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfeval.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfname.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfobj.c | 2 +- drivers/bus/acpi/acpica/parser/psargs.c | 2 +- drivers/bus/acpi/acpica/parser/psloop.c | 2 +- drivers/bus/acpi/acpica/parser/psobject.c | 2 +- drivers/bus/acpi/acpica/parser/psopcode.c | 2 +- drivers/bus/acpi/acpica/parser/psopinfo.c | 2 +- drivers/bus/acpi/acpica/parser/psparse.c | 2 +- drivers/bus/acpi/acpica/parser/psscope.c | 2 +- drivers/bus/acpi/acpica/parser/pstree.c | 2 +- drivers/bus/acpi/acpica/parser/psutils.c | 2 +- drivers/bus/acpi/acpica/parser/pswalk.c | 2 +- drivers/bus/acpi/acpica/parser/psxface.c | 2 +- drivers/bus/acpi/acpica/resources/rsaddr.c | 2 +- drivers/bus/acpi/acpica/resources/rscalc.c | 2 +- drivers/bus/acpi/acpica/resources/rscreate.c | 2 +- drivers/bus/acpi/acpica/resources/rsdump.c | 2 +- drivers/bus/acpi/acpica/resources/rsdumpinfo.c | 2 +- drivers/bus/acpi/acpica/resources/rsinfo.c | 2 +- drivers/bus/acpi/acpica/resources/rsio.c | 2 +- drivers/bus/acpi/acpica/resources/rsirq.c | 2 +- drivers/bus/acpi/acpica/resources/rslist.c | 2 +- drivers/bus/acpi/acpica/resources/rsmemory.c | 2 +- drivers/bus/acpi/acpica/resources/rsmisc.c | 2 +- drivers/bus/acpi/acpica/resources/rsserial.c | 2 +- drivers/bus/acpi/acpica/resources/rsutils.c | 2 +- drivers/bus/acpi/acpica/resources/rsxface.c | 2 +- drivers/bus/acpi/acpica/tables/tbdata.c | 2 +- drivers/bus/acpi/acpica/tables/tbfadt.c | 2 +- drivers/bus/acpi/acpica/tables/tbfind.c | 2 +- drivers/bus/acpi/acpica/tables/tbinstal.c | 2 +- drivers/bus/acpi/acpica/tables/tbprint.c | 2 +- drivers/bus/acpi/acpica/tables/tbutils.c | 2 +- drivers/bus/acpi/acpica/tables/tbxface.c | 2 +- drivers/bus/acpi/acpica/tables/tbxfload.c | 2 +- drivers/bus/acpi/acpica/tables/tbxfroot.c | 2 +- drivers/bus/acpi/acpica/utilities/utaddress.c | 2 +- drivers/bus/acpi/acpica/utilities/utalloc.c | 2 +- drivers/bus/acpi/acpica/utilities/utascii.c | 2 +- drivers/bus/acpi/acpica/utilities/utbuffer.c | 2 +- drivers/bus/acpi/acpica/utilities/utcache.c | 2 +- drivers/bus/acpi/acpica/utilities/utclib.c | 2 +- drivers/bus/acpi/acpica/utilities/utcopy.c | 2 +- drivers/bus/acpi/acpica/utilities/utdebug.c | 2 +- drivers/bus/acpi/acpica/utilities/utdecode.c | 12 ++--- drivers/bus/acpi/acpica/utilities/utdelete.c | 2 +- drivers/bus/acpi/acpica/utilities/uterror.c | 2 +- drivers/bus/acpi/acpica/utilities/uteval.c | 2 +- drivers/bus/acpi/acpica/utilities/utexcep.c | 2 +- drivers/bus/acpi/acpica/utilities/utglobal.c | 2 +- drivers/bus/acpi/acpica/utilities/uthex.c | 2 +- drivers/bus/acpi/acpica/utilities/utids.c | 2 +- drivers/bus/acpi/acpica/utilities/utinit.c | 2 +- drivers/bus/acpi/acpica/utilities/utlock.c | 2 +- drivers/bus/acpi/acpica/utilities/utmath.c | 2 +- drivers/bus/acpi/acpica/utilities/utmisc.c | 2 +- drivers/bus/acpi/acpica/utilities/utmutex.c | 2 +- drivers/bus/acpi/acpica/utilities/utnonansi.c | 2 +- drivers/bus/acpi/acpica/utilities/utobject.c | 2 +- drivers/bus/acpi/acpica/utilities/utosi.c | 2 +- drivers/bus/acpi/acpica/utilities/utownerid.c | 2 +- drivers/bus/acpi/acpica/utilities/utpredef.c | 2 +- drivers/bus/acpi/acpica/utilities/utprint.c | 2 +- drivers/bus/acpi/acpica/utilities/utresdecode.c | 2 +- drivers/bus/acpi/acpica/utilities/utresrc.c | 2 +- drivers/bus/acpi/acpica/utilities/utstate.c | 2 +- drivers/bus/acpi/acpica/utilities/utstring.c | 2 +- drivers/bus/acpi/acpica/utilities/utstrsuppt.c | 2 +- drivers/bus/acpi/acpica/utilities/utstrtoul64.c | 2 +- drivers/bus/acpi/acpica/utilities/uttrack.c | 11 ++++- drivers/bus/acpi/acpica/utilities/utuuid.c | 2 +- drivers/bus/acpi/acpica/utilities/utxface.c | 2 +- drivers/bus/acpi/acpica/utilities/utxferror.c | 55 +++++++++++++++++++++- drivers/bus/acpi/acpica/utilities/utxfinit.c | 2 +- drivers/bus/acpi/acpica/utilities/utxfmutex.c | 2 +- 225 files changed, 311 insertions(+), 238 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsargs.c b/drivers/bus/acpi/acpica/dispatcher/dsargs.c index da05c5e431..b092a02f01 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsargs.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsargs.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c index 7b0ac6a6aa..b2bec50333 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c +++ b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c index f962a61c10..274d77ae7e 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index 85744cb42a..44e2889b12 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsinit.c b/drivers/bus/acpi/acpica/dispatcher/dsinit.c index cec331cb90..b1300b7e82 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsinit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c index 8a35cc8576..e7d7eab5f6 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c b/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c index 851666fb55..f95c8bc163 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsobject.c b/drivers/bus/acpi/acpica/dispatcher/dsobject.c index 1326a98569..0669463817 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsobject.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -352,7 +352,6 @@ AcpiDsCreateNode ( } - /******************************************************************************* * * FUNCTION: AcpiDsInitObjectFromOp diff --git a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c index 25c27185c4..97d6b3f5e6 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -178,7 +178,7 @@ AcpiDsInitBufferField ( if (BitCount == 0) { - ACPI_ERROR ((AE_INFO, + ACPI_BIOS_ERROR ((AE_INFO, "Attempt to CreateField of length zero")); Status = AE_AML_OPERAND_VALUE; goto Cleanup; @@ -244,12 +244,12 @@ AcpiDsInitBufferField ( if ((BitOffset + BitCount) > (8 * (UINT32) BufferDesc->Buffer.Length)) { - ACPI_ERROR ((AE_INFO, + Status = AE_AML_BUFFER_LIMIT; + ACPI_BIOS_EXCEPTION ((AE_INFO, Status, "Field [%4.4s] at bit offset/length %u/%u " "exceeds size of target Buffer (%u bits)", AcpiUtGetNodeName (ResultDesc), BitOffset, BitCount, 8 * (UINT32) BufferDesc->Buffer.Length)); - Status = AE_AML_BUFFER_LIMIT; goto Cleanup; } diff --git a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c index 98378aeb8f..a553416549 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsutils.c b/drivers/bus/acpi/acpica/dispatcher/dsutils.c index e913cb6826..456cf5c40a 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsutils.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsutils.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswexec.c b/drivers/bus/acpi/acpica/dispatcher/dswexec.c index e3aa385a12..e8cc3c1789 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswexec.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswexec.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload.c b/drivers/bus/acpi/acpica/dispatcher/dswload.c index 28c15384a9..bc99b2b166 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload2.c b/drivers/bus/acpi/acpica/dispatcher/dswload2.c index 477d8024fd..13677be514 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload2.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload2.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswscope.c b/drivers/bus/acpi/acpica/dispatcher/dswscope.c index d94242e523..2100ce179f 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswscope.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswscope.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswstate.c b/drivers/bus/acpi/acpica/dispatcher/dswstate.c index 9c501179bc..7c6670b31d 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswstate.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswstate.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evevent.c b/drivers/bus/acpi/acpica/events/evevent.c index cec39cbb1c..af984c4dfc 100644 --- a/drivers/bus/acpi/acpica/events/evevent.c +++ b/drivers/bus/acpi/acpica/events/evevent.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evglock.c b/drivers/bus/acpi/acpica/events/evglock.c index 154a08a71a..87c7a8d9f2 100644 --- a/drivers/bus/acpi/acpica/events/evglock.c +++ b/drivers/bus/acpi/acpica/events/evglock.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index 15e260ae2a..bfef37a0a8 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeblk.c b/drivers/bus/acpi/acpica/events/evgpeblk.c index cded0598d7..131eec8cce 100644 --- a/drivers/bus/acpi/acpica/events/evgpeblk.c +++ b/drivers/bus/acpi/acpica/events/evgpeblk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c b/drivers/bus/acpi/acpica/events/evgpeinit.c index e260a08e62..ccdcff2a3c 100644 --- a/drivers/bus/acpi/acpica/events/evgpeinit.c +++ b/drivers/bus/acpi/acpica/events/evgpeinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeutil.c b/drivers/bus/acpi/acpica/events/evgpeutil.c index 6e5d908801..c237d51afb 100644 --- a/drivers/bus/acpi/acpica/events/evgpeutil.c +++ b/drivers/bus/acpi/acpica/events/evgpeutil.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evhandler.c b/drivers/bus/acpi/acpica/events/evhandler.c index 12e6c275c3..e9500542f5 100644 --- a/drivers/bus/acpi/acpica/events/evhandler.c +++ b/drivers/bus/acpi/acpica/events/evhandler.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evmisc.c b/drivers/bus/acpi/acpica/events/evmisc.c index b4f18f6a4a..37132d41bb 100644 --- a/drivers/bus/acpi/acpica/events/evmisc.c +++ b/drivers/bus/acpi/acpica/events/evmisc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evregion.c b/drivers/bus/acpi/acpica/events/evregion.c index 9cee492364..dd37eca204 100644 --- a/drivers/bus/acpi/acpica/events/evregion.c +++ b/drivers/bus/acpi/acpica/events/evregion.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evrgnini.c b/drivers/bus/acpi/acpica/events/evrgnini.c index a8b576c79a..dc144e18fe 100644 --- a/drivers/bus/acpi/acpica/events/evrgnini.c +++ b/drivers/bus/acpi/acpica/events/evrgnini.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evsci.c b/drivers/bus/acpi/acpica/events/evsci.c index 3974d8ddab..cc68a91bb5 100644 --- a/drivers/bus/acpi/acpica/events/evsci.c +++ b/drivers/bus/acpi/acpica/events/evsci.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxface.c b/drivers/bus/acpi/acpica/events/evxface.c index 79dc347c7c..d6f1d2fa43 100644 --- a/drivers/bus/acpi/acpica/events/evxface.c +++ b/drivers/bus/acpi/acpica/events/evxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfevnt.c b/drivers/bus/acpi/acpica/events/evxfevnt.c index 0e67db30ca..a90e62c67f 100644 --- a/drivers/bus/acpi/acpica/events/evxfevnt.c +++ b/drivers/bus/acpi/acpica/events/evxfevnt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfgpe.c b/drivers/bus/acpi/acpica/events/evxfgpe.c index 0b1b22e7b7..1870d6a315 100644 --- a/drivers/bus/acpi/acpica/events/evxfgpe.c +++ b/drivers/bus/acpi/acpica/events/evxfgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfregn.c b/drivers/bus/acpi/acpica/events/evxfregn.c index 45bd7d6ee2..615a3bb422 100644 --- a/drivers/bus/acpi/acpica/events/evxfregn.c +++ b/drivers/bus/acpi/acpica/events/evxfregn.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconcat.c b/drivers/bus/acpi/acpica/executer/exconcat.c index 556dff6668..1650146c31 100644 --- a/drivers/bus/acpi/acpica/executer/exconcat.c +++ b/drivers/bus/acpi/acpica/executer/exconcat.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconfig.c b/drivers/bus/acpi/acpica/executer/exconfig.c index 864637463f..5347acf46f 100644 --- a/drivers/bus/acpi/acpica/executer/exconfig.c +++ b/drivers/bus/acpi/acpica/executer/exconfig.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconvrt.c b/drivers/bus/acpi/acpica/executer/exconvrt.c index 9fa06834ad..398a700592 100644 --- a/drivers/bus/acpi/acpica/executer/exconvrt.c +++ b/drivers/bus/acpi/acpica/executer/exconvrt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/excreate.c b/drivers/bus/acpi/acpica/executer/excreate.c index e8a0ef02bf..04dc3d22a6 100644 --- a/drivers/bus/acpi/acpica/executer/excreate.c +++ b/drivers/bus/acpi/acpica/executer/excreate.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exdebug.c b/drivers/bus/acpi/acpica/executer/exdebug.c index e340fb1b16..5c1f1e22ac 100644 --- a/drivers/bus/acpi/acpica/executer/exdebug.c +++ b/drivers/bus/acpi/acpica/executer/exdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exdump.c b/drivers/bus/acpi/acpica/executer/exdump.c index a30c1ccade..cfe1e30409 100644 --- a/drivers/bus/acpi/acpica/executer/exdump.c +++ b/drivers/bus/acpi/acpica/executer/exdump.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index fb6138a88f..917cd2fd53 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exfldio.c b/drivers/bus/acpi/acpica/executer/exfldio.c index ba72188862..397464e93d 100644 --- a/drivers/bus/acpi/acpica/executer/exfldio.c +++ b/drivers/bus/acpi/acpica/executer/exfldio.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exmisc.c b/drivers/bus/acpi/acpica/executer/exmisc.c index b392eb92be..6822f3ecac 100644 --- a/drivers/bus/acpi/acpica/executer/exmisc.c +++ b/drivers/bus/acpi/acpica/executer/exmisc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exmutex.c b/drivers/bus/acpi/acpica/executer/exmutex.c index 88e1a89c08..1f28c6f7b5 100644 --- a/drivers/bus/acpi/acpica/executer/exmutex.c +++ b/drivers/bus/acpi/acpica/executer/exmutex.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exnames.c b/drivers/bus/acpi/acpica/executer/exnames.c index b4a2a648ae..f730df2e21 100644 --- a/drivers/bus/acpi/acpica/executer/exnames.c +++ b/drivers/bus/acpi/acpica/executer/exnames.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg1.c b/drivers/bus/acpi/acpica/executer/exoparg1.c index 416e74debd..2668dff435 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg1.c +++ b/drivers/bus/acpi/acpica/executer/exoparg1.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg2.c b/drivers/bus/acpi/acpica/executer/exoparg2.c index 952e5e1f6a..30ed253c84 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg2.c +++ b/drivers/bus/acpi/acpica/executer/exoparg2.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -458,7 +458,7 @@ AcpiExOpcode_2A_1T_1R ( if (ACPI_FAILURE (Status)) { - ACPI_EXCEPTION ((AE_INFO, Status, + ACPI_BIOS_EXCEPTION ((AE_INFO, Status, "Index (0x%X%8.8X) is beyond end of object (length 0x%X)", ACPI_FORMAT_UINT64 (Index), (UINT32) Length)); goto Cleanup; diff --git a/drivers/bus/acpi/acpica/executer/exoparg3.c b/drivers/bus/acpi/acpica/executer/exoparg3.c index 3828ec1162..81e3016184 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg3.c +++ b/drivers/bus/acpi/acpica/executer/exoparg3.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg6.c b/drivers/bus/acpi/acpica/executer/exoparg6.c index f1e405c6b6..a9b877d536 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg6.c +++ b/drivers/bus/acpi/acpica/executer/exoparg6.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exprep.c b/drivers/bus/acpi/acpica/executer/exprep.c index 0c6397cc36..edd3c0caf2 100644 --- a/drivers/bus/acpi/acpica/executer/exprep.c +++ b/drivers/bus/acpi/acpica/executer/exprep.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exregion.c b/drivers/bus/acpi/acpica/executer/exregion.c index 7e0b3bc65d..ac264ef670 100644 --- a/drivers/bus/acpi/acpica/executer/exregion.c +++ b/drivers/bus/acpi/acpica/executer/exregion.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresnte.c b/drivers/bus/acpi/acpica/executer/exresnte.c index 1110171081..82202004d0 100644 --- a/drivers/bus/acpi/acpica/executer/exresnte.c +++ b/drivers/bus/acpi/acpica/executer/exresnte.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresolv.c b/drivers/bus/acpi/acpica/executer/exresolv.c index 7a78388a5d..7fc2c1ab95 100644 --- a/drivers/bus/acpi/acpica/executer/exresolv.c +++ b/drivers/bus/acpi/acpica/executer/exresolv.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresop.c b/drivers/bus/acpi/acpica/executer/exresop.c index 3453803556..e693272422 100644 --- a/drivers/bus/acpi/acpica/executer/exresop.c +++ b/drivers/bus/acpi/acpica/executer/exresop.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exserial.c b/drivers/bus/acpi/acpica/executer/exserial.c index 381d26f919..2c7bf8bb38 100644 --- a/drivers/bus/acpi/acpica/executer/exserial.c +++ b/drivers/bus/acpi/acpica/executer/exserial.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstore.c b/drivers/bus/acpi/acpica/executer/exstore.c index 26f26dda91..de95bf1939 100644 --- a/drivers/bus/acpi/acpica/executer/exstore.c +++ b/drivers/bus/acpi/acpica/executer/exstore.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstoren.c b/drivers/bus/acpi/acpica/executer/exstoren.c index 6ad784c712..7963c8e6d3 100644 --- a/drivers/bus/acpi/acpica/executer/exstoren.c +++ b/drivers/bus/acpi/acpica/executer/exstoren.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstorob.c b/drivers/bus/acpi/acpica/executer/exstorob.c index 45806217b2..827857c65a 100644 --- a/drivers/bus/acpi/acpica/executer/exstorob.c +++ b/drivers/bus/acpi/acpica/executer/exstorob.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exsystem.c b/drivers/bus/acpi/acpica/executer/exsystem.c index 3ef8df7a5a..608981a8c4 100644 --- a/drivers/bus/acpi/acpica/executer/exsystem.c +++ b/drivers/bus/acpi/acpica/executer/exsystem.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/extrace.c b/drivers/bus/acpi/acpica/executer/extrace.c index 7864aedb3e..744510b86b 100644 --- a/drivers/bus/acpi/acpica/executer/extrace.c +++ b/drivers/bus/acpi/acpica/executer/extrace.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exutils.c b/drivers/bus/acpi/acpica/executer/exutils.c index a3222124fb..0c2820b8ee 100644 --- a/drivers/bus/acpi/acpica/executer/exutils.c +++ b/drivers/bus/acpi/acpica/executer/exutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -505,4 +505,3 @@ AcpiIsValidSpaceId ( return (TRUE); } - diff --git a/drivers/bus/acpi/acpica/hardware/hwacpi.c b/drivers/bus/acpi/acpica/hardware/hwacpi.c index d907fe278c..c2b8dca9b1 100644 --- a/drivers/bus/acpi/acpica/hardware/hwacpi.c +++ b/drivers/bus/acpi/acpica/hardware/hwacpi.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwesleep.c b/drivers/bus/acpi/acpica/hardware/hwesleep.c index 31e67d1d28..06d196c13c 100644 --- a/drivers/bus/acpi/acpica/hardware/hwesleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwesleep.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwgpe.c b/drivers/bus/acpi/acpica/hardware/hwgpe.c index 788fc56e5f..53ff2e6878 100644 --- a/drivers/bus/acpi/acpica/hardware/hwgpe.c +++ b/drivers/bus/acpi/acpica/hardware/hwgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwpci.c b/drivers/bus/acpi/acpica/hardware/hwpci.c index 2803fe086b..fd1da67d2e 100644 --- a/drivers/bus/acpi/acpica/hardware/hwpci.c +++ b/drivers/bus/acpi/acpica/hardware/hwpci.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwregs.c b/drivers/bus/acpi/acpica/hardware/hwregs.c index 33171f26bb..03b8640308 100644 --- a/drivers/bus/acpi/acpica/hardware/hwregs.c +++ b/drivers/bus/acpi/acpica/hardware/hwregs.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwsleep.c b/drivers/bus/acpi/acpica/hardware/hwsleep.c index 02a420f178..7863be513f 100644 --- a/drivers/bus/acpi/acpica/hardware/hwsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwsleep.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwtimer.c b/drivers/bus/acpi/acpica/hardware/hwtimer.c index 7f856ffd75..12a36a9cfe 100644 --- a/drivers/bus/acpi/acpica/hardware/hwtimer.c +++ b/drivers/bus/acpi/acpica/hardware/hwtimer.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwvalid.c b/drivers/bus/acpi/acpica/hardware/hwvalid.c index 99cbeeb7cf..1b51c405c9 100644 --- a/drivers/bus/acpi/acpica/hardware/hwvalid.c +++ b/drivers/bus/acpi/acpica/hardware/hwvalid.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwxface.c b/drivers/bus/acpi/acpica/hardware/hwxface.c index 15de6b2fc8..49bffa1674 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxface.c +++ b/drivers/bus/acpi/acpica/hardware/hwxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c index f6449565f0..6531d0174b 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acapps.h b/drivers/bus/acpi/acpica/include/acapps.h index 0192ea7750..c0d58d2099 100644 --- a/drivers/bus/acpi/acpica/include/acapps.h +++ b/drivers/bus/acpi/acpica/include/acapps.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ /* Common info for tool signons */ #define ACPICA_NAME "Intel ACPI Component Architecture" -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2018 Intel Corporation" +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2019 Intel Corporation" #if ACPI_MACHINE_WIDTH == 64 #define ACPI_WIDTH " (64-bit version)" diff --git a/drivers/bus/acpi/acpica/include/acbuffer.h b/drivers/bus/acpi/acpica/include/acbuffer.h index e1414f9253..4a061429ab 100644 --- a/drivers/bus/acpi/acpica/include/acbuffer.h +++ b/drivers/bus/acpi/acpica/include/acbuffer.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acclib.h b/drivers/bus/acpi/acpica/include/acclib.h index ba5a95efc3..6e23fc914b 100644 --- a/drivers/bus/acpi/acpica/include/acclib.h +++ b/drivers/bus/acpi/acpica/include/acclib.h @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/accommon.h b/drivers/bus/acpi/acpica/include/accommon.h index d1636e3007..dde42069ca 100644 --- a/drivers/bus/acpi/acpica/include/accommon.h +++ b/drivers/bus/acpi/acpica/include/accommon.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acconfig.h b/drivers/bus/acpi/acpica/include/acconfig.h index 6f9c8d6d50..12267bfb69 100644 --- a/drivers/bus/acpi/acpica/include/acconfig.h +++ b/drivers/bus/acpi/acpica/include/acconfig.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acconvert.h b/drivers/bus/acpi/acpica/include/acconvert.h index 348eb9a4c9..a66bcc321b 100644 --- a/drivers/bus/acpi/acpica/include/acconvert.h +++ b/drivers/bus/acpi/acpica/include/acconvert.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acdebug.h b/drivers/bus/acpi/acpica/include/acdebug.h index 1cf4c83901..4d9d3acfa7 100644 --- a/drivers/bus/acpi/acpica/include/acdebug.h +++ b/drivers/bus/acpi/acpica/include/acdebug.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acdisasm.h b/drivers/bus/acpi/acpica/include/acdisasm.h index 28e398f3e9..573f2876e1 100644 --- a/drivers/bus/acpi/acpica/include/acdisasm.h +++ b/drivers/bus/acpi/acpica/include/acdisasm.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acdispat.h b/drivers/bus/acpi/acpica/include/acdispat.h index 41e7e40eec..af4cd4d8c9 100644 --- a/drivers/bus/acpi/acpica/include/acdispat.h +++ b/drivers/bus/acpi/acpica/include/acdispat.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acevents.h b/drivers/bus/acpi/acpica/include/acevents.h index d6db0caca5..c2f6140e74 100644 --- a/drivers/bus/acpi/acpica/include/acevents.h +++ b/drivers/bus/acpi/acpica/include/acevents.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acexcep.h b/drivers/bus/acpi/acpica/include/acexcep.h index 2a5511a7c0..fe2f19b2be 100644 --- a/drivers/bus/acpi/acpica/include/acexcep.h +++ b/drivers/bus/acpi/acpica/include/acexcep.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acglobal.h b/drivers/bus/acpi/acpica/include/acglobal.h index 6527c05723..689191b0f4 100644 --- a/drivers/bus/acpi/acpica/include/acglobal.h +++ b/drivers/bus/acpi/acpica/include/acglobal.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -200,6 +200,7 @@ ACPI_GLOBAL (ACPI_MEMORY_LIST *, AcpiGbl_GlobalList); ACPI_GLOBAL (ACPI_MEMORY_LIST *, AcpiGbl_NsNodeList); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DisplayFinalMemStats); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DisableMemTracking); +ACPI_GLOBAL (BOOLEAN, AcpiGbl_VerboseLeakDump); #endif diff --git a/drivers/bus/acpi/acpica/include/achware.h b/drivers/bus/acpi/acpica/include/achware.h index b9b0a78789..8cb6832e15 100644 --- a/drivers/bus/acpi/acpica/include/achware.h +++ b/drivers/bus/acpi/acpica/include/achware.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acinterp.h b/drivers/bus/acpi/acpica/include/acinterp.h index 1e4925f77f..bcad853329 100644 --- a/drivers/bus/acpi/acpica/include/acinterp.h +++ b/drivers/bus/acpi/acpica/include/acinterp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index 0a599f14cd..37e3f7f8f9 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acmacros.h b/drivers/bus/acpi/acpica/include/acmacros.h index b7aba87b3a..ddb96cbd81 100644 --- a/drivers/bus/acpi/acpica/include/acmacros.h +++ b/drivers/bus/acpi/acpica/include/acmacros.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acnames.h b/drivers/bus/acpi/acpica/include/acnames.h index 8ca7fc8573..166fb99ea8 100644 --- a/drivers/bus/acpi/acpica/include/acnames.h +++ b/drivers/bus/acpi/acpica/include/acnames.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acnamesp.h b/drivers/bus/acpi/acpica/include/acnamesp.h index bdd3967785..e2e1e487a2 100644 --- a/drivers/bus/acpi/acpica/include/acnamesp.h +++ b/drivers/bus/acpi/acpica/include/acnamesp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index de3fbb6e5c..10bf5ef790 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acopcode.h b/drivers/bus/acpi/acpica/include/acopcode.h index 1bd91359a4..ed818bb45d 100644 --- a/drivers/bus/acpi/acpica/include/acopcode.h +++ b/drivers/bus/acpi/acpica/include/acopcode.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acoutput.h b/drivers/bus/acpi/acpica/include/acoutput.h index bf90bcf5a1..96779cb8c0 100644 --- a/drivers/bus/acpi/acpica/include/acoutput.h +++ b/drivers/bus/acpi/acpica/include/acoutput.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -239,6 +239,7 @@ #define ACPI_EXCEPTION(plist) AcpiException plist #define ACPI_ERROR(plist) AcpiError plist #define ACPI_BIOS_WARNING(plist) AcpiBiosWarning plist +#define ACPI_BIOS_EXCEPTION(plist) AcpiBiosException plist #define ACPI_BIOS_ERROR(plist) AcpiBiosError plist #define ACPI_DEBUG_OBJECT(obj,l,i) AcpiExDoDebugObject(obj,l,i) @@ -251,6 +252,7 @@ #define ACPI_EXCEPTION(plist) #define ACPI_ERROR(plist) #define ACPI_BIOS_WARNING(plist) +#define ACPI_BIOS_EXCEPTION(plist) #define ACPI_BIOS_ERROR(plist) #define ACPI_DEBUG_OBJECT(obj,l,i) diff --git a/drivers/bus/acpi/acpica/include/acparser.h b/drivers/bus/acpi/acpica/include/acparser.h index 949e0a2a56..47811875c6 100644 --- a/drivers/bus/acpi/acpica/include/acparser.h +++ b/drivers/bus/acpi/acpica/include/acparser.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpi.h b/drivers/bus/acpi/acpica/include/acpi.h index 819324040a..ec80790dde 100644 --- a/drivers/bus/acpi/acpica/include/acpi.h +++ b/drivers/bus/acpi/acpica/include/acpi.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpiosxf.h b/drivers/bus/acpi/acpica/include/acpiosxf.h index 97adccc7a6..a874f65f31 100644 --- a/drivers/bus/acpi/acpica/include/acpiosxf.h +++ b/drivers/bus/acpi/acpica/include/acpiosxf.h @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index d72c530581..e8818bf800 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20181213 +#define ACPI_CA_VERSION 0x20190108 #include "acconfig.h" #include "actypes.h" @@ -1229,6 +1229,16 @@ AcpiBiosError ( const char *Format, ...)) +ACPI_MSG_DEPENDENT_RETURN_VOID ( +ACPI_PRINTF_LIKE(4) +void ACPI_INTERNAL_VAR_XFACE +AcpiBiosException ( + const char *ModuleName, + UINT32 LineNumber, + ACPI_STATUS Status, + const char *Format, + ...)) + ACPI_MSG_DEPENDENT_RETURN_VOID ( ACPI_PRINTF_LIKE(3) void ACPI_INTERNAL_VAR_XFACE diff --git a/drivers/bus/acpi/acpica/include/acpredef.h b/drivers/bus/acpi/acpica/include/acpredef.h index d6afb01366..a42a6ab462 100644 --- a/drivers/bus/acpi/acpica/include/acpredef.h +++ b/drivers/bus/acpi/acpica/include/acpredef.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acresrc.h b/drivers/bus/acpi/acpica/include/acresrc.h index 6563b49ad6..4445b754ae 100644 --- a/drivers/bus/acpi/acpica/include/acresrc.h +++ b/drivers/bus/acpi/acpica/include/acresrc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acrestyp.h b/drivers/bus/acpi/acpica/include/acrestyp.h index 39dfdb77a7..ab42a2ab46 100644 --- a/drivers/bus/acpi/acpica/include/acrestyp.h +++ b/drivers/bus/acpi/acpica/include/acrestyp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index 203a577faf..04123f307f 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actables.h b/drivers/bus/acpi/acpica/include/actables.h index 2eb7dd292c..9f3548e129 100644 --- a/drivers/bus/acpi/acpica/include/actables.h +++ b/drivers/bus/acpi/acpica/include/actables.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbinfo.h b/drivers/bus/acpi/acpica/include/actbinfo.h index 53e75a1287..47e79f22f0 100644 --- a/drivers/bus/acpi/acpica/include/actbinfo.h +++ b/drivers/bus/acpi/acpica/include/actbinfo.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl.h b/drivers/bus/acpi/acpica/include/actbl.h index 7195bb0a89..55d4b4826c 100644 --- a/drivers/bus/acpi/acpica/include/actbl.h +++ b/drivers/bus/acpi/acpica/include/actbl.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl1.h b/drivers/bus/acpi/acpica/include/actbl1.h index b76195f8b1..14b8ade133 100644 --- a/drivers/bus/acpi/acpica/include/actbl1.h +++ b/drivers/bus/acpi/acpica/include/actbl1.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl2.h b/drivers/bus/acpi/acpica/include/actbl2.h index 3205ec9310..3d2c070647 100644 --- a/drivers/bus/acpi/acpica/include/actbl2.h +++ b/drivers/bus/acpi/acpica/include/actbl2.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl3.h b/drivers/bus/acpi/acpica/include/actbl3.h index 4809606879..85d41d9890 100644 --- a/drivers/bus/acpi/acpica/include/actbl3.h +++ b/drivers/bus/acpi/acpica/include/actbl3.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 7424e4e048..0c96c820c3 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index dc7750808e..5d407343df 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acuuid.h b/drivers/bus/acpi/acpica/include/acuuid.h index 8a3207a3fb..6da4ca73f7 100644 --- a/drivers/bus/acpi/acpica/include/acuuid.h +++ b/drivers/bus/acpi/acpica/include/acuuid.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/amlcode.h b/drivers/bus/acpi/acpica/include/amlcode.h index 216f784ca2..defeffbe94 100644 --- a/drivers/bus/acpi/acpica/include/amlcode.h +++ b/drivers/bus/acpi/acpica/include/amlcode.h @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/amlresrc.h b/drivers/bus/acpi/acpica/include/amlresrc.h index f572840d25..af87791e8e 100644 --- a/drivers/bus/acpi/acpica/include/amlresrc.h +++ b/drivers/bus/acpi/acpica/include/amlresrc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/accygwin.h b/drivers/bus/acpi/acpica/include/platform/accygwin.h index da7bae3477..0e2776fd18 100644 --- a/drivers/bus/acpi/acpica/include/platform/accygwin.h +++ b/drivers/bus/acpi/acpica/include/platform/accygwin.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acdragonfly.h b/drivers/bus/acpi/acpica/include/platform/acdragonfly.h index 264e30f36b..71af4206b8 100644 --- a/drivers/bus/acpi/acpica/include/platform/acdragonfly.h +++ b/drivers/bus/acpi/acpica/include/platform/acdragonfly.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h b/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h index d091866f60..5cb011b3d2 100644 --- a/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h +++ b/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acefi.h b/drivers/bus/acpi/acpica/include/platform/acefi.h index 5ae9918d89..a8790883af 100644 --- a/drivers/bus/acpi/acpica/include/platform/acefi.h +++ b/drivers/bus/acpi/acpica/include/platform/acefi.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acefiex.h b/drivers/bus/acpi/acpica/include/platform/acefiex.h index 733264e71c..d57133691b 100644 --- a/drivers/bus/acpi/acpica/include/platform/acefiex.h +++ b/drivers/bus/acpi/acpica/include/platform/acefiex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acenv.h b/drivers/bus/acpi/acpica/include/platform/acenv.h index 732891283f..a6b5ab18fd 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenv.h +++ b/drivers/bus/acpi/acpica/include/platform/acenv.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acenvex.h b/drivers/bus/acpi/acpica/include/platform/acenvex.h index f69252afe3..ed315d9bc7 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenvex.h +++ b/drivers/bus/acpi/acpica/include/platform/acenvex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h index 8c01a5be44..40da5b0a17 100644 --- a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acgcc.h b/drivers/bus/acpi/acpica/include/platform/acgcc.h index eee37ebcf3..53e4eb386d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acgcc.h +++ b/drivers/bus/acpi/acpica/include/platform/acgcc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acgccex.h b/drivers/bus/acpi/acpica/include/platform/acgccex.h index 9140c2027a..ebef1b2cec 100644 --- a/drivers/bus/acpi/acpica/include/platform/acgccex.h +++ b/drivers/bus/acpi/acpica/include/platform/acgccex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/achaiku.h b/drivers/bus/acpi/acpica/include/platform/achaiku.h index d6d44d7af4..5fc5e448c0 100644 --- a/drivers/bus/acpi/acpica/include/platform/achaiku.h +++ b/drivers/bus/acpi/acpica/include/platform/achaiku.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acintel.h b/drivers/bus/acpi/acpica/include/platform/acintel.h index 3afbdd933d..74ed985bf9 100644 --- a/drivers/bus/acpi/acpica/include/platform/acintel.h +++ b/drivers/bus/acpi/acpica/include/platform/acintel.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/aclinux.h b/drivers/bus/acpi/acpica/include/platform/aclinux.h index 57d28f8b95..c93548b94c 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinux.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinux.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/aclinuxex.h b/drivers/bus/acpi/acpica/include/platform/aclinuxex.h index 5e7dc841da..bb7b7ff6a1 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinuxex.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinuxex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmacosx.h b/drivers/bus/acpi/acpica/include/platform/acmacosx.h index 9a35e866fb..fa99442280 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmacosx.h +++ b/drivers/bus/acpi/acpica/include/platform/acmacosx.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index 210cc73a3b..57d9693c65 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvcex.h b/drivers/bus/acpi/acpica/include/platform/acmsvcex.h index 3d8615167c..51c419771f 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvcex.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvcex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acnetbsd.h b/drivers/bus/acpi/acpica/include/platform/acnetbsd.h index 3b0b7a5a07..766fdbfd7c 100644 --- a/drivers/bus/acpi/acpica/include/platform/acnetbsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acnetbsd.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acos2.h b/drivers/bus/acpi/acpica/include/platform/acos2.h index d96148364b..f217eeac57 100644 --- a/drivers/bus/acpi/acpica/include/platform/acos2.h +++ b/drivers/bus/acpi/acpica/include/platform/acos2.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acqnx.h b/drivers/bus/acpi/acpica/include/platform/acqnx.h index f6b23188b4..05a10bc69e 100644 --- a/drivers/bus/acpi/acpica/include/platform/acqnx.h +++ b/drivers/bus/acpi/acpica/include/platform/acqnx.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acwin.h b/drivers/bus/acpi/acpica/include/platform/acwin.h index b14f9ef394..5dbb7126af 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acwin64.h b/drivers/bus/acpi/acpica/include/platform/acwin64.h index f946bd1f50..5dda0a5de8 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin64.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin64.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index 9d13fb531b..59121b7b82 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsalloc.c b/drivers/bus/acpi/acpica/namespace/nsalloc.c index 7111ab3098..8f079c3e9f 100644 --- a/drivers/bus/acpi/acpica/namespace/nsalloc.c +++ b/drivers/bus/acpi/acpica/namespace/nsalloc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsarguments.c b/drivers/bus/acpi/acpica/namespace/nsarguments.c index 4e450e50bb..1c67bdc6a6 100644 --- a/drivers/bus/acpi/acpica/namespace/nsarguments.c +++ b/drivers/bus/acpi/acpica/namespace/nsarguments.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsconvert.c b/drivers/bus/acpi/acpica/namespace/nsconvert.c index 2df8298ea9..a96ff5bd4d 100644 --- a/drivers/bus/acpi/acpica/namespace/nsconvert.c +++ b/drivers/bus/acpi/acpica/namespace/nsconvert.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index 827da69745..051f7dfeb5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsdumpdv.c b/drivers/bus/acpi/acpica/namespace/nsdumpdv.c index cc5f9d176a..a045f7e100 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdumpdv.c +++ b/drivers/bus/acpi/acpica/namespace/nsdumpdv.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nseval.c b/drivers/bus/acpi/acpica/namespace/nseval.c index fc416f829f..c8f73411e0 100644 --- a/drivers/bus/acpi/acpica/namespace/nseval.c +++ b/drivers/bus/acpi/acpica/namespace/nseval.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsinit.c b/drivers/bus/acpi/acpica/namespace/nsinit.c index 59a1ea321b..9dac9d5a32 100644 --- a/drivers/bus/acpi/acpica/namespace/nsinit.c +++ b/drivers/bus/acpi/acpica/namespace/nsinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsload.c b/drivers/bus/acpi/acpica/namespace/nsload.c index d993c1de8b..c5a1921b0b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsload.c +++ b/drivers/bus/acpi/acpica/namespace/nsload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c b/drivers/bus/acpi/acpica/namespace/nsnames.c index 6b97ce9d11..847b59f000 100644 --- a/drivers/bus/acpi/acpica/namespace/nsnames.c +++ b/drivers/bus/acpi/acpica/namespace/nsnames.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsobject.c b/drivers/bus/acpi/acpica/namespace/nsobject.c index 680717db5b..bca4193076 100644 --- a/drivers/bus/acpi/acpica/namespace/nsobject.c +++ b/drivers/bus/acpi/acpica/namespace/nsobject.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c b/drivers/bus/acpi/acpica/namespace/nsparse.c index 6dbf0483c5..542c9c9345 100644 --- a/drivers/bus/acpi/acpica/namespace/nsparse.c +++ b/drivers/bus/acpi/acpica/namespace/nsparse.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nspredef.c b/drivers/bus/acpi/acpica/namespace/nspredef.c index 79713a2195..de9a7a06db 100644 --- a/drivers/bus/acpi/acpica/namespace/nspredef.c +++ b/drivers/bus/acpi/acpica/namespace/nspredef.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsprepkg.c b/drivers/bus/acpi/acpica/namespace/nsprepkg.c index dfd594718f..5ae863d8ef 100644 --- a/drivers/bus/acpi/acpica/namespace/nsprepkg.c +++ b/drivers/bus/acpi/acpica/namespace/nsprepkg.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair.c b/drivers/bus/acpi/acpica/namespace/nsrepair.c index abd24c82b8..b1fa63b2db 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c b/drivers/bus/acpi/acpica/namespace/nsrepair2.c index 46d8d34af8..7f2c400621 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nssearch.c b/drivers/bus/acpi/acpica/namespace/nssearch.c index 97ed8edc20..de2f20c222 100644 --- a/drivers/bus/acpi/acpica/namespace/nssearch.c +++ b/drivers/bus/acpi/acpica/namespace/nssearch.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsutils.c b/drivers/bus/acpi/acpica/namespace/nsutils.c index 77d9a94256..e234855cb1 100644 --- a/drivers/bus/acpi/acpica/namespace/nsutils.c +++ b/drivers/bus/acpi/acpica/namespace/nsutils.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nswalk.c b/drivers/bus/acpi/acpica/namespace/nswalk.c index 7a44e0c073..c6ee625c3b 100644 --- a/drivers/bus/acpi/acpica/namespace/nswalk.c +++ b/drivers/bus/acpi/acpica/namespace/nswalk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfeval.c b/drivers/bus/acpi/acpica/namespace/nsxfeval.c index 966c7de5be..404073d03b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfeval.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfeval.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c b/drivers/bus/acpi/acpica/namespace/nsxfname.c index 3f693a0aec..6cdc9114a7 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfname.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfobj.c b/drivers/bus/acpi/acpica/namespace/nsxfobj.c index 1552f1d9b2..b7ab534b71 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfobj.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfobj.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psargs.c b/drivers/bus/acpi/acpica/parser/psargs.c index 8147c1e314..3189ea4d89 100644 --- a/drivers/bus/acpi/acpica/parser/psargs.c +++ b/drivers/bus/acpi/acpica/parser/psargs.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psloop.c b/drivers/bus/acpi/acpica/parser/psloop.c index 8689375a32..61ff2d1fcb 100644 --- a/drivers/bus/acpi/acpica/parser/psloop.c +++ b/drivers/bus/acpi/acpica/parser/psloop.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psobject.c b/drivers/bus/acpi/acpica/parser/psobject.c index 41e5abdc9a..fb9652ec85 100644 --- a/drivers/bus/acpi/acpica/parser/psobject.c +++ b/drivers/bus/acpi/acpica/parser/psobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psopcode.c b/drivers/bus/acpi/acpica/parser/psopcode.c index 11d409b79b..c804b144a4 100644 --- a/drivers/bus/acpi/acpica/parser/psopcode.c +++ b/drivers/bus/acpi/acpica/parser/psopcode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psopinfo.c b/drivers/bus/acpi/acpica/parser/psopinfo.c index 91a83f9254..01efa60e5a 100644 --- a/drivers/bus/acpi/acpica/parser/psopinfo.c +++ b/drivers/bus/acpi/acpica/parser/psopinfo.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psparse.c b/drivers/bus/acpi/acpica/parser/psparse.c index 7d9bbba547..f4181b99c2 100644 --- a/drivers/bus/acpi/acpica/parser/psparse.c +++ b/drivers/bus/acpi/acpica/parser/psparse.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psscope.c b/drivers/bus/acpi/acpica/parser/psscope.c index 44274653c0..36e96ab2ad 100644 --- a/drivers/bus/acpi/acpica/parser/psscope.c +++ b/drivers/bus/acpi/acpica/parser/psscope.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/pstree.c b/drivers/bus/acpi/acpica/parser/pstree.c index 48e8899854..95ac4bebff 100644 --- a/drivers/bus/acpi/acpica/parser/pstree.c +++ b/drivers/bus/acpi/acpica/parser/pstree.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psutils.c b/drivers/bus/acpi/acpica/parser/psutils.c index 6b5f12051d..a50a5d1912 100644 --- a/drivers/bus/acpi/acpica/parser/psutils.c +++ b/drivers/bus/acpi/acpica/parser/psutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/pswalk.c b/drivers/bus/acpi/acpica/parser/pswalk.c index d64c244ba1..b63946f33d 100644 --- a/drivers/bus/acpi/acpica/parser/pswalk.c +++ b/drivers/bus/acpi/acpica/parser/pswalk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psxface.c b/drivers/bus/acpi/acpica/parser/psxface.c index e6e7ed07e7..5b80e89778 100644 --- a/drivers/bus/acpi/acpica/parser/psxface.c +++ b/drivers/bus/acpi/acpica/parser/psxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsaddr.c b/drivers/bus/acpi/acpica/resources/rsaddr.c index 21418312bc..d5a855215e 100644 --- a/drivers/bus/acpi/acpica/resources/rsaddr.c +++ b/drivers/bus/acpi/acpica/resources/rsaddr.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rscalc.c b/drivers/bus/acpi/acpica/resources/rscalc.c index 63b6b97b54..768a73989f 100644 --- a/drivers/bus/acpi/acpica/resources/rscalc.c +++ b/drivers/bus/acpi/acpica/resources/rscalc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rscreate.c b/drivers/bus/acpi/acpica/resources/rscreate.c index 32e82872fe..5f8d5351ab 100644 --- a/drivers/bus/acpi/acpica/resources/rscreate.c +++ b/drivers/bus/acpi/acpica/resources/rscreate.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsdump.c b/drivers/bus/acpi/acpica/resources/rsdump.c index a7d2af76a1..a955653a9a 100644 --- a/drivers/bus/acpi/acpica/resources/rsdump.c +++ b/drivers/bus/acpi/acpica/resources/rsdump.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c index 41351da869..bb6fe481fe 100644 --- a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c +++ b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsinfo.c b/drivers/bus/acpi/acpica/resources/rsinfo.c index 7fbfea4760..afb004e6d5 100644 --- a/drivers/bus/acpi/acpica/resources/rsinfo.c +++ b/drivers/bus/acpi/acpica/resources/rsinfo.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsio.c b/drivers/bus/acpi/acpica/resources/rsio.c index 4d976157d9..04166227e4 100644 --- a/drivers/bus/acpi/acpica/resources/rsio.c +++ b/drivers/bus/acpi/acpica/resources/rsio.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsirq.c b/drivers/bus/acpi/acpica/resources/rsirq.c index 441d071e72..8514445f98 100644 --- a/drivers/bus/acpi/acpica/resources/rsirq.c +++ b/drivers/bus/acpi/acpica/resources/rsirq.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rslist.c b/drivers/bus/acpi/acpica/resources/rslist.c index 0f8adbf57b..9ea30abb1b 100644 --- a/drivers/bus/acpi/acpica/resources/rslist.c +++ b/drivers/bus/acpi/acpica/resources/rslist.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsmemory.c b/drivers/bus/acpi/acpica/resources/rsmemory.c index 5b9c02eccf..7e744f86b8 100644 --- a/drivers/bus/acpi/acpica/resources/rsmemory.c +++ b/drivers/bus/acpi/acpica/resources/rsmemory.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsmisc.c b/drivers/bus/acpi/acpica/resources/rsmisc.c index 86ab0fc81c..fcee777f82 100644 --- a/drivers/bus/acpi/acpica/resources/rsmisc.c +++ b/drivers/bus/acpi/acpica/resources/rsmisc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsserial.c b/drivers/bus/acpi/acpica/resources/rsserial.c index 702d26a8dd..31edd7203c 100644 --- a/drivers/bus/acpi/acpica/resources/rsserial.c +++ b/drivers/bus/acpi/acpica/resources/rsserial.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsutils.c b/drivers/bus/acpi/acpica/resources/rsutils.c index 6f1af327e6..d82bdd2204 100644 --- a/drivers/bus/acpi/acpica/resources/rsutils.c +++ b/drivers/bus/acpi/acpica/resources/rsutils.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsxface.c b/drivers/bus/acpi/acpica/resources/rsxface.c index 41e7fc4363..cfbabec405 100644 --- a/drivers/bus/acpi/acpica/resources/rsxface.c +++ b/drivers/bus/acpi/acpica/resources/rsxface.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index 87fd012ca6..6c210b38cb 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbfadt.c b/drivers/bus/acpi/acpica/tables/tbfadt.c index 121bbce376..f56d31e96f 100644 --- a/drivers/bus/acpi/acpica/tables/tbfadt.c +++ b/drivers/bus/acpi/acpica/tables/tbfadt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbfind.c b/drivers/bus/acpi/acpica/tables/tbfind.c index b15ba89206..e3e7c5c1e8 100644 --- a/drivers/bus/acpi/acpica/tables/tbfind.c +++ b/drivers/bus/acpi/acpica/tables/tbfind.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbinstal.c b/drivers/bus/acpi/acpica/tables/tbinstal.c index 6d465b89fe..969716b7fa 100644 --- a/drivers/bus/acpi/acpica/tables/tbinstal.c +++ b/drivers/bus/acpi/acpica/tables/tbinstal.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbprint.c b/drivers/bus/acpi/acpica/tables/tbprint.c index b57c6fcba7..11bd00908d 100644 --- a/drivers/bus/acpi/acpica/tables/tbprint.c +++ b/drivers/bus/acpi/acpica/tables/tbprint.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbutils.c b/drivers/bus/acpi/acpica/tables/tbutils.c index 5c19da162a..e71596b66c 100644 --- a/drivers/bus/acpi/acpica/tables/tbutils.c +++ b/drivers/bus/acpi/acpica/tables/tbutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxface.c b/drivers/bus/acpi/acpica/tables/tbxface.c index 08d6964c94..2ceb049fe2 100644 --- a/drivers/bus/acpi/acpica/tables/tbxface.c +++ b/drivers/bus/acpi/acpica/tables/tbxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index 72239c8380..ad2b766506 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxfroot.c b/drivers/bus/acpi/acpica/tables/tbxfroot.c index 3a96d8e232..09135c1f40 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfroot.c +++ b/drivers/bus/acpi/acpica/tables/tbxfroot.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utaddress.c b/drivers/bus/acpi/acpica/utilities/utaddress.c index 52aa4f2d42..bf7785acfe 100644 --- a/drivers/bus/acpi/acpica/utilities/utaddress.c +++ b/drivers/bus/acpi/acpica/utilities/utaddress.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utalloc.c b/drivers/bus/acpi/acpica/utilities/utalloc.c index e17c3099b6..dbc91fde7f 100644 --- a/drivers/bus/acpi/acpica/utilities/utalloc.c +++ b/drivers/bus/acpi/acpica/utilities/utalloc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utascii.c b/drivers/bus/acpi/acpica/utilities/utascii.c index 2be3376579..06a3586c49 100644 --- a/drivers/bus/acpi/acpica/utilities/utascii.c +++ b/drivers/bus/acpi/acpica/utilities/utascii.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utbuffer.c b/drivers/bus/acpi/acpica/utilities/utbuffer.c index 8b443c6377..e1fdc01ed2 100644 --- a/drivers/bus/acpi/acpica/utilities/utbuffer.c +++ b/drivers/bus/acpi/acpica/utilities/utbuffer.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utcache.c b/drivers/bus/acpi/acpica/utilities/utcache.c index 02461f2379..0401d39cb2 100644 --- a/drivers/bus/acpi/acpica/utilities/utcache.c +++ b/drivers/bus/acpi/acpica/utilities/utcache.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utclib.c b/drivers/bus/acpi/acpica/utilities/utclib.c index 25c20fa67d..d0547cf9c1 100644 --- a/drivers/bus/acpi/acpica/utilities/utclib.c +++ b/drivers/bus/acpi/acpica/utilities/utclib.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utcopy.c b/drivers/bus/acpi/acpica/utilities/utcopy.c index 5f55727537..c687d60024 100644 --- a/drivers/bus/acpi/acpica/utilities/utcopy.c +++ b/drivers/bus/acpi/acpica/utilities/utcopy.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utdebug.c b/drivers/bus/acpi/acpica/utilities/utdebug.c index 87f863dd6d..9ceed9754a 100644 --- a/drivers/bus/acpi/acpica/utilities/utdebug.c +++ b/drivers/bus/acpi/acpica/utilities/utdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c b/drivers/bus/acpi/acpica/utilities/utdecode.c index 2b42d88415..d8423a907a 100644 --- a/drivers/bus/acpi/acpica/utilities/utdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utdecode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -359,7 +359,7 @@ AcpiUtGetNodeName ( static const char *AcpiGbl_DescTypeNames[] = { /* 00 */ "Not a Descriptor", - /* 01 */ "Cached", + /* 01 */ "Cached Object", /* 02 */ "State-Generic", /* 03 */ "State-Update", /* 04 */ "State-Package", @@ -370,10 +370,10 @@ static const char *AcpiGbl_DescTypeNames[] = /* 09 */ "State-Result", /* 10 */ "State-Notify", /* 11 */ "State-Thread", - /* 12 */ "Walk", - /* 13 */ "Parser", - /* 14 */ "Operand", - /* 15 */ "Node" + /* 12 */ "Tree Walk State", + /* 13 */ "Parse Tree Op", + /* 14 */ "Operand Object", + /* 15 */ "Namespace Node" }; diff --git a/drivers/bus/acpi/acpica/utilities/utdelete.c b/drivers/bus/acpi/acpica/utilities/utdelete.c index 2bace65aa4..68fd650f2c 100644 --- a/drivers/bus/acpi/acpica/utilities/utdelete.c +++ b/drivers/bus/acpi/acpica/utilities/utdelete.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uterror.c b/drivers/bus/acpi/acpica/utilities/uterror.c index 1956ff3cc8..1082009c16 100644 --- a/drivers/bus/acpi/acpica/utilities/uterror.c +++ b/drivers/bus/acpi/acpica/utilities/uterror.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uteval.c b/drivers/bus/acpi/acpica/utilities/uteval.c index 8cf0a4f4ee..0df837ab40 100644 --- a/drivers/bus/acpi/acpica/utilities/uteval.c +++ b/drivers/bus/acpi/acpica/utilities/uteval.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utexcep.c b/drivers/bus/acpi/acpica/utilities/utexcep.c index f9d64ddc39..81c1ac81be 100644 --- a/drivers/bus/acpi/acpica/utilities/utexcep.c +++ b/drivers/bus/acpi/acpica/utilities/utexcep.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utglobal.c b/drivers/bus/acpi/acpica/utilities/utglobal.c index a3ba1cb5f6..ce7b73acdc 100644 --- a/drivers/bus/acpi/acpica/utilities/utglobal.c +++ b/drivers/bus/acpi/acpica/utilities/utglobal.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uthex.c b/drivers/bus/acpi/acpica/utilities/uthex.c index a9ac90fa2b..4c09831eb0 100644 --- a/drivers/bus/acpi/acpica/utilities/uthex.c +++ b/drivers/bus/acpi/acpica/utilities/uthex.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utids.c b/drivers/bus/acpi/acpica/utilities/utids.c index 3690c8e5d5..ac2d1a6dbe 100644 --- a/drivers/bus/acpi/acpica/utilities/utids.c +++ b/drivers/bus/acpi/acpica/utilities/utids.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utinit.c b/drivers/bus/acpi/acpica/utilities/utinit.c index 64229d9d5a..5b2fc1c8ce 100644 --- a/drivers/bus/acpi/acpica/utilities/utinit.c +++ b/drivers/bus/acpi/acpica/utilities/utinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utlock.c b/drivers/bus/acpi/acpica/utilities/utlock.c index af521974fe..261a8ae61f 100644 --- a/drivers/bus/acpi/acpica/utilities/utlock.c +++ b/drivers/bus/acpi/acpica/utilities/utlock.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmath.c b/drivers/bus/acpi/acpica/utilities/utmath.c index 168f58bd78..01c44d0f52 100644 --- a/drivers/bus/acpi/acpica/utilities/utmath.c +++ b/drivers/bus/acpi/acpica/utilities/utmath.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmisc.c b/drivers/bus/acpi/acpica/utilities/utmisc.c index 05ad32adf2..bbb384562d 100644 --- a/drivers/bus/acpi/acpica/utilities/utmisc.c +++ b/drivers/bus/acpi/acpica/utilities/utmisc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmutex.c b/drivers/bus/acpi/acpica/utilities/utmutex.c index fa986e09e1..0dac7cd14a 100644 --- a/drivers/bus/acpi/acpica/utilities/utmutex.c +++ b/drivers/bus/acpi/acpica/utilities/utmutex.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utnonansi.c b/drivers/bus/acpi/acpica/utilities/utnonansi.c index 75be28d695..a6e4f501a7 100644 --- a/drivers/bus/acpi/acpica/utilities/utnonansi.c +++ b/drivers/bus/acpi/acpica/utilities/utnonansi.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utobject.c b/drivers/bus/acpi/acpica/utilities/utobject.c index edc96c4edb..d84c5f254f 100644 --- a/drivers/bus/acpi/acpica/utilities/utobject.c +++ b/drivers/bus/acpi/acpica/utilities/utobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utosi.c b/drivers/bus/acpi/acpica/utilities/utosi.c index 9b7711bdc8..8c0da51cff 100644 --- a/drivers/bus/acpi/acpica/utilities/utosi.c +++ b/drivers/bus/acpi/acpica/utilities/utosi.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utownerid.c b/drivers/bus/acpi/acpica/utilities/utownerid.c index 4238d6ca77..ea98b81d59 100644 --- a/drivers/bus/acpi/acpica/utilities/utownerid.c +++ b/drivers/bus/acpi/acpica/utilities/utownerid.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utpredef.c b/drivers/bus/acpi/acpica/utilities/utpredef.c index 26d94a0cc5..3650dd7c67 100644 --- a/drivers/bus/acpi/acpica/utilities/utpredef.c +++ b/drivers/bus/acpi/acpica/utilities/utpredef.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utprint.c b/drivers/bus/acpi/acpica/utilities/utprint.c index 70f418be45..7d97f8e701 100644 --- a/drivers/bus/acpi/acpica/utilities/utprint.c +++ b/drivers/bus/acpi/acpica/utilities/utprint.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utresdecode.c b/drivers/bus/acpi/acpica/utilities/utresdecode.c index e784eb2d4a..6fa3610a39 100644 --- a/drivers/bus/acpi/acpica/utilities/utresdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utresdecode.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utresrc.c b/drivers/bus/acpi/acpica/utilities/utresrc.c index 3710dee2c0..ee403fe133 100644 --- a/drivers/bus/acpi/acpica/utilities/utresrc.c +++ b/drivers/bus/acpi/acpica/utilities/utresrc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstate.c b/drivers/bus/acpi/acpica/utilities/utstate.c index 7fefe75a49..2cea93b807 100644 --- a/drivers/bus/acpi/acpica/utilities/utstate.c +++ b/drivers/bus/acpi/acpica/utilities/utstate.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstring.c b/drivers/bus/acpi/acpica/utilities/utstring.c index 9e601d9fef..b45e8f9a81 100644 --- a/drivers/bus/acpi/acpica/utilities/utstring.c +++ b/drivers/bus/acpi/acpica/utilities/utstring.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c index 22020f7e9f..12c9240a8d 100644 --- a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c +++ b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstrtoul64.c b/drivers/bus/acpi/acpica/utilities/utstrtoul64.c index 146b6587cd..e1717cd9dd 100644 --- a/drivers/bus/acpi/acpica/utilities/utstrtoul64.c +++ b/drivers/bus/acpi/acpica/utilities/utstrtoul64.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uttrack.c b/drivers/bus/acpi/acpica/utilities/uttrack.c index ac50bc48a3..a3e50a18d1 100644 --- a/drivers/bus/acpi/acpica/utilities/uttrack.c +++ b/drivers/bus/acpi/acpica/utilities/uttrack.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -699,6 +699,15 @@ AcpiUtDumpAllocations ( Descriptor, Element->Size, Element->Module, Element->Line, AcpiUtGetDescriptorName (Descriptor)); + /* Optional object hex dump */ + + if (AcpiGbl_VerboseLeakDump) + { + AcpiOsPrintf ("\n"); + AcpiUtDumpBuffer ((UINT8 *) Descriptor, Element->Size, + DB_BYTE_DISPLAY, 0); + } + /* Validate the descriptor type using Type field and length */ DescriptorType = 0; /* Not a valid descriptor type */ diff --git a/drivers/bus/acpi/acpica/utilities/utuuid.c b/drivers/bus/acpi/acpica/utilities/utuuid.c index cfa8bf5eff..1f8dcd6ba2 100644 --- a/drivers/bus/acpi/acpica/utilities/utuuid.c +++ b/drivers/bus/acpi/acpica/utilities/utuuid.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxface.c b/drivers/bus/acpi/acpica/utilities/utxface.c index 5c93cd4c48..238dab8d3d 100644 --- a/drivers/bus/acpi/acpica/utilities/utxface.c +++ b/drivers/bus/acpi/acpica/utilities/utxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxferror.c b/drivers/bus/acpi/acpica/utilities/utxferror.c index 20834ed612..7fa2c4fa48 100644 --- a/drivers/bus/acpi/acpica/utilities/utxferror.c +++ b/drivers/bus/acpi/acpica/utilities/utxferror.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -260,6 +260,59 @@ AcpiBiosError ( ACPI_EXPORT_SYMBOL (AcpiBiosError) +/******************************************************************************* + * + * FUNCTION: AcpiBiosException + * + * PARAMETERS: ModuleName - Caller's module name (for error output) + * LineNumber - Caller's line number (for error output) + * Status - Status value to be decoded/formatted + * Format - Printf format string + additional args + * + * RETURN: None + * + * DESCRIPTION: Print an "ACPI Firmware Error" message with module/line/version + * info as well as decoded ACPI_STATUS. + * + ******************************************************************************/ + +void ACPI_INTERNAL_VAR_XFACE +AcpiBiosException ( + const char *ModuleName, + UINT32 LineNumber, + ACPI_STATUS Status, + const char *Format, + ...) +{ + va_list ArgList; + + + ACPI_MSG_REDIRECT_BEGIN; + + /* For AE_OK, just print the message */ + + if (ACPI_SUCCESS (Status)) + { + AcpiOsPrintf (ACPI_MSG_BIOS_ERROR); + + } + else + { + AcpiOsPrintf (ACPI_MSG_BIOS_ERROR "%s, ", + AcpiFormatException (Status)); + } + + va_start (ArgList, Format); + AcpiOsVprintf (Format, ArgList); + ACPI_MSG_SUFFIX; + va_end (ArgList); + + ACPI_MSG_REDIRECT_END; +} + +ACPI_EXPORT_SYMBOL (AcpiBiosException) + + /******************************************************************************* * * FUNCTION: AcpiBiosWarning diff --git a/drivers/bus/acpi/acpica/utilities/utxfinit.c b/drivers/bus/acpi/acpica/utilities/utxfinit.c index b8aa13223d..40b06e4eca 100644 --- a/drivers/bus/acpi/acpica/utilities/utxfinit.c +++ b/drivers/bus/acpi/acpica/utilities/utxfinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxfmutex.c b/drivers/bus/acpi/acpica/utilities/utxfmutex.c index 0d82e7e3a0..324fc1523f 100644 --- a/drivers/bus/acpi/acpica/utilities/utxfmutex.c +++ b/drivers/bus/acpi/acpica/utilities/utxfmutex.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2018, Intel Corp. + * Copyright (C) 2000 - 2019, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without

5 years, 8 months

[reactos] 04/05: [ACPICA] Update to version 20181213. CORE-15593

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ecbd6353cc16ae53bfd67… commit ecbd6353cc16ae53bfd67fb8f28c72d6a99e83e8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 12 13:21:22 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 12 16:27:42 2019 +0100 [ACPICA] Update to version 20181213. CORE-15593 --- drivers/bus/acpi/acpica/dispatcher/dsmethod.c | 12 +++++++ drivers/bus/acpi/acpica/dispatcher/dsobject.c | 10 ------ drivers/bus/acpi/acpica/dispatcher/dsopcode.c | 3 ++ drivers/bus/acpi/acpica/dispatcher/dspkginit.c | 26 ++++++++++++++ drivers/bus/acpi/acpica/dispatcher/dsutils.c | 2 -- drivers/bus/acpi/acpica/dispatcher/dswload.c | 6 +--- drivers/bus/acpi/acpica/dispatcher/dswload2.c | 15 ++++---- drivers/bus/acpi/acpica/dispatcher/dswstate.c | 2 +- drivers/bus/acpi/acpica/executer/exconvrt.c | 49 +++++++++++++++++++------- drivers/bus/acpi/acpica/executer/excreate.c | 2 -- drivers/bus/acpi/acpica/executer/exoparg2.c | 6 ++-- drivers/bus/acpi/acpica/executer/exserial.c | 20 ++--------- drivers/bus/acpi/acpica/executer/exutils.c | 2 -- drivers/bus/acpi/acpica/include/acdisasm.h | 2 ++ drivers/bus/acpi/acpica/include/acglobal.h | 4 --- drivers/bus/acpi/acpica/include/acnamesp.h | 1 + drivers/bus/acpi/acpica/include/acoutput.h | 6 ++-- drivers/bus/acpi/acpica/include/acpixf.h | 9 +---- drivers/bus/acpi/acpica/include/acstruct.h | 5 ++- drivers/bus/acpi/acpica/include/actbinfo.h | 2 ++ drivers/bus/acpi/acpica/include/actbl.h | 1 + drivers/bus/acpi/acpica/include/actbl3.h | 28 +++++++++++++++ drivers/bus/acpi/acpica/include/actypes.h | 6 ++++ drivers/bus/acpi/acpica/namespace/nsaccess.c | 21 ++++++++++- drivers/bus/acpi/acpica/namespace/nseval.c | 12 +++++++ drivers/bus/acpi/acpica/namespace/nsload.c | 2 -- drivers/bus/acpi/acpica/namespace/nsparse.c | 10 ++++++ drivers/bus/acpi/acpica/parser/psloop.c | 24 +++++++++---- drivers/bus/acpi/acpica/parser/psobject.c | 2 +- drivers/bus/acpi/acpica/parser/psparse.c | 12 +++++++ drivers/bus/acpi/acpica/parser/psxface.c | 6 ++++ drivers/bus/acpi/acpica/tables/tbxfload.c | 2 +- drivers/bus/acpi/acpica/utilities/utglobal.c | 3 -- drivers/bus/acpi/acpica/utilities/utmisc.c | 3 +- drivers/bus/acpi/acpica/utilities/utosi.c | 2 ++ 35 files changed, 227 insertions(+), 91 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c index e0159171e0..8a35cc8576 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c @@ -612,6 +612,8 @@ AcpiDsCallControlMethod ( goto Cleanup; } + NextWalkState->MethodNestingDepth = ThisWalkState->MethodNestingDepth + 1; + /* * Delete the operands on the previous walkstate operand stack * (they were copied to new objects) @@ -630,6 +632,16 @@ AcpiDsCallControlMethod ( "**** Begin nested execution of [%4.4s] **** WalkState=%p\n", MethodNode->Name.Ascii, NextWalkState)); + ThisWalkState->MethodPathname = AcpiNsGetNormalizedPathname (MethodNode, TRUE); + ThisWalkState->MethodIsNested = TRUE; + + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, + "%-26s: %*s%s\n", " Nested method call", + NextWalkState->MethodNestingDepth * 3, " ", + &ThisWalkState->MethodPathname[1])); + /* Invoke an internal method if necessary */ if (ObjDesc->Method.InfoFlags & ACPI_METHOD_INTERNAL_ONLY) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsobject.c b/drivers/bus/acpi/acpica/dispatcher/dsobject.c index c9b1227fba..1326a98569 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsobject.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsobject.c @@ -53,7 +53,6 @@ ACPI_MODULE_NAME ("dsobject") -#ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* * * FUNCTION: AcpiDsBuildInternalObject @@ -352,7 +351,6 @@ AcpiDsCreateNode ( return_ACPI_STATUS (Status); } -#endif /* ACPI_NO_METHOD_EXECUTION */ /******************************************************************************* @@ -463,9 +461,7 @@ AcpiDsInitObjectFromOp ( /* Truncate value if we are executing from a 32-bit ACPI table */ -#ifndef ACPI_NO_METHOD_EXECUTION (void) AcpiExTruncateFor32bitTable (ObjDesc); -#endif break; case AML_REVISION_OP: @@ -486,7 +482,6 @@ AcpiDsInitObjectFromOp ( ObjDesc->Integer.Value = Op->Common.Value.Integer; -#ifndef ACPI_NO_METHOD_EXECUTION if (AcpiExTruncateFor32bitTable (ObjDesc)) { /* Warn if we found a 64-bit constant in a 32-bit table */ @@ -496,7 +491,6 @@ AcpiDsInitObjectFromOp ( ACPI_FORMAT_UINT64 (Op->Common.Value.Integer), (UINT32) ObjDesc->Integer.Value)); } -#endif break; default: @@ -534,12 +528,10 @@ AcpiDsInitObjectFromOp ( ObjDesc->Reference.Value = ((UINT32) Opcode) - AML_FIRST_LOCAL_OP; ObjDesc->Reference.Class = ACPI_REFCLASS_LOCAL; -#ifndef ACPI_NO_METHOD_EXECUTION Status = AcpiDsMethodDataGetNode (ACPI_REFCLASS_LOCAL, ObjDesc->Reference.Value, WalkState, ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &ObjDesc->Reference.Object)); -#endif break; case AML_TYPE_METHOD_ARGUMENT: @@ -549,12 +541,10 @@ AcpiDsInitObjectFromOp ( ObjDesc->Reference.Value = ((UINT32) Opcode) - AML_FIRST_ARG_OP; ObjDesc->Reference.Class = ACPI_REFCLASS_ARG; -#ifndef ACPI_NO_METHOD_EXECUTION Status = AcpiDsMethodDataGetNode (ACPI_REFCLASS_ARG, ObjDesc->Reference.Value, WalkState, ACPI_CAST_INDIRECT_PTR (ACPI_NAMESPACE_NODE, &ObjDesc->Reference.Object)); -#endif break; default: /* Object name or Debug object */ diff --git a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c index 309f011e88..25c27185c4 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c @@ -478,6 +478,9 @@ AcpiDsEvalRegionOperands ( ObjDesc, ACPI_FORMAT_UINT64 (ObjDesc->Region.Address), ObjDesc->Region.Length)); + Status = AcpiUtAddAddressRange (ObjDesc->Region.SpaceId, + ObjDesc->Region.Address, ObjDesc->Region.Length, Node); + /* Now the address and length are valid for this opregion */ ObjDesc->Region.Flags |= AOPOBJ_DATA_VALID; diff --git a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c index 56ab585eaa..98378aeb8f 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c @@ -200,6 +200,32 @@ AcpiDsBuildInternalPackageObj ( { if (Arg->Common.AmlOpcode == AML_INT_RETURN_VALUE_OP) { + if (!Arg->Common.Node) + { + /* + * This is the case where an expression has returned a value. + * The use of expressions (TermArgs) within individual + * package elements is not supported by the AML interpreter, + * even though the ASL grammar supports it. Example: + * + * Name (INT1, 0x1234) + * + * Name (PKG3, Package () { + * Add (INT1, 0xAAAA0000) + * }) + * + * 1) No known AML interpreter supports this type of construct + * 2) This fixes a fault if the construct is encountered + */ + ACPI_EXCEPTION ((AE_INFO, AE_SUPPORT, + "Expressions within package elements are not supported")); + + /* Cleanup the return object, it is not needed */ + + AcpiUtRemoveReference (WalkState->Results->Results.ObjDesc[0]); + return_ACPI_STATUS (AE_SUPPORT); + } + if (Arg->Common.Node->Type == ACPI_TYPE_METHOD) { /* diff --git a/drivers/bus/acpi/acpica/dispatcher/dsutils.c b/drivers/bus/acpi/acpica/dispatcher/dsutils.c index f01a741096..e913cb6826 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsutils.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsutils.c @@ -101,7 +101,6 @@ AcpiDsClearImplicitReturn ( } -#ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* * * FUNCTION: AcpiDsDoImplicitReturn @@ -475,7 +474,6 @@ AcpiDsClearOperands ( WalkState->NumOperands = 0; return_VOID; } -#endif /******************************************************************************* diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload.c b/drivers/bus/acpi/acpica/dispatcher/dswload.c index 0b222072e2..28c15384a9 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload.c @@ -113,12 +113,10 @@ AcpiDsInitCallbacks ( /* Execution pass */ -#ifndef ACPI_NO_METHOD_EXECUTION WalkState->ParseFlags |= ACPI_PARSE_EXECUTE | ACPI_PARSE_DELETE_TREE; WalkState->DescendingCallback = AcpiDsExecBeginOp; WalkState->AscendingCallback = AcpiDsExecEndOp; -#endif break; default: @@ -409,7 +407,7 @@ AcpiDsLoad1BeginOp ( /* Initialize the op */ -#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)) +#ifdef ACPI_CONSTANT_EVAL_ONLY Op->Named.Path = Path; #endif @@ -472,7 +470,6 @@ AcpiDsLoad1EndOp ( ObjectType = WalkState->OpInfo->ObjectType; -#ifndef ACPI_NO_METHOD_EXECUTION if (WalkState->OpInfo->Flags & AML_FIELD) { /* @@ -518,7 +515,6 @@ AcpiDsLoad1EndOp ( } } } -#endif if (Op->Common.AmlOpcode == AML_NAME_OP) { diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload2.c b/drivers/bus/acpi/acpica/dispatcher/dswload2.c index eb43985ccf..477d8024fd 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload2.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload2.c @@ -340,6 +340,15 @@ AcpiDsLoad2BeginOp ( } #endif + /* + * For name creation opcodes, the full namepath prefix must + * exist, except for the final (new) nameseg. + */ + if (WalkState->OpInfo->Flags & AML_NAMED) + { + Flags |= ACPI_NS_PREFIX_MUST_EXIST; + } + /* Add new entry or lookup existing entry */ Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr, ObjectType, @@ -412,10 +421,8 @@ AcpiDsLoad2EndOp ( ACPI_NAMESPACE_NODE *Node; ACPI_PARSE_OBJECT *Arg; ACPI_NAMESPACE_NODE *NewNode; -#ifndef ACPI_NO_METHOD_EXECUTION UINT32 i; UINT8 RegionSpace; -#endif ACPI_FUNCTION_TRACE (DsLoad2EndOp); @@ -505,7 +512,6 @@ AcpiDsLoad2EndOp ( switch (WalkState->OpInfo->Type) { -#ifndef ACPI_NO_METHOD_EXECUTION case AML_TYPE_CREATE_FIELD: /* @@ -601,13 +607,11 @@ AcpiDsLoad2EndOp ( } break; -#endif /* ACPI_NO_METHOD_EXECUTION */ case AML_TYPE_NAMED_COMPLEX: switch (Op->Common.AmlOpcode) { -#ifndef ACPI_NO_METHOD_EXECUTION case AML_REGION_OP: case AML_DATA_REGION_OP: @@ -692,7 +696,6 @@ AcpiDsLoad2EndOp ( } break; -#endif /* ACPI_NO_METHOD_EXECUTION */ default: diff --git a/drivers/bus/acpi/acpica/dispatcher/dswstate.c b/drivers/bus/acpi/acpica/dispatcher/dswstate.c index 225a6dcffb..9c501179bc 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswstate.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswstate.c @@ -625,7 +625,7 @@ AcpiDsCreateWalkState ( /* Init the method args/local */ -#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) +#ifndef ACPI_CONSTANT_EVAL_ONLY AcpiDsMethodDataInit (WalkState); #endif diff --git a/drivers/bus/acpi/acpica/executer/exconvrt.c b/drivers/bus/acpi/acpica/executer/exconvrt.c index 6c2bc9db19..9fa06834ad 100644 --- a/drivers/bus/acpi/acpica/executer/exconvrt.c +++ b/drivers/bus/acpi/acpica/executer/exconvrt.c @@ -388,7 +388,7 @@ AcpiExConvertToAscii ( /* HexLength: 2 ascii hex chars per data byte */ - HexLength = ACPI_MUL_2 (DataWidth); + HexLength = (DataWidth * 2); for (i = 0, j = (HexLength-1); i < HexLength; i++, j--) { /* Get one hex digit, most significant digits first */ @@ -431,7 +431,8 @@ AcpiExConvertToAscii ( * * RETURN: Status * - * DESCRIPTION: Convert an ACPI Object to a string + * DESCRIPTION: Convert an ACPI Object to a string. Supports both implicit + * and explicit conversions and related rules. * ******************************************************************************/ @@ -466,9 +467,11 @@ AcpiExConvertToString ( switch (Type) { case ACPI_EXPLICIT_CONVERT_DECIMAL: - - /* Make room for maximum decimal number */ - + /* + * From ToDecimalString, integer source. + * + * Make room for the maximum decimal number size + */ StringLength = ACPI_MAX_DECIMAL_DIGITS; Base = 10; break; @@ -512,8 +515,10 @@ AcpiExConvertToString ( { case ACPI_EXPLICIT_CONVERT_DECIMAL: /* Used by ToDecimalString */ /* - * From ACPI: "If Data is a buffer, it is converted to a string of - * decimal values separated by commas." + * Explicit conversion from the ToDecimalString ASL operator. + * + * From ACPI: "If the input is a buffer, it is converted to a + * a string of decimal values separated by commas." */ Base = 10; @@ -540,20 +545,29 @@ AcpiExConvertToString ( case ACPI_IMPLICIT_CONVERT_HEX: /* + * Implicit buffer-to-string conversion + * * From the ACPI spec: - *"The entire contents of the buffer are converted to a string of + * "The entire contents of the buffer are converted to a string of * two-character hexadecimal numbers, each separated by a space." + * + * Each hex number is prefixed with 0x (11/2018) */ Separator = ' '; - StringLength = (ObjDesc->Buffer.Length * 3); + StringLength = (ObjDesc->Buffer.Length * 5); break; - case ACPI_EXPLICIT_CONVERT_HEX: /* Used by ToHexString */ + case ACPI_EXPLICIT_CONVERT_HEX: /* + * Explicit conversion from the ToHexString ASL operator. + * * From ACPI: "If Data is a buffer, it is converted to a string of * hexadecimal values separated by commas." + * + * Each hex number is prefixed with 0x (11/2018) */ - StringLength = (ObjDesc->Buffer.Length * 3); + Separator = ','; + StringLength = (ObjDesc->Buffer.Length * 5); break; default: @@ -584,9 +598,20 @@ AcpiExConvertToString ( */ for (i = 0; i < ObjDesc->Buffer.Length; i++) { + if (Base == 16) + { + /* Emit 0x prefix for explict/implicit hex conversion */ + + *NewBuf++ = '0'; + *NewBuf++ = 'x'; + } + NewBuf += AcpiExConvertToAscii ( (UINT64) ObjDesc->Buffer.Pointer[i], Base, NewBuf, 1); - *NewBuf++ = Separator; /* each separated by a comma or space */ + + /* Each digit is separated by either a comma or space */ + + *NewBuf++ = Separator; } /* diff --git a/drivers/bus/acpi/acpica/executer/excreate.c b/drivers/bus/acpi/acpica/executer/excreate.c index 2fc55d9c36..e8a0ef02bf 100644 --- a/drivers/bus/acpi/acpica/executer/excreate.c +++ b/drivers/bus/acpi/acpica/executer/excreate.c @@ -52,7 +52,6 @@ ACPI_MODULE_NAME ("excreate") -#ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* * * FUNCTION: AcpiExCreateAlias @@ -464,7 +463,6 @@ AcpiExCreatePowerResource ( AcpiUtRemoveReference (ObjDesc); return_ACPI_STATUS (Status); } -#endif /******************************************************************************* diff --git a/drivers/bus/acpi/acpica/executer/exoparg2.c b/drivers/bus/acpi/acpica/executer/exoparg2.c index 1174ba89ea..952e5e1f6a 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg2.c +++ b/drivers/bus/acpi/acpica/executer/exoparg2.c @@ -352,9 +352,9 @@ AcpiExOpcode_2A_1T_1R ( * NOTE: A length of zero is ok, and will create a zero-length, null * terminated string. */ - while ((Length < Operand[0]->Buffer.Length) && - (Length < Operand[1]->Integer.Value) && - (Operand[0]->Buffer.Pointer[Length])) + while ((Length < Operand[0]->Buffer.Length) && /* Length of input buffer */ + (Length < Operand[1]->Integer.Value) && /* Length operand */ + (Operand[0]->Buffer.Pointer[Length])) /* Null terminator */ { Length++; } diff --git a/drivers/bus/acpi/acpica/executer/exserial.c b/drivers/bus/acpi/acpica/executer/exserial.c index 023e48b968..381d26f919 100644 --- a/drivers/bus/acpi/acpica/executer/exserial.c +++ b/drivers/bus/acpi/acpica/executer/exserial.c @@ -337,14 +337,12 @@ AcpiExWriteSerialBus ( case ACPI_ADR_SPACE_SMBUS: BufferLength = ACPI_SMBUS_BUFFER_SIZE; - DataLength = ACPI_SMBUS_DATA_SIZE; Function = ACPI_WRITE | (ObjDesc->Field.Attribute << 16); break; case ACPI_ADR_SPACE_IPMI: BufferLength = ACPI_IPMI_BUFFER_SIZE; - DataLength = ACPI_IPMI_DATA_SIZE; Function = ACPI_WRITE; break; @@ -363,7 +361,6 @@ AcpiExWriteSerialBus ( /* Add header length to get the full size of the buffer */ BufferLength += ACPI_SERIAL_HEADER_SIZE; - DataLength = SourceDesc->Buffer.Pointer[1]; Function = ACPI_WRITE | (AccessorType << 16); break; @@ -371,21 +368,6 @@ AcpiExWriteSerialBus ( return_ACPI_STATUS (AE_AML_INVALID_SPACE_ID); } -#if 0 -OBSOLETE? - /* Check for possible buffer overflow */ - - if (DataLength > SourceDesc->Buffer.Length) - { - ACPI_ERROR ((AE_INFO, - "Length in buffer header (%u)(%u) is greater than " - "the physical buffer length (%u) and will overflow", - DataLength, BufferLength, SourceDesc->Buffer.Length)); - - return_ACPI_STATUS (AE_AML_BUFFER_LIMIT); - } -#endif - /* Create the transfer/bidirectional/return buffer */ BufferDesc = AcpiUtCreateBufferObject (BufferLength); @@ -397,6 +379,8 @@ OBSOLETE? /* Copy the input buffer data to the transfer buffer */ Buffer = BufferDesc->Buffer.Pointer; + DataLength = (BufferLength < SourceDesc->Buffer.Length ? + BufferLength : SourceDesc->Buffer.Length); memcpy (Buffer, SourceDesc->Buffer.Pointer, DataLength); /* Lock entire transaction if requested */ diff --git a/drivers/bus/acpi/acpica/executer/exutils.c b/drivers/bus/acpi/acpica/executer/exutils.c index 6f14f63a19..a3222124fb 100644 --- a/drivers/bus/acpi/acpica/executer/exutils.c +++ b/drivers/bus/acpi/acpica/executer/exutils.c @@ -73,7 +73,6 @@ AcpiExDigitsNeeded ( UINT32 Base); -#ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* * * FUNCTION: AcpiExEnterInterpreter @@ -507,4 +506,3 @@ AcpiIsValidSpaceId ( return (TRUE); } -#endif diff --git a/drivers/bus/acpi/acpica/include/acdisasm.h b/drivers/bus/acpi/acpica/include/acdisasm.h index abe3bdf91c..28e398f3e9 100644 --- a/drivers/bus/acpi/acpica/include/acdisasm.h +++ b/drivers/bus/acpi/acpica/include/acdisasm.h @@ -453,6 +453,8 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaServer[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm2a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm211[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoUefi[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc0[]; diff --git a/drivers/bus/acpi/acpica/include/acglobal.h b/drivers/bus/acpi/acpica/include/acglobal.h index 0b4ca5261a..6527c05723 100644 --- a/drivers/bus/acpi/acpica/include/acglobal.h +++ b/drivers/bus/acpi/acpica/include/acglobal.h @@ -209,11 +209,7 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_DisableMemTracking); * ****************************************************************************/ -#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) #define NUM_PREDEFINED_NAMES 10 -#else -#define NUM_PREDEFINED_NAMES 9 -#endif ACPI_GLOBAL (ACPI_NAMESPACE_NODE, AcpiGbl_RootNodeStruct); ACPI_GLOBAL (ACPI_NAMESPACE_NODE *, AcpiGbl_RootNode); diff --git a/drivers/bus/acpi/acpica/include/acnamesp.h b/drivers/bus/acpi/acpica/include/acnamesp.h index b9a34f2203..bdd3967785 100644 --- a/drivers/bus/acpi/acpica/include/acnamesp.h +++ b/drivers/bus/acpi/acpica/include/acnamesp.h @@ -69,6 +69,7 @@ #define ACPI_NS_TEMPORARY 0x0040 #define ACPI_NS_OVERRIDE_IF_FOUND 0x0080 #define ACPI_NS_EARLY_INIT 0x0100 +#define ACPI_NS_PREFIX_MUST_EXIST 0x0200 /* Flags for AcpiNsWalkNamespace */ diff --git a/drivers/bus/acpi/acpica/include/acoutput.h b/drivers/bus/acpi/acpica/include/acoutput.h index a03003b953..bf90bcf5a1 100644 --- a/drivers/bus/acpi/acpica/include/acoutput.h +++ b/drivers/bus/acpi/acpica/include/acoutput.h @@ -108,7 +108,8 @@ #define ACPI_LV_RESOURCES 0x00010000 #define ACPI_LV_USER_REQUESTS 0x00020000 #define ACPI_LV_PACKAGE 0x00040000 -#define ACPI_LV_VERBOSITY1 0x0007FF40 | ACPI_LV_ALL_EXCEPTIONS +#define ACPI_LV_EVALUATION 0x00080000 +#define ACPI_LV_VERBOSITY1 0x000FFF40 | ACPI_LV_ALL_EXCEPTIONS /* Trace verbosity level 2 [Function tracing and memory allocation] */ @@ -177,6 +178,7 @@ #define ACPI_DB_INTERRUPTS ACPI_DEBUG_LEVEL (ACPI_LV_INTERRUPTS) #define ACPI_DB_USER_REQUESTS ACPI_DEBUG_LEVEL (ACPI_LV_USER_REQUESTS) #define ACPI_DB_PACKAGE ACPI_DEBUG_LEVEL (ACPI_LV_PACKAGE) +#define ACPI_DB_EVALUATION ACPI_DEBUG_LEVEL (ACPI_LV_EVALUATION) #define ACPI_DB_MUTEX ACPI_DEBUG_LEVEL (ACPI_LV_MUTEX) #define ACPI_DB_EVENTS ACPI_DEBUG_LEVEL (ACPI_LV_EVENTS) @@ -184,7 +186,7 @@ /* Defaults for DebugLevel, debug and normal */ -#define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR) #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index 294308ef46..d72c530581 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20181003 +#define ACPI_CA_VERSION 0x20181213 #include "acconfig.h" #include "actypes.h" @@ -192,13 +192,6 @@ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_CopyDsdtLocally, FALSE); */ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_DoNotUseXsdt, FALSE); -/* - * Optionally support group module level code. - * NOTE, this is essentially obsolete and will be removed soon - * (01/2018). - */ -ACPI_INIT_GLOBAL (UINT8, AcpiGbl_GroupModuleLevelCode, FALSE); - /* * Optionally support module level code by parsing an entire table as * a method as it is loaded. Default is TRUE. diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index 161926430c..203a577faf 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -97,6 +97,8 @@ typedef struct acpi_walk_state ACPI_PARSE_STATE ParserState; /* Current state of parser */ UINT32 PrevArgTypes; UINT32 ArgCount; /* push for fixed or var args */ + UINT16 MethodNestingDepth; + UINT8 MethodIsNested; struct acpi_namespace_node Arguments[ACPI_METHOD_NUM_ARGS]; /* Control method arguments */ struct acpi_namespace_node LocalVariables[ACPI_METHOD_NUM_LOCALS]; /* Control method locals */ @@ -111,7 +113,8 @@ typedef struct acpi_walk_state struct acpi_namespace_node *MethodCallNode; /* Called method Node*/ ACPI_PARSE_OBJECT *MethodCallOp; /* MethodCall Op if running a method */ union acpi_operand_object *MethodDesc; /* Method descriptor if running a method */ - struct acpi_namespace_node *MethodNode; /* Method node if running a method. */ + struct acpi_namespace_node *MethodNode; /* Method node if running a method */ + char *MethodPathname; /* Full pathname of running method */ ACPI_PARSE_OBJECT *Op; /* Current parser op */ const ACPI_OPCODE_INFO *OpInfo; /* Info on current opcode */ ACPI_PARSE_OBJECT *Origin; /* Start of walk [Obsolete] */ diff --git a/drivers/bus/acpi/acpica/include/actbinfo.h b/drivers/bus/acpi/acpica/include/actbinfo.h index 8a1fd74742..53e75a1287 100644 --- a/drivers/bus/acpi/acpica/include/actbinfo.h +++ b/drivers/bus/acpi/acpica/include/actbinfo.h @@ -86,6 +86,7 @@ #define ACPI_STAO_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_STAO,f) #define ACPI_TCPA_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_HDR,f) #define ACPI_TPM2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TPM2,f) +#define ACPI_TPM23_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TPM23,f) #define ACPI_UEFI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_UEFI,f) #define ACPI_WAET_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WAET,f) #define ACPI_WDAT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDAT,f) @@ -229,6 +230,7 @@ #define ACPI_TCPA_SERVER_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_SERVER,f) #define ACPI_TPM2A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_TRAILER,f) #define ACPI_TPM211_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_ARM_SMC,f) +#define ACPI_TPM23A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM23_TRAILER,f) #define ACPI_VRTC0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_VRTC_ENTRY,f) #define ACPI_WDAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WDAT_ENTRY,f) diff --git a/drivers/bus/acpi/acpica/include/actbl.h b/drivers/bus/acpi/acpica/include/actbl.h index 5fdf05dc08..7195bb0a89 100644 --- a/drivers/bus/acpi/acpica/include/actbl.h +++ b/drivers/bus/acpi/acpica/include/actbl.h @@ -74,6 +74,7 @@ #define ACPI_SIG_XSDT "XSDT" /* Extended System Description Table */ #define ACPI_SIG_SSDT "SSDT" /* Secondary System Description Table */ #define ACPI_RSDP_NAME "RSDP" /* Short name for RSDP, not signature */ +#define ACPI_OEM_NAME "OEM" /* Short name for OEM, not signature */ /* diff --git a/drivers/bus/acpi/acpica/include/actbl3.h b/drivers/bus/acpi/acpica/include/actbl3.h index 8af4a6df71..4809606879 100644 --- a/drivers/bus/acpi/acpica/include/actbl3.h +++ b/drivers/bus/acpi/acpica/include/actbl3.h @@ -444,6 +444,34 @@ typedef struct acpi_table_tcpa_server * ******************************************************************************/ +/* Revision 3 */ + +typedef struct acpi_table_tpm23 +{ + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ + UINT32 Reserved; + UINT64 ControlAddress; + UINT32 StartMethod; + +} ACPI_TABLE_TPM23; + +/* Value for StartMethod above */ + +#define ACPI_TPM23_ACPI_START_METHOD 2 + +/* + * Optional trailer for revision 3. If start method is 2, there is a 4 byte + * reserved area of all zeros. + */ +typedef struct acpi_tmp23_trailer +{ + UINT32 Reserved; + +} ACPI_TPM23_TRAILER; + + +/* Revision 4 */ + typedef struct acpi_table_tpm2 { ACPI_TABLE_HEADER Header; /* Common ACPI table header */ diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 3cdbcb7f3b..7424e4e048 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -570,6 +570,10 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_VALIDATE_RSDP_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8)) #define ACPI_MAKE_RSDP_SIG(dest) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8)) +/* Support for OEMx signature (x can be any character) */ +#define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\ + strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE) + /* * Algorithm to obtain access bit width. * Can be used with AccessWidth of ACPI_GENERIC_ADDRESS and AccessSize of @@ -1404,6 +1408,8 @@ typedef enum #define ACPI_OSI_WIN_10_RS1 0x0E #define ACPI_OSI_WIN_10_RS2 0x0F #define ACPI_OSI_WIN_10_RS3 0x10 +#define ACPI_OSI_WIN_10_RS4 0x11 +#define ACPI_OSI_WIN_10_RS5 0x12 /* Definitions of getopt */ diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index a5047a3e80..9d13fb531b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -313,6 +313,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 LocalFlags; + ACPI_INTERPRETER_MODE LocalInterpreterMode; ACPI_FUNCTION_TRACE (NsLookup); @@ -562,6 +563,7 @@ AcpiNsLookup ( */ ThisSearchType = ACPI_TYPE_ANY; CurrentNode = ThisNode; + while (NumSegments && CurrentNode) { NumSegments--; @@ -596,6 +598,16 @@ AcpiNsLookup ( } } + /* Handle opcodes that create a new NameSeg via a full NamePath */ + + LocalInterpreterMode = InterpreterMode; + if ((Flags & ACPI_NS_PREFIX_MUST_EXIST) && (NumSegments > 0)) + { + /* Every element of the path must exist (except for the final NameSeg) */ + + LocalInterpreterMode = ACPI_IMODE_EXECUTE; + } + /* Extract one ACPI name from the front of the pathname */ ACPI_MOVE_32_TO_32 (&SimpleName, Path); @@ -603,11 +615,18 @@ AcpiNsLookup ( /* Try to find the single (4 character) ACPI name */ Status = AcpiNsSearchAndEnter (SimpleName, WalkState, CurrentNode, - InterpreterMode, ThisSearchType, LocalFlags, &ThisNode); + LocalInterpreterMode, ThisSearchType, LocalFlags, &ThisNode); if (ACPI_FAILURE (Status)) { if (Status == AE_NOT_FOUND) { +#if !defined ACPI_ASL_COMPILER /* Note: iASL reports this error by itself, not needed here */ + if (Flags & ACPI_NS_PREFIX_MUST_EXIST) + { + AcpiOsPrintf (ACPI_MSG_BIOS_ERROR + "Object does not exist: %4.4s\n", &SimpleName); + } +#endif /* Name not found in ACPI namespace */ ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, diff --git a/drivers/bus/acpi/acpica/namespace/nseval.c b/drivers/bus/acpi/acpica/namespace/nseval.c index 6c1eaa76ad..fc416f829f 100644 --- a/drivers/bus/acpi/acpica/namespace/nseval.c +++ b/drivers/bus/acpi/acpica/namespace/nseval.c @@ -150,6 +150,12 @@ AcpiNsEvaluate ( return_ACPI_STATUS (AE_NO_MEMORY); } + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, + "%-26s: %s (%s)\n", " Enter evaluation", + &Info->FullPathname[1], AcpiUtGetTypeName (Info->Node->Type))); + /* Count the number of arguments being passed in */ Info->ParamCount = 0; @@ -336,6 +342,12 @@ AcpiNsEvaluate ( Info->RelativePathname)); Cleanup: + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, + "%-26s: %s\n", " Exit evaluation", + &Info->FullPathname[1])); + /* * Namespace was unlocked by the handling AcpiNs* function, so we * just free the pathname and return diff --git a/drivers/bus/acpi/acpica/namespace/nsload.c b/drivers/bus/acpi/acpica/namespace/nsload.c index 0c92d31bb3..d993c1de8b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsload.c +++ b/drivers/bus/acpi/acpica/namespace/nsload.c @@ -65,7 +65,6 @@ AcpiNsDeleteSubtree ( #endif -#ifndef ACPI_NO_METHOD_EXECUTION /******************************************************************************* * * FUNCTION: AcpiNsLoadTable @@ -369,4 +368,3 @@ AcpiNsUnloadNamespace ( return_ACPI_STATUS (Status); } #endif -#endif diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c b/drivers/bus/acpi/acpica/namespace/nsparse.c index 2700400188..6dbf0483c5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsparse.c +++ b/drivers/bus/acpi/acpica/namespace/nsparse.c @@ -153,8 +153,18 @@ AcpiNsExecuteTable ( goto Cleanup; } + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, + "%-26s: (Definition Block level)\n", "Module-level evaluation")); + Status = AcpiPsExecuteTable (Info); + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, + "%-26s: (Definition Block level)\n", "Module-level complete")); + Cleanup: if (Info) { diff --git a/drivers/bus/acpi/acpica/parser/psloop.c b/drivers/bus/acpi/acpica/parser/psloop.c index 727a78b6e4..8689375a32 100644 --- a/drivers/bus/acpi/acpica/parser/psloop.c +++ b/drivers/bus/acpi/acpica/parser/psloop.c @@ -190,7 +190,7 @@ AcpiPsGetArguments ( * future. Use of this option can cause problems with AML code that * depends upon in-order immediate execution of module-level code. */ - if (AcpiGbl_GroupModuleLevelCode && + if (!AcpiGbl_ExecuteTablesAsMethods && (WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2) && ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) == 0)) { @@ -458,6 +458,7 @@ AcpiPsParseLoop ( ACPI_PARSE_OBJECT *Op = NULL; /* current op */ ACPI_PARSE_STATE *ParserState; UINT8 *AmlOpStart = NULL; + UINT8 OpcodeLength; ACPI_FUNCTION_TRACE_PTR (PsParseLoop, WalkState); @@ -471,7 +472,7 @@ AcpiPsParseLoop ( ParserState = &WalkState->ParserState; WalkState->ArgTypes = 0; -#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) +#ifndef ACPI_CONSTANT_EVAL_ONLY if (WalkState->WalkType & ACPI_WALK_METHOD_RESTART) { @@ -546,7 +547,7 @@ AcpiPsParseLoop ( * status to AE_OK to proceed with the table load. */ if ((WalkState->ParseFlags & ACPI_PARSE_MODULE_LEVEL) && - Status == AE_ALREADY_EXISTS) + ((Status == AE_ALREADY_EXISTS) || (Status == AE_NOT_FOUND))) { Status = AE_OK; } @@ -578,9 +579,20 @@ AcpiPsParseLoop ( * the scope op because the parse failure indicates that * the device may not exist. */ - ACPI_ERROR ((AE_INFO, "Skip parsing opcode %s", - AcpiPsGetOpcodeName (WalkState->Opcode))); - WalkState->ParserState.Aml = WalkState->Aml + 1; + ACPI_INFO (("Skipping parse of AML opcode: %s (0x%4.4X)", + AcpiPsGetOpcodeName (WalkState->Opcode), WalkState->Opcode)); + + /* + * Determine the opcode length before skipping the opcode. + * An opcode can be 1 byte or 2 bytes in length. + */ + OpcodeLength = 1; + if ((WalkState->Opcode & 0xFF00) == AML_EXTENDED_OPCODE) + { + OpcodeLength = 2; + } + WalkState->ParserState.Aml = WalkState->Aml + OpcodeLength; + WalkState->ParserState.Aml = AcpiPsGetNextPackageEnd(&WalkState->ParserState); WalkState->Aml = WalkState->ParserState.Aml; diff --git a/drivers/bus/acpi/acpica/parser/psobject.c b/drivers/bus/acpi/acpica/parser/psobject.c index 6dc3242b86..41e5abdc9a 100644 --- a/drivers/bus/acpi/acpica/parser/psobject.c +++ b/drivers/bus/acpi/acpica/parser/psobject.c @@ -665,7 +665,7 @@ AcpiPsCompleteOp ( * because there could be correct AML beyond the parts that caused * the runtime error. */ - ACPI_ERROR ((AE_INFO, "Ignore error and continue table load")); + ACPI_INFO (("Ignoring error and continuing table load")); return_ACPI_STATUS (AE_OK); } return_ACPI_STATUS (Status); diff --git a/drivers/bus/acpi/acpica/parser/psparse.c b/drivers/bus/acpi/acpica/parser/psparse.c index e056069889..7d9bbba547 100644 --- a/drivers/bus/acpi/acpica/parser/psparse.c +++ b/drivers/bus/acpi/acpica/parser/psparse.c @@ -529,6 +529,18 @@ AcpiPsParseAml ( "Completed one call to walk loop, %s State=%p\n", AcpiFormatException (Status), WalkState)); + if (WalkState->MethodPathname && WalkState->MethodIsNested) + { + /* Optional object evaluation log */ + + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EVALUATION, "%-26s: %*s%s\n", + " Exit nested method", + (WalkState->MethodNestingDepth + 1) * 3, " ", + &WalkState->MethodPathname[1])); + + ACPI_FREE (WalkState->MethodPathname); + WalkState->MethodIsNested = FALSE; + } if (Status == AE_CTRL_TRANSFER) { /* diff --git a/drivers/bus/acpi/acpica/parser/psxface.c b/drivers/bus/acpi/acpica/parser/psxface.c index 990a6505ea..e6e7ed07e7 100644 --- a/drivers/bus/acpi/acpica/parser/psxface.c +++ b/drivers/bus/acpi/acpica/parser/psxface.c @@ -199,6 +199,9 @@ AcpiPsExecuteMethod ( goto Cleanup; } + WalkState->MethodPathname = Info->FullPathname; + WalkState->MethodIsNested = FALSE; + if (Info->ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) { WalkState->ParseFlags |= ACPI_PARSE_MODULE_LEVEL; @@ -329,6 +332,9 @@ AcpiPsExecuteTable ( goto Cleanup; } + WalkState->MethodPathname = Info->FullPathname; + WalkState->MethodIsNested = FALSE; + if (Info->ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) { WalkState->ParseFlags |= ACPI_PARSE_MODULE_LEVEL; diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index f8d1c2e20b..72239c8380 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -111,7 +111,7 @@ AcpiLoadTables ( "While loading namespace from ACPI tables")); } - if (AcpiGbl_ExecuteTablesAsMethods || !AcpiGbl_GroupModuleLevelCode) + if (AcpiGbl_ExecuteTablesAsMethods) { /* * If the module-level code support is enabled, initialize the objects diff --git a/drivers/bus/acpi/acpica/utilities/utglobal.c b/drivers/bus/acpi/acpica/utilities/utglobal.c index f717a120a9..a3ba1cb5f6 100644 --- a/drivers/bus/acpi/acpica/utilities/utglobal.c +++ b/drivers/bus/acpi/acpica/utilities/utglobal.c @@ -127,10 +127,7 @@ const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] = {"_REV", ACPI_TYPE_INTEGER, ACPI_CAST_PTR (char, 2)}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, {"_GL_", ACPI_TYPE_MUTEX, ACPI_CAST_PTR (char, 1)}, - -#if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) {"_OSI", ACPI_TYPE_METHOD, ACPI_CAST_PTR (char, 1)}, -#endif /* Table terminator */ diff --git a/drivers/bus/acpi/acpica/utilities/utmisc.c b/drivers/bus/acpi/acpica/utilities/utmisc.c index f0a0b0574b..05ad32adf2 100644 --- a/drivers/bus/acpi/acpica/utilities/utmisc.c +++ b/drivers/bus/acpi/acpica/utilities/utmisc.c @@ -109,7 +109,8 @@ AcpiUtIsAmlTable ( if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) || ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_PSDT) || ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT)) + ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT) || + ACPI_IS_OEM_SIG (Table->Signature)) { return (TRUE); } diff --git a/drivers/bus/acpi/acpica/utilities/utosi.c b/drivers/bus/acpi/acpica/utilities/utosi.c index bc9044cf75..9b7711bdc8 100644 --- a/drivers/bus/acpi/acpica/utilities/utosi.c +++ b/drivers/bus/acpi/acpica/utilities/utosi.c @@ -109,6 +109,8 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10 version 1607 - Added 12/2017 */ {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10 version 1703 - Added 12/2017 */ {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 version 1709 - Added 02/2018 */ + {"Windows 2018", NULL, 0, ACPI_OSI_WIN_10_RS4}, /* Windows 10 version 1803 - Added 11/2018 */ + {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5}, /* Windows 10 version 1809 - Added 11/2018 */ /* Feature Group Strings */

5 years, 8 months

[reactos] 03/05: [FASTFAT] Avoid a use after free in VfatCloseFile.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc002f17087d912f1148b… commit bc002f17087d912f1148b988299aa523f28e927c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 12 16:25:52 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 12 16:27:37 2019 +0100 [FASTFAT] Avoid a use after free in VfatCloseFile. --- drivers/filesystems/fastfat/close.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index b6c250f92c..57efdad97a 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -163,6 +163,7 @@ VfatCloseFile( { PVFATFCB pFcb; PVFATCCB pCcb; + BOOLEAN IsVolume; NTSTATUS Status = STATUS_SUCCESS; DPRINT("VfatCloseFile(DeviceExt %p, FileObject %p)\n", @@ -177,6 +178,8 @@ VfatCloseFile( return STATUS_SUCCESS; } + IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); + if (pCcb) { vfatDestroyCCB(pCcb); @@ -194,7 +197,7 @@ VfatCloseFile( FileObject->SectionObjectPointer = NULL; #ifdef ENABLE_SWAPOUT - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME) && DeviceExt->OpenHandleCount == 0) + if (IsVolume && DeviceExt->OpenHandleCount == 0) { VfatCheckForDismount(DeviceExt, FALSE); }

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2019