emacs-unicode-2 branch w32select.c patch

emacs-unicode-2 branch w32select.c patch

[xls]

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);