Merge remote-tracking branch 'origin/released'

Conflicts:
	tools/plink/sshbn.c

1 files changed, 18 insertions, 6 deletions

diff --git a/tools/plink/winstuff.h b/tools/plink/winstuff.h
index 1cc48348e..d2d65a47f 100644
--- a/tools/plink/winstuff.h
+++ b/tools/plink/winstuff.h
@@ -16,16 +16,18 @@
 #include "winhelp.h"

 

 struct Filename {

-    char path[FILENAME_MAX];

+    char *path;

 };

-#define f_open(filename, mode, isprivate) ( fopen((filename).path, (mode)) )

+#define f_open(filename, mode, isprivate) ( fopen((filename)->path, (mode)) )

 

 struct FontSpec {

-    char name[64];

+    char *name;

     int isbold;

     int height;

     int charset;

 };

+struct FontSpec *fontspec_new(const char *name,

+                               int bold, int height, int charset);

 

 #ifndef CLEARTYPE_QUALITY

 #define CLEARTYPE_QUALITY 5

@@ -115,7 +117,7 @@ struct FontSpec {
 

 #ifndef DONE_TYPEDEFS

 #define DONE_TYPEDEFS

-typedef struct config_tag Config;

+typedef struct conf_tag Conf;

 typedef struct backend_tag Backend;

 typedef struct terminal_tag Terminal;

 #endif

@@ -285,6 +287,7 @@ BOOL request_file(filereq *state, OPENFILENAME *of, int preserve, int save);
 filereq *filereq_new(void);

 void filereq_free(filereq *state);

 int message_box(LPCTSTR text, LPCTSTR caption, DWORD style, DWORD helpctxid);

+char *GetDlgItemText_alloc(HWND hwnd, int id);

 void split_into_argv(char *, int *, char ***, char ***);

 

 /*

@@ -473,7 +476,7 @@ void EnableSizeTip(int bEnable);
  * Exports from unicode.c.

  */

 struct unicode_data;

-void init_ucs(Config *, struct unicode_data *);

+void init_ucs(Conf *, struct unicode_data *);

 

 /*

  * Exports from winhandl.c.

@@ -489,6 +492,7 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata,
 struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata,

 				 void *privdata, int flags);

 int handle_write(struct handle *h, const void *data, int len);

+void handle_write_eof(struct handle *h);

 HANDLE *handle_get_events(int *nevents);

 void handle_free(struct handle *h);

 void handle_got_event(HANDLE event);

@@ -497,7 +501,7 @@ int handle_backlog(struct handle *h);
 void *handle_get_privdata(struct handle *h);

 

 /*

- * pageantc.c needs to schedule callbacks for asynchronous agent

+ * winpgntc.c needs to schedule callbacks for asynchronous agent

  * requests. This has to be done differently in GUI and console, so

  * there's an exported function used for the purpose.

  * 

@@ -509,6 +513,14 @@ void agent_schedule_callback(void (*callback)(void *, void *, int),
 #define FLAG_SYNCAGENT 0x1000

 

 /*

+ * winpgntc.c also exports these two functions which are used by the

+ * server side of Pageant as well, to get the user SID for comparing

+ * with clients'.

+ */

+int init_advapi(void);  /* initialises everything needed by get_user_sid */

+PSID get_user_sid(void);

+

+/*

  * Exports from winser.c.

  */

 extern Backend serial_backend;