Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Implemented SetConsoleIcon() fallback method.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-12-22 22:49:30 +01:00
parent e90f95bc2f
commit a4d96e74f7
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GUI.cpp
View File

@ -95,7 +95,7 @@ namespace MUtils
SendMessage(parent->winId(), WM_SETICON, (bIsBigIcon ? ICON_BIG : ICON_SMALL), LPARAM(hIcon)); SendMessage(parent->winId(), WM_SETICON, (bIsBigIcon ? ICON_BIG : ICON_SMALL), LPARAM(hIcon));
} }
~WindowIconHelper(void) virtual ~WindowIconHelper(void)
{ {
if(m_hIcon) if(m_hIcon)
{ {
@ -115,12 +115,10 @@ bool MUtils::GUI::set_window_icon(QWidget *const window, const QIcon &icon, cons
if((!icon.isNull()) && window->winId()) if((!icon.isNull()) && window->winId())
{ {
const int extend = (bIsBigIcon ? 32 : 16); const int extend = (bIsBigIcon ? 32 : 16);
if(HICON hIcon = (HICON) MUtils::Win32Utils::qicon_to_hicon(icon, extend, extend)) if(const HICON hIcon = (HICON) MUtils::Win32Utils::qicon_to_hicon(icon, extend, extend))
{ {
if(new Internal::WindowIconHelper(window, hIcon, bIsBigIcon)) new Internal::WindowIconHelper(window, hIcon, bIsBigIcon); /*will be free'd using QObject parent mechanism*/
{ return true;
return true;
}
} }
} }
return false; return false;

46
src/Terminal_Win32.cpp
View File

@ -72,6 +72,9 @@ static QScopedPointer<std::filebuf> g_fileBuf_stderr;
//The log file //The log file
static QScopedPointer<QFile> g_terminal_log_file; static QScopedPointer<QFile> g_terminal_log_file;
//Terminal icon
static HICON g_terminal_icon = NULL;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// HELPER FUNCTIONS // HELPER FUNCTIONS
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -145,6 +148,15 @@ static inline size_t clean_string(char *const str)
return out; return out;
} }
static inline void set_hicon(HICON *const ptr, const HICON val)
{
if (*ptr)
{
DestroyIcon(*ptr);
}
*ptr = val;
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// TERMINAL SETUP // TERMINAL SETUP
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -172,6 +184,7 @@ static void terminal_shutdown(void)
if(stdout) freopen_s(&temp[0], "NUL", "wb", stdout); if(stdout) freopen_s(&temp[0], "NUL", "wb", stdout);
if(stderr) freopen_s(&temp[1], "NUL", "wb", stderr); if(stderr) freopen_s(&temp[1], "NUL", "wb", stderr);
FreeConsole(); FreeConsole();
set_hicon(&g_terminal_icon, NULL);
g_terminal_attached = false; g_terminal_attached = false;
} }
} }
@ -406,13 +419,36 @@ void MUtils::Terminal::set_icon(const QIcon &icon)
if(g_terminal_attached && (!(icon.isNull() || MUtils::OS::running_on_wine()))) if(g_terminal_attached && (!(icon.isNull() || MUtils::OS::running_on_wine())))
{ {
typedef DWORD(__stdcall *SetConsoleIconFun)(HICON); if(const HICON hIcon = (HICON) MUtils::Win32Utils::qicon_to_hicon(icon, 16, 16))
if(const SetConsoleIconFun setConsoleIconFun = MUtils::Win32Utils::resolve<SetConsoleIconFun>(QLatin1String("kernel32"), QLatin1String("SetConsoleIcon")))
{ {
if(HICON hIcon = (HICON) MUtils::Win32Utils::qicon_to_hicon(icon, 16, 16)) typedef BOOL(__stdcall *SetConsoleIconFun)(HICON);
bool success = false;
if (const SetConsoleIconFun pSetConsoleIconFun = MUtils::Win32Utils::resolve<SetConsoleIconFun>(QLatin1String("kernel32"), QLatin1String("SetConsoleIcon")))
{ {
setConsoleIconFun(hIcon); const DWORD before = GetLastError();
DestroyIcon(hIcon); qWarning("[Before: 0x%08X]", before);
if (pSetConsoleIconFun(hIcon))
{
success = true;
}
else
{
const DWORD error = GetLastError();
qWarning("SetConsoleIcon() has failed! [Error: 0x%08X]", error);
}
}
if (!success)
{
const HWND hwndConsole = GetConsoleWindow();
if ((hwndConsole != NULL) && (hwndConsole != INVALID_HANDLE_VALUE))
{
SendMessage(hwndConsole, WM_SETICON, ICON_SMALL, LPARAM(hIcon));
success = true;
}
}
if (success)
{
set_hicon(&g_terminal_icon, hIcon);
} }
} }
} }