[STOBJECT] Thoughts on volume button detection

Author: SigmaTel71

dll/shellext/stobject/volume.cpp

@@ -176,6 +176,7 @@ HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray)
     // Unmute if volume is increased or unmuted explicitly
     if (pSysTray->lpVolCmd)
     {
+        MMRESULT mmres;
         g_IsMute = pSysTray->lpVolCmd == APPCOMMAND_VOLUME_UP ? FALSE : !g_IsMute;
 
         MIXERCONTROLDETAILS_BOOLEAN mxcdMute = {0};
@@ -189,13 +190,52 @@ HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray)
         mxcd.paDetails = &mxcdMute;
         mxcd.cbDetails = sizeof(mxcdMute);
 
-        MMRESULT mmres = mixerSetControlDetails((HMIXEROBJ)UlongToHandle(g_mixerId), &mxcd, MIXER_SETCONTROLDETAILSF_VALUE);
+        mmres = mixerSetControlDetails((HMIXEROBJ)UlongToHandle(g_mixerId), &mxcd, MIXER_SETCONTROLDETAILSF_VALUE);
 
         if (mmres)
         {
-            ERR("Volume_Update failed at MMixer: %d\n", mmres);
+            ERR("Volume_Update failed at updating mute state: %d\n", mmres);
             return E_FAIL;
         }
+
+        // Update volume depending on pressed button.
+        if (pSysTray->lpVolCmd != APPCOMMAND_VOLUME_MUTE)
+        {
+            MIXERLINECONTROLSW mxlc;
+            MIXERCONTROLW mxctrl;
+
+            mxlc.cbStruct = sizeof(mxlc);
+            mxlc.dwLineID = g_mixerLineID;
+            mxlc.cControls = 1;
+            mxlc.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME;
+            mxlc.pamxctrl = &mxctrl;
+            mxlc.cbmxctrl = sizeof(mxctrl);
+
+            mmres = mixerGetLineControlsW((HMIXEROBJ)UlongToHandle(g_mixerId), &mxlc, MIXER_GETLINECONTROLSF_ONEBYTYPE);
+
+            if (mmres)
+            {
+                ERR("Volume_Update failed retrieving line control: %d\n", mmres);
+                return E_FAIL;
+            }
+
+            MIXERCONTROLDETAILS_UNSIGNED mxcdVolume;
+
+            mxcd.dwControlID = mxctrl.dwControlID;
+            mxcd.paDetails = &mxcdVolume;
+            mxcd.cbDetails = sizeof(mxcdVolume);
+
+            mmres = mixerGetControlDetailsW((HMIXEROBJ)UlongToHandle(g_mixerId), &mxcd, MIXER_GETCONTROLDETAILSF_VALUE);
+
+            if (mmres)
+            {
+                ERR("Volume_Update failed reading current volume: %d\n", mmres);
+                return E_FAIL;
+            }
+
+            pSysTray->lpVolCmd = 0;
+            DPRINTF("Volume_Update: Current volume is %d\n", mxcdVolume.dwValue);
+        }
     }
 
     if (pSysTray->lpVolCmd == APPCOMMAND_VOLUME_MUTE || PrevState != g_IsMute)