X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6da411554bfe4c2a8ddfbb0616b0030ea5e813f5..77603464f5b4231df69eb20ca278062bd7aae9fb:/windows/winstuff.h diff --git a/windows/winstuff.h b/windows/winstuff.h index 693fd42e..5b44d6a1 100644 --- a/windows/winstuff.h +++ b/windows/winstuff.h @@ -57,6 +57,9 @@ typedef struct terminal_tag Terminal; #define PUTTY_REG_GPARENT "Software" #define PUTTY_REG_GPARENT_CHILD "SimonTatham" +#define PUTTY_HELP_FILE "putty.hlp" +#define PUTTY_HELP_CONTENTS "putty.cnt" + #define GETTICKCOUNT GetTickCount #define CURSORBLINK GetCaretBlinkTime() #define TICKSPERSEC 1000 /* GetTickCount returns milliseconds */ @@ -66,9 +69,10 @@ typedef struct terminal_tag Terminal; typedef HDC Context; /* - * Window handles for the dialog boxes that can be running during a + * Window handles for the windows that can be running during a * PuTTY session. */ +GLOBAL HWND hwnd; /* the main terminal window */ GLOBAL HWND logbox; /* @@ -117,11 +121,11 @@ GLOBAL void *logctx; /* * sk_getxdmdata() does not exist under Windows (not that I * couldn't write it if I wanted to, but I haven't bothered), so - * it's a macro which always returns FALSE. With any luck this will + * it's a macro which always returns NULL. With any luck this will * cause the compiler to notice it can optimise away the * implementation of XDM-AUTHORIZATION-1 in x11fwd.c :-) */ -#define sk_getxdmdata(socket, ip, port) (0) +#define sk_getxdmdata(socket, lenp) (NULL) /* * File-selector filter strings used in the config box. On Windows, @@ -150,6 +154,8 @@ extern int (WINAPI *p_WSAGetLastError)(void); extern int (WINAPI *p_WSAEnumNetworkEvents) (SOCKET s, WSAEVENT hEventObject, LPWSANETWORKEVENTS lpNetworkEvents); +extern int socket_writable(SOCKET skt); + /* * Exports from winctrls.c. */ @@ -325,7 +331,7 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help, */ void defuse_showwindow(void); int do_config(void); -int do_reconfig(HWND); +int do_reconfig(HWND, int); void showeventlog(HWND); void showabout(HWND); void force_normal(HWND hwnd);