From 1f2b7e5a5628c9c1a34bfc2dab172f538a5cd9ce Mon Sep 17 00:00:00 2001
From: Thamatip Chitpong <tangaming123456@outlook.com>
Date: Sun, 25 Sep 2022 20:46:30 +0700
Subject: [PATCH] [MMSYS] Fix "Speaker settings" image transparency (#4716)

- Use 72x72 icon instead of a bitmap
- Use correct control position and size for IDC_SPEAKIMG
- VolumeDlgProc: Add NULL check for DestroyIcon and fix cleanup order

Addendum to 781c247b.
---
 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/pt-PT.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-HK.rc         |   2 +-
 dll/cpl/mmsys/lang/zh-TW.rc         |   2 +-
 dll/cpl/mmsys/mmsys.rc              |   3 +-
 dll/cpl/mmsys/resource.h            |   2 +-
 dll/cpl/mmsys/resources/speaker.bmp | Bin 14896 -> 0 bytes
 dll/cpl/mmsys/resources/speaker.ico | Bin 0 -> 32366 bytes
 dll/cpl/mmsys/volume.c              |  91 ++++++++++------------------
 30 files changed, 58 insertions(+), 88 deletions(-)
 delete mode 100644 dll/cpl/mmsys/resources/speaker.bmp
 create mode 100644 dll/cpl/mmsys/resources/speaker.ico

diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc
index 93d04883c84..b9a00488a61 100644
--- a/dll/cpl/mmsys/lang/bg-BG.rc
+++ b/dll/cpl/mmsys/lang/bg-BG.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "Чрез долните настройки можете да укажете силата и други свойства на всеки говорител поотделно.", -1, 70, 155, 150, 36
     PUSHBUTTON "Сила на &говорителя...", IDC_SPEAKER_VOL_BTN, 72, 195, 80, 15
     PUSHBUTTON "Раз&ширени...", IDC_ADVANCED2_BTN, 154, 195, 80, 15
diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc
index c6e132ace81..4267f92b072 100644
--- a/dll/cpl/mmsys/lang/cs-CZ.rc
+++ b/dll/cpl/mmsys/lang/cs-CZ.rc
@@ -21,7 +21,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "U&přesnit...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc
index 95a2492daac..5de5457beb2 100644
--- a/dll/cpl/mmsys/lang/de-DE.rc
+++ b/dll/cpl/mmsys/lang/de-DE.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "E&rweitert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc
index 3976d3c4365..0d13de812dc 100644
--- a/dll/cpl/mmsys/lang/el-GR.rc
+++ b/dll/cpl/mmsys/lang/el-GR.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc
index 4f0742b0d26..338eb6a7843 100644
--- a/dll/cpl/mmsys/lang/en-US.rc
+++ b/dll/cpl/mmsys/lang/en-US.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc
index 9f93c3cfaec..04f50ba4545 100644
--- a/dll/cpl/mmsys/lang/es-ES.rc
+++ b/dll/cpl/mmsys/lang/es-ES.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "Propiedades &avanzadas...", IDC_ADVANCED2_BTN, 140, 195, 88, 15
diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc
index 7180c2a6615..8bdb742709f 100644
--- a/dll/cpl/mmsys/lang/fr-FR.rc
+++ b/dll/cpl/mmsys/lang/fr-FR.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&vancé...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc
index c98f19992e4..0c5b8059048 100644
--- a/dll/cpl/mmsys/lang/he-IL.rc
+++ b/dll/cpl/mmsys/lang/he-IL.rc
@@ -18,7 +18,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "מתקדם...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc
index 2035718dd68..7737bb9942e 100644
--- a/dll/cpl/mmsys/lang/id-ID.rc
+++ b/dll/cpl/mmsys/lang/id-ID.rc
@@ -16,7 +16,7 @@ BEGIN
     AUTOCHECKBOX "Tempatkan i&kon volume pada bilah tugas", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10
     PUSHBUTTON "&Tingkat Lanjut...", IDC_ADVANCED_BTN, 150, 105, 75, 15
     GROUPBOX "Pengaturan pengeras suara", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "Gunakan pengaturan di bawah untuk mengubah volume masing-masing pengeras suara dan pengaturan lainnya.", -1, 70, 155, 150, 36
     PUSHBUTTON "Volume &Pengeras Suara...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "Tingkat La&njut...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc
index 36e8890675f..fe60d3b85e6 100644
--- a/dll/cpl/mmsys/lang/it-IT.rc
+++ b/dll/cpl/mmsys/lang/it-IT.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&vanzate...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc
index 55b6bbea673..a29e91705e7 100644
--- a/dll/cpl/mmsys/lang/ja-JP.rc
+++ b/dll/cpl/mmsys/lang/ja-JP.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "個別のスピーカーの音量やその他の設定を変更するために下の設定をお使い下さい。", -1, 70, 155, 150, 36
     PUSHBUTTON "スピーカー音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "上級者向け(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc
index b63fa6cef3f..78c058ff078 100644
--- a/dll/cpl/mmsys/lang/nl-NL.rc
+++ b/dll/cpl/mmsys/lang/nl-NL.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "&Geavanceerd...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc
index 89e32235c9e..b18371eed6c 100644
--- a/dll/cpl/mmsys/lang/no-NO.rc
+++ b/dll/cpl/mmsys/lang/no-NO.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&vansert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc
index 6b0d0af62e3..478e36848bb 100644
--- a/dll/cpl/mmsys/lang/pl-PL.rc
+++ b/dll/cpl/mmsys/lang/pl-PL.rc
@@ -30,7 +30,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "Z&aawansowane...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc
index ea0a8781bde..35229b943e7 100644
--- a/dll/cpl/mmsys/lang/pt-BR.rc
+++ b/dll/cpl/mmsys/lang/pt-BR.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/pt-PT.rc b/dll/cpl/mmsys/lang/pt-PT.rc
index ef6cb15598b..6e5bc2d1b1e 100644
--- a/dll/cpl/mmsys/lang/pt-PT.rc
+++ b/dll/cpl/mmsys/lang/pt-PT.rc
@@ -16,7 +16,7 @@ BEGIN
     AUTOCHECKBOX "Colocar um &icone de volume na barra de tarefas", IDC_ICON_IN_TASKBAR, 50, 92, 190, 10
     PUSHBUTTON "A&vançadas...", IDC_ADVANCED_BTN, 150, 105, 75, 15
     GROUPBOX "Definições dos altifalantes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "Utilize as definições abaixo, para modificar o volume dos altifalantas individualmente e outras definições.", -1, 70, 155, 150, 36
     PUSHBUTTON "&Volume dos altifalantes...", IDC_SPEAKER_VOL_BTN, 60, 195, 85, 15
     PUSHBUTTON "Ava&nçadas...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc
index 3b4de2876d7..5dbf907fd0a 100644
--- a/dll/cpl/mmsys/lang/ro-RO.rc
+++ b/dll/cpl/mmsys/lang/ro-RO.rc
@@ -21,7 +21,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "Avansat&e…", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc
index 504bdeee0a3..16fb46e4152 100644
--- a/dll/cpl/mmsys/lang/ru-RU.rc
+++ b/dll/cpl/mmsys/lang/ru-RU.rc
@@ -16,7 +16,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "Расположенные ниже кнопки позволяют выполнить индивидуальную настройку громкости динамиков и других параметров.", -1, 70, 155, 150, 36
     PUSHBUTTON "Гром&кость...", IDC_SPEAKER_VOL_BTN, 70, 200, 80, 15
     PUSHBUTTON "Д&ополнительно...", IDC_ADVANCED2_BTN, 155, 200, 75, 15
diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc
index 34541343e58..56ca747f641 100644
--- a/dll/cpl/mmsys/lang/sk-SK.rc
+++ b/dll/cpl/mmsys/lang/sk-SK.rc
@@ -21,7 +21,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "Spr&esniť...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc
index c32fd998635..ce222aa16ab 100644
--- a/dll/cpl/mmsys/lang/sq-AL.rc
+++ b/dll/cpl/mmsys/lang/sq-AL.rc
@@ -20,7 +20,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc
index 33dcf5402df..c862b417c9f 100644
--- a/dll/cpl/mmsys/lang/tr-TR.rc
+++ b/dll/cpl/mmsys/lang/tr-TR.rc
@@ -18,7 +18,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     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
     PUSHBUTTON "Ge&lişmiş...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc
index 3a646df7a48..5deffb13d41 100644
--- a/dll/cpl/mmsys/lang/uk-UA.rc
+++ b/dll/cpl/mmsys/lang/uk-UA.rc
@@ -24,7 +24,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "За допомогою розташованих нижче кнопок можна виконати індивідуальну настройку гучності динаміків та інших параметрів.", -1, 70, 155, 150, 36
     PUSHBUTTON "&Гучність динаміків...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "Дод&атково...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc
index e9c0e9248b1..55d256453a8 100644
--- a/dll/cpl/mmsys/lang/zh-CN.rc
+++ b/dll/cpl/mmsys/lang/zh-CN.rc
@@ -26,7 +26,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "用下列设置更改每个扬声器音量和其他设置。", -1, 70, 155, 150, 36
     PUSHBUTTON "扬声器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "高级(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/zh-HK.rc b/dll/cpl/mmsys/lang/zh-HK.rc
index 7e92d9c3390..df94ee6d62b 100644
--- a/dll/cpl/mmsys/lang/zh-HK.rc
+++ b/dll/cpl/mmsys/lang/zh-HK.rc
@@ -24,7 +24,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "用下列設定更改每個揚聲器音量和其他設定。", -1, 70, 155, 150, 36
     PUSHBUTTON "揚聲器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "進階(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc
index 60995e92ab4..e91c51ef099 100644
--- a/dll/cpl/mmsys/lang/zh-TW.rc
+++ b/dll/cpl/mmsys/lang/zh-TW.rc
@@ -24,7 +24,7 @@ BEGIN
     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, WS_GROUP
-    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70
+    CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 15, 155, 48, 45
     LTEXT "用下列設定更改每個揚聲器音量和其他設定。", -1, 70, 155, 150, 36
     PUSHBUTTON "揚聲器音量(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15
     PUSHBUTTON "進階(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15
diff --git a/dll/cpl/mmsys/mmsys.rc b/dll/cpl/mmsys/mmsys.rc
index 82e7997848c..83714428136 100644
--- a/dll/cpl/mmsys/mmsys.rc
+++ b/dll/cpl/mmsys/mmsys.rc
@@ -57,8 +57,7 @@ IDI_SHUTDOWN_ICON ICON "resources/4394.ico"
 IDI_PLAY_ICON ICON "resources/play.ico"
 IDI_STOP_ICON ICON "resources/stop.ico"
 
-/* Bitmaps */
-IDB_SPEAKIMG BITMAP "resources/speaker.bmp"
+IDI_SPEAKIMG ICON "resources/speaker.ico"
 
 #include <reactos/manifest_hosted.rc>
 
diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h
index bdd843f65c4..8c7a3d919ce 100644
--- a/dll/cpl/mmsys/resource.h
+++ b/dll/cpl/mmsys/resource.h
@@ -66,7 +66,7 @@
 #define IDC_SAVEAS_BTN            5033
 #define IDC_DELETE_BTN            5034
 
-#define IDB_SPEAKIMG  4624
+#define IDI_SPEAKIMG  4624
 #define IDC_SPEAKIMG  4625
 #define IDC_MUTE_ICON 4626
 
diff --git a/dll/cpl/mmsys/resources/speaker.bmp b/dll/cpl/mmsys/resources/speaker.bmp
deleted file mode 100644
index 98ed0f0658446a474ab4cc26f4444597c6b2dea5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14896
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

diff --git a/dll/cpl/mmsys/resources/speaker.ico b/dll/cpl/mmsys/resources/speaker.ico
new file mode 100644
index 0000000000000000000000000000000000000000..548e5d1d44f825d3d605ce2bc75c48a537aaf706
GIT binary patch
literal 32366
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

literal 0
HcmV?d00001

diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c
index f18a9f57b7e..7f4040fcf8b 100644
--- a/dll/cpl/mmsys/volume.c
+++ b/dll/cpl/mmsys/volume.c
@@ -12,20 +12,13 @@
 #include <shellapi.h>
 
 
-typedef struct _IMGINFO
-{
-    HBITMAP hBitmap;
-    INT cxSource;
-    INT cySource;
-} IMGINFO, *PIMGINFO;
-
-
 typedef struct _GLOBAL_DATA
 {
     HMIXER hMixer;
     HICON hIconMuted;
     HICON hIconUnMuted;
     HICON hIconNoHW;
+    HICON hIconSpeakImg;
 
     LONG muteVal;
     DWORD muteControlID;
@@ -44,30 +37,6 @@ typedef struct _GLOBAL_DATA
 } GLOBAL_DATA, *PGLOBAL_DATA;
 
 
-static VOID
-InitImageInfo(PIMGINFO ImgInfo)
-{
-    BITMAP bitmap;
-
-    ZeroMemory(ImgInfo, sizeof(*ImgInfo));
-
-    ImgInfo->hBitmap = LoadImageW(hApplet,
-                                  MAKEINTRESOURCEW(IDB_SPEAKIMG),
-                                  IMAGE_BITMAP,
-                                  0,
-                                  0,
-                                  LR_DEFAULTCOLOR);
-
-    if (ImgInfo->hBitmap != NULL)
-    {
-        GetObjectW(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
-
-        ImgInfo->cxSource = bitmap.bmWidth;
-        ImgInfo->cySource = bitmap.bmHeight;
-    }
-}
-
-
 VOID
 GetMuteControl(PGLOBAL_DATA pGlobalData)
 {
@@ -421,7 +390,7 @@ VolumeDlgProc(HWND hwndDlg,
               WPARAM wParam,
               LPARAM lParam)
 {
-    static IMGINFO ImgInfo;
+    static const INT speakImgSize[] = {72, 72};
     PGLOBAL_DATA pGlobalData;
 
     pGlobalData = (PGLOBAL_DATA)GetWindowLongPtrW(hwndDlg, DWLP_USER);
@@ -457,8 +426,13 @@ VolumeDlgProc(HWND hwndDlg,
             pGlobalData->hIconUnMuted = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
             pGlobalData->hIconMuted = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
             pGlobalData->hIconNoHW = LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NO_HW), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+            pGlobalData->hIconSpeakImg = LoadImageW(hApplet,
+                                                    MAKEINTRESOURCEW(IDI_SPEAKIMG),
+                                                    IMAGE_ICON,
+                                                    speakImgSize[0],
+                                                    speakImgSize[1],
+                                                    LR_DEFAULTCOLOR);
 
-            InitImageInfo(&ImgInfo);
             InitVolumeControls(hwndDlg, pGlobalData);
             break;
         }
@@ -469,27 +443,20 @@ VolumeDlgProc(HWND hwndDlg,
             lpDrawItem = (LPDRAWITEMSTRUCT)lParam;
             if (lpDrawItem->CtlID == IDC_SPEAKIMG)
             {
-                HDC hdcMem;
                 LONG left;
 
                 /* Position image in centre of dialog */
-                left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2;
+                left = (lpDrawItem->rcItem.right - speakImgSize[0]) / 2;
 
-                hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
-                if (hdcMem != NULL)
-                {
-                    SelectObject(hdcMem, ImgInfo.hBitmap);
-                    BitBlt(lpDrawItem->hDC,
+                DrawIconEx(lpDrawItem->hDC,
                            left,
                            lpDrawItem->rcItem.top,
-                           lpDrawItem->rcItem.right - lpDrawItem->rcItem.left,
-                           lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top,
-                           hdcMem,
+                           pGlobalData->hIconSpeakImg,
+                           speakImgSize[0],
+                           speakImgSize[1],
                            0,
-                           0,
-                           SRCCOPY);
-                    DeleteDC(hdcMem);
-                }
+                           NULL,
+                           DI_NORMAL);
             }
             break;
         }
@@ -559,19 +526,23 @@ VolumeDlgProc(HWND hwndDlg,
         case WM_DESTROY:
             if (pGlobalData)
             {
-                if (pGlobalData->volumeCurrentValues)
-                    HeapFree(GetProcessHeap(), 0, pGlobalData->volumeCurrentValues);
-
-                if (pGlobalData->volumePreviousValues)
-                    HeapFree(GetProcessHeap(), 0, pGlobalData->volumePreviousValues);
-
-                if (pGlobalData->volumeInitialValues)
-                    HeapFree(GetProcessHeap(), 0, pGlobalData->volumeInitialValues);
-
+                HeapFree(GetProcessHeap(), 0, pGlobalData->volumeCurrentValues);
+                HeapFree(GetProcessHeap(), 0, pGlobalData->volumePreviousValues);
+                HeapFree(GetProcessHeap(), 0, pGlobalData->volumeInitialValues);
                 mixerClose(pGlobalData->hMixer);
-                DestroyIcon(pGlobalData->hIconMuted);
-                DestroyIcon(pGlobalData->hIconUnMuted);
-                DestroyIcon(pGlobalData->hIconNoHW);
+
+                if (pGlobalData->hIconSpeakImg)
+                    DestroyIcon(pGlobalData->hIconSpeakImg);
+
+                if (pGlobalData->hIconNoHW)
+                    DestroyIcon(pGlobalData->hIconNoHW);
+
+                if (pGlobalData->hIconMuted)
+                    DestroyIcon(pGlobalData->hIconMuted);
+
+                if (pGlobalData->hIconUnMuted)
+                    DestroyIcon(pGlobalData->hIconUnMuted);
+
                 HeapFree(GetProcessHeap(), 0, pGlobalData);
             }
             break;