Merge branch 'thirdparty'

Conflicts:
	source/putty/WINDOWS/winnet.c

Source commit: f45d28c4dc35d5892267fba5ce9e7c808b975c3c

source/Putty.cbproj

@@ -127,6 +127,9 @@
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
+		<CppCompile Include="putty\miscucs.c">
+			<BuildOrder>51</BuildOrder>
+		</CppCompile>
 		<CppCompile Include="putty\noshare.c">
 			<BuildOrder>41</BuildOrder>
 		</CppCompile>
@@ -279,6 +282,9 @@
 			<BuildOrder>12</BuildOrder>
 			<BuildOrder>110</BuildOrder>
 		</CppCompile>
+		<CppCompile Include="putty\WINDOWS\winucs.c">
+			<BuildOrder>52</BuildOrder>
+		</CppCompile>
 		<CppCompile Include="putty\x11fwd.c">
 			<BuildOrder>113</BuildOrder>
 			<BuildOrder>11</BuildOrder>

source/putty/misc.c

@@ -399,15 +399,19 @@ int toint(unsigned u)
  *    directive we don't know about, we should panic and die rather
  *    than run any risk.
  */
-static char *dupvprintf_inner(char *buf, int oldlen, int oldsize,
+static char *dupvprintf_inner(char *buf, int oldlen, int *oldsize,
                               const char *fmt, va_list ap)
 {
-    int len, size;
+    int len, size, newsize;
 
-    size = oldsize - oldlen;
+    assert(*oldsize >= oldlen);
+    size = *oldsize - oldlen;
     if (size == 0) {
         size = 512;
-        buf = sresize(buf, oldlen + size, char);
+        newsize = oldlen + size;
+        buf = sresize(buf, newsize, char);
+    } else {
+        newsize = *oldsize;
     }
 
     while (1) {
@@ -435,6 +439,7 @@ static char *dupvprintf_inner(char *buf, int oldlen, int oldsize,
 	if (len >= 0 && len < size) {
 	    /* This is the C99-specified criterion for snprintf to have
 	     * been completely successful. */
+            *oldsize = newsize;
 	    return buf;
 	} else if (len > 0) {
 	    /* This is the C99 error condition: the returned length is
@@ -445,13 +450,15 @@ static char *dupvprintf_inner(char *buf, int oldlen, int oldsize,
 	     * buffer wasn't big enough, so we enlarge it a bit and hope. */
 	    size += 512;
 	}
-	buf = sresize(buf, oldlen + size, char);
+        newsize = oldlen + size;
+        buf = sresize(buf, newsize, char);
     }
 }
 
 char *dupvprintf(const char *fmt, va_list ap)
 {
-    return dupvprintf_inner(NULL, 0, 0, fmt, ap);
+    int size = 0;
+    return dupvprintf_inner(NULL, 0, &size, fmt, ap);
 }
 char *dupprintf(const char *fmt, ...)
 {
@@ -493,7 +500,7 @@ char *strbuf_to_str(strbuf *buf)
 }
 void strbuf_catfv(strbuf *buf, const char *fmt, va_list ap)
 {
-    buf->s = dupvprintf_inner(buf->s, buf->len, buf->size, fmt, ap);
+    buf->s = dupvprintf_inner(buf->s, buf->len, &buf->size, fmt, ap);
     buf->len += strlen(buf->s + buf->len);
 }
 void strbuf_catf(strbuf *buf, const char *fmt, ...)

source/putty/miscucs.c

@@ -0,0 +1,28 @@
+/*
+ * Centralised Unicode-related helper functions, separate from misc.c
+ * so that they can be omitted from tools that aren't including
+ * Unicode handling.
+ */
+
+#include "putty.h"
+#include "misc.h"
+
+wchar_t *dup_mb_to_wc_c(int codepage, int flags, const char *string, int len)
+{
+    int mult;
+    for (mult = 1 ;; mult++) {
+        wchar_t *ret = snewn(mult*len + 2, wchar_t);
+        int outlen;
+        outlen = mb_to_wc(codepage, flags, string, len, ret, mult*len + 1);
+        if (outlen < mult*len+1) {
+            ret[outlen] = L'\0';
+            return ret;
+        }
+        sfree(ret);
+    }
+}
+
+wchar_t *dup_mb_to_wc(int codepage, int flags, const char *string)
+{
+    return dup_mb_to_wc_c(codepage, flags, string, strlen(string));
+}

source/putty/ssh.c

@@ -1036,20 +1036,20 @@ static void parse_ttymodes(Ssh ssh,
     int i;
     const struct ssh_ttymode *mode;
     char *val;
-    char default_val[2];
-
-    strcpy(default_val, "A");
 
     for (i = 0; i < lenof(ssh_ttymodes); i++) {
         mode = ssh_ttymodes + i;
-        val = conf_get_str_str_opt(ssh->conf, CONF_ttymodes, mode->mode);
-        if (!val)
-            val = default_val;
+	/* Every mode known to the current version of the code should be
+	 * mentioned; this was ensured when settings were loaded. */
+        val = conf_get_str_str(ssh->conf, CONF_ttymodes, mode->mode);
 
 	/*
-	 * val[0] is either 'V', indicating that an explicit value
-	 * follows it, or 'A' indicating that we should pass the
-	 * value through from the local environment via get_ttymode.
+	 * val[0] can be
+	 *  - 'V', indicating that an explicit value follows it;
+	 *  - 'A', indicating that we should pass the value through from
+	 *    the local environment via get_ttymode; or
+	 *  - 'N', indicating that we should explicitly not send this
+	 *    mode.
 	 */
 	if (val[0] == 'A') {
 	    val = get_ttymode(ssh->frontend, mode->mode);
@@ -1057,8 +1057,9 @@ static void parse_ttymodes(Ssh ssh,
 		do_mode(data, mode, val);
 		sfree(val);
 	    }
-	} else
+	} else if (val[0] == 'V') {
             do_mode(data, mode, val + 1);              /* skip the 'V' */
+	} /* else 'N', or something from the future we don't understand */
     }
 }
 

source/putty/sshccp.c

@@ -440,9 +440,10 @@ static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b)
 
 static void bigval_final_reduce(bigval *n)
 {
-    BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v12, v13, v14, v15;
-    BignumInt v16, v17, v18, v19, v20, v21, v22, v24, v25, v26, v27, v28, v29;
-    BignumInt v30, v31, v32, v33;
+    BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v13, v14, v15;
+    BignumInt v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28;
+    BignumInt v29, v30, v31, v32, v34, v35, v36, v37, v38, v39, v40, v41, v42;
+    BignumInt v43;
     BignumCarry carry;
 
     v0 = n->w[0];
@@ -455,45 +456,55 @@ static void bigval_final_reduce(bigval *n)
     v7 = n->w[7];
     v8 = n->w[8];
     v9 = (v8) >> 2;
-    v10 = 5 * v9;
-    BignumADC(v12, carry, v0, v10, 0);
-    (void)v12;
-    BignumADC(v13, carry, v1, 0, carry);
-    (void)v13;
-    BignumADC(v14, carry, v2, 0, carry);
-    (void)v14;
-    BignumADC(v15, carry, v3, 0, carry);
-    (void)v15;
-    BignumADC(v16, carry, v4, 0, carry);
-    (void)v16;
-    BignumADC(v17, carry, v5, 0, carry);
-    (void)v17;
-    BignumADC(v18, carry, v6, 0, carry);
-    (void)v18;
-    BignumADC(v19, carry, v7, 0, carry);
-    (void)v19;
-    v20 = v8 + 0 + carry;
-    v21 = (v20) >> 2;
-    v22 = 5 * v21;
-    BignumADC(v24, carry, v0, v22, 0);
-    BignumADC(v25, carry, v1, 0, carry);
-    BignumADC(v26, carry, v2, 0, carry);
-    BignumADC(v27, carry, v3, 0, carry);
-    BignumADC(v28, carry, v4, 0, carry);
-    BignumADC(v29, carry, v5, 0, carry);
-    BignumADC(v30, carry, v6, 0, carry);
-    BignumADC(v31, carry, v7, 0, carry);
-    v32 = v8 + 0 + carry;
-    v33 = (v32) & ((((BignumInt)1) << 2)-1);
-    n->w[0] = v24;
-    n->w[1] = v25;
-    n->w[2] = v26;
-    n->w[3] = v27;
-    n->w[4] = v28;
-    n->w[5] = v29;
-    n->w[6] = v30;
-    n->w[7] = v31;
-    n->w[8] = v33;
+    v10 = (v8) & ((((BignumInt)1) << 2)-1);
+    v11 = 5 * v9;
+    BignumADC(v13, carry, v0, v11, 0);
+    BignumADC(v14, carry, v1, 0, carry);
+    BignumADC(v15, carry, v2, 0, carry);
+    BignumADC(v16, carry, v3, 0, carry);
+    BignumADC(v17, carry, v4, 0, carry);
+    BignumADC(v18, carry, v5, 0, carry);
+    BignumADC(v19, carry, v6, 0, carry);
+    BignumADC(v20, carry, v7, 0, carry);
+    v21 = v10 + 0 + carry;
+    BignumADC(v22, carry, v13, 5, 0);
+    (void)v22;
+    BignumADC(v23, carry, v14, 0, carry);
+    (void)v23;
+    BignumADC(v24, carry, v15, 0, carry);
+    (void)v24;
+    BignumADC(v25, carry, v16, 0, carry);
+    (void)v25;
+    BignumADC(v26, carry, v17, 0, carry);
+    (void)v26;
+    BignumADC(v27, carry, v18, 0, carry);
+    (void)v27;
+    BignumADC(v28, carry, v19, 0, carry);
+    (void)v28;
+    BignumADC(v29, carry, v20, 0, carry);
+    (void)v29;
+    v30 = v21 + 0 + carry;
+    v31 = (v30) >> 2;
+    v32 = 5 * v31;
+    BignumADC(v34, carry, v13, v32, 0);
+    BignumADC(v35, carry, v14, 0, carry);
+    BignumADC(v36, carry, v15, 0, carry);
+    BignumADC(v37, carry, v16, 0, carry);
+    BignumADC(v38, carry, v17, 0, carry);
+    BignumADC(v39, carry, v18, 0, carry);
+    BignumADC(v40, carry, v19, 0, carry);
+    BignumADC(v41, carry, v20, 0, carry);
+    v42 = v21 + 0 + carry;
+    v43 = (v42) & ((((BignumInt)1) << 2)-1);
+    n->w[0] = v34;
+    n->w[1] = v35;
+    n->w[2] = v36;
+    n->w[3] = v37;
+    n->w[4] = v38;
+    n->w[5] = v39;
+    n->w[6] = v40;
+    n->w[7] = v41;
+    n->w[8] = v43;
 }
 
 #elif BIGNUM_INT_BITS == 32
@@ -604,8 +615,8 @@ static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b)
 
 static void bigval_final_reduce(bigval *n)
 {
-    BignumInt v0, v1, v2, v3, v4, v5, v6, v8, v9, v10, v11, v12, v13, v14;
-    BignumInt v16, v17, v18, v19, v20, v21;
+    BignumInt v0, v1, v2, v3, v4, v5, v6, v7, v9, v10, v11, v12, v13, v14;
+    BignumInt v15, v16, v17, v18, v19, v20, v22, v23, v24, v25, v26, v27;
     BignumCarry carry;
 
     v0 = n->w[0];
@@ -614,29 +625,35 @@ static void bigval_final_reduce(bigval *n)
     v3 = n->w[3];
     v4 = n->w[4];
     v5 = (v4) >> 2;
-    v6 = 5 * v5;
-    BignumADC(v8, carry, v0, v6, 0);
-    (void)v8;
-    BignumADC(v9, carry, v1, 0, carry);
-    (void)v9;
-    BignumADC(v10, carry, v2, 0, carry);
-    (void)v10;
-    BignumADC(v11, carry, v3, 0, carry);
-    (void)v11;
-    v12 = v4 + 0 + carry;
-    v13 = (v12) >> 2;
-    v14 = 5 * v13;
-    BignumADC(v16, carry, v0, v14, 0);
-    BignumADC(v17, carry, v1, 0, carry);
-    BignumADC(v18, carry, v2, 0, carry);
-    BignumADC(v19, carry, v3, 0, carry);
-    v20 = v4 + 0 + carry;
-    v21 = (v20) & ((((BignumInt)1) << 2)-1);
-    n->w[0] = v16;
-    n->w[1] = v17;
-    n->w[2] = v18;
-    n->w[3] = v19;
-    n->w[4] = v21;
+    v6 = (v4) & ((((BignumInt)1) << 2)-1);
+    v7 = 5 * v5;
+    BignumADC(v9, carry, v0, v7, 0);
+    BignumADC(v10, carry, v1, 0, carry);
+    BignumADC(v11, carry, v2, 0, carry);
+    BignumADC(v12, carry, v3, 0, carry);
+    v13 = v6 + 0 + carry;
+    BignumADC(v14, carry, v9, 5, 0);
+    (void)v14;
+    BignumADC(v15, carry, v10, 0, carry);
+    (void)v15;
+    BignumADC(v16, carry, v11, 0, carry);
+    (void)v16;
+    BignumADC(v17, carry, v12, 0, carry);
+    (void)v17;
+    v18 = v13 + 0 + carry;
+    v19 = (v18) >> 2;
+    v20 = 5 * v19;
+    BignumADC(v22, carry, v9, v20, 0);
+    BignumADC(v23, carry, v10, 0, carry);
+    BignumADC(v24, carry, v11, 0, carry);
+    BignumADC(v25, carry, v12, 0, carry);
+    v26 = v13 + 0 + carry;
+    v27 = (v26) & ((((BignumInt)1) << 2)-1);
+    n->w[0] = v22;
+    n->w[1] = v23;
+    n->w[2] = v24;
+    n->w[3] = v25;
+    n->w[4] = v27;
 }
 
 #elif BIGNUM_INT_BITS == 64
@@ -705,28 +722,33 @@ static void bigval_mul_mod_p(bigval *r, const bigval *a, const bigval *b)
 
 static void bigval_final_reduce(bigval *n)
 {
-    BignumInt v0, v1, v2, v3, v4, v6, v7, v8, v9, v10, v12, v13, v14, v15;
+    BignumInt v0, v1, v2, v3, v4, v5, v7, v8, v9, v10, v11, v12, v13, v14;
+    BignumInt v16, v17, v18, v19;
     BignumCarry carry;
 
     v0 = n->w[0];
     v1 = n->w[1];
     v2 = n->w[2];
     v3 = (v2) >> 2;
-    v4 = 5 * v3;
-    BignumADC(v6, carry, v0, v4, 0);
-    (void)v6;
-    BignumADC(v7, carry, v1, 0, carry);
-    (void)v7;
-    v8 = v2 + 0 + carry;
-    v9 = (v8) >> 2;
-    v10 = 5 * v9;
-    BignumADC(v12, carry, v0, v10, 0);
-    BignumADC(v13, carry, v1, 0, carry);
-    v14 = v2 + 0 + carry;
-    v15 = (v14) & ((((BignumInt)1) << 2)-1);
-    n->w[0] = v12;
-    n->w[1] = v13;
-    n->w[2] = v15;
+    v4 = (v2) & ((((BignumInt)1) << 2)-1);
+    v5 = 5 * v3;
+    BignumADC(v7, carry, v0, v5, 0);
+    BignumADC(v8, carry, v1, 0, carry);
+    v9 = v4 + 0 + carry;
+    BignumADC(v10, carry, v7, 5, 0);
+    (void)v10;
+    BignumADC(v11, carry, v8, 0, carry);
+    (void)v11;
+    v12 = v9 + 0 + carry;
+    v13 = (v12) >> 2;
+    v14 = 5 * v13;
+    BignumADC(v16, carry, v7, v14, 0);
+    BignumADC(v17, carry, v8, 0, carry);
+    v18 = v9 + 0 + carry;
+    v19 = (v18) & ((((BignumInt)1) << 2)-1);
+    n->w[0] = v16;
+    n->w[1] = v17;
+    n->w[2] = v19;
 }
 
 #else

source/putty/version.h

@@ -1,6 +1,6 @@
 /* Generated by automated build script */
-#define RELEASE 0.68
-#define TEXTVER "Release 0.68"
-#define SSHVER "PuTTY-Release-0.68"
-#define BINARY_VERSION 0,68,0,0
-#define SOURCE_COMMIT "23fbc4f56b04ca5d387c16720caa05ddf2d63e2f"
+#define RELEASE 0.69
+#define TEXTVER "Release 0.69"
+#define SSHVER "PuTTY-Release-0.69"
+#define BINARY_VERSION 0,69,0,0
+#define SOURCE_COMMIT "b1829b81b5c0d12dcc91f6b50b0b4d83c3df6a8e"

source/putty/windows/wingss.c

@@ -49,6 +49,9 @@ DECL_WINDOWS_FUNCTION(static, SECURITY_STATUS,
 DECL_WINDOWS_FUNCTION(static, SECURITY_STATUS,
 		      MakeSignature,
 		      (PCtxtHandle, ULONG, PSecBufferDesc, ULONG));
+DECL_WINDOWS_FUNCTION(static, DLL_DIRECTORY_COOKIE,
+                      AddDllDirectory,
+                      (PCWSTR));
 
 typedef struct winSsh_gss_ctx {
     unsigned long maj_stat;
@@ -75,6 +78,16 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
     HKEY regkey;
     struct ssh_gss_liblist *list = snew(struct ssh_gss_liblist);
     char *path;
+    static HMODULE kernel32_module;
+    if (!kernel32_module) {
+        kernel32_module = load_system32_dll("kernel32.dll");
+    }
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined MPEXT
+    /* Omit the type-check because older MSVCs don't have this function */
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(kernel32_module, AddDllDirectory);
+#else
+    GET_WINDOWS_FUNCTION(kernel32_module, AddDllDirectory);
+#endif
 
     list->libraries = snewn(3, struct ssh_gss_library);
     list->nlibraries = 0;
@@ -96,8 +109,20 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
 	    ret = RegQueryValueEx(regkey, "InstallDir", NULL,
 				  &type, (LPBYTE)buffer, &size);
 	    if (ret == ERROR_SUCCESS && type == REG_SZ) {
-		strcat(buffer, "\\bin\\gssapi32.dll");
-		module = LoadLibrary(buffer);
+                strcat (buffer, "\\bin");
+                if(p_AddDllDirectory) {
+                    /* Add MIT Kerberos' path to the DLL search path,
+                     * it loads its own DLLs further down the road */
+                    wchar_t *dllPath =
+                        dup_mb_to_wc(DEFAULT_CODEPAGE, 0, buffer);
+                    p_AddDllDirectory(dllPath);
+                    sfree(dllPath);
+                }
+                strcat (buffer, "\\gssapi32.dll");
+                module = LoadLibraryEx (buffer, NULL,
+                                        LOAD_LIBRARY_SEARCH_SYSTEM32 |
+                                        LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
+                                        LOAD_LIBRARY_SEARCH_USER_DIRS);
 	    }
 	    sfree(buffer);
 	}
@@ -138,7 +163,9 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
 	lib->gsslogmsg = "Using SSPI from SECUR32.DLL";
 	lib->handle = (void *)module;
 
+#pragma option push -w-cpt
 	GET_WINDOWS_FUNCTION(module, AcquireCredentialsHandleA);
+#pragma option pop
 	GET_WINDOWS_FUNCTION(module, InitializeSecurityContextA);
 	GET_WINDOWS_FUNCTION(module, FreeContextBuffer);
 	GET_WINDOWS_FUNCTION(module, FreeCredentialsHandle);
@@ -155,7 +182,32 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
     module = NULL;
     path = conf_get_filename(conf, CONF_ssh_gss_custom)->path;
     if (*path) {
-	module = LoadLibrary(path);
+        if(p_AddDllDirectory) {
+            /* Add the custom directory as well in case it chainloads
+             * some other DLLs (e.g a non-installed MIT Kerberos
+             * instance) */
+            int pathlen = strlen(path);
+
+            while (pathlen > 0 && path[pathlen-1] != ':' &&
+                   path[pathlen-1] != '\\')
+                pathlen--;
+
+            if (pathlen > 0 && path[pathlen-1] != '\\')
+                pathlen--;
+
+            if (pathlen > 0) {
+                char *dirpath = dupprintf("%.*s", pathlen, path);
+                wchar_t *dllPath = dup_mb_to_wc(DEFAULT_CODEPAGE, 0, dirpath);
+                p_AddDllDirectory(dllPath);
+                sfree(dllPath);
+                sfree(dirpath);
+            }
+        }
+
+        module = LoadLibraryEx(path, NULL,
+                               LOAD_LIBRARY_SEARCH_SYSTEM32 |
+                               LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
+                               LOAD_LIBRARY_SEARCH_USER_DIRS);
     }
     if (module) {
 	struct ssh_gss_library *lib =

source/putty/windows/winhsock.c

@@ -98,7 +98,15 @@ static int handle_stderr(struct handle *h, void *data, int len)
 static void handle_sentdata(struct handle *h, int new_backlog)
 {
     Handle_Socket ps = (Handle_Socket) handle_get_privdata(h);
-    
+
+    if (new_backlog < 0) {
+        /* Special case: this is actually reporting an error writing
+         * to the underlying handle, and our input value is the error
+         * code itself, negated. */
+        plug_closing(ps->plug, win_strerror(-new_backlog), -new_backlog, 0);
+        return;
+    }
+
     plug_sent(ps->plug, new_backlog);
 }
 
@@ -283,7 +291,16 @@ static char *sk_handle_peer_info(Socket s)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
-        GET_WINDOWS_FUNCTION(kernel32_module, GetNamedPipeClientProcessId);
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__
+        /* For older Visual Studio, and MinGW too (at least as of
+         * Ubuntu 16.04), this function isn't available in the header
+         * files to type-check */
+        GET_WINDOWS_FUNCTION_NO_TYPECHECK(
+            kernel32_module, GetNamedPipeClientProcessId);
+#else
+        GET_WINDOWS_FUNCTION(
+            kernel32_module, GetNamedPipeClientProcessId);
+#endif
     }
 
     /*

source/putty/windows/winmisc.c

@@ -138,6 +138,11 @@ char *get_username(void)
 	if (!tried_usernameex) {
 	    /* Not available on Win9x, so load dynamically */
 	    HMODULE secur32 = load_system32_dll("secur32.dll");
+	    /* If MIT Kerberos is installed, the following call to
+	       GET_WINDOWS_FUNCTION makes Windows implicitly load
+	       sspicli.dll WITHOUT proper path sanitizing, so better
+	       load it properly before */
+	    HMODULE sspicli = load_system32_dll("sspicli.dll");
 	    GET_WINDOWS_FUNCTION(secur32, GetUserNameExA);
 	    tried_usernameex = TRUE;
 	}
@@ -209,12 +214,21 @@ void dll_hijacking_protection(void)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined MPEXT
+        /* For older Visual Studio, this function isn't available in
+         * the header files to type-check */
+        GET_WINDOWS_FUNCTION_NO_TYPECHECK(
+            kernel32_module, SetDefaultDllDirectories);
+#else
         GET_WINDOWS_FUNCTION(kernel32_module, SetDefaultDllDirectories);
+#endif
     }
 
     if (p_SetDefaultDllDirectories) {
-        /* LOAD_LIBRARY_SEARCH_SYSTEM32 only */
-        p_SetDefaultDllDirectories(0x800);
+        /* LOAD_LIBRARY_SEARCH_SYSTEM32 and explicitly specified
+         * directories only */
+        p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 |
+                                   LOAD_LIBRARY_SEARCH_USER_DIRS);
     }
 }
 

source/putty/windows/winnet.c

@@ -277,8 +277,13 @@ void sk_init(void)
 #endif
 	GET_WINDOWS_FUNCTION(winsock_module, getaddrinfo);
 	GET_WINDOWS_FUNCTION(winsock_module, freeaddrinfo);
+#pragma option push -w-cpt
 	GET_WINDOWS_FUNCTION(winsock_module, getnameinfo);
-	GET_WINDOWS_FUNCTION(winsock_module, gai_strerror);
+#pragma option pop
+        /* This function would fail its type-check if we did one,
+         * because the VS header file provides an inline definition
+         * which is __cdecl instead of WINAPI. */
+        GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gai_strerror);
     } else {
 	/* Fall back to wship6.dll for Windows 2000 */
 	wship6_module = load_system32_dll("wship6.dll");
@@ -288,8 +293,11 @@ void sk_init(void)
 #endif
 	    GET_WINDOWS_FUNCTION(wship6_module, getaddrinfo);
 	    GET_WINDOWS_FUNCTION(wship6_module, freeaddrinfo);
+#pragma option push -w-cpt
 	    GET_WINDOWS_FUNCTION(wship6_module, getnameinfo);
-	    GET_WINDOWS_FUNCTION(wship6_module, gai_strerror);
+#pragma option pop
+            /* See comment above about type check */
+            GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gai_strerror);
 	} else {
 #ifdef NET_SETUP_DIAGNOSTICS
 	    logevent(NULL, "No IPv6 support detected");
@@ -320,7 +328,13 @@ void sk_init(void)
     GET_WINDOWS_FUNCTION(winsock_module, getservbyname);
     GET_WINDOWS_FUNCTION(winsock_module, inet_addr);
     GET_WINDOWS_FUNCTION(winsock_module, inet_ntoa);
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__
+    /* Older Visual Studio, and MinGW as of Ubuntu 16.04, don't know
+     * about this function at all, so can't type-check it */
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, inet_ntop);
+#else
     GET_WINDOWS_FUNCTION(winsock_module, inet_ntop);
+#endif
     GET_WINDOWS_FUNCTION(winsock_module, connect);
     GET_WINDOWS_FUNCTION(winsock_module, bind);
     #ifdef MPEXT
@@ -793,6 +807,8 @@ static int ipv4_is_local_addr(struct in_addr addr)
 	SOCKET s = p_socket(AF_INET, SOCK_DGRAM, 0);
 	DWORD retbytes;
 
+	SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0);
+
 	if (p_WSAIoctl &&
 	    p_WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0,
 		       local_interfaces, sizeof(local_interfaces),
@@ -1061,6 +1077,8 @@ static DWORD try_connect(Actual_Socket sock,
 	goto ret;
     }
 
+	SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0);
+
     if (sock->oobinline) {
 	BOOL b = TRUE;
 	p_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b));
@@ -1404,6 +1422,8 @@ Socket sk_newlistener(const char *srcaddr, int port, Plug plug,
 	return (Socket) ret;
     }
 
+	SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0);
+
     ret->oobinline = 0;
 
     p_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));

source/putty/windows/winstuff.h

@@ -139,15 +139,24 @@ struct FontSpec *fontspec_new(const char *name,
  *
  * (DECL_WINDOWS_FUNCTION works with both these variants.)
  */
-#define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params) \
-    typedef rettype (WINAPI *t_##name) params; \
+#define TYPECHECK(to_check, to_return)          \
+    (sizeof(to_check) ? to_return : to_return)
+#define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params)   \
+    typedef rettype (WINAPI *t_##name) params;                  \
     linkage t_##name p_##name
 #define STR1(x) #x
 #define STR(x) STR1(x)
-#define GET_WINDOWS_FUNCTION_PP(module, name) \
-    (p_##name = module ? (t_##name) GetProcAddress(module, STR(name)) : NULL)
-#define GET_WINDOWS_FUNCTION(module, name) \
-    (p_##name = module ? (t_##name) GetProcAddress(module, #name) : NULL)
+#define GET_WINDOWS_FUNCTION_PP(module, name)                           \
+    TYPECHECK((t_##name)NULL == name,                                   \
+              (p_##name = module ?                                      \
+               (t_##name) GetProcAddress(module, STR(name)) : NULL))
+#define GET_WINDOWS_FUNCTION(module, name)                              \
+    TYPECHECK((t_##name)NULL == name,                                   \
+              (p_##name = module ?                                      \
+               (t_##name) GetProcAddress(module, #name) : NULL))
+#define GET_WINDOWS_FUNCTION_NO_TYPECHECK(module, name) \
+    (p_##name = module ?                                \
+     (t_##name) GetProcAddress(module, #name) : NULL)
 
 /*
  * Global variables. Most modules declare these `extern', but
@@ -331,6 +340,7 @@ struct ctlpos {
     int boxystart, boxid;
     char *boxtext;
 };
+void init_common_controls(void);       /* also does some DLL-loading */
 
 /*
  * Exports from winutils.c.
@@ -523,6 +533,21 @@ const char *win_strerror(int error);
 void restrict_process_acl(void);
 GLOBAL int restricted_acl;
 
+/* A few pieces of up-to-date Windows API definition needed for older
+ * compilers. */
+#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
+#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
+#endif
+#ifndef LOAD_LIBRARY_SEARCH_USER_DIRS
+#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x00000400
+#endif
+#ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
+#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100
+#endif
+#if _MSC_VER < 1400
+typedef PVOID DLL_DIRECTORY_COOKIE;
+#endif
+
 /*
  * Exports from sizetip.c.
  */

source/putty/windows/winucs.c

@@ -0,0 +1,1211 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <time.h>
+#include <assert.h>
+
+#include "putty.h"
+
+#ifndef MPEXT
+
+#include "terminal.h"
+#include "misc.h"
+
+/* Character conversion arrays; they are usually taken from windows,
+ * the xterm one has the four scanlines that have no unicode 2.0
+ * equivalents mapped to their unicode 3.0 locations.
+ */
+static const WCHAR unitab_xterm_std[32] = {
+    0x2666, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1,
+    0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba,
+    0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c,
+    0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 0x0020
+};
+
+/*
+ * If the codepage is non-zero it's a window codepage, zero means use a
+ * local codepage. The name is always converted to the first of any
+ * duplicate definitions.
+ */
+
+/* 
+ * Tables for ISO-8859-{1-10,13-16} derived from those downloaded
+ * 2001-10-02 from <http://www.unicode.org/Public/MAPPINGS/> -- jtn
+ * Table for ISO-8859-11 derived from same on 2002-11-18. -- bjh21
+ */
+
+/* XXX: This could be done algorithmically, but I'm not sure it's
+ *      worth the hassle -- jtn */
+/* ISO/IEC 8859-1:1998 (Latin-1, "Western", "West European") */
+static const wchar_t iso_8859_1[] = {
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+};
+
+/* ISO/IEC 8859-2:1999 (Latin-2, "Central European", "East European") */
+static const wchar_t iso_8859_2[] = {
+    0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
+    0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
+    0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
+    0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
+    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+};
+
+/* ISO/IEC 8859-3:1999 (Latin-3, "South European", "Maltese & Esperanto") */
+static const wchar_t iso_8859_3[] = {
+    0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0xFFFD, 0x0124, 0x00A7,
+    0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0xFFFD, 0x017B,
+    0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
+    0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0xFFFD, 0x017C,
+    0x00C0, 0x00C1, 0x00C2, 0xFFFD, 0x00C4, 0x010A, 0x0108, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0xFFFD, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
+    0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0xFFFD, 0x00E4, 0x010B, 0x0109, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0xFFFD, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+    0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+};
+
+/* ISO/IEC 8859-4:1998 (Latin-4, "North European") */
+static const wchar_t iso_8859_4[] = {
+    0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7,
+    0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
+    0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7,
+    0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
+    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
+    0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
+    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
+    0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
+};
+
+/* ISO/IEC 8859-5:1999 (Latin/Cyrillic) */
+static const wchar_t iso_8859_5[] = {
+    0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
+    0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+    0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
+    0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
+};
+
+/* ISO/IEC 8859-6:1999 (Latin/Arabic) */
+static const wchar_t iso_8859_6[] = {
+    0x00A0, 0xFFFD, 0xFFFD, 0xFFFD, 0x00A4, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x060C, 0x00AD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0x061B, 0xFFFD, 0xFFFD, 0xFFFD, 0x061F,
+    0xFFFD, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
+    0x0638, 0x0639, 0x063A, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
+    0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
+    0x0650, 0x0651, 0x0652, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD
+};
+
+/* ISO 8859-7:1987 (Latin/Greek) */
+static const wchar_t iso_8859_7[] = {
+    0x00A0, 0x2018, 0x2019, 0x00A3, 0xFFFD, 0xFFFD, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0xFFFD, 0x00AB, 0x00AC, 0x00AD, 0xFFFD, 0x2015,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7,
+    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+    0x03A0, 0x03A1, 0xFFFD, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+    0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0xFFFD
+};
+
+/* ISO/IEC 8859-8:1999 (Latin/Hebrew) */
+static const wchar_t iso_8859_8[] = {
+    0x00A0, 0xFFFD, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x2017,
+    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+    0x05E8, 0x05E9, 0x05EA, 0xFFFD, 0xFFFD, 0x200E, 0x200F, 0xFFFD
+};
+
+/* ISO/IEC 8859-9:1999 (Latin-5, "Turkish") */
+static const wchar_t iso_8859_9[] = {
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
+};
+
+/* ISO/IEC 8859-10:1998 (Latin-6, "Nordic" [Sami, Inuit, Icelandic]) */
+static const wchar_t iso_8859_10[] = {
+    0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7,
+    0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
+    0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7,
+    0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
+    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168,
+    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169,
+    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138
+};
+
+/* ISO/IEC 8859-11:2001 ("Thai", "TIS620") */
+static const wchar_t iso_8859_11[] = {
+    0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07,
+    0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F,
+    0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17,
+    0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F,
+    0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+    0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+    0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+    0x0E38, 0x0E39, 0x0E3A, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x0E3F,
+    0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
+    0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+    0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
+    0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD
+};
+
+/* ISO/IEC 8859-13:1998 (Latin-7, "Baltic Rim") */
+static const wchar_t iso_8859_13[] = {
+    0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7,
+    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7,
+    0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+    0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019
+};
+
+/* ISO/IEC 8859-14:1998 (Latin-8, "Celtic", "Gaelic/Welsh") */
+static const wchar_t iso_8859_14[] = {
+    0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7,
+    0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
+    0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56,
+    0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF
+};
+
+/* ISO/IEC 8859-15:1999 (Latin-9 aka -0, "euro") */
+static const wchar_t iso_8859_15[] = {
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
+    0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
+    0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+};
+
+/* ISO/IEC 8859-16:2001 (Latin-10, "Balkan") */
+static const wchar_t iso_8859_16[] = {
+    0x00A0, 0x0104, 0x0105, 0x0141, 0x20AC, 0x201E, 0x0160, 0x00A7,
+    0x0161, 0x00A9, 0x0218, 0x00AB, 0x0179, 0x00AD, 0x017A, 0x017B,
+    0x00B0, 0x00B1, 0x010C, 0x0142, 0x017D, 0x201D, 0x00B6, 0x00B7,
+    0x017E, 0x010D, 0x0219, 0x00BB, 0x0152, 0x0153, 0x0178, 0x017C,
+    0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0106, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x0110, 0x0143, 0x00D2, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x015A,
+    0x0170, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0118, 0x021A, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x0107, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x0111, 0x0144, 0x00F2, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x015B,
+    0x0171, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0119, 0x021B, 0x00FF
+};
+
+static const wchar_t roman8[] = {
+    0x00A0, 0x00C0, 0x00C2, 0x00C8, 0x00CA, 0x00CB, 0x00CE, 0x00CF,
+    0x00B4, 0x02CB, 0x02C6, 0x00A8, 0x02DC, 0x00D9, 0x00DB, 0x20A4,
+    0x00AF, 0x00DD, 0x00FD, 0x00B0, 0x00C7, 0x00E7, 0x00D1, 0x00F1,
+    0x00A1, 0x00BF, 0x00A4, 0x00A3, 0x00A5, 0x00A7, 0x0192, 0x00A2,
+    0x00E2, 0x00EA, 0x00F4, 0x00FB, 0x00E1, 0x00E9, 0x00F3, 0x00FA,
+    0x00E0, 0x00E8, 0x00F2, 0x00F9, 0x00E4, 0x00EB, 0x00F6, 0x00FC,
+    0x00C5, 0x00EE, 0x00D8, 0x00C6, 0x00E5, 0x00ED, 0x00F8, 0x00E6,
+    0x00C4, 0x00EC, 0x00D6, 0x00DC, 0x00C9, 0x00EF, 0x00DF, 0x00D4,
+    0x00C1, 0x00C3, 0x00E3, 0x00D0, 0x00F0, 0x00CD, 0x00CC, 0x00D3,
+    0x00D2, 0x00D5, 0x00F5, 0x0160, 0x0161, 0x00DA, 0x0178, 0x00FF,
+    0x00DE, 0x00FE, 0x00B7, 0x00B5, 0x00B6, 0x00BE, 0x2014, 0x00BC,
+    0x00BD, 0x00AA, 0x00BA, 0x00AB, 0x25A0, 0x00BB, 0x00B1, 0xFFFD
+};
+
+static const wchar_t koi8_u[] = {
+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2022, 0x221A, 0x2248,
+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
+    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457,
+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E,
+    0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407,
+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9,
+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
+};
+
+static const wchar_t vscii[] = {
+    0x0000, 0x0001, 0x1EB2, 0x0003, 0x0004, 0x1EB4, 0x1EAA, 0x0007,
+    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+    0x0010, 0x0011, 0x0012, 0x0013, 0x1EF6, 0x0015, 0x0016, 0x0017,
+    0x0018, 0x1EF8, 0x001a, 0x001b, 0x001c, 0x001d, 0x1EF4, 0x001f,
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
+    0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
+    0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
+    0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
+    0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
+    0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
+    0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007f,
+    0x1EA0, 0x1EAE, 0x1EB0, 0x1EB6, 0x1EA4, 0x1EA6, 0x1EA8, 0x1EAC,
+    0x1EBC, 0x1EB8, 0x1EBE, 0x1EC0, 0x1EC2, 0x1EC4, 0x1EC6, 0x1ED0,
+    0x1ED2, 0x1ED4, 0x1ED6, 0x1ED8, 0x1EE2, 0x1EDA, 0x1EDC, 0x1EDE,
+    0x1ECA, 0x1ECE, 0x1ECC, 0x1EC8, 0x1EE6, 0x0168, 0x1EE4, 0x1EF2,
+    0x00D5, 0x1EAF, 0x1EB1, 0x1EB7, 0x1EA5, 0x1EA7, 0x1EA8, 0x1EAD,
+    0x1EBD, 0x1EB9, 0x1EBF, 0x1EC1, 0x1EC3, 0x1EC5, 0x1EC7, 0x1ED1,
+    0x1ED3, 0x1ED5, 0x1ED7, 0x1EE0, 0x01A0, 0x1ED9, 0x1EDD, 0x1EDF,
+    0x1ECB, 0x1EF0, 0x1EE8, 0x1EEA, 0x1EEC, 0x01A1, 0x1EDB, 0x01AF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x1EA2, 0x0102, 0x1EB3, 0x1EB5,
+    0x00C8, 0x00C9, 0x00CA, 0x1EBA, 0x00CC, 0x00CD, 0x0128, 0x1EF3,
+    0x0110, 0x1EE9, 0x00D2, 0x00D3, 0x00D4, 0x1EA1, 0x1EF7, 0x1EEB,
+    0x1EED, 0x00D9, 0x00DA, 0x1EF9, 0x1EF5, 0x00DD, 0x1EE1, 0x01B0,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x1EA3, 0x0103, 0x1EEF, 0x1EAB,
+    0x00E8, 0x00E9, 0x00EA, 0x1EBB, 0x00EC, 0x00ED, 0x0129, 0x1EC9,
+    0x0111, 0x1EF1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x1ECF, 0x1ECD,
+    0x1EE5, 0x00F9, 0x00FA, 0x0169, 0x1EE7, 0x00FD, 0x1EE3, 0x1EEE
+};
+
+static const wchar_t dec_mcs[] = {
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0xFFFD, 0x00A5, 0xFFFD, 0x00A7,
+    0x00A4, 0x00A9, 0x00AA, 0x00AB, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0xFFFD, 0x00B5, 0x00B6, 0x00B7,
+    0xFFFD, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0xFFFD, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0xFFFD, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0152,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0178, 0xFFFD, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0xFFFD, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0153,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FF, 0xFFFD, 0xFFFD
+};
+
+/* Mazovia (Polish) aka CP620
+ * from "Mazowia to Unicode table", 04/24/96, Mikolaj Jedrzejak */
+static const wchar_t mazovia[] = {
+    /* Code point 0x9B is "zloty" symbol (z&#0142;), which is not
+     *   widely used and for which there is no Unicode equivalent.
+     * One reference shows 0xA8 as U+00A7 SECTION SIGN, but we're
+     *   told that's incorrect. */
+    0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x0105, 0x00E7,
+    0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0107, 0x00C4, 0x0104,
+    0x0118, 0x0119, 0x0142, 0x00F4, 0x00F6, 0x0106, 0x00FB, 0x00F9,
+    0x015a, 0x00D6, 0x00DC, 0xFFFD, 0x0141, 0x00A5, 0x015b, 0x0192,
+    0x0179, 0x017b, 0x00F3, 0x00d3, 0x0144, 0x0143, 0x017a, 0x017c,
+    0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
+    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
+    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+    0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4,
+    0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+    0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248,
+    0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
+};
+
+struct cp_list_item {
+    char *name;
+    int codepage;
+    int cp_size;
+    const wchar_t *cp_table;
+};
+
+static const struct cp_list_item cp_list[] = {
+    {"UTF-8", CP_UTF8},
+
+    {"ISO-8859-1:1998 (Latin-1, West Europe)", 0, 96, iso_8859_1},
+    {"ISO-8859-2:1999 (Latin-2, East Europe)", 0, 96, iso_8859_2},
+    {"ISO-8859-3:1999 (Latin-3, South Europe)", 0, 96, iso_8859_3},
+    {"ISO-8859-4:1998 (Latin-4, North Europe)", 0, 96, iso_8859_4},
+    {"ISO-8859-5:1999 (Latin/Cyrillic)", 0, 96, iso_8859_5},
+    {"ISO-8859-6:1999 (Latin/Arabic)", 0, 96, iso_8859_6},
+    {"ISO-8859-7:1987 (Latin/Greek)", 0, 96, iso_8859_7},
+    {"ISO-8859-8:1999 (Latin/Hebrew)", 0, 96, iso_8859_8},
+    {"ISO-8859-9:1999 (Latin-5, Turkish)", 0, 96, iso_8859_9},
+    {"ISO-8859-10:1998 (Latin-6, Nordic)", 0, 96, iso_8859_10},
+    {"ISO-8859-11:2001 (Latin/Thai)", 0, 96, iso_8859_11},
+    {"ISO-8859-13:1998 (Latin-7, Baltic)", 0, 96, iso_8859_13},
+    {"ISO-8859-14:1998 (Latin-8, Celtic)", 0, 96, iso_8859_14},
+    {"ISO-8859-15:1999 (Latin-9, \"euro\")", 0, 96, iso_8859_15},
+    {"ISO-8859-16:2001 (Latin-10, Balkan)", 0, 96, iso_8859_16},
+
+    {"KOI8-U", 0, 128, koi8_u},
+    {"KOI8-R", 20866},
+    {"HP-ROMAN8", 0, 96, roman8},
+    {"VSCII", 0, 256, vscii},
+    {"DEC-MCS", 0, 96, dec_mcs},
+
+    {"Win1250 (Central European)", 1250},
+    {"Win1251 (Cyrillic)", 1251},
+    {"Win1252 (Western)", 1252},
+    {"Win1253 (Greek)", 1253},
+    {"Win1254 (Turkish)", 1254},
+    {"Win1255 (Hebrew)", 1255},
+    {"Win1256 (Arabic)", 1256},
+    {"Win1257 (Baltic)", 1257},
+    {"Win1258 (Vietnamese)", 1258},
+
+    {"CP437", 437},
+    {"CP620 (Mazovia)", 0, 128, mazovia},
+    {"CP819", 28591},
+    {"CP852", 852},
+    {"CP878", 20866},
+
+    {"Use font encoding", -1},
+
+    {0, 0}
+};
+
+static void link_font(WCHAR * line_tbl, WCHAR * font_tbl, WCHAR attr);
+
+void init_ucs(Conf *conf, struct unicode_data *ucsdata)
+{
+    int i, j;
+    int used_dtf = 0;
+    int vtmode;
+
+    /* Decide on the Line and Font codepages */
+    ucsdata->line_codepage = decode_codepage(conf_get_str(conf,
+							  CONF_line_codepage));
+
+    if (ucsdata->font_codepage <= 0) { 
+	ucsdata->font_codepage=0; 
+	ucsdata->dbcs_screenfont=0; 
+    }
+
+    vtmode = conf_get_int(conf, CONF_vtmode);
+    if (vtmode == VT_OEMONLY) {
+	ucsdata->font_codepage = 437;
+	ucsdata->dbcs_screenfont = 0;
+	if (ucsdata->line_codepage <= 0)
+	    ucsdata->line_codepage = GetACP();
+    } else if (ucsdata->line_codepage <= 0)
+	ucsdata->line_codepage = ucsdata->font_codepage;
+
+    /* Collect screen font ucs table */
+    if (ucsdata->dbcs_screenfont || ucsdata->font_codepage == 0) {
+	get_unitab(ucsdata->font_codepage, ucsdata->unitab_font, 2);
+	for (i = 128; i < 256; i++)
+	    ucsdata->unitab_font[i] = (WCHAR) (CSET_ACP + i);
+    } else {
+	get_unitab(ucsdata->font_codepage, ucsdata->unitab_font, 1);
+
+	/* CP437 fonts are often broken ... */
+	if (ucsdata->font_codepage == 437)
+	    ucsdata->unitab_font[0] = ucsdata->unitab_font[255] = 0xFFFF;
+    }
+    if (vtmode == VT_XWINDOWS)
+	memcpy(ucsdata->unitab_font + 1, unitab_xterm_std,
+	       sizeof(unitab_xterm_std));
+
+    /* Collect OEMCP ucs table */
+    get_unitab(CP_OEMCP, ucsdata->unitab_oemcp, 1);
+
+    /* Collect CP437 ucs table for SCO acs */
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS)
+	memcpy(ucsdata->unitab_scoacs, ucsdata->unitab_oemcp,
+	       sizeof(ucsdata->unitab_scoacs));
+    else
+	get_unitab(437, ucsdata->unitab_scoacs, 1);
+
+    /* Collect line set ucs table */
+    if (ucsdata->line_codepage == ucsdata->font_codepage &&
+	(ucsdata->dbcs_screenfont ||
+	 vtmode == VT_POORMAN || ucsdata->font_codepage==0)) {
+
+	/* For DBCS and POOR fonts force direct to font */
+	used_dtf = 1;
+	for (i = 0; i < 32; i++)
+	    ucsdata->unitab_line[i] = (WCHAR) i;
+	for (i = 32; i < 256; i++)
+	    ucsdata->unitab_line[i] = (WCHAR) (CSET_ACP + i);
+	ucsdata->unitab_line[127] = (WCHAR) 127;
+    } else {
+	get_unitab(ucsdata->line_codepage, ucsdata->unitab_line, 0);
+    }
+
+#if 0
+    debug(
+	  ("Line cp%d, Font cp%d%s\n", ucsdata->line_codepage,
+	   ucsdata->font_codepage, ucsdata->dbcs_screenfont ? " DBCS" : ""));
+
+    for (i = 0; i < 256; i += 16) {
+	for (j = 0; j < 16; j++) {
+	    debug(("%04x%s", ucsdata->unitab_line[i + j], j == 15 ? "" : ","));
+	}
+	debug(("\n"));
+    }
+#endif
+
+    /* VT100 graphics - NB: Broken for non-ascii CP's */
+    memcpy(ucsdata->unitab_xterm, ucsdata->unitab_line,
+	   sizeof(ucsdata->unitab_xterm));
+    memcpy(ucsdata->unitab_xterm + '`', unitab_xterm_std,
+	   sizeof(unitab_xterm_std));
+    ucsdata->unitab_xterm['_'] = ' ';
+
+    /* Generate UCS ->line page table. */
+    if (ucsdata->uni_tbl) {
+	for (i = 0; i < 256; i++)
+	    if (ucsdata->uni_tbl[i])
+		sfree(ucsdata->uni_tbl[i]);
+	sfree(ucsdata->uni_tbl);
+	ucsdata->uni_tbl = 0;
+    }
+    if (!used_dtf) {
+	for (i = 0; i < 256; i++) {
+	    if (DIRECT_CHAR(ucsdata->unitab_line[i]))
+		continue;
+	    if (DIRECT_FONT(ucsdata->unitab_line[i]))
+		continue;
+	    if (!ucsdata->uni_tbl) {
+		ucsdata->uni_tbl = snewn(256, char *);
+		memset(ucsdata->uni_tbl, 0, 256 * sizeof(char *));
+	    }
+	    j = ((ucsdata->unitab_line[i] >> 8) & 0xFF);
+	    if (!ucsdata->uni_tbl[j]) {
+		ucsdata->uni_tbl[j] = snewn(256, char);
+		memset(ucsdata->uni_tbl[j], 0, 256 * sizeof(char));
+	    }
+	    ucsdata->uni_tbl[j][ucsdata->unitab_line[i] & 0xFF] = i;
+	}
+    }
+
+    /* Find the line control characters. */
+    for (i = 0; i < 256; i++)
+	if (ucsdata->unitab_line[i] < ' '
+	    || (ucsdata->unitab_line[i] >= 0x7F && 
+		ucsdata->unitab_line[i] < 0xA0))
+	    ucsdata->unitab_ctrl[i] = i;
+	else
+	    ucsdata->unitab_ctrl[i] = 0xFF;
+
+    /* Generate line->screen direct conversion links. */
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS)
+	link_font(ucsdata->unitab_scoacs, ucsdata->unitab_oemcp, CSET_OEMCP);
+
+    link_font(ucsdata->unitab_line, ucsdata->unitab_font, CSET_ACP);
+    link_font(ucsdata->unitab_scoacs, ucsdata->unitab_font, CSET_ACP);
+    link_font(ucsdata->unitab_xterm, ucsdata->unitab_font, CSET_ACP);
+
+    if (vtmode == VT_OEMANSI || vtmode == VT_XWINDOWS) {
+	link_font(ucsdata->unitab_line, ucsdata->unitab_oemcp, CSET_OEMCP);
+	link_font(ucsdata->unitab_xterm, ucsdata->unitab_oemcp, CSET_OEMCP);
+    }
+
+    if (ucsdata->dbcs_screenfont &&
+	ucsdata->font_codepage != ucsdata->line_codepage) {
+	/* F***ing Microsoft fonts, Japanese and Korean codepage fonts
+	 * have a currency symbol at 0x5C but their unicode value is 
+	 * still given as U+005C not the correct U+00A5. */
+	ucsdata->unitab_line['\\'] = CSET_OEMCP + '\\';
+    }
+
+    /* Last chance, if !unicode then try poorman links. */
+    if (vtmode != VT_UNICODE) {
+	static const char poorman_scoacs[] = 
+	    "CueaaaaceeeiiiAAE**ooouuyOUc$YPsaiounNao?++**!<>###||||++||++++++--|-+||++--|-+----++++++++##||#aBTPEsyt******EN=+><++-=... n2* ";
+	static const char poorman_latin1[] =
+	    " !cL.Y|S\"Ca<--R~o+23'u|.,1o>///?AAAAAAACEEEEIIIIDNOOOOOxOUUUUYPBaaaaaaaceeeeiiiionooooo/ouuuuypy";
+	static const char poorman_vt100[] = "*#****o~**+++++-----++++|****L.";
+
+	for (i = 160; i < 256; i++)
+	    if (!DIRECT_FONT(ucsdata->unitab_line[i]) &&
+		ucsdata->unitab_line[i] >= 160 &&
+		ucsdata->unitab_line[i] < 256) {
+		ucsdata->unitab_line[i] =
+		    (WCHAR) (CSET_ACP +
+			     poorman_latin1[ucsdata->unitab_line[i] - 160]);
+	    }
+	for (i = 96; i < 127; i++)
+	    if (!DIRECT_FONT(ucsdata->unitab_xterm[i]))
+		ucsdata->unitab_xterm[i] =
+	    (WCHAR) (CSET_ACP + poorman_vt100[i - 96]);
+	for(i=128;i<256;i++) 
+	    if (!DIRECT_FONT(ucsdata->unitab_scoacs[i]))
+		ucsdata->unitab_scoacs[i] = 
+		    (WCHAR) (CSET_ACP + poorman_scoacs[i - 128]);
+    }
+}
+
+static void link_font(WCHAR * line_tbl, WCHAR * font_tbl, WCHAR attr)
+{
+    int font_index, line_index, i;
+    for (line_index = 0; line_index < 256; line_index++) {
+	if (DIRECT_FONT(line_tbl[line_index]))
+	    continue;
+	for(i = 0; i < 256; i++) {
+	    font_index = ((32 + i) & 0xFF);
+	    if (line_tbl[line_index] == font_tbl[font_index]) {
+		line_tbl[line_index] = (WCHAR) (attr + font_index);
+		break;
+	    }
+	}
+    }
+}
+
+wchar_t xlat_uskbd2cyrllic(int ch)
+{
+    static const wchar_t cyrtab[] = {
+            0,      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, 0x042d,     35,     36,     37,     38, 0x044d,
+            40,     41,     42, 0x0406, 0x0431, 0x0454, 0x044e, 0x002e,
+            48,     49,     50,     51,     52,     53,     54,     55,
+            56,     57, 0x0416, 0x0436, 0x0411, 0x0456, 0x042e, 0x002c,
+            64, 0x0424, 0x0418, 0x0421, 0x0412, 0x0423, 0x0410, 0x041f,
+        0x0420, 0x0428, 0x041e, 0x041b, 0x0414, 0x042c, 0x0422, 0x0429,
+        0x0417, 0x0419, 0x041a, 0x042b, 0x0415, 0x0413, 0x041c, 0x0426,
+        0x0427, 0x041d, 0x042f, 0x0445, 0x0457, 0x044a,     94, 0x0404,
+            96, 0x0444, 0x0438, 0x0441, 0x0432, 0x0443, 0x0430, 0x043f,
+        0x0440, 0x0448, 0x043e, 0x043b, 0x0434, 0x044c, 0x0442, 0x0449,
+        0x0437, 0x0439, 0x043a, 0x044b, 0x0435, 0x0433, 0x043c, 0x0446,
+        0x0447, 0x043d, 0x044f, 0x0425, 0x0407, 0x042a,    126,    127
+       };
+    return cyrtab[ch&0x7F];
+}
+
+int check_compose_internal(int first, int second, int recurse)
+{
+
+    static const struct {
+	char first, second;
+        wchar_t composed;
+    } composetbl[] = {
+        {0x2b, 0x2b, 0x0023},
+        {0x41, 0x41, 0x0040},
+        {0x28, 0x28, 0x005b},
+        {0x2f, 0x2f, 0x005c},
+        {0x29, 0x29, 0x005d},
+        {0x28, 0x2d, 0x007b},
+        {0x2d, 0x29, 0x007d},
+        {0x2f, 0x5e, 0x007c},
+        {0x21, 0x21, 0x00a1},
+        {0x43, 0x2f, 0x00a2},
+        {0x43, 0x7c, 0x00a2},
+        {0x4c, 0x2d, 0x00a3},
+        {0x4c, 0x3d, 0x20a4},
+        {0x58, 0x4f, 0x00a4},
+        {0x58, 0x30, 0x00a4},
+        {0x59, 0x2d, 0x00a5},
+        {0x59, 0x3d, 0x00a5},
+        {0x7c, 0x7c, 0x00a6},
+        {0x53, 0x4f, 0x00a7},
+        {0x53, 0x21, 0x00a7},
+        {0x53, 0x30, 0x00a7},
+        {0x22, 0x22, 0x00a8},
+        {0x43, 0x4f, 0x00a9},
+        {0x43, 0x30, 0x00a9},
+        {0x41, 0x5f, 0x00aa},
+        {0x3c, 0x3c, 0x00ab},
+        {0x2c, 0x2d, 0x00ac},
+        {0x2d, 0x2d, 0x00ad},
+        {0x52, 0x4f, 0x00ae},
+        {0x2d, 0x5e, 0x00af},
+        {0x30, 0x5e, 0x00b0},
+        {0x2b, 0x2d, 0x00b1},
+        {0x32, 0x5e, 0x00b2},
+        {0x33, 0x5e, 0x00b3},
+        {0x27, 0x27, 0x00b4},
+        {0x2f, 0x55, 0x00b5},
+        {0x50, 0x21, 0x00b6},
+        {0x2e, 0x5e, 0x00b7},
+        {0x2c, 0x2c, 0x00b8},
+        {0x31, 0x5e, 0x00b9},
+        {0x4f, 0x5f, 0x00ba},
+        {0x3e, 0x3e, 0x00bb},
+        {0x31, 0x34, 0x00bc},
+        {0x31, 0x32, 0x00bd},
+        {0x33, 0x34, 0x00be},
+        {0x3f, 0x3f, 0x00bf},
+        {0x60, 0x41, 0x00c0},
+        {0x27, 0x41, 0x00c1},
+        {0x5e, 0x41, 0x00c2},
+        {0x7e, 0x41, 0x00c3},
+        {0x22, 0x41, 0x00c4},
+        {0x2a, 0x41, 0x00c5},
+        {0x41, 0x45, 0x00c6},
+        {0x2c, 0x43, 0x00c7},
+        {0x60, 0x45, 0x00c8},
+        {0x27, 0x45, 0x00c9},
+        {0x5e, 0x45, 0x00ca},
+        {0x22, 0x45, 0x00cb},
+        {0x60, 0x49, 0x00cc},
+        {0x27, 0x49, 0x00cd},
+        {0x5e, 0x49, 0x00ce},
+        {0x22, 0x49, 0x00cf},
+        {0x2d, 0x44, 0x00d0},
+        {0x7e, 0x4e, 0x00d1},
+        {0x60, 0x4f, 0x00d2},
+        {0x27, 0x4f, 0x00d3},
+        {0x5e, 0x4f, 0x00d4},
+        {0x7e, 0x4f, 0x00d5},
+        {0x22, 0x4f, 0x00d6},
+        {0x58, 0x58, 0x00d7},
+        {0x2f, 0x4f, 0x00d8},
+        {0x60, 0x55, 0x00d9},
+        {0x27, 0x55, 0x00da},
+        {0x5e, 0x55, 0x00db},
+        {0x22, 0x55, 0x00dc},
+        {0x27, 0x59, 0x00dd},
+        {0x48, 0x54, 0x00de},
+        {0x73, 0x73, 0x00df},
+        {0x60, 0x61, 0x00e0},
+        {0x27, 0x61, 0x00e1},
+        {0x5e, 0x61, 0x00e2},
+        {0x7e, 0x61, 0x00e3},
+        {0x22, 0x61, 0x00e4},
+        {0x2a, 0x61, 0x00e5},
+        {0x61, 0x65, 0x00e6},
+        {0x2c, 0x63, 0x00e7},
+        {0x60, 0x65, 0x00e8},
+        {0x27, 0x65, 0x00e9},
+        {0x5e, 0x65, 0x00ea},
+        {0x22, 0x65, 0x00eb},
+        {0x60, 0x69, 0x00ec},
+        {0x27, 0x69, 0x00ed},
+        {0x5e, 0x69, 0x00ee},
+        {0x22, 0x69, 0x00ef},
+        {0x2d, 0x64, 0x00f0},
+        {0x7e, 0x6e, 0x00f1},
+        {0x60, 0x6f, 0x00f2},
+        {0x27, 0x6f, 0x00f3},
+        {0x5e, 0x6f, 0x00f4},
+        {0x7e, 0x6f, 0x00f5},
+        {0x22, 0x6f, 0x00f6},
+        {0x3a, 0x2d, 0x00f7},
+        {0x6f, 0x2f, 0x00f8},
+        {0x60, 0x75, 0x00f9},
+        {0x27, 0x75, 0x00fa},
+        {0x5e, 0x75, 0x00fb},
+        {0x22, 0x75, 0x00fc},
+        {0x27, 0x79, 0x00fd},
+        {0x68, 0x74, 0x00fe},
+        {0x22, 0x79, 0x00ff},
+        /* Unicode extras. */
+        {0x6f, 0x65, 0x0153},
+        {0x4f, 0x45, 0x0152},
+        /* Compose pairs from UCS */
+        {0x41, 0x2D, 0x0100},
+        {0x61, 0x2D, 0x0101},
+        {0x43, 0x27, 0x0106},
+        {0x63, 0x27, 0x0107},
+        {0x43, 0x5E, 0x0108},
+        {0x63, 0x5E, 0x0109},
+        {0x45, 0x2D, 0x0112},
+        {0x65, 0x2D, 0x0113},
+        {0x47, 0x5E, 0x011C},
+        {0x67, 0x5E, 0x011D},
+        {0x47, 0x2C, 0x0122},
+        {0x67, 0x2C, 0x0123},
+        {0x48, 0x5E, 0x0124},
+        {0x68, 0x5E, 0x0125},
+        {0x49, 0x7E, 0x0128},
+        {0x69, 0x7E, 0x0129},
+        {0x49, 0x2D, 0x012A},
+        {0x69, 0x2D, 0x012B},
+        {0x4A, 0x5E, 0x0134},
+        {0x6A, 0x5E, 0x0135},
+        {0x4B, 0x2C, 0x0136},
+        {0x6B, 0x2C, 0x0137},
+        {0x4C, 0x27, 0x0139},
+        {0x6C, 0x27, 0x013A},
+        {0x4C, 0x2C, 0x013B},
+        {0x6C, 0x2C, 0x013C},
+        {0x4E, 0x27, 0x0143},
+        {0x6E, 0x27, 0x0144},
+        {0x4E, 0x2C, 0x0145},
+        {0x6E, 0x2C, 0x0146},
+        {0x4F, 0x2D, 0x014C},
+        {0x6F, 0x2D, 0x014D},
+        {0x52, 0x27, 0x0154},
+        {0x72, 0x27, 0x0155},
+        {0x52, 0x2C, 0x0156},
+        {0x72, 0x2C, 0x0157},
+        {0x53, 0x27, 0x015A},
+        {0x73, 0x27, 0x015B},
+        {0x53, 0x5E, 0x015C},
+        {0x73, 0x5E, 0x015D},
+        {0x53, 0x2C, 0x015E},
+        {0x73, 0x2C, 0x015F},
+        {0x54, 0x2C, 0x0162},
+        {0x74, 0x2C, 0x0163},
+        {0x55, 0x7E, 0x0168},
+        {0x75, 0x7E, 0x0169},
+        {0x55, 0x2D, 0x016A},
+        {0x75, 0x2D, 0x016B},
+        {0x55, 0x2A, 0x016E},
+        {0x75, 0x2A, 0x016F},
+        {0x57, 0x5E, 0x0174},
+        {0x77, 0x5E, 0x0175},
+        {0x59, 0x5E, 0x0176},
+        {0x79, 0x5E, 0x0177},
+        {0x59, 0x22, 0x0178},
+        {0x5A, 0x27, 0x0179},
+        {0x7A, 0x27, 0x017A},
+        {0x47, 0x27, 0x01F4},
+        {0x67, 0x27, 0x01F5},
+        {0x4E, 0x60, 0x01F8},
+        {0x6E, 0x60, 0x01F9},
+        {0x45, 0x2C, 0x0228},
+        {0x65, 0x2C, 0x0229},
+        {0x59, 0x2D, 0x0232},
+        {0x79, 0x2D, 0x0233},
+        {0x44, 0x2C, 0x1E10},
+        {0x64, 0x2C, 0x1E11},
+        {0x47, 0x2D, 0x1E20},
+        {0x67, 0x2D, 0x1E21},
+        {0x48, 0x22, 0x1E26},
+        {0x68, 0x22, 0x1E27},
+        {0x48, 0x2C, 0x1E28},
+        {0x68, 0x2C, 0x1E29},
+        {0x4B, 0x27, 0x1E30},
+        {0x6B, 0x27, 0x1E31},
+        {0x4D, 0x27, 0x1E3E},
+        {0x6D, 0x27, 0x1E3F},
+        {0x50, 0x27, 0x1E54},
+        {0x70, 0x27, 0x1E55},
+        {0x56, 0x7E, 0x1E7C},
+        {0x76, 0x7E, 0x1E7D},
+        {0x57, 0x60, 0x1E80},
+        {0x77, 0x60, 0x1E81},
+        {0x57, 0x27, 0x1E82},
+        {0x77, 0x27, 0x1E83},
+        {0x57, 0x22, 0x1E84},
+        {0x77, 0x22, 0x1E85},
+        {0x58, 0x22, 0x1E8C},
+        {0x78, 0x22, 0x1E8D},
+        {0x5A, 0x5E, 0x1E90},
+        {0x7A, 0x5E, 0x1E91},
+        {0x74, 0x22, 0x1E97},
+        {0x77, 0x2A, 0x1E98},
+        {0x79, 0x2A, 0x1E99},
+        {0x45, 0x7E, 0x1EBC},
+        {0x65, 0x7E, 0x1EBD},
+        {0x59, 0x60, 0x1EF2},
+        {0x79, 0x60, 0x1EF3},
+        {0x59, 0x7E, 0x1EF8},
+        {0x79, 0x7E, 0x1EF9},
+        /* Compatible/possibles from UCS */
+        {0x49, 0x4A, 0x0132},
+        {0x69, 0x6A, 0x0133},
+        {0x4C, 0x4A, 0x01C7},
+        {0x4C, 0x6A, 0x01C8},
+        {0x6C, 0x6A, 0x01C9},
+        {0x4E, 0x4A, 0x01CA},
+        {0x4E, 0x6A, 0x01CB},
+        {0x6E, 0x6A, 0x01CC},
+        {0x44, 0x5A, 0x01F1},
+        {0x44, 0x7A, 0x01F2},
+        {0x64, 0x7A, 0x01F3},
+        {0x2E, 0x2E, 0x2025},
+        {0x21, 0x21, 0x203C},
+        {0x3F, 0x21, 0x2048},
+        {0x21, 0x3F, 0x2049},
+        {0x52, 0x73, 0x20A8},
+        {0x4E, 0x6F, 0x2116},
+        {0x53, 0x4D, 0x2120},
+        {0x54, 0x4D, 0x2122},
+        {0x49, 0x49, 0x2161},
+        {0x49, 0x56, 0x2163},
+        {0x56, 0x49, 0x2165},
+        {0x49, 0x58, 0x2168},
+        {0x58, 0x49, 0x216A},
+        {0x69, 0x69, 0x2171},
+        {0x69, 0x76, 0x2173},
+        {0x76, 0x69, 0x2175},
+        {0x69, 0x78, 0x2178},
+        {0x78, 0x69, 0x217A},
+        {0x31, 0x30, 0x2469},
+        {0x31, 0x31, 0x246A},
+        {0x31, 0x32, 0x246B},
+        {0x31, 0x33, 0x246C},
+        {0x31, 0x34, 0x246D},
+        {0x31, 0x35, 0x246E},
+        {0x31, 0x36, 0x246F},
+        {0x31, 0x37, 0x2470},
+        {0x31, 0x38, 0x2471},
+        {0x31, 0x39, 0x2472},
+        {0x32, 0x30, 0x2473},
+        {0x31, 0x2E, 0x2488},
+        {0x32, 0x2E, 0x2489},
+        {0x33, 0x2E, 0x248A},
+        {0x34, 0x2E, 0x248B},
+        {0x35, 0x2E, 0x248C},
+        {0x36, 0x2E, 0x248D},
+        {0x37, 0x2E, 0x248E},
+        {0x38, 0x2E, 0x248F},
+        {0x39, 0x2E, 0x2490},
+        {0x64, 0x61, 0x3372},
+        {0x41, 0x55, 0x3373},
+        {0x6F, 0x56, 0x3375},
+        {0x70, 0x63, 0x3376},
+        {0x70, 0x41, 0x3380},
+        {0x6E, 0x41, 0x3381},
+        {0x6D, 0x41, 0x3383},
+        {0x6B, 0x41, 0x3384},
+        {0x4B, 0x42, 0x3385},
+        {0x4D, 0x42, 0x3386},
+        {0x47, 0x42, 0x3387},
+        {0x70, 0x46, 0x338A},
+        {0x6E, 0x46, 0x338B},
+        {0x6D, 0x67, 0x338E},
+        {0x6B, 0x67, 0x338F},
+        {0x48, 0x7A, 0x3390},
+        {0x66, 0x6D, 0x3399},
+        {0x6E, 0x6D, 0x339A},
+        {0x6D, 0x6D, 0x339C},
+        {0x63, 0x6D, 0x339D},
+        {0x6B, 0x6D, 0x339E},
+        {0x50, 0x61, 0x33A9},
+        {0x70, 0x73, 0x33B0},
+        {0x6E, 0x73, 0x33B1},
+        {0x6D, 0x73, 0x33B3},
+        {0x70, 0x56, 0x33B4},
+        {0x6E, 0x56, 0x33B5},
+        {0x6D, 0x56, 0x33B7},
+        {0x6B, 0x56, 0x33B8},
+        {0x4D, 0x56, 0x33B9},
+        {0x70, 0x57, 0x33BA},
+        {0x6E, 0x57, 0x33BB},
+        {0x6D, 0x57, 0x33BD},
+        {0x6B, 0x57, 0x33BE},
+        {0x4D, 0x57, 0x33BF},
+        {0x42, 0x71, 0x33C3},
+        {0x63, 0x63, 0x33C4},
+        {0x63, 0x64, 0x33C5},
+        {0x64, 0x42, 0x33C8},
+        {0x47, 0x79, 0x33C9},
+        {0x68, 0x61, 0x33CA},
+        {0x48, 0x50, 0x33CB},
+        {0x69, 0x6E, 0x33CC},
+        {0x4B, 0x4B, 0x33CD},
+        {0x4B, 0x4D, 0x33CE},
+        {0x6B, 0x74, 0x33CF},
+        {0x6C, 0x6D, 0x33D0},
+        {0x6C, 0x6E, 0x33D1},
+        {0x6C, 0x78, 0x33D3},
+        {0x6D, 0x62, 0x33D4},
+        {0x50, 0x48, 0x33D7},
+        {0x50, 0x52, 0x33DA},
+        {0x73, 0x72, 0x33DB},
+        {0x53, 0x76, 0x33DC},
+        {0x57, 0x62, 0x33DD},
+        {0x66, 0x66, 0xFB00},
+        {0x66, 0x69, 0xFB01},
+        {0x66, 0x6C, 0xFB02},
+        {0x73, 0x74, 0xFB06},
+        {0, 0, 0}
+    }, *c;
+
+    int nc = -1;
+
+    for (c = composetbl; c->first; c++) {
+	if (c->first == first && c->second == second)
+	    return c->composed;
+    }
+
+    if (recurse == 0) {
+	nc = check_compose_internal(second, first, 1);
+	if (nc == -1)
+	    nc = check_compose_internal(toupper(first), toupper(second), 1);
+	if (nc == -1)
+	    nc = check_compose_internal(toupper(second), toupper(first), 1);
+    }
+    return nc;
+}
+
+int check_compose(int first, int second)
+{
+    return check_compose_internal(first, second, 0);
+}
+
+int decode_codepage(char *cp_name)
+{
+    char *s, *d;
+    const struct cp_list_item *cpi;
+    int codepage = -1;
+    CPINFO cpinfo;
+
+    if (!cp_name || !*cp_name)
+        return CP_UTF8;                /* default */
+
+    for (cpi = cp_list; cpi->name; cpi++) {
+        s = cp_name;
+        d = cpi->name;
+        for (;;) {
+            while (*s && !isalnum(*s) && *s != ':')
+                s++;
+            while (*d && !isalnum(*d) && *d != ':')
+                d++;
+            if (*s == 0) {
+                codepage = cpi->codepage;
+                if (codepage == CP_UTF8)
+                    goto break_break;
+                if (codepage == -1)
+                    return codepage;
+                if (codepage == 0) {
+                    codepage = 65536 + (cpi - cp_list);
+                    goto break_break;
+                }
+
+                if (GetCPInfo(codepage, &cpinfo) != 0)
+                    goto break_break;
+            }
+            if (tolower((unsigned char)*s++) != tolower((unsigned char)*d++))
+                break;
+        }
+    }
+
+    d = cp_name;
+    if (tolower((unsigned char)d[0]) == 'c' &&
+        tolower((unsigned char)d[1]) == 'p')
+        d += 2;
+    if (tolower((unsigned char)d[0]) == 'i' &&
+        tolower((unsigned char)d[1]) == 'b' &&
+        tolower((unsigned char)d[2]) == 'm')
+        d += 3;
+    for (s = d; *s >= '0' && *s <= '9'; s++);
+    if (*s == 0 && s != d)
+        codepage = atoi(d);	       /* CP999 or IBM999 */
+
+    if (codepage == CP_ACP)
+        codepage = GetACP();
+    if (codepage == CP_OEMCP)
+        codepage = GetOEMCP();
+    if (codepage > 65535)
+        codepage = -2;
+
+  break_break:;
+    if (codepage != -1) {
+	if (codepage != CP_UTF8 && codepage < 65536) {
+	    if (GetCPInfo(codepage, &cpinfo) == 0) {
+		codepage = -2;
+	    } else if (cpinfo.MaxCharSize > 1)
+		codepage = -3;
+	}
+    }
+    if (codepage == -1 && *cp_name)
+	codepage = -2;
+    return codepage;
+}
+
+const char *cp_name(int codepage)
+{
+    const struct cp_list_item *cpi, *cpno;
+    static char buf[32];
+
+    if (codepage == -1) {
+	sprintf(buf, "Use font encoding");
+	return buf;
+    }
+
+    if (codepage > 0 && codepage < 65536)
+	sprintf(buf, "CP%03d", codepage);
+    else
+	*buf = 0;
+
+    if (codepage >= 65536) {
+	cpno = 0;
+	for (cpi = cp_list; cpi->name; cpi++)
+	    if (cpi == cp_list + (codepage - 65536)) {
+		cpno = cpi;
+		break;
+	    }
+	if (cpno)
+	    for (cpi = cp_list; cpi->name; cpi++) {
+		if (cpno->cp_table == cpi->cp_table)
+		    return cpi->name;
+	    }
+    } else {
+	for (cpi = cp_list; cpi->name; cpi++) {
+	    if (codepage == cpi->codepage)
+		return cpi->name;
+	}
+    }
+    return buf;
+}
+
+/*
+ * Return the nth code page in the list, for use in the GUI
+ * configurer.
+ */
+const char *cp_enumerate(int index)
+{
+    if (index < 0 || index >= lenof(cp_list))
+	return NULL;
+    return cp_list[index].name;
+}
+
+void get_unitab(int codepage, wchar_t * unitab, int ftype)
+{
+    char tbuf[4];
+    int i, max = 256, flg = MB_ERR_INVALID_CHARS;
+
+    if (ftype)
+	flg |= MB_USEGLYPHCHARS;
+    if (ftype == 2)
+	max = 128;
+
+    if (codepage == CP_UTF8) {
+	for (i = 0; i < max; i++)
+	    unitab[i] = i;
+	return;
+    }
+
+    if (codepage == CP_ACP)
+	codepage = GetACP();
+    else if (codepage == CP_OEMCP)
+	codepage = GetOEMCP();
+
+    if (codepage > 0 && codepage < 65536) {
+	for (i = 0; i < max; i++) {
+	    tbuf[0] = i;
+
+	    if (mb_to_wc(codepage, flg, tbuf, 1, unitab + i, 1)
+		!= 1)
+		unitab[i] = 0xFFFD;
+	}
+    } else {
+	int j = 256 - cp_list[codepage & 0xFFFF].cp_size;
+	for (i = 0; i < max; i++)
+	    unitab[i] = i;
+	for (i = j; i < max; i++)
+	    unitab[i] = cp_list[codepage & 0xFFFF].cp_table[i - j];
+    }
+}
+
+int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen,
+	     char *mbstr, int mblen, const char *defchr, int *defused,
+	     struct unicode_data *ucsdata)
+{
+    char *p;
+    int i;
+    if (ucsdata && codepage == ucsdata->line_codepage && ucsdata->uni_tbl) {
+	/* Do this by array lookup if we can. */
+	if (wclen < 0) {
+	    for (wclen = 0; wcstr[wclen++] ;);   /* will include the NUL */
+	}
+	for (p = mbstr, i = 0; i < wclen; i++) {
+	    wchar_t ch = wcstr[i];
+	    int by;
+	    char *p1;
+	    if (ucsdata->uni_tbl && (p1 = ucsdata->uni_tbl[(ch >> 8) & 0xFF])
+		&& (by = p1[ch & 0xFF]))
+		*p++ = by;
+	    else if (ch < 0x80)
+		*p++ = (char) ch;
+	    else if (defchr) {
+		int j;
+		for (j = 0; defchr[j]; j++)
+		    *p++ = defchr[j];
+		if (defused) *defused = 1;
+	    }
+#if 1
+	    else
+		*p++ = '.';
+#endif
+	    assert(p - mbstr < mblen);
+	}
+	return p - mbstr;
+    } else
+	return WideCharToMultiByte(codepage, flags, wcstr, wclen,
+				   mbstr, mblen, defchr, defused);
+}
+
+#endif
+
+int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
+	     wchar_t *wcstr, int wclen)
+{
+    return MultiByteToWideChar(codepage, flags, mbstr, mblen, wcstr, wclen);
+}
+
+int is_dbcs_leadbyte(int codepage, char byte)
+{
+    return IsDBCSLeadByteEx(codepage, byte);
+}