From 00013f50f020736a410b71b94c478b7f025ea74a Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sat, 20 Dec 2014 13:40:53 +0100
Subject: [PATCH] Re-enabled 'async' mode for play_sound_file() function +
 fixed possible handle leak in setOverlayIcon() function.

---
 include/MUtils/Sound.h |  8 ++++----
 src/Sound_Win32.cpp    | 16 ++++++++++------
 src/Taskbar7_Win32.cpp | 14 +++++++++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/include/MUtils/Sound.h b/include/MUtils/Sound.h
index 7895d11..06c8968 100644
--- a/include/MUtils/Sound.h
+++ b/include/MUtils/Sound.h
@@ -38,16 +38,16 @@ namespace MUtils
 		};
 
 		//Simple beep
-		MUTILS_API bool beep(beep_t beepType);
+		MUTILS_API bool beep(const beep_t &beepType);
 
 		//Play built-in sound by name
-		MUTILS_API bool play_sound(const QString &name, const bool bAsync);
+		MUTILS_API bool play_sound(const QString &name, const bool &bAsync);
 
 		//Play system sound by name
-		MUTILS_API bool play_system_sound(const QString &alias, const bool bAsync);
+		MUTILS_API bool play_system_sound(const QString &alias, const bool &bAsync);
 
 		//Play sound from file
-		MUTILS_API bool play_sound_file(const QString &library, const unsigned short uiSoundIdx);
+		MUTILS_API bool play_sound_file(const QString &library, const unsigned short uiSoundIdx, const bool &bAsync);
 	}
 }
 
diff --git a/src/Sound_Win32.cpp b/src/Sound_Win32.cpp
index ba6b798..86b16a4 100644
--- a/src/Sound_Win32.cpp
+++ b/src/Sound_Win32.cpp
@@ -39,7 +39,7 @@
 // BEEP
 ///////////////////////////////////////////////////////////////////////////////
 
-bool MUtils::Sound::beep(MUtils::Sound::beep_t beepType)
+bool MUtils::Sound::beep(const MUtils::Sound::beep_t &beepType)
 {
 	switch(beepType)
 	{
@@ -97,7 +97,7 @@ static const unsigned char *get_sound_from_cache(const QString &name)
 	return NULL;
 }
 
-bool MUtils::Sound::play_sound(const QString &name, const bool bAsync)
+bool MUtils::Sound::play_sound(const QString &name, const bool &bAsync)
 {
 	if(!name.isEmpty())
 	{
@@ -110,12 +110,12 @@ bool MUtils::Sound::play_sound(const QString &name, const bool bAsync)
 	return false;
 }
 
-bool MUtils::Sound::play_system_sound(const QString &alias, const bool bAsync)
+bool MUtils::Sound::play_system_sound(const QString &alias, const bool &bAsync)
 {
 	return PlaySound(MUTILS_WCHR(alias), GetModuleHandle(NULL), (SND_ALIAS | (bAsync ? SND_ASYNC : SND_SYNC))) != FALSE;
 }
 
-bool MUtils::Sound::play_sound_file(const QString &library, const unsigned short uiSoundIdx)
+bool MUtils::Sound::play_sound_file(const QString &library, const unsigned short uiSoundIdx, const bool &bAsync)
 {
 	bool result = false;
 
@@ -131,9 +131,13 @@ bool MUtils::Sound::play_sound_file(const QString &library, const unsigned short
 
 	if(libraryFile.exists() && libraryFile.isFile())
 	{
-		if(const HMODULE module = LoadLibraryW(MUTILS_WCHR(QDir::toNativeSeparators(libraryFile.canonicalFilePath()))))
+		if(const HMODULE module = GetModuleHandleW(MUTILS_WCHR(QDir::toNativeSeparators(libraryFile.canonicalFilePath()))))
 		{
-			result = (PlaySound(MAKEINTRESOURCE(uiSoundIdx), module, (SND_RESOURCE | SND_SYNC)) != FALSE);
+			result = (PlaySound(MAKEINTRESOURCE(uiSoundIdx), module, (SND_RESOURCE | (bAsync ? SND_ASYNC : SND_SYNC))) != FALSE);
+		}
+		else if(const HMODULE module = LoadLibraryW(MUTILS_WCHR(QDir::toNativeSeparators(libraryFile.canonicalFilePath()))))
+		{
+			result = (PlaySound(MAKEINTRESOURCE(uiSoundIdx), module, (SND_RESOURCE | (bAsync ? SND_ASYNC : SND_SYNC))) != FALSE);
 			FreeLibrary(module);
 		}
 	}
diff --git a/src/Taskbar7_Win32.cpp b/src/Taskbar7_Win32.cpp
index d95abab..d86bd53 100644
--- a/src/Taskbar7_Win32.cpp
+++ b/src/Taskbar7_Win32.cpp
@@ -136,7 +136,19 @@ bool MUtils::Taskbar7::setTaskbarProgress(const quint64 &currentValue, const qui
 bool MUtils::Taskbar7::setOverlayIcon(const QIcon *const icon, const QString &info)
 {
 	INITIALIZE_TASKBAR();
-	const HRESULT result = p->taskbarList->SetOverlayIcon(m_window->winId(), (icon ? icon->pixmap(16,16).toWinHICON() : NULL), MUTILS_WCHR(info));
+	HRESULT result = HRESULT(-1);
+	if(icon)
+	{
+		if(const HICON hIcon = icon->pixmap(16,16).toWinHICON())
+		{
+			result = p->taskbarList->SetOverlayIcon(m_window->winId(), hIcon, MUTILS_WCHR(info));
+			DestroyIcon(hIcon);
+		}
+	}
+	else
+	{
+		result = p->taskbarList->SetOverlayIcon(m_window->winId(), NULL, MUTILS_WCHR(info));
+	}
 	return SUCCEEDED(result);
 }
 
-- 
2.11.4.GIT