Grow some nasty warts on the side of winhandl.c, in preparation for

[PuTTY.git] / windows / winhandl.c

diff --git a/windows/winhandl.c b/windows/winhandl.c
index 305f9971539800f986bc4b1eec630fbc4ad5d4a0..fc641812a1b024a943f3d9318bb17aa4c3912add 100644 (file)
--- a/windows/winhandl.c
+++ b/windows/winhandl.c
@@ -18,13 +18,6 @@
  * when one completes.
  */
 
-/*
- * TODO:
- *
- *  - could do with some sort of private-data field in each handle
- *    structure.
- */
-
 #include <assert.h>
 
 #include "putty.h"
@@ -58,6 +51,7 @@ struct handle_generic {
     int done;                         /* request subthread to terminate */
     int defunct;                      /* has the subthread already gone? */
     int busy;                         /* operation currently in progress? */
+    void *privdata;                   /* for client to remember who they are */
 };
 
 /* ----------------------------------------------------------------------
@@ -78,6 +72,12 @@ struct handle_input {
     int done;                         /* request subthread to terminate */
     int defunct;                      /* has the subthread already gone? */
     int busy;                         /* operation currently in progress? */
+    void *privdata;                   /* for client to remember who they are */
+
+    /*
+     * Data set at initialisation and then read-only.
+     */
+    int flags;
 
     /*
      * Data set by the input thread before signalling ev_to_main,
@@ -100,13 +100,28 @@ struct handle_input {
 static DWORD WINAPI handle_input_threadfunc(void *param)
 {
     struct handle_input *ctx = (struct handle_input *) param;
+    OVERLAPPED ovl, *povl;
+
+    if (ctx->flags & HANDLE_FLAG_OVERLAPPED)
+       povl = &ovl;
+    else
+       povl = NULL;
 
     while (1) {
+       if (povl)
+           memset(povl, 0, sizeof(OVERLAPPED));
        ctx->readret = ReadFile(ctx->h, ctx->buffer, sizeof(ctx->buffer),
-                               &ctx->len, NULL);
+                               &ctx->len, povl);
+       if (povl && !ctx->readret && GetLastError() == ERROR_IO_PENDING)
+           ctx->readret = GetOverlappedResult(ctx->h, povl, &ctx->len, TRUE);
+
        if (!ctx->readret)
            ctx->len = 0;
 
+       if (ctx->readret && ctx->len == 0 &&
+           (ctx->flags & HANDLE_FLAG_IGNOREEOF))
+           continue;
+
        SetEvent(ctx->ev_to_main);
 
        if (!ctx->len)
@@ -127,7 +142,8 @@ static DWORD WINAPI handle_input_threadfunc(void *param)
  */
 static void handle_throttle(struct handle_input *ctx, int backlog)
 {
-    assert(!ctx->defunct);
+    if (ctx->defunct)
+       return;
 
     /*
      * If there's a read operation already in progress, do nothing:
@@ -165,6 +181,12 @@ struct handle_output {
     int done;                         /* request subthread to terminate */
     int defunct;                      /* has the subthread already gone? */
     int busy;                         /* operation currently in progress? */
+    void *privdata;                   /* for client to remember who they are */
+
+    /*
+     * Data set at initialisation and then read-only.
+     */
+    int flags;
 
     /*
      * Data set by the main thread before signalling ev_from_main,
@@ -195,6 +217,12 @@ struct handle_output {
 static DWORD WINAPI handle_output_threadfunc(void *param)
 {
     struct handle_output *ctx = (struct handle_output *) param;
+    OVERLAPPED ovl, *povl;
+
+    if (ctx->flags & HANDLE_FLAG_OVERLAPPED)
+       povl = &ovl;
+    else
+       povl = NULL;
 
     while (1) {
        WaitForSingleObject(ctx->ev_from_main, INFINITE);
@@ -202,8 +230,14 @@ static DWORD WINAPI handle_output_threadfunc(void *param)
            SetEvent(ctx->ev_to_main);
            break;
        }
+       if (povl)
+           memset(povl, 0, sizeof(OVERLAPPED));
        ctx->writeret = WriteFile(ctx->h, ctx->buffer, ctx->len,
-                                 &ctx->lenwritten, NULL);
+                                 &ctx->lenwritten, povl);
+       if (povl && !ctx->writeret && GetLastError() == ERROR_IO_PENDING)
+           ctx->writeret = GetOverlappedResult(ctx->h, povl,
+                                               &ctx->lenwritten, TRUE);
+
        SetEvent(ctx->ev_to_main);
        if (!ctx->writeret)
            break;
@@ -267,7 +301,8 @@ static int handle_find_evtomain(void *av, void *bv)
        return 0;
 }
 
-struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata)
+struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata,
+                               void *privdata, int flags)
 {
     struct handle *h = snew(struct handle);
 
@@ -276,10 +311,11 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata)
     h->u.i.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL);
     h->u.i.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL);
     h->u.i.gotdata = gotdata;
-    h->u.i.busy = FALSE;
     h->u.i.defunct = FALSE;
     h->u.i.moribund = FALSE;
     h->u.i.done = FALSE;
+    h->u.i.privdata = privdata;
+    h->u.i.flags = flags;
 
     if (!handles_by_evtomain)
        handles_by_evtomain = newtree234(handle_cmp_evtomain);
@@ -287,13 +323,13 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata)
 
     CreateThread(NULL, 0, handle_input_threadfunc,
                 &h->u.i, 0, NULL);
-
-    handle_throttle(&h->u.i, 0);       /* start first read operation */
+    h->u.i.busy = TRUE;
 
     return h;
 }
 
-struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata)
+struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata,
+                                void *privdata, int flags)
 {
     struct handle *h = snew(struct handle);
 
@@ -305,8 +341,10 @@ struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata)
     h->u.o.defunct = FALSE;
     h->u.o.moribund = FALSE;
     h->u.o.done = FALSE;
+    h->u.o.privdata = privdata;
     bufchain_init(&h->u.o.queued_data);
     h->u.o.sentdata = sentdata;
+    h->u.o.flags = flags;
 
     if (!handles_by_evtomain)
        handles_by_evtomain = newtree234(handle_cmp_evtomain);
@@ -393,6 +431,7 @@ void handle_free(struct handle *h)
         */
        h->u.g.moribund = TRUE;
        h->u.g.done = TRUE;
+       h->u.g.busy = TRUE;
        SetEvent(h->u.g.ev_from_main);
     }
 }
@@ -426,6 +465,7 @@ void handle_got_event(HANDLE event)
            handle_destroy(h);
        } else {
            h->u.g.done = TRUE;
+           h->u.g.busy = TRUE;
            SetEvent(h->u.g.ev_from_main);
        }
        return;
@@ -484,3 +524,8 @@ int handle_backlog(struct handle *h)
     assert(h->output);
     return bufchain_size(&h->u.o.queued_data);
 }
+
+void *handle_get_privdata(struct handle *h)
+{
+    return h->u.g.privdata;
+}