X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/34292b1daab0fcd6ce02627497117d01aaa39a19..b3d375b244187cd77f45dc013668e6273e133179:/windows/winstuff.h diff --git a/windows/winstuff.h b/windows/winstuff.h index 5f974dc3..99bda104 100644 --- a/windows/winstuff.h +++ b/windows/winstuff.h @@ -18,7 +18,7 @@ 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]; @@ -36,6 +36,9 @@ struct FontSpec { (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 @@ -71,6 +74,33 @@ struct FontSpec { #define DF_END 0x0001 /* + * Dynamically linked functions. These come in two flavours: + * + * - GET_WINDOWS_FUNCTION does not expose "name" to the preprocessor, + * so will always dynamically link against exactly what is specified + * in "name". If you're not sure, use this one. + * + * - GET_WINDOWS_FUNCTION_PP allows "name" to be redirected via + * preprocessor definitions like "#define foo bar"; this is principally + * intended for the ANSI/Unicode DoSomething/DoSomethingA/DoSomethingW. + * If your function has an argument of type "LPTSTR" or similar, this + * is the variant to use. + * (However, it can't always be used, as it trips over more complicated + * macro trickery such as the WspiapiGetAddrInfo wrapper for getaddrinfo.) + * + * (DECL_WINDOWS_FUNCTION works with both these variants.) + */ +#define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params) \ + typedef rettype (WINAPI *t_##name) params; \ + linkage t_##name p_##name +#define STR1(x) #x +#define STR(x) STR1(x) +#define GET_WINDOWS_FUNCTION_PP(module, name) \ + p_##name = module ? (t_##name) GetProcAddress(module, STR(name)) : NULL +#define GET_WINDOWS_FUNCTION(module, name) \ + p_##name = module ? (t_##name) GetProcAddress(module, #name) : NULL + +/* * Global variables. Most modules declare these `extern', but * window.c will do `#define PUTTY_DO_GLOBALS' before including this * module, and so will get them properly defined. @@ -97,6 +127,7 @@ typedef struct terminal_tag Terminal; #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 @@ -107,6 +138,25 @@ typedef struct terminal_tag Terminal; typedef HDC Context; +typedef unsigned int uint32; /* int is 32-bits on Win32 and Win64. */ +#define PUTTY_UINT32_DEFINED + +#ifndef NO_GSSAPI +/* + * GSS-API stuff + */ +#define GSS_CC CALLBACK +/* +typedef struct Ssh_gss_buf { + size_t 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. @@ -120,11 +170,13 @@ GLOBAL HWND logbox; 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 @@ -186,19 +238,21 @@ GLOBAL void *logctx; * that module must be exported from it as function pointers. So * here they are. */ -extern int (WINAPI *p_WSAAsyncSelect) - (SOCKET s, HWND hWnd, u_int wMsg, long lEvent); -extern int (WINAPI *p_WSAEventSelect) - (SOCKET s, WSAEVENT hEventObject, long lNetworkEvents); -extern int (WINAPI *p_select) - (int nfds, fd_set FAR * readfds, fd_set FAR * writefds, - fd_set FAR *exceptfds, const struct timeval FAR * timeout); -extern int (WINAPI *p_WSAGetLastError)(void); -extern int (WINAPI *p_WSAEnumNetworkEvents) - (SOCKET s, WSAEVENT hEventObject, LPWSANETWORKEVENTS lpNetworkEvents); +DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAAsyncSelect, + (SOCKET, HWND, u_int, long)); +DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAEventSelect, + (SOCKET, WSAEVENT, long)); +DECL_WINDOWS_FUNCTION(GLOBAL, int, select, + (int, fd_set FAR *, fd_set FAR *, + fd_set FAR *, const struct timeval FAR *)); +DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAGetLastError, (void)); +DECL_WINDOWS_FUNCTION(GLOBAL, int, WSAEnumNetworkEvents, + (SOCKET, WSAEVENT, LPWSANETWORKEVENTS)); extern int socket_writable(SOCKET skt); +extern void socket_reselect_all(void); + /* * Exports from winctrls.c. */ @@ -373,7 +427,7 @@ void dp_cleanup(struct dlgparam *dp); * Exports from wincfg.c. */ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help, - int midsession); + int midsession, int protocol); /* * Exports from windlg.c. @@ -408,17 +462,23 @@ void init_ucs(Config *, struct unicode_data *); /* * Exports from winhandl.c. */ +#define HANDLE_FLAG_OVERLAPPED 1 +#define HANDLE_FLAG_IGNOREEOF 2 +#define HANDLE_FLAG_UNITBUFFER 4 struct handle; typedef int (*handle_inputfn_t)(struct handle *h, void *data, int len); typedef void (*handle_outputfn_t)(struct handle *h, int new_backlog); -struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata); -struct handle *handle_output_new(HANDLE handle, handle_outputfn_t sentdata); +struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata, + void *privdata, int flags); +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); HANDLE *handle_get_events(int *nevents); void handle_free(struct handle *h); void handle_got_event(HANDLE event); void handle_unthrottle(struct handle *h, int backlog); int handle_backlog(struct handle *h); +void *handle_get_privdata(struct handle *h); /* * pageantc.c needs to schedule callbacks for asynchronous agent @@ -432,4 +492,9 @@ void agent_schedule_callback(void (*callback)(void *, void *, int), void *callback_ctx, void *data, int len); #define FLAG_SYNCAGENT 0x1000 +/* + * Exports from winser.c. + */ +extern Backend serial_backend; + #endif