~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Corey Stup: when we're declaring stuff for WSAAddressToStringA, we should
[sgt/putty]
/
windows
/
winstuff.h
diff --git
a/windows/winstuff.h
b/windows/winstuff.h
index
4436972
..
64f3232
100644
(file)
--- a/
windows/winstuff.h
+++ b/
windows/winstuff.h
@@
-18,7
+18,7
@@
struct Filename {
char path[FILENAME_MAX];
};
struct Filename {
char path[FILENAME_MAX];
};
-#define f_open(filename, mode) ( fopen((filename).path, (mode)) )
+#define f_open(filename, mode
, isprivate
) ( fopen((filename).path, (mode)) )
struct FontSpec {
char name[64];
struct FontSpec {
char name[64];
@@
-36,6
+36,9
@@
struct FontSpec {
(fq) == FQ_NONANTIALIASED ? NONANTIALIASED_QUALITY : \
CLEARTYPE_QUALITY)
(fq) == FQ_NONANTIALIASED ? NONANTIALIASED_QUALITY : \
CLEARTYPE_QUALITY)
+#define PLATFORM_IS_UTF16 /* enable UTF-16 processing when exchanging
+ * wchar_t strings with environment */
+
/*
* Where we can, we use GetWindowLongPtr and friends because they're
* more useful on 64-bit platforms, but they're a relatively recent
/*
* Where we can, we use GetWindowLongPtr and friends because they're
* more useful on 64-bit platforms, but they're a relatively recent
@@
-97,6
+100,7
@@
typedef struct terminal_tag Terminal;
#define PUTTY_REG_GPARENT_CHILD "SimonTatham"
#define PUTTY_HELP_FILE "putty.hlp"
#define PUTTY_REG_GPARENT_CHILD "SimonTatham"
#define PUTTY_HELP_FILE "putty.hlp"
+#define PUTTY_CHM_FILE "putty.chm"
#define PUTTY_HELP_CONTENTS "putty.cnt"
#define GETTICKCOUNT GetTickCount
#define PUTTY_HELP_CONTENTS "putty.cnt"
#define GETTICKCOUNT GetTickCount
@@
-107,6
+111,19
@@
typedef struct terminal_tag Terminal;
typedef HDC Context;
typedef HDC Context;
+#ifndef NO_GSSAPI
+/*
+ * GSS-API stuff
+ */
+typedef struct Ssh_gss_buf {
+ int length;
+ char *value;
+} Ssh_gss_buf;
+
+#define SSH_GSS_EMPTY_BUF (Ssh_gss_buf) {0,NULL}
+typedef void *Ssh_gss_name;
+#endif
+
/*
* Window handles for the windows that can be running during a
* PuTTY session.
/*
* Window handles for the windows that can be running during a
* PuTTY session.
@@
-120,11
+137,13
@@
GLOBAL HWND logbox;
GLOBAL HINSTANCE hinst;
/*
GLOBAL HINSTANCE hinst;
/*
- *
Details of the help file
.
+ *
Help file stuff in winhelp.c
.
*/
*/
-GLOBAL char *help_path;
-GLOBAL int help_has_contents;
-GLOBAL int requested_help;
+void init_help(void);
+void shutdown_help(void);
+int has_help(void);
+void launch_help(HWND hwnd, const char *topic);
+void quit_help(HWND hwnd);
/*
* The terminal and logging context are notionally local to the
/*
* The terminal and logging context are notionally local to the
@@
-199,6
+218,8
@@
extern int (WINAPI *p_WSAEnumNetworkEvents)
extern int socket_writable(SOCKET skt);
extern int socket_writable(SOCKET skt);
+extern void socket_reselect_all(void);
+
/*
* Exports from winctrls.c.
*/
/*
* Exports from winctrls.c.
*/