X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgwin32appinfo.c;h=f1697c8a19c9cdac08dd9591fb8d566a1678f82c;hb=a3d86afa81ff34ce797a3928fd619ead219a37af;hp=cec2533bd6b10464d2b36672c996e8753bb8cdf8;hpb=4437940fe1f0932d5ad3e5dd2677f4b3e8d4b52e;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c
index cec2533..f1697c8 100644
--- a/gio/gwin32appinfo.c
+++ b/gio/gwin32appinfo.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
@@ -24,7 +22,7 @@
#include
-#include "gcontenttypeprivate.h"
+#include "gcontenttype.h"
#include "gwin32appinfo.h"
#include "gappinfo.h"
#include "gioerror.h"
@@ -35,7 +33,6 @@
#include
#include
-#include "gioalias.h"
#ifndef ASSOCF_INIT_BYEXENAME
#define ASSOCF_INIT_BYEXENAME 0x00000002
@@ -249,10 +246,10 @@ g_win32_app_info_get_icon (GAppInfo *appinfo)
}
static gboolean
-g_win32_app_info_launch (GAppInfo *appinfo,
- GList *files,
- GAppLaunchContext *launch_context,
- GError **error)
+g_win32_app_info_launch_locations (GAppInfo *appinfo,
+ GList *locations,
+ GAppLaunchContext *launch_context,
+ GError **error)
{
GWin32AppInfo *info = G_WIN32_APP_INFO (appinfo);
#ifdef AssocQueryString
@@ -279,46 +276,39 @@ g_win32_app_info_launch (GAppInfo *appinfo,
}
#endif
- for (l = files; l != NULL; l = l->next)
- {
- char *path = g_file_get_path (l->data);
- wchar_t *wfilename = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL);
+ /* FIXME: Need to do something with
+ * g_app_launch_context_get_environment()... ShellExecuteExW()
+ * doesn't have any way to pass an environment though. We need to
+ * either (a) update environment, ShellExecuteExW(), revert
+ * environment; or (b) find an API to figure out what app
+ * ShellExecuteExW() would launch, and then use g_spawn_async()
+ * instead.
+ */
- g_free (path);
+ for (l = locations; l != NULL; l = l->next)
+ {
+ wchar_t *wloc = g_utf8_to_utf16 (l->data, -1, NULL, NULL, NULL);
memset (&exec_info, 0, sizeof (exec_info));
exec_info.cbSize = sizeof (exec_info);
exec_info.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_CLASSKEY;
- exec_info.lpFile = wfilename;
+ exec_info.lpFile = wloc;
exec_info.nShow = SW_SHOWNORMAL;
exec_info.hkeyClass = class_key;
- if (!ShellExecuteExW(&exec_info))
+ if (!ShellExecuteExW (&exec_info))
{
- DWORD last_error;
- LPVOID message;
- char *message_utf8;
-
- last_error = GetLastError ();
- FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- last_error,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &message,
- 0, NULL );
-
- message_utf8 = g_utf16_to_utf8 (message, -1, NULL, NULL, NULL);
+ char *message_utf8 = g_win32_error_message (GetLastError ());
+
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Error launching application: %s"), message_utf8);
g_free (message_utf8);
- LocalFree (message);
- g_free (wfilename);
+ g_free (wloc);
RegCloseKey (class_key);
return FALSE;
}
- g_free (wfilename);
+ g_free (wloc);
}
RegCloseKey (class_key);
@@ -329,7 +319,8 @@ g_win32_app_info_launch (GAppInfo *appinfo,
static gboolean
g_win32_app_info_supports_uris (GAppInfo *appinfo)
{
- return FALSE;
+ /* TODO: is there some way to determine this on windows? */
+ return TRUE;
}
static gboolean
@@ -339,15 +330,31 @@ g_win32_app_info_supports_files (GAppInfo *appinfo)
}
static gboolean
+g_win32_app_info_launch (GAppInfo *appinfo,
+ GList *files,
+ GAppLaunchContext *launch_context,
+ GError **error)
+{
+ gboolean success;
+ GList *paths = g_list_copy_deep (files, (GCopyFunc) g_file_get_path,
+ NULL);
+
+ success = g_win32_app_info_launch_locations (appinfo, paths,
+ launch_context, error);
+
+ g_list_free_full (paths, g_free);
+
+ return success;
+}
+
+static gboolean
g_win32_app_info_launch_uris (GAppInfo *appinfo,
GList *uris,
GAppLaunchContext *launch_context,
GError **error)
{
- g_set_error_literal (error, G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("URIs not supported"));
- return FALSE;
+ return g_win32_app_info_launch_locations (appinfo, uris,
+ launch_context, error);
}
static gboolean
@@ -601,15 +608,41 @@ g_app_info_get_all_for_type (const char *content_type)
return g_list_reverse (infos);
}
-GAppInfo *
-g_app_info_get_default_for_type (const char *content_type,
- gboolean must_support_uris)
+GList *
+g_app_info_get_recommended_for_type (const char *content_type)
+{
+ /* FIXME: this should generate a list of applications that are registered
+ * as direct handlers for the given content type, without using MIME subclassing.
+ * See g_app_info_get_recommended_for_type() in gdesktopappinfo.c for a reference
+ * UNIX implementation.
+ */
+ return g_app_info_get_all_for_type (content_type);
+}
+
+GList *
+g_app_info_get_fallback_for_type (const char *content_type)
+{
+ /* FIXME: this should generate a list of applications that are registered
+ * as handlers for a superclass of the given content type, but are not
+ * direct handlers for the content type itself. See g_app_info_get_fallback_for_type()
+ * in gdesktopappinfo.c for a reference UNIX implementation.
+ */
+ return g_app_info_get_all_for_type (content_type);
+}
+
+/*
+ * The windows api (AssocQueryString) doesn't distinguish between uri schemes
+ * and file type extensions here, so we use the same implementation for both
+ * g_app_info_get_default_for_type and g_app_info_get_default_for_uri_scheme
+ */
+static GAppInfo *
+get_default_for_association (const char *association)
{
wchar_t *wtype;
wchar_t buffer[1024];
DWORD buffer_size;
- wtype = g_utf8_to_utf16 (content_type, -1, NULL, NULL, NULL);
+ wtype = g_utf8_to_utf16 (association, -1, NULL, NULL, NULL);
/* Verify that we have some sort of app registered for this type */
#ifdef AssocQueryString
@@ -629,10 +662,16 @@ g_app_info_get_default_for_type (const char *content_type,
}
GAppInfo *
+g_app_info_get_default_for_type (const char *content_type,
+ gboolean must_support_uris)
+{
+ return get_default_for_association (content_type);
+}
+
+GAppInfo *
g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
{
- /* TODO: Implement */
- return NULL;
+ return get_default_for_association (uri_scheme);
}
GList *
@@ -674,3 +713,9 @@ g_app_info_get_all (void)
return g_list_reverse (infos);
}
+
+void
+g_app_info_reset_type_associations (const char *content_type)
+{
+ /* nothing to do */
+}