When doing manual underlining, underline the text in question rather than a box

[u/mdw/putty] / windows / winproxy.c

diff --git a/windows/winproxy.c b/windows/winproxy.c
index c8221ed..b1d3f6e 100644 (file)
--- a/windows/winproxy.c
+++ b/windows/winproxy.c
@@ -39,7 +39,7 @@ int localproxy_gotdata(struct handle *h, void *data, int len)
     } else if (len == 0) {
        return plug_closing(ps->plug, NULL, 0, 0);
     } else {
-       return plug_receive(ps->plug, 1, data, len);
+       return plug_receive(ps->plug, 0, data, len);
     }
 }
 
@@ -123,7 +123,7 @@ static const char *sk_localproxy_socket_error(Socket s)
 Socket platform_new_connection(SockAddr addr, char *hostname,
                               int port, int privport,
                               int oobinline, int nodelay, int keepalive,
-                              Plug plug, const Config *cfg)
+                              Plug plug, Conf *conf)
 {
     char *cmd;
 
@@ -145,10 +145,10 @@ Socket platform_new_connection(SockAddr addr, char *hostname,
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
 
-    if (cfg->proxy_type != PROXY_CMD)
+    if (conf_get_int(conf, CONF_proxy_type) != PROXY_CMD)
        return NULL;
 
-    cmd = format_telnet_command(addr, port, cfg);
+    cmd = format_telnet_command(addr, port, conf);
 
     {
        char *msg = dupprintf("Starting local proxy command: %s", cmd);
@@ -199,6 +199,8 @@ Socket platform_new_connection(SockAddr addr, char *hostname,
                  CREATE_NO_WINDOW | NORMAL_PRIORITY_CLASS,
                  NULL, NULL, &si, &pi);
 
+    sfree(cmd);
+
     CloseHandle(cmd_from_us);
     CloseHandle(cmd_to_us);