[mmsys]

-State if there are no audio devices installed
-remove an obsolete resource ID
Patch by Jared Smudde CORE-10009 #resolve

svn path=/trunk/; revision=69088

diff --git a/reactos/dll/cpl/mmsys/mmsys.rc b/reactos/dll/cpl/mmsys/mmsys.rc
index 9929b4e..48d42a0 100644 (file)
--- a/reactos/dll/cpl/mmsys/mmsys.rc
+++ b/reactos/dll/cpl/mmsys/mmsys.rc
@@ -15,7 +15,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* Icons */
 IDI_CPLICON ICON "resources/3004.ico"
 IDI_MIDICON ICON "resources/4353.ico"
 /* Icons */
 IDI_CPLICON ICON "resources/3004.ico"
 IDI_MIDICON ICON "resources/4353.ico"

-4353 ICON "resources/4353.ico"

 4354 ICON "resources/4354.ico"
 4355 ICON "resources/4355.ico"
 4356 ICON "resources/4356.ico"
 4354 ICON "resources/4354.ico"
 4355 ICON "resources/4355.ico"
 4356 ICON "resources/4356.ico"

diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c
index 204a949..25143e7 100644 (file)
--- a/reactos/dll/cpl/mmsys/volume.c
+++ b/reactos/dll/cpl/mmsys/volume.c
@@ -224,6 +224,8 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
 {
     UINT NumMixers;
     MIXERCAPS mxc;
 {
     UINT NumMixers;
     MIXERCAPS mxc;

+    LPCWSTR nodevices;
+    LoadString(hApplet, IDS_NO_DEVICES, (LPTSTR)&nodevices, 0);

 
     NumMixers = mixerGetNumDevs();
     if (!NumMixers)
 
     NumMixers = mixerGetNumDevs();
     if (!NumMixers)


@@ -235,6 +237,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
         EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN),   FALSE);
         SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW);
         EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE);
         EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN),   FALSE);
         SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW);

+        SetDlgItemText(hwndDlg, IDC_DEVICE_NAME, nodevices);

         return;
     }
 
         return;
     }