Skip to content

Commit a18fba6

Browse files
committed
[MMSYS] Fix some icons and add more appropriate ones. Brought to you by Jared Smudde. CORE-9471 for more details.
svn path=/trunk/; revision=67064
1 parent 9de3477 commit a18fba6

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed

reactos/dll/cpl/mmsys/mmsys.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ IDI_MICROPHONE_ICON ICON "resources/4378.ico"
5151
4386 ICON "resources/4386.ico"
5252
4387 ICON "resources/4387.ico"
5353
4388 ICON "resources/4388.ico"
54-
4390 ICON "resources/4390.ico"
54+
IDI_NO_HW ICON "resources/4390.ico"
5555
IDI_MUTED_ICON ICON "resources/4393.ico"
5656
IDI_SHUTDOWN_ICON ICON "resources/4394.ico"
5757

reactos/dll/cpl/mmsys/resource.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define IDI_JOY_ICON 4361
99
#define IDI_CAMERA_ICON 4364
1010
#define IDI_SHUTDOWN_ICON 3009
11+
#define IDI_NO_HW 4390
1112
#define IDI_MUTED_ICON 4393
1213
#define IDI_MICROPHONE_ICON 4378
1314

-4.13 KB
Binary file not shown.
9.23 KB
Binary file not shown.
3 KB
Binary file not shown.

reactos/dll/cpl/mmsys/volume.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ typedef struct _GLOBAL_DATA
2626
HMIXER hMixer;
2727
HICON hIconMuted;
2828
HICON hIconUnMuted;
29+
HICON hIconNoHW;
2930

3031
LONG muteVal;
3132
DWORD muteControlID;
@@ -234,7 +235,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
234235
EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE);
235236
EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE);
236237
EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE);
237-
SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted);
238+
SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconNoHW);
238239
return;
239240
}
240241

@@ -333,6 +334,7 @@ VolumeDlgProc(HWND hwndDlg,
333334

334335
pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
335336
pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
337+
pGlobalData->hIconNoHW = LoadImage(hApplet, MAKEINTRESOURCE(IDI_NO_HW), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
336338

337339
InitImageInfo(&ImgInfo);
338340
InitVolumeControls(hwndDlg, pGlobalData);
@@ -411,6 +413,7 @@ VolumeDlgProc(HWND hwndDlg,
411413
mixerClose(pGlobalData->hMixer);
412414
DestroyIcon(pGlobalData->hIconMuted);
413415
DestroyIcon(pGlobalData->hIconUnMuted);
416+
DestroyIcon(pGlobalData->hIconNoHW);
414417
HeapFree(GetProcessHeap(), 0, pGlobalData);
415418
break;
416419
}

0 commit comments

Comments
 (0)