[0.4.7][MMSYS] 100% sync of the module to 0.4.11-release-46-g12d8367

All of those are super safe commits. Fixes CORE-13508 -excerpt of 0.4.11-dev-909-g 07b120bd56 zh-CN [TRANSLATION] Update Simplified Chinese translation. (#1094) -excerpt of 0.4.11-dev-149-g 31019e8c0c ro-RO [TRANSLATION] Update Romanian translation (#851) -excerpt of 0.4.9-dev-126-g 0182dcd71b sounds.c x64 compatibility issue, possible pointer truncation -0.4.9-dev-104-g 9e9f053eec fixes CORE-13508 fr-FR "Sound settings : narrow elements (french)" -excerpt of 0.4.8-dev-644-g ba3f074320 tr-TR whitespace noise -excerpt of 0.4.8-dev-627-g fe50c655aa zh-CN [TRANSLATION] Update Simplified Chinese translations and font settings. (#266) -excerpt of 0.4.8-dev-533-g 2b91b29642 zh-CN/zh-TW [CPL] Control Panel Applets: Use correct font name in Chinese resources, CORE-9566 (#220). mmsys.cpl binary size in bytes RosBE2.1.6 GCC4.7.2 dbg I18N=all decreases for 0.4.7 thanks to the chinese changes: 0.4.11 which is the source 741.376 0.4.10 old 741.376 patched 741.376 0.4. 9 old 741.376 patched 741.376 0.4. 8 old 741.376 patched 741.376 0.4. 7 old 741.888 patched 741.376 Syncing the module will simplify future backmerges.
2025-02-23 08:55:19 +00:00 · 2021-01-17 20:48:06 +01:00 · 2021-01-17 20:48:06 +01:00 · 77a1d1062b
commit 77a1d1062b
parent e751ba51d9
6 changed files with 40 additions and 39 deletions
--- a/dll/cpl/mmsys/lang/fr-FR.rc
+++ b/dll/cpl/mmsys/lang/fr-FR.rc
@ -13,12 +13,12 @@ BEGIN
    LTEXT "Faible", -1, 62, 66, 30, 17
    LTEXT "Élevé", -1, 195, 66, 30, 17
    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, 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
    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, 70, 195, 75, 15
+    PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15
    PUSHBUTTON "A&vancé...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
 END

--- a/dll/cpl/mmsys/lang/ro-RO.rc
+++ b/dll/cpl/mmsys/lang/ro-RO.rc
@ -1,6 +1,6 @@
 /*
 * Translators: Petru Dimitriu (petrimetri at gmail dot com)
- *              Ștefan Fulea (stefan dot fulea at mail dot md)
+ *              Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
--- a/dll/cpl/mmsys/lang/tr-TR.rc
+++ b/dll/cpl/mmsys/lang/tr-TR.rc
@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

--- a/dll/cpl/mmsys/lang/zh-CN.rc
+++ b/dll/cpl/mmsys/lang/zh-CN.rc
@ -3,6 +3,7 @@
 * (简体中文资源)
 * by zhangbing 2008 <e_zb@21cn.com, ezb@mail.gywb.cn>
 * Updated: 2009-05-02 Jingjing Fu <jingjingf AT 188.com>
+ *          2018-01-06 Luo Yufan <njlyf2011@hotmail.com>
 */

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@ -10,7 +11,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 IDD_VOLUME DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "音量"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32
    LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36
@ -32,7 +33,7 @@ END
 IDD_SOUNDS DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "事件方案"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    LTEXT "声音方案是应用于 ReactOS 和程序事件中的一组声音。请选择一个现有方案或保存您已经更改的方案。", -1, 8, 7, 230, 40
    LTEXT "声音方案(&C):", -1, 8, 42, 150, 17
@ -51,7 +52,7 @@ END
 IDD_AUDIO DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "音频"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    GROUPBOX "声音播放", -1, 7, 7, 230, 60
    ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32
@ -77,7 +78,7 @@ END
 IDD_VOICE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "语声"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    LTEXT "这些设置控制声音播放或您选择的录音设备的音量和高级选项。", -1, 8, 7, 230, 40
    GROUPBOX "声音播放", -1, 7, 37, 230, 60
@ -98,14 +99,14 @@ END
 IDD_HARDWARE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "硬件"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
 END

 IDD_SAVE_SCHEME_AS DIALOGEX 9, 23, 225, 54
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "将方案存为"
-FONT 9, "MS Shell Dlg"
+CAPTION "将方案另存为"
+FONT 9, "宋体"
 BEGIN
    LTEXT "将此声音方案存为(&S):", -1, 7, 7, 212, 9
    EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL
@ -116,7 +117,7 @@ END
 IDD_SPEAKERS DIALOGEX 0, 0, 257, 204
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "扬声器"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    ICON 4379, -1, 7, 8, 20, 20
    LTEXT "请选择最接近您的计算机设置的扬声器设置。", -1, 36, 8, 215, 27
@ -128,7 +129,7 @@ END
 IDD_PERFORMANCE1 DIALOGEX 0, 0, 257, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "性能"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    LTEXT "这些设置控制 ReactOS 如何播放音频。他们能够帮助您解答有关音频方面的问题。", 8492, 34, 7, 218, 23
    GROUPBOX "音频播放", 8494, 7, 32, 243, 152
@ -149,7 +150,7 @@ END
 IDD_PERFORMANCE2 DIALOGEX 0, 0, 257, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "性能"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    LTEXT "这些设置控制 ReactOS 如何录音。可帮助您诊断与音频有关的问题。", 8492, 34, 7, 217, 20
    GROUPBOX "音频录音", 8494, 7, 29, 242, 122
@ -170,21 +171,21 @@ END
 IDD_SETUP1 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "安装"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
-    GROUPBOX "ReactOS 音频", 10243, 7, 5, 213, 192
+    GROUPBOX "ReactOS 声音", 10243, 7, 5, 213, 192
    ICON 4393, 10241, 26, 26, 20, 20
-    LTEXT "因为 ReactOS 音频服务无效因此这台计算机目前无法播放声音", 10245, 60, 25, 150, 40
-    AUTOCHECKBOX "启用ReactOS 音频(&E)", 10253, 60, 68, 150, 9
+    LTEXT "因为 ReactOS 声音服务无效因此这台计算机目前无法播放声音", 10245, 60, 25, 150, 40
+    AUTOCHECKBOX "启用 ReactOS 声音(&E)", 10253, 60, 68, 150, 9
    LTEXT "注意", 10246, 58, 87, 150, 11
    LTEXT "1. 您必须是管理员才能启用此服务。如果您没有以管理员身份登录，您将提示输入管理员名称和密码。", 10247, 60, 100, 150, 40
-    LTEXT "2. 您启用ReactOS音频后，必须重新启动计算机。", 10248, 60, 140, 150, 40
+    LTEXT "2. 您启用 ReactOS 声音后，必须重新启动计算机。", 10248, 60, 140, 150, 40
 END

 IDD_MULTICHANNEL DIALOGEX 0, 0, 227, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "多声道"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
    LTEXT "这里是说明。", 9506, 8, 4, 212, 24
    LTEXT "低", 9473, 65, 31, 14, 8
@ -226,9 +227,9 @@ END
 IDD_SETUP2 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "安装"
-FONT 9, "MS Shell Dlg"
+FONT 9, "宋体"
 BEGIN
-    GROUPBOX "ReactOS 音频", 10259, 7, 5, 213, 192
+    GROUPBOX "ReactOS 声音", 10259, 7, 5, 213, 192
    ICON 4394, 10257, 25, 25, 20, 20
    LTEXT "驱动程序设置已经更改。必须退出 ReactOS 后重新启动，新的设置才会生效。", 10261, 60, 25, 150, 50
    LTEXT "点击这里重新启动 ReactOS", 10262, 60, 75, 150, 20
@ -238,7 +239,7 @@ END
 STRINGTABLE
 BEGIN
    IDS_CPLNAME "声音和音频设备"
-    IDS_CPLDESCRIPTION "更改计算机的声音方案，或者配置扬声器和录音设备的设置"
+    IDS_CPLDESCRIPTION "更改计算机的声音方案，或配置扬声器和录音设备的设置。"
    IDS_NO_SOUND "(无)"
    IDS_NO_DEVICES "没有设备"
    5825 "程序出错"
@ -270,7 +271,7 @@ BEGIN
    5851 "「开始」菜单"
    IDS_REACTOS_LOGOFF "ReactOS 注销"
    IDS_REACTOS_LOGON "ReactOS 登录"
-    5854 "ReactOS 浏览器"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5854 "ReactOS 资源管理器"
+    IDS_BROWSE_FOR_SOUND "搜索新声音文件"
+    IDS_WAVE_FILES_FILTER "波形声音 (*.wav)|*.wav|"
 END
--- a/dll/cpl/mmsys/lang/zh-TW.rc
+++ b/dll/cpl/mmsys/lang/zh-TW.rc
@ -9,7 +9,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 IDD_VOLUME DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "音量"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 32, 32
    LTEXT "", IDC_DEVICE_NAME, 40, 10, 194, 36
@ -31,7 +31,7 @@ END
 IDD_SOUNDS DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "事件方案"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "聲音方案是應用於 ReactOS 和程式事件中的一組聲音。請選擇一個現有方案或儲存您已經更改的方案。", -1, 8, 7, 230, 40
    LTEXT "聲音方案(&C):", -1, 8, 42, 150, 17
@ -50,7 +50,7 @@ END
 IDD_AUDIO DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "音訊"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    GROUPBOX "聲音播放", -1, 7, 7, 230, 60
    ICON IDI_CPLICON, IDI_CPLICON, 15, 20, 32, 32
@ -76,7 +76,7 @@ END
 IDD_VOICE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "語聲"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "這些設定控制聲音播放或您選擇的錄音裝置的音量和高階選項。", -1, 8, 7, 230, 40
    GROUPBOX "聲音播放", -1, 7, 37, 230, 60
@ -97,14 +97,14 @@ END
 IDD_HARDWARE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "硬體"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
 END

 IDD_SAVE_SCHEME_AS DIALOGEX 9, 23, 225, 54
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "將方案存為"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "將此聲音方案存為(&S):", -1, 7, 7, 212, 9
    EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL
@ -115,7 +115,7 @@ END
 IDD_SPEAKERS DIALOGEX 0, 0, 257, 204
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "揚聲器"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    ICON 4379, -1, 7, 8, 20, 20
    LTEXT "請選擇最接近您的計算機設定的揚聲器設定。", -1, 36, 8, 215, 27
@ -127,7 +127,7 @@ END
 IDD_PERFORMANCE1 DIALOGEX 0, 0, 257, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "效能"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "這些設定控制 ReactOS 如何播放音訊。他們能夠幫助您解答有關音訊方面的問題。", 8492, 34, 7, 218, 23
    GROUPBOX "音訊播放", 8494, 7, 32, 243, 152
@ -148,7 +148,7 @@ END
 IDD_PERFORMANCE2 DIALOGEX 0, 0, 257, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "效能"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "這些設定控制 ReactOS 如何錄音。可幫助您診斷與音訊有關的問題。", 8492, 34, 7, 217, 20
    GROUPBOX "音訊錄音", 8494, 7, 29, 242, 122
@ -169,7 +169,7 @@ END
 IDD_SETUP1 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "安裝"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    GROUPBOX "ReactOS 音訊", 10243, 7, 5, 213, 192
    ICON 4393, 10241, 26, 26, 20, 20
@ -183,7 +183,7 @@ END
 IDD_MULTICHANNEL DIALOGEX 0, 0, 227, 218
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "多聲道"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    LTEXT "這裡是說明。", 9506, 8, 4, 212, 24
    LTEXT "低", 9473, 65, 31, 14, 8
@ -225,7 +225,7 @@ END
 IDD_SETUP2 DIALOGEX 0, 0, 227, 206
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 CAPTION "安裝"
-FONT 9, "MS Shell Dlg"
+FONT 9, "新細明體"
 BEGIN
    GROUPBOX "ReactOS 音訊", 10259, 7, 5, 213, 192
    ICON 4394, 10257, 25, 25, 20, 20
--- a/dll/cpl/mmsys/sounds.c
+++ b/dll/cpl/mmsys/sounds.c
@ -929,7 +929,7 @@ ApplyChanges(HWND hwndDlg)
    }
    RegCloseKey(hKey);

-    SetWindowLong(hwndDlg, DWL_MSGRESULT, (LONG)PSNRET_NOERROR);
+    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)PSNRET_NOERROR);
    return TRUE;
 }