1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
From 1d4e36a04b8ab49fafccb0bbdb74d4961b5eed58 Mon Sep 17 00:00:00 2001
From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Thu, 13 Jul 2017 01:42:13 +0000
Subject: [PATCH] W32 - don't use gettext & gcov during gettext init
Non-representable characters during UTF16->locale conversion
will cause gcov code to return an error, for which it will try
to use gettext, so that the error message is localized.
If such call is made while gettext is being initialized
(there's a g_once_init_enter up the stack), the thread will hang forever.
To solve this, use W32 API to do the UTF16->locale conversion
and don't use gettext when it returns an error.
Also optimize g_win32_locale_filename_from_utf8() a bit,
as we need more UTF16 and less UTF8 now.
https://bugzilla.gnome.org/show_bug.cgi?id=784579
---
glib/gwin32.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 60 insertions(+), 16 deletions(-)
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 81aab00..97a4808 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -672,6 +672,49 @@ g_win32_get_windows_version (void)
return windows_version;
}
+/*
+ * Doesn't use gettext (and gconv), preventing recursive calls when
+ * g_win32_locale_filename_from_utf8() is called during
+ * gettext initialization.
+ */
+static gchar *
+special_wchar_to_locale_enoding (wchar_t *wstring)
+{
+ int sizeof_output;
+ int wctmb_result;
+ char *result;
+ BOOL not_representable = FALSE;
+
+ sizeof_output = WideCharToMultiByte (CP_ACP,
+ WC_NO_BEST_FIT_CHARS,
+ wstring, -1,
+ NULL, 0,
+ NULL,
+ ¬_representable);
+
+ if (not_representable ||
+ sizeof_output == 0 ||
+ sizeof_output > MAX_PATH)
+ return NULL;
+
+ result = g_malloc0 (sizeof_output + 1);
+
+ wctmb_result = WideCharToMultiByte (CP_ACP,
+ WC_NO_BEST_FIT_CHARS,
+ wstring, -1,
+ result, sizeof_output + 1,
+ NULL,
+ ¬_representable);
+
+ if (wctmb_result == sizeof_output &&
+ not_representable == FALSE)
+ return result;
+
+ g_free (result);
+
+ return NULL;
+}
+
/**
* g_win32_locale_filename_from_utf8:
* @utf8filename: a UTF-8 encoded filename.
@@ -704,26 +747,27 @@ g_win32_get_windows_version (void)
gchar *
g_win32_locale_filename_from_utf8 (const gchar *utf8filename)
{
- gchar *retval = g_locale_from_utf8 (utf8filename, -1, NULL, NULL, NULL);
+ gchar *retval;
+ wchar_t *wname;
+
+ wname = g_utf8_to_utf16 (utf8filename, -1, NULL, NULL, NULL);
+
+ if (wname == NULL)
+ return NULL;
+
+ retval = special_wchar_to_locale_enoding (wname);
if (retval == NULL)
{
- /* Conversion failed, so convert to wide chars, check if there
- * is a 8.3 version, and use that.
- */
- wchar_t *wname = g_utf8_to_utf16 (utf8filename, -1, NULL, NULL, NULL);
- if (wname != NULL)
- {
- wchar_t wshortname[MAX_PATH + 1];
- if (GetShortPathNameW (wname, wshortname, G_N_ELEMENTS (wshortname)))
- {
- gchar *tem = g_utf16_to_utf8 (wshortname, -1, NULL, NULL, NULL);
- retval = g_locale_from_utf8 (tem, -1, NULL, NULL, NULL);
- g_free (tem);
- }
- g_free (wname);
- }
+ /* Conversion failed, so check if there is a 8.3 version, and use that. */
+ wchar_t wshortname[MAX_PATH + 1];
+
+ if (GetShortPathNameW (wname, wshortname, G_N_ELEMENTS (wshortname)))
+ retval = special_wchar_to_locale_enoding (wshortname);
}
+
+ g_free (wname);
+
return retval;
}
--
libgit2 0.27.1
|
