From: Daniel Colascione <dancol@dancol.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 13907@debbugs.gnu.org
Subject: bug#13907: 24.3.50; cygw32 build mishandles drag-n-dropped file with non-ASCII characters in name
Date: Fri, 08 Mar 2013 19:03:58 -0800 [thread overview]
Message-ID: <513AA69E.5080908@dancol.org> (raw)
In-Reply-To: <513AA672.80903@dancol.org>
[-- Attachment #1: Type: text/plain, Size: 2445 bytes --]
On 3/8/2013 7:03 PM, Daniel Colascione wrote:
> On 3/8/2013 1:25 PM, Daniel Colascione wrote:
>> On 3/8/2013 12:53 PM, Eli Zaretskii wrote:
>>>> Date: Fri, 08 Mar 2013 22:33:07 +0200
>>>> From: Eli Zaretskii <eliz@gnu.org>
>>>> Cc: 13907@debbugs.gnu.org
>>>>
>>>> And one more question: what is the value of file-name _before_ it is
>>>> passed to cygwin-convert-file-name-from-windows? Does it perhaps
>>>> already have the U-umlaut replaced by a blank?
>>>
>>> I think the problem is on the C level, not on the Lisp level. Take a
>>> look at w32term.c:construct_drag_n_drop -- it uses ANSI version of
>>> DragQueryFile to get the file name, then decodes it by DECODE_FILE.
>>> But DECODE_FILE uses UTF-8 in the cygw32 build, so this is
>>> inappropriate for decoding file names that come from Windows APIs.
>>>
>>> Instead, in the cygw32 build, construct_drag_n_drop should use
>>> DragQueryFileW and convert the file name to the internal Emacs
>>> representation using from_unicode.
>>>
>>
>>
>> Thanks for finding that! I've been swamped this week, and I haven't been able to
>> do any investigation. I'll see whether I can come up with a fix this weekend.
>>
>
> The patch below resolves the issue for me. Assuming it's acceptable, where
> should I install it?
>
> ~/edev/trunk
> $ bzr diff
> === modified file 'src/w32term.c'
> --- src/w32term.c 2013-02-16 13:59:37 +0000
> +++ src/w32term.c 2013-03-09 03:02:10 +0000
> @@ -3186,12 +3186,27 @@
>
> for (i = 0; i < num_files; i++)
> {
> +#ifdef NTGUI_UNICODE
> + len = DragQueryFileW (hdrop, i, NULL, 0);
> + if (len <= 0)
> + continue;
> +
> + name = alloca ((len + 1) * sizeof (wchar_t));
> + DragQueryFileW (hdrop, i, (wchar_t *) name, len + 1);
> + files = Fcons (
> + from_unicode (make_unibyte_string(
> + name,
> + 1 + sizeof (wchar_t) * len)),
> + files);
> +#else
> len = DragQueryFile (hdrop, i, NULL, 0);
> if (len <= 0)
> continue;
> +
> name = alloca (len + 1);
> DragQueryFile (hdrop, i, name, len + 1);
> files = Fcons (DECODE_FILE (build_string (name)), files);
> +#endif /* NTGUI_UNICODE */
> }
>
> DragFinish (hdrop);
By the way: shouldn't we have an unwind handler here so that we call DragFinish
even if our memory allocation fails?
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
next prev parent reply other threads:[~2013-03-09 3:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-08 17:18 bug#13907: 24.3.50; cygw32 build mishandles drag-n-dropped file with non-ASCII characters in name Ken Brown
2013-03-08 19:42 ` Eli Zaretskii
2013-03-08 20:06 ` Eli Zaretskii
2013-03-08 20:33 ` Eli Zaretskii
2013-03-08 20:53 ` Eli Zaretskii
2013-03-08 21:03 ` Ken Brown
2013-03-09 8:09 ` Eli Zaretskii
2013-03-08 21:25 ` Daniel Colascione
2013-03-09 3:03 ` Daniel Colascione
2013-03-09 3:03 ` Daniel Colascione [this message]
2013-03-09 8:32 ` Eli Zaretskii
2013-03-09 8:37 ` Daniel Colascione
2013-03-09 8:51 ` Eli Zaretskii
2013-03-09 8:37 ` Daniel Colascione
2013-03-10 23:00 ` Daniel Colascione
2013-03-11 9:51 ` Ken Brown
2013-03-09 12:16 ` Ken Brown
2013-03-09 19:31 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=513AA69E.5080908@dancol.org \
--to=dancol@dancol.org \
--cc=13907@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).