From: xls <xuelisong@gmail.com>
Subject: emacs-unicode-2 branch w32select.c patch
Date: Thu, 17 Mar 2005 12:07:41 +0800 [thread overview]
Message-ID: <e717fc8b050316200714231382@mail.gmail.com> (raw)
Hi All,
Compilation of latest emacs-unicode-2 branch CVS version of
w32select.c (Rev.1.29.2.5) fails because the function
"convert_to_handle_as_coded" and "w32-get-clipboard-data" have some
stynax error.
The following patch fixes that, but i ignore the clipboard-data's eol-type .
--- w32select.c.org 2005-03-16 09:05:49.546875000 +0800
+++ w32select.c 2005-03-16 09:06:07.171875000 +0800
@@ -227,37 +227,27 @@
coding.src_multibyte = 1;
coding.dst_multibyte = 0;
/* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
- encode_coding_iso2022 trying to dereference a null pointer. */
- coding.composing = COMPOSITION_DISABLED;
- if (coding.type == coding_type_iso2022)
- coding.flags |= CODING_FLAG_ISO_SAFE;
+ encode_coding_iso2022 trying to dereference a null pointer. */
+ coding.common_flags &= ~CODING_ANNOTATION_MASK;
coding.mode |= CODING_MODE_LAST_BLOCK;
- /* Force DOS line-ends. */
- coding.eol_type = CODING_EOL_CRLF;
-
- if (SYMBOLP (coding.pre_write_conversion)
- && !NILP (Ffboundp (coding.pre_write_conversion)))
- string = run_pre_post_conversion_on_str (current_text, &coding, 1);
- else
- string = current_text;
-
- nbytes = SBYTES (string);
- src = SDATA (string);
-
- bufsize = encoding_buffer_size (&coding, nbytes) +2;
+
+ string = current_text;
+ encode_coding_string (&coding, string, nbytes);
+
+ bufsize = SBYTES (coding.dst_object)+2;
+ src = SDATA (coding.dst_object);
+ /* Add the string terminator. Add two NULs in case we are
+ producing Unicode here. */
+ src[coding.produced] = src[coding.produced+1] = '\0';
+
htext = GlobalAlloc (GMEM_MOVEABLE | GMEM_DDESHARE, bufsize);
-
if (htext != NULL)
- dst = (unsigned char *) GlobalLock (htext);
-
+ dst = (unsigned char *) GlobalLock (htext);
if (dst != NULL)
{
- encode_coding (&coding, src, dst, nbytes, bufsize-2);
- /* Add the string terminator. Add two NULs in case we are
- producing Unicode here. */
- dst[coding.produced] = dst[coding.produced+1] = '\0';
+ memcpy(dst, src, bufsize);
}
-
+
if (dst != NULL)
GlobalUnlock (htext);
@@ -918,7 +908,7 @@
sequence. */
coding.common_flags &= ~CODING_ANNOTATION_MASK;
/* Force DOS line-ends. */
- coding.eol_type = CODING_EOL_CRLF;
+ /* coding.eol_type = CODING_EOL_CRLF; */
coding.dst_bytes = nbytes * 2;
coding.destination = (unsigned char *) xmalloc (coding.dst_bytes);
next reply other threads:[~2005-03-17 4:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-17 4:07 xls [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-03-11 4:33 emacs-unicode-2 branch w32select.c patch xls
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e717fc8b050316200714231382@mail.gmail.com \
--to=xuelisong@gmail.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.