First half of `pageant-async' work. agent_query() is now passed a

[u/mdw/putty] / pageantc.c

diff --git a/pageantc.c b/pageantc.c
index 82cfb20..d7dbfc0 100644 (file)
--- a/pageantc.c
+++ b/pageantc.c
@@ -33,7 +33,8 @@ int agent_exists(void)
        return TRUE;
 }
 
-void agent_query(void *in, int inlen, void **out, int *outlen)
+int agent_query(void *in, int inlen, void **out, int *outlen,
+               void (*callback)(void *, void *, int), void *callback_ctx)
 {
     HWND hwnd;
     char mapname[64];
@@ -48,12 +49,12 @@ void agent_query(void *in, int inlen, void **out, int *outlen)
     hwnd = FindWindow("Pageant", "Pageant");
     debug(("hwnd is %p\n", hwnd));
     if (!hwnd)
-       return;
-    sprintf(mapname, "PageantRequest%08x", GetCurrentThreadId());
+       return 1;                      /* *out == NULL, so failure */
+    sprintf(mapname, "PageantRequest%08x", (unsigned)GetCurrentThreadId());
     filemap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
                                0, AGENT_MAX_MSGLEN, mapname);
     if (!filemap)
-       return;
+       return 1;                      /* *out == NULL, so failure */
     p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0);
     memcpy(p, in, inlen);
     cds.dwData = AGENT_COPYDATA_ID;
@@ -64,7 +65,7 @@ void agent_query(void *in, int inlen, void **out, int *outlen)
     if (id > 0) {
        retlen = 4 + GET_32BIT(p);
        debug(("len is %d\n", retlen));
-       ret = smalloc(retlen);
+       ret = snewn(retlen, unsigned char);
        if (ret) {
            memcpy(ret, p, retlen);
            *out = ret;
@@ -73,6 +74,8 @@ void agent_query(void *in, int inlen, void **out, int *outlen)
     }
     UnmapViewOfFile(p);
     CloseHandle(filemap);
+
+    return 1;
 }
 
 #ifdef TESTMODE