X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5321c0c69fbb8966982687d208ffc5f0c17ba191..604fab0c2d879947490eceb1b898b82be0fb0c00:/windows/winstuff.h diff --git a/windows/winstuff.h b/windows/winstuff.h index fbc9e5f6..f70b007e 100644 --- a/windows/winstuff.h +++ b/windows/winstuff.h @@ -28,7 +28,7 @@ struct FontSpec { }; #define BOXFLAGS DLGWINDOWEXTRA -#define BOXRESULT DLGWINDOWEXTRA + 4 +#define BOXRESULT (DLGWINDOWEXTRA + sizeof(LONG_PTR)) #define DF_END 0x0001 /* @@ -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 */ @@ -82,6 +85,7 @@ GLOBAL HINSTANCE hinst; */ GLOBAL char *help_path; GLOBAL int help_has_contents; +GLOBAL int requested_help; /* * The terminal and logging context are notionally local to the @@ -91,13 +95,7 @@ GLOBAL int help_has_contents; GLOBAL Terminal *term; GLOBAL void *logctx; -/* - * I've just looked in the windows standard headr files for WM_USER, there - * are hundreds of flags defined using the form WM_USER+123 so I've - * renumbered this NETEVENT value and the two in window.c - */ -#define WM_XUSER (WM_USER + 0x2000) -#define WM_NETEVENT (WM_XUSER + 5) +#define WM_NETEVENT (WM_APP + 5) /* * On Windows, we send MA_2CLK as the only event marking the second @@ -135,6 +133,15 @@ GLOBAL void *logctx; "All Files (*.*)\0*\0\0\0") /* + * On some versions of Windows, it has been known for WM_TIMER to + * occasionally get its callback time simply wrong, and call us + * back several minutes early. Defining these symbols enables + * compensation code in timing.c. + */ +#define TIMING_SYNC +#define TIMING_SYNC_TICKCOUNT + +/* * winnet.c dynamically loads WinSock 2 or WinSock 1 depending on * what it can get, which means any WinSock routines used outside * that module must be exported from it as function pointers. So @@ -170,6 +177,11 @@ struct ctlpos { /* * Exports from winutils.c. */ +typedef struct filereq_tag filereq; /* cwd for file requester */ +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); void split_into_argv(char *, int *, char ***, char ***); /* @@ -213,7 +225,8 @@ HWND doctl(struct ctlpos *cp, RECT r, void bartitle(struct ctlpos *cp, char *name, int id); void beginbox(struct ctlpos *cp, char *name, int idbox); void endbox(struct ctlpos *cp); -void multiedit(struct ctlpos *cp, int password, ...); +void editboxfw(struct ctlpos *cp, int password, char *text, + int staticid, int editid); void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...); void bareradioline(struct ctlpos *cp, int nacross, ...); void radiobig(struct ctlpos *cp, char *text, int id, ...); @@ -338,14 +351,6 @@ void show_help(HWND hwnd); /* * Exports from winmisc.c. */ - -int SaneDialogBox(HINSTANCE hinst, - LPCTSTR tmpl, - HWND hwndparent, - DLGPROC lpDialogFunc); - -void SaneEndDialog(HWND hwnd, int ret); - extern OSVERSIONINFO osVersion; BOOL init_winver(void);