luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-02 17:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GWin32AppInfo: Retrieve display name of UWP (packaged) apps

Browse Source
This commit is contained in:
Luca Bacci 2022-12-23 17:36:22 +01:00
parent 0f0520ffa2
commit 01889cd348
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gwin32appinfo.c
View File

@ -3356,6 +3356,7 @@ static gboolean
uwp_package_cb (gpointer user_data,
const gunichar2 *full_package_name,
const gunichar2 *package_name,
const gunichar2 *display_name,
const gunichar2 *app_user_model_id,
gboolean show_in_applist,
GPtrArray *supported_extgroups,
@ -3384,6 +3385,13 @@ uwp_package_cb (gpointer user_data,
FALSE,
TRUE);
if (!app->pretty_name && !app->pretty_name_u8 && display_name)
{
char *display_name_u8 = g_utf16_to_utf8 (display_name, -1, NULL, NULL, NULL);
app->pretty_name = g_wcsdup (display_name, -1);
app->pretty_name_u8 = g_steal_pointer (&display_name_u8);
}
extensions_considered = 0;
for (i = 0; i < supported_extgroups->len; i++)

38
gio/gwin32packageparser.c
View File

@ -141,6 +141,7 @@ struct _xml_sax_state
gsize package_index;
const wchar_t *wcs_full_name;
const wchar_t *wcs_name;
const wchar_t *wcs_display_name;
HSTRING package_family;
gboolean applist;
@ -322,17 +323,20 @@ g_win32_package_parser_enum_packages (GWin32PackageParserCallback callback,
{
IUnknown *item = NULL;
IPackage *ipackage = NULL;
IPackage2 *ipackage2 = NULL;
IPackageId *ipackageid = NULL;
IUnknown *package_install_location = NULL;
IStorageItem *storage_item = NULL;
HSTRING path = NULL;
HSTRING name = NULL;
HSTRING full_name = NULL;
HSTRING display_name = NULL;
HSTRING package_family = NULL;
size_t manifest_filename_size;
const wchar_t *wcs_path;
const wchar_t *wcs_full_name;
const wchar_t *wcs_name;
const wchar_t *wcs_display_name;
wchar_t *manifest_filename = NULL;
#define canned_com_error_handler_pkg(function_name_literal, where_to_go) \
@ -353,6 +357,9 @@ g_win32_package_parser_enum_packages (GWin32PackageParserCallback callback,
hr = IUnknown_QueryInterface (item, &IID_IPackage, (void **) &ipackage);
canned_com_error_handler_pkg ("IUnknown_QueryInterface(IID_IPackage)", package_cleanup);
hr = IUnknown_QueryInterface (item, &IID_IPackage2, (void **) &ipackage2);
canned_com_error_handler_pkg ("IUnknown_QueryInterface(IID_IPackage2)", package_cleanup);
hr = IPackage_get_Id (ipackage, &ipackageid);
canned_com_error_handler_pkg ("IPackage_get_Id()", package_cleanup);
@ -362,8 +369,12 @@ g_win32_package_parser_enum_packages (GWin32PackageParserCallback callback,
hr = IPackageId_get_Name (ipackageid, &name);
canned_com_error_handler_pkg ("IPackageId_get_Name()", package_cleanup);
hr = IPackage2_get_DisplayName (ipackage2, &display_name);
canned_com_error_handler_pkg ("IPackage2_get_DisplayName()", package_cleanup);
wcs_full_name = LoadedWindowsGetStringRawBuffer (full_name, NULL);
wcs_name = LoadedWindowsGetStringRawBuffer (name, NULL);
wcs_display_name = LoadedWindowsGetStringRawBuffer (display_name, NULL);
#define canned_com_error_handler_pkg_named(function_name_literal, where_to_go) \
do \
@ -402,6 +413,7 @@ g_win32_package_parser_enum_packages (GWin32PackageParserCallback callback,
sax->package_index = package_index;
sax->wcs_full_name = wcs_full_name;
sax->wcs_name = wcs_name;
sax->wcs_display_name = wcs_display_name;
sax->package_family = package_family;
sax->applist = TRUE;
sax->exit_early = FALSE;
@ -426,22 +438,26 @@ g_win32_package_parser_enum_packages (GWin32PackageParserCallback callback,
if (path)
LoadedWindowsDeleteString (path);
if (storage_item)
(void) IStorageItem_Release (storage_item);
if (package_install_location)
(void) IUnknown_Release (package_install_location);
if (ipackage)
(void) IPackage_Release (ipackage);
if (item)
(void) IUnknown_Release (item);
if (package_family)
LoadedWindowsDeleteString (package_family);
if (display_name)
LoadedWindowsDeleteString (display_name);
if (name)
LoadedWindowsDeleteString (name);
if (full_name)
LoadedWindowsDeleteString (full_name);
if (storage_item)
(void) IStorageItem_Release (storage_item);
if (package_install_location)
(void) IUnknown_Release (package_install_location);
if (ipackage2)
(void) IPackage2_Release (ipackage2);
if (ipackage)
(void) IPackage_Release (ipackage);
if (item)
(void) IUnknown_Release (item);
if (ipackageid)
(void) IPackageId_Release (ipackageid);
if (sax->exit_early)
@ -791,8 +807,8 @@ xml_parser_iteration (struct _xml_sax_state *sax,
{
if (sax->application_usermodelid != NULL)
sax->exit_early = !sax->callback (sax->user_data, sax->wcs_full_name, sax->wcs_name,
sax->application_usermodelid, sax->applist,
sax->supported_extgroups, sax->supported_protocols);
sax->wcs_display_name, sax->application_usermodelid,
sax->applist, sax->supported_extgroups, sax->supported_protocols);
g_clear_pointer (&sax->supported_extgroups, g_ptr_array_unref);
g_clear_pointer (&sax->supported_protocols, g_ptr_array_unref);
sax->supported_protocols = g_ptr_array_new_full (0, (GDestroyNotify) g_free);

1
gio/gwin32packageparser.h
View File

@ -36,6 +36,7 @@ struct _GWin32PackageExtGroup
typedef gboolean (*GWin32PackageParserCallback)(gpointer user_data,
const gunichar2 *full_package_name,
const gunichar2 *package_name,
const gunichar2 *display_name,
const gunichar2 *app_user_model_id,
gboolean show_in_applist,
GPtrArray *supported_extgroups,