Author: akhaldi
Date: Sun Apr 5 16:58:46 2015
New Revision: 67064
URL:
http://svn.reactos.org/svn/reactos?rev=67064&view=rev
Log:
[MMSYS] Fix some icons and add more appropriate ones. Brought to you by Jared Smudde.
CORE-9471 for more details.
Modified:
trunk/reactos/dll/cpl/mmsys/mmsys.rc
trunk/reactos/dll/cpl/mmsys/resource.h
trunk/reactos/dll/cpl/mmsys/resources/3004.ico
trunk/reactos/dll/cpl/mmsys/resources/4390.ico
trunk/reactos/dll/cpl/mmsys/resources/4393.ico
trunk/reactos/dll/cpl/mmsys/volume.c
Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/mmsys.rc [iso-8859-1] Sun Apr 5 16:58:46 2015
@@ -51,7 +51,7 @@
4386 ICON "resources/4386.ico"
4387 ICON "resources/4387.ico"
4388 ICON "resources/4388.ico"
-4390 ICON "resources/4390.ico"
+IDI_NO_HW ICON "resources/4390.ico"
IDI_MUTED_ICON ICON "resources/4393.ico"
IDI_SHUTDOWN_ICON ICON "resources/4394.ico"
Modified: trunk/reactos/dll/cpl/mmsys/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Sun Apr 5 16:58:46 2015
@@ -8,6 +8,7 @@
#define IDI_JOY_ICON 4361
#define IDI_CAMERA_ICON 4364
#define IDI_SHUTDOWN_ICON 3009
+#define IDI_NO_HW 4390
#define IDI_MUTED_ICON 4393
#define IDI_MICROPHONE_ICON 4378
Modified: trunk/reactos/dll/cpl/mmsys/resources/3004.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/30…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/cpl/mmsys/resources/4390.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/cpl/mmsys/resources/4393.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43…
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/dll/cpl/mmsys/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Sun Apr 5 16:58:46 2015
@@ -26,6 +26,7 @@
HMIXER hMixer;
HICON hIconMuted;
HICON hIconUnMuted;
+ HICON hIconNoHW;
LONG muteVal;
DWORD muteControlID;
@@ -234,7 +235,7 @@
EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE);
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->hIconMuted);
+ SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)pGlobalData->hIconNoHW);
return;
}
@@ -333,6 +334,7 @@
pGlobalData->hIconUnMuted = LoadImage(hApplet,
MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
pGlobalData->hIconMuted = LoadImage(hApplet,
MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
+ pGlobalData->hIconNoHW = LoadImage(hApplet, MAKEINTRESOURCE(IDI_NO_HW),
IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
InitImageInfo(&ImgInfo);
InitVolumeControls(hwndDlg, pGlobalData);
@@ -411,6 +413,7 @@
mixerClose(pGlobalData->hMixer);
DestroyIcon(pGlobalData->hIconMuted);
DestroyIcon(pGlobalData->hIconUnMuted);
+ DestroyIcon(pGlobalData->hIconNoHW);
HeapFree(GetProcessHeap(), 0, pGlobalData);
break;
}