Skip to content

Commit

Permalink
upd icons loading
Browse files Browse the repository at this point in the history
  • Loading branch information
henrypp committed Jul 21, 2022
1 parent f4a4d36 commit 9c0f0d9
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 65 deletions.
146 changes: 88 additions & 58 deletions src/icons.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// simplewall
// Copyright (c) 2016-2021 Henry++
// Copyright (c) 2016-2022 Henry++

#include "global.h"

Expand All @@ -8,21 +8,31 @@ PICON_INFORMATION _app_icons_getdefault ()
static R_INITONCE init_once = PR_INITONCE_INIT;
static ICON_INFORMATION icon_info = {0};

PR_STRING path;

if (_r_initonce_begin (&init_once))
{
PR_STRING path;

// load default icons
path = _r_obj_concatstrings (2, _r_sys_getsystemdirectory ()->buffer, L"\\svchost.exe");
path = _r_obj_concatstrings (
2,
_r_sys_getsystemdirectory ()->buffer,
L"\\svchost.exe"
);

_app_icons_loadfromfile (path, &icon_info.app_icon_id, &icon_info.app_hicon, FALSE);
_app_icons_loadfromfile (path, 0, &icon_info.app_icon_id, &icon_info.app_hicon, FALSE);

// load uwp icons
if (_r_sys_isosversiongreaterorequal (WINDOWS_8))
{
_r_obj_movereference (&path, _r_obj_concatstrings (2, _r_sys_getsystemdirectory ()->buffer, L"\\wsreset.exe"));
_r_obj_dereference (path);

path = _r_obj_concatstrings (
2,
_r_sys_getsystemdirectory ()->buffer,
L"\\wsreset.exe"
);

_app_icons_loadfromfile (path, &icon_info.uwp_icon_id, &icon_info.uwp_hicon, FALSE);
_app_icons_loadfromfile (path, 0, &icon_info.uwp_icon_id, &icon_info.uwp_hicon, FALSE);
}

_r_obj_dereference (path);
Expand Down Expand Up @@ -64,22 +74,18 @@ HICON _app_icons_getdefaulttype_hicon (
return NULL;
}

LONG _app_icons_getdefaultapp_id ()
LONG _app_icons_getdefaultapp_id (
_In_ ENUM_TYPE_DATA type
)
{
PICON_INFORMATION icon_info;

icon_info = _app_icons_getdefault ();

return icon_info->app_icon_id;
}

LONG _app_icons_getdefaultuwp_id ()
{
PICON_INFORMATION icon_info;

icon_info = _app_icons_getdefault ();
if (type == DATA_APP_UWP)
return icon_info->uwp_icon_id;

return icon_info->uwp_icon_id;
return icon_info->app_icon_id;
}

HICON _app_icons_getsafeapp_hicon (
Expand Down Expand Up @@ -114,7 +120,7 @@ HICON _app_icons_getsafeapp_hicon (
return hicon;
}

_app_icons_loadfromfile (ptr_app->real_path, &icon_id, &hicon, TRUE);
_app_icons_loadfromfile (ptr_app->real_path, ptr_app->type, &icon_id, &hicon, TRUE);

if (!icon_id || (ptr_app->type == DATA_APP_UWP && icon_id == icon_info->app_icon_id))
{
Expand All @@ -129,65 +135,89 @@ HICON _app_icons_getsafeapp_hicon (
return hicon;
}

VOID _app_icons_loadfromfile (
_In_ PR_STRING path,
_Out_opt_ PLONG icon_id,
_Out_opt_ HICON_PTR hicon,
_In_ BOOLEAN is_loaddefaults
VOID _app_icons_loaddefaults (
_In_ ENUM_TYPE_DATA type,
_Inout_opt_ PLONG icon_id_ptr,
_Inout_opt_ HICON_PTR hicon_ptr
)
{
SHFILEINFO shfi = {0};
PICON_INFORMATION icon_info;
UINT flags;

flags = SHGFI_LARGEICON;

if (icon_id)
flags |= SHGFI_SYSICONINDEX;

if (hicon)
flags |= SHGFI_ICON;
icon_info = _app_icons_getdefault ();

if (SHGetFileInfo (path->buffer, 0, &shfi, sizeof (shfi), flags))
if (icon_id_ptr)
{
if (icon_id)
*icon_id = shfi.iIcon;

if (hicon)
*hicon = shfi.hIcon;

return;
if (*icon_id_ptr == 0 || type == DATA_APP_UWP)
{
if (type == DATA_APP_UWP)
{
*icon_id_ptr = icon_info->uwp_icon_id;
}
else
{
*icon_id_ptr = icon_info->app_icon_id;
}
}
}

if (!icon_id && !hicon)
return;

if (is_loaddefaults)
if (hicon_ptr)
{
icon_info = _app_icons_getdefault ();

if (icon_id)
*icon_id = icon_info->app_icon_id;

if (hicon)
if (*hicon_ptr == NULL || type == DATA_APP_UWP)
{
if (icon_info->app_hicon)
if (type == DATA_APP_UWP)
{
*hicon = CopyIcon (icon_info->app_hicon);
if (icon_info->uwp_hicon)
*hicon_ptr = CopyIcon (icon_info->uwp_hicon);
}
else
{
*hicon = NULL;
if (icon_info->app_hicon)
*hicon_ptr = CopyIcon (icon_info->app_hicon);
}
}
}
}

VOID _app_icons_loadfromfile (
_In_opt_ PR_STRING path,
_In_ ENUM_TYPE_DATA type,
_Out_opt_ PLONG icon_id_ptr,
_Out_opt_ HICON_PTR hicon_ptr,
_In_ BOOLEAN is_loaddefaults
)
{
SHFILEINFO shfi = {0};
UINT flags;

if (!icon_id_ptr && !hicon_ptr)
return;

flags = SHGFI_LARGEICON;

if (icon_id_ptr)
{
flags |= SHGFI_SYSICONINDEX;
*icon_id_ptr = 0;
}

if (hicon_ptr)
{
flags |= SHGFI_ICON;
*hicon_ptr = NULL;
}

// set to null
if (icon_id)
*icon_id = 0;
if (path)
{
if (SHGetFileInfo (path->buffer, 0, &shfi, sizeof (shfi), flags))
{
if (icon_id_ptr)
*icon_id_ptr = shfi.iIcon;

if (hicon_ptr)
*hicon_ptr = shfi.hIcon;
}
}

if (hicon)
*hicon = NULL;
if (is_loaddefaults)
_app_icons_loaddefaults (type, icon_id_ptr, hicon_ptr);
}
21 changes: 14 additions & 7 deletions src/icons.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// simplewall
// Copyright (c) 2016-2021 Henry++
// Copyright (c) 2016-2022 Henry++

#pragma once

Expand All @@ -14,17 +14,24 @@ HICON _app_icons_getdefaulttype_hicon (
_In_ PICON_INFORMATION icon_info
);

LONG _app_icons_getdefaultapp_id ();

LONG _app_icons_getdefaultuwp_id ();
LONG _app_icons_getdefaultapp_id (
_In_ ENUM_TYPE_DATA type
);

HICON _app_icons_getsafeapp_hicon (
_In_ ULONG_PTR app_hash
);

VOID _app_icons_loaddefaults (
_In_ ENUM_TYPE_DATA type,
_Inout_opt_ PLONG icon_id_ptr,
_Inout_opt_ HICON_PTR hicon_ptr
);

VOID _app_icons_loadfromfile (
_In_ PR_STRING path,
_Out_opt_ PLONG icon_id,
_Out_opt_ HICON_PTR hicon,
_In_opt_ PR_STRING path,
_In_ ENUM_TYPE_DATA type,
_Out_opt_ PLONG icon_id_ptr,
_Out_opt_ HICON_PTR hicon_ptr,
_In_ BOOLEAN is_loaddefaults
);

0 comments on commit 9c0f0d9

Please sign in to comment.