File 0002-Add-g_win32_get_utf8_argv.patch of Package mingw32-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Add-g_win32_get_utf8_argv.patch of Package mingw32-glib2 (Revision d3ffdd1d2c98ccbce95741ace551592c)

Currently displaying revision d3ffdd1d2c98ccbce95741ace551592c , Show latest

From ddd9d62b5f811b6e5960e9f7f55886f59815f117 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Sat, 5 Jun 2010 16:25:29 +0200
Subject: [PATCH 2/3] Add g_win32_get_utf8_argv()

Based on the patches by Christian Persch.

Bug #522131
---
 docs/reference/glib/glib-sections.txt |    1 +
 glib/glib.symbols                     |    1 +
 glib/gwin32.c                         |   59 +++++++++++++++++++++++++++++++++
 glib/gwin32.h                         |    2 +
 4 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 5810f68..f76b608 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1772,6 +1772,7 @@ g_win32_get_package_installation_directory_of_module
 g_win32_get_package_installation_subdirectory
 g_win32_get_windows_version
 g_win32_locale_filename_from_utf8
+g_win32_get_utf8_argv
 G_WIN32_DLLMAIN_FOR_DLL_NAME
 G_WIN32_HAVE_WIDECHAR_API
 G_WIN32_IS_NT_BASED
diff --git a/glib/glib.symbols b/glib/glib.symbols
index 87e9d65..b1f5ba5 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1867,6 +1867,7 @@ g_win32_get_package_installation_subdirectory_utf8
 g_win32_get_windows_version
 g_win32_getlocale
 g_win32_locale_filename_from_utf8
+g_win32_get_utf8_argv G_GNUC_MALLOC
 #endif
 #endif
 #endif
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 1440327..bd2a55d 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -596,5 +596,64 @@ g_win32_locale_filename_from_utf8 (const gchar *utf8filename)
   return retval;
 }
 
+/**
+ * g_win32_get_utf8_argv():
+ * @expand_wildcards: %TRUE if wildcards should be expanded.
+ * @argc: (allow-none): a location to store the array length
+ *
+ * Creates an array containing the Windows Unicode command line arguments
+ * retrieved with __wgetmainargs.
+ *
+ * Unlike the arguments that the system passes to main and WinMain,
+ * the Unicode command line contains sufficient information
+ * to correctly open files with names that are not representable
+ * in the system codepage. This situation can arise when e.g. files
+ * with Chinese names are opened on an English version of Windows.
+ *
+ * Returns: (array length=argc) (element-type utf-8): the newly allocated array of
+ *   command line arguments
+ *
+ * Since: 2.26
+ */
+
+typedef struct {
+  int newmode;
+} _startupinfo;
+
+extern void __wgetmainargs(int *argc,
+			   wchar_t ***wargv,
+			   wchar_t ***wenviron,
+			   int expand_wildcards,
+			   _startupinfo *startupinfo);
+
+gchar**
+g_win32_get_utf8_argv (gboolean expand_wildcards, gint *argc)
+{
+  gchar **argv;
+  wchar_t **wargv, **wenviron;
+  gint i, n;
+  int dowildcard;
+
+  if (expand_wildcards)
+    dowildcard = -1;
+  else
+    dowildcard = 0;
+
+  _startupinfo si = { 0 };
+
+  __wgetmainargs (&n, &wargv, &wenviron, dowildcard, &si);
+
+  if (argc)
+    *argc = n;
+
+  argv = g_new0 (gchar *, n + 1);
+
+  for (i = 0; i < n; ++i)
+    argv[i] = g_utf16_to_utf8 ((gunichar2 *) wargv[i], -1, NULL, NULL, NULL);
+  argv[n] = NULL;
+
+  return argv;
+}
+
 #define __G_WIN32_C__
 #include "galiasdef.c"
diff --git a/glib/gwin32.h b/glib/gwin32.h
index 5793335..3f46695 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -103,6 +103,8 @@ guint		g_win32_get_windows_version (void);
 
 gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
 
+gchar**         g_win32_get_utf8_argv (gboolean expand_wildcards, gint *argc) G_GNUC_MALLOC;
+
 /* As of GLib 2.14 we only support NT-based Windows */
 #define G_WIN32_IS_NT_BASED() TRUE
 #define G_WIN32_HAVE_WIDECHAR_API() TRUE
-- 
1.6.4.2

Places

File 0002-Add-g_win32_get_utf8_argv.patch of Package mingw32-glib2 (Revision d3ffdd1d2c98ccbce95741ace551592c)

Places