From fc2d3e430aeb622b97af645c40589716166e7a34 Mon Sep 17 00:00:00 2001 From: cyd01 Date: Mon, 6 Mar 2023 16:52:29 +0100 Subject: [PATCH] Update pre0.77 --- 0.76b_My_PuTTY/version.h | 2 +- 0.76b_My_PuTTY/windows/MAKEFILE.MINGW | 640 ++++++++++-------- .../windows/{winpgntc.c => agent-client.c} | 0 0.76b_My_PuTTY/windows/{wingss.c => gss.c} | 0 .../windows/{winhandl.c => handle-io.c} | 0 .../windows/{winhsock.c => handle-socket.c} | 0 0.76b_My_PuTTY/windows/{winhelp.c => help.c} | 0 0.76b_My_PuTTY/windows/{winhelp.h => help.h} | 0 .../windows/{winhelp.rc2 => help.rc2} | 0 .../windows/{winjump.c => jump-list.c} | 0 .../windows/{winnpc.c => named-pipe-client.c} | 0 .../windows/{winnps.c => named-pipe-server.c} | 0 .../windows/{winnet.c => network.c} | 1 + .../windows/{winnojmp.c => no-jump-list.c} | 0 .../windows/{winnohlp.c => nohelp.c} | 0 .../windows/{winnoise.c => noise.c} | 0 .../windows/{winpgnt.c => pageant.c} | 0 0.76b_My_PuTTY/windows/pageant.rc | 2 +- 0.76b_My_PuTTY/windows/platform.h | 0 .../windows/{winplink.c => plink.c} | 0 .../windows/{winprint.c => printing.c} | 0 0.76b_My_PuTTY/windows/putty.rc | 2 +- .../windows/{winpgen.c => puttygen.c} | 0 0.76b_My_PuTTY/windows/puttygen.rc | 2 +- 0.76b_My_PuTTY/windows/puttytel.rc | 2 +- 0.76b_My_PuTTY/windows/{ => utils}/defaults.c | 0 .../windows/utils/dll_hijacking_protection.c | 43 ++ 0.76b_My_PuTTY/windows/utils/dputs.c | 39 ++ .../windows/utils/escape_registry_key.c | 48 ++ 0.76b_My_PuTTY/windows/utils/filename.c | 54 ++ 0.76b_My_PuTTY/windows/utils/fontspec.c | 39 ++ 0.76b_My_PuTTY/windows/utils/get_username.c | 77 +++ .../windows/utils/is_console_handle.c | 13 + .../windows/utils/load_system32_dll.c | 32 + .../windows/{winmiscs.c => utils/minefield.c} | 76 +-- .../utils/open_for_write_would_lose_data.c | 47 ++ .../windows/utils/platform_get_x_display.c | 12 + .../windows/utils/registry_get_string.c | 43 ++ 0.76b_My_PuTTY/windows/utils/smemclr.c | 52 ++ 0.76b_My_PuTTY/windows/utils/strtoumax.c | 12 + 0.76b_My_PuTTY/windows/utils/version.c | 45 ++ 0.76b_My_PuTTY/windows/utils/win_strerror.c | 72 ++ 0.76b_My_PuTTY/windows/version_minor.txt | 2 +- 0.76b_My_PuTTY/windows/winmisc.c | 467 ------------- 0.76b_My_PuTTY/windows/winstuff.h | 2 +- blocnote/notepad.a | Bin 32498 -> 32498 bytes 46 files changed, 986 insertions(+), 840 deletions(-) rename 0.76b_My_PuTTY/windows/{winpgntc.c => agent-client.c} (100%) rename 0.76b_My_PuTTY/windows/{wingss.c => gss.c} (100%) rename 0.76b_My_PuTTY/windows/{winhandl.c => handle-io.c} (100%) rename 0.76b_My_PuTTY/windows/{winhsock.c => handle-socket.c} (100%) rename 0.76b_My_PuTTY/windows/{winhelp.c => help.c} (100%) rename 0.76b_My_PuTTY/windows/{winhelp.h => help.h} (100%) rename 0.76b_My_PuTTY/windows/{winhelp.rc2 => help.rc2} (100%) rename 0.76b_My_PuTTY/windows/{winjump.c => jump-list.c} (100%) rename 0.76b_My_PuTTY/windows/{winnpc.c => named-pipe-client.c} (100%) rename 0.76b_My_PuTTY/windows/{winnps.c => named-pipe-server.c} (100%) rename 0.76b_My_PuTTY/windows/{winnet.c => network.c} (99%) rename 0.76b_My_PuTTY/windows/{winnojmp.c => no-jump-list.c} (100%) rename 0.76b_My_PuTTY/windows/{winnohlp.c => nohelp.c} (100%) rename 0.76b_My_PuTTY/windows/{winnoise.c => noise.c} (100%) rename 0.76b_My_PuTTY/windows/{winpgnt.c => pageant.c} (100%) create mode 100644 0.76b_My_PuTTY/windows/platform.h rename 0.76b_My_PuTTY/windows/{winplink.c => plink.c} (100%) rename 0.76b_My_PuTTY/windows/{winprint.c => printing.c} (100%) rename 0.76b_My_PuTTY/windows/{winpgen.c => puttygen.c} (100%) rename 0.76b_My_PuTTY/windows/{ => utils}/defaults.c (100%) create mode 100644 0.76b_My_PuTTY/windows/utils/dll_hijacking_protection.c create mode 100644 0.76b_My_PuTTY/windows/utils/dputs.c create mode 100644 0.76b_My_PuTTY/windows/utils/escape_registry_key.c create mode 100644 0.76b_My_PuTTY/windows/utils/filename.c create mode 100644 0.76b_My_PuTTY/windows/utils/fontspec.c create mode 100644 0.76b_My_PuTTY/windows/utils/get_username.c create mode 100644 0.76b_My_PuTTY/windows/utils/is_console_handle.c create mode 100644 0.76b_My_PuTTY/windows/utils/load_system32_dll.c rename 0.76b_My_PuTTY/windows/{winmiscs.c => utils/minefield.c} (77%) create mode 100644 0.76b_My_PuTTY/windows/utils/open_for_write_would_lose_data.c create mode 100644 0.76b_My_PuTTY/windows/utils/platform_get_x_display.c create mode 100644 0.76b_My_PuTTY/windows/utils/registry_get_string.c create mode 100644 0.76b_My_PuTTY/windows/utils/smemclr.c create mode 100644 0.76b_My_PuTTY/windows/utils/strtoumax.c create mode 100644 0.76b_My_PuTTY/windows/utils/version.c create mode 100644 0.76b_My_PuTTY/windows/utils/win_strerror.c delete mode 100644 0.76b_My_PuTTY/windows/winmisc.c diff --git a/0.76b_My_PuTTY/version.h b/0.76b_My_PuTTY/version.h index acd2ee8..fa909fb 100644 --- a/0.76b_My_PuTTY/version.h +++ b/0.76b_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.76 #define TEXTVER "Release 0.76" #define SSHVER "-Release-0.76" -#define BINARY_VERSION 0,76,1,4 +#define BINARY_VERSION 0,76,1,5 #define SOURCE_COMMIT "unavailable" diff --git a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW index f456df9..d340fb5 100644 --- a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW @@ -1,4 +1,5 @@ # Makefile for putty under MinGW, Cygwin, or Winelib. +# Makefile for putty under MinGW, Cygwin, or Winelib. # # This file was created by `mkfiles.pl' from the `Recipe' file. # DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead. @@ -204,10 +205,11 @@ pageant.exe: aqsync.o be_misc.o callback.o conf.o ecc-arithmetic.o errsock.o mar argon2.o pubkey-ppk.o blake2.o des.o dsa.o \ ecc-ssh.o hmac.o md5.o sshpubk.o rsa.o sha256.o \ sha512.o sha1.o sha3.o stripctrl.o tree234.o utils.o \ - version.o wcwidth.o cryptoapi.o winhandl.o winhelp.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnpc.o winnps.o \ - winpgnt.o winpgntc.o winsecur.o winselgui.o winutils.o \ + version.o wcwidth.o cryptoapi.o handle-io.o help.o \ + handle-socket.o network.o named-pipe-client.o named-pipe-server.o \ + winpageant.o agent-client.o winsecur.o winselgui.o winutils.o \ notiming.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o winversion.o win_strerror.o \ kitty_commun.o kitty_crypt.o kitty_registry.o $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pageant.map aqsync.o \ be_misc.o callback.o conf.o ecc-arithmetic.o errsock.o marshal.o \ @@ -215,10 +217,11 @@ pageant.exe: aqsync.o be_misc.o callback.o conf.o ecc-arithmetic.o errsock.o mar argon2.o pubkey-ppk.o blake2.o des.o dsa.o \ ecc-ssh.o hmac.o md5.o sshpubk.o rsa.o sha256.o \ sha512.o sha1.o sha3.o stripctrl.o tree234.o utils.o \ - version.o wcwidth.o cryptoapi.o winhandl.o winhelp.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnpc.o winnps.o \ - winpgnt.o winpgntc.o winsecur.o winselgui.o winutils.o \ + version.o wcwidth.o cryptoapi.o handle-io.o help.o \ + handle-socket.o network.o named-pipe-client.o named-pipe-server.o \ + winpageant.o agent-client.o winsecur.o winselgui.o winutils.o \ notiming.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o winversion.o win_strerror.o \ kitty_commun.o kitty_crypt.o kitty_registry.o \ ../../bcrypt/bcrypt.a ../../mini/mini.a \ -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lole32 -lshell32 \ @@ -244,10 +247,11 @@ plink.exe: agentf.o aqsync.o \ sshutils.o verstring.o zlib.o stripctrl.o supdup.o \ telnet.o timing.o tree234.o utils.o version.o wcwidth.o \ wildcard.o cryptoapi.o cliloop.o wincons.o defaults.o \ - wingss.o winhandl.o winhsock.o winmisc.o winmiscs.o winnet.o \ - winnohlp.o winnoise.o winnojmp.o winnpc.o winnps.o \ - winpgntc.o winplink.o winproxy.o winsecur.o winselcli.o \ + gss.o handle-io.o handle-socket.o network.o \ + nohelp.o noise.o no-jump-list.o named-pipe-client.o named-pipe-server.o \ + agent-client.o plink.o winproxy.o winsecur.o winselcli.o \ winser.o winshare.o winstore.o wintime.o winucs.o winx11.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ x11fwd.o \ adb.o kitty_registry.o kitty_commun.o kitty_proxy.o kitty_ssh.o kitty_store.o kitty_tools.o $(CC) $(LDFLAGS) -o $@ -Wl,-Map,plink.map agentf.o aqsync.o \ @@ -270,11 +274,12 @@ plink.exe: agentf.o aqsync.o \ sha1.o sha3.o sharing.o sshutils.o verstring.o \ zlib.o stripctrl.o supdup.o telnet.o timing.o tree234.o \ utils.o version.o wcwidth.o wildcard.o cryptoapi.o \ - cliloop.o wincons.o defaults.o wingss.o winhandl.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnohlp.o \ - winnoise.o winnojmp.o winnpc.o winnps.o winpgntc.o \ - winplink.o winproxy.o winsecur.o winselcli.o winser.o \ + cliloop.o wincons.o defaults.o gss.o handle-io.o \ + handle-socket.o network.o nohelp.o \ + noise.o no-jump-list.o named-pipe-client.o named-pipe-server.o agent-client.o \ + plink.o winproxy.o winsecur.o winselcli.o winser.o \ winshare.o winstore.o wintime.o winucs.o winx11.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ adb.o kitty_registry.o kitty_commun.o kitty_proxy.o kitty_ssh.o kitty_store.o kitty_tools.o \ ../../base64/base64.a ../../bcrypt/bcrypt.a ../../mini/mini.a \ -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lole32 -lshell32 \ @@ -297,11 +302,12 @@ pscp.exe: agentf.o aqsync.o be_misc.o be_ssh.o callback.o clicons.o \ rsa.o sha256.o sha512.o sha1.o sha3.o sharing.o \ sshutils.o verstring.o zlib.o stripctrl.o timing.o \ tree234.o utils.o version.o wcwidth.o wildcard.o cryptoapi.o \ - cliloop.o wincons.o defaults.o wingss.o winhandl.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnohlp.o \ - winnoise.o winnojmp.o winnpc.o winnps.o winpgntc.o \ + cliloop.o wincons.o defaults.o gss.o handle-io.o \ + handle-socket.o network.o nohelp.o \ + noise.o no-jump-list.o named-pipe-client.o named-pipe-server.o agent-client.o \ winproxy.o winsecur.o winselcli.o winsftp.o winshare.o \ winstore.o wintime.o winucs.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ kitty_commun.o kitty_ssh.o kitty_tools.o kitty_registry.o kitty_store.o $(CC) $(LDFLAGS) -o $@ -Wl,-Map,pscp.map agentf.o aqsync.o be_misc.o \ be_ssh.o callback.o clicons.o cmdline.o conf.o console.o \ @@ -320,10 +326,11 @@ pscp.exe: agentf.o aqsync.o be_misc.o be_ssh.o callback.o clicons.o \ sha3.o sharing.o sshutils.o verstring.o zlib.o \ stripctrl.o timing.o tree234.o utils.o version.o wcwidth.o \ wildcard.o cryptoapi.o cliloop.o wincons.o defaults.o \ - wingss.o winhandl.o winhsock.o winmisc.o winmiscs.o winnet.o \ - winnohlp.o winnoise.o winnojmp.o winnpc.o winnps.o \ - winpgntc.o winproxy.o winsecur.o winselcli.o winsftp.o \ + gss.o handle-io.o handle-socket.o network.o \ + nohelp.o noise.o no-jump-list.o named-pipe-client.o named-pipe-server.o \ + agent-client.o winproxy.o winsecur.o winselcli.o winsftp.o \ winshare.o winstore.o wintime.o winucs.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ kitty_commun.o kitty_ssh.o kitty_tools.o kitty_registry.o kitty_store.o \ ../../base64/base64.a ../../bcrypt/bcrypt.a ../../mini/mini.a \ -ladvapi32 -lcomdlg32 -lgdi32 -limm32 \ @@ -346,11 +353,12 @@ psftp.exe: agentf.o aqsync.o be_misc.o be_ssh.o callback.o clicons.o \ rsa.o sha256.o sha512.o sha1.o sha3.o sharing.o \ sshutils.o verstring.o zlib.o stripctrl.o timing.o \ tree234.o utils.o version.o wcwidth.o wildcard.o cryptoapi.o \ - cliloop.o wincons.o defaults.o wingss.o winhandl.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnohlp.o \ - winnoise.o winnojmp.o winnpc.o winnps.o winpgntc.o \ + cliloop.o wincons.o defaults.o gss.o handle-io.o \ + handle-socket.o network.o nohelp.o \ + noise.o no-jump-list.o named-pipe-client.o named-pipe-server.o agent-client.o \ winproxy.o winsecur.o winselcli.o winsftp.o winshare.o \ winstore.o wintime.o winucs.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ kitty_commun.o kitty_ssh.o kitty_tools.o kitty_registry.o kitty_store.o $(CC) $(LDFLAGS) -o $@ -Wl,-Map,psftp.map agentf.o aqsync.o \ be_misc.o be_ssh.o callback.o clicons.o cmdline.o conf.o \ @@ -369,11 +377,12 @@ psftp.exe: agentf.o aqsync.o be_misc.o be_ssh.o callback.o clicons.o \ sha1.o sha3.o sharing.o sshutils.o verstring.o \ zlib.o stripctrl.o timing.o tree234.o utils.o version.o \ wcwidth.o wildcard.o cryptoapi.o cliloop.o wincons.o \ - defaults.o wingss.o winhandl.o winhsock.o winmisc.o \ - winmiscs.o winnet.o winnohlp.o winnoise.o winnojmp.o \ - winnpc.o winnps.o winpgntc.o winproxy.o winsecur.o \ + defaults.o gss.o handle-io.o handle-socket.o \ + network.o nohelp.o noise.o no-jump-list.o \ + named-pipe-client.o named-pipe-server.o agent-client.o winproxy.o winsecur.o \ winselcli.o winsftp.o winshare.o winstore.o wintime.o \ winucs.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o is_console_handle.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o win_strerror.o \ -ladvapi32 -lcomdlg32 -lgdi32 -limm32 \ -lole32 -lshell32 -luser32 \ kitty_commun.o kitty_ssh.o kitty_tools.o kitty_registry.o kitty_store.o \ @@ -384,14 +393,14 @@ psocks.exe: be_misc.o callback.o conf.o console.o errsock.o logging.o \ marshal.o memory.o misc.o nocproxy.o norand.o portfwd.o \ proxy.o psocks.o sshutils.o stripctrl.o ltime.o timing.o \ tree234.o utils.o version.o wcwidth.o cliloop.o wincons.o \ - winhandl.o winhsock.o winmisc.o winmiscs.o winnet.o \ - winnohlp.o winproxy.o winselcli.o winsocks.o + handle-io.o handle-socket.o network.o \ + nohelp.o winproxy.o winselcli.o winsocks.o $(CC) $(LDFLAGS) -o $@ -Wl,-Map,psocks.map be_misc.o callback.o \ conf.o console.o errsock.o logging.o marshal.o memory.o \ misc.o nocproxy.o norand.o portfwd.o proxy.o psocks.o \ sshutils.o stripctrl.o ltime.o timing.o tree234.o utils.o \ - version.o wcwidth.o cliloop.o wincons.o winhandl.o \ - winhsock.o winmisc.o winmiscs.o winnet.o winnohlp.o \ + version.o wcwidth.o cliloop.o wincons.o handle-io.o \ + handle-socket.o network.o nohelp.o \ kitty_commun.o kitty_tools.o \ winproxy.o winselcli.o winsocks.o -ladvapi32 -lcomdlg32 \ -lgdi32 -limm32 -lole32 -lshell32 -luser32 \ @@ -414,16 +423,17 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ sshutils.o verstring.o zlib.o stripctrl.o supdup.o \ telnet.o terminal.o timing.o tree234.o utils.o version.o \ wcwidth.o wildcard.o cryptoapi.o wincfg.o controls.o defaults.o \ - windlg.o window.o wingss.o winhandl.o winhelp.o winhsock.o \ - winjump.o winmisc.o winmiscs.o winnet.o winnoise.o winnpc.o \ - winnps.o winpgntc.o winprint.o winproxy.o winsecur.o \ + windlg.o window.o gss.o handle-io.o help.o handle-socket.o \ + jump-list.o network.o noise.o named-pipe-client.o \ + named-pipe-server.o agent-client.o printing.o winproxy.o winsecur.o \ winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o winversion.o win_strerror.o \ adb.o \ cencode.o cdecode.o \ kitty.o kitty_commun.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o winpzmodem.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ @@ -444,16 +454,17 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ sshutils.o verstring.o zlib.o stripctrl.o supdup.o \ telnet.o terminal.o timing.o tree234.o utils.o version.o \ wcwidth.o wildcard.o cryptoapi.o wincfg.o controls.o defaults.o \ - windlg.o window.o wingss.o winhandl.o winhelp.o winhsock.o \ - winjump.o winmisc.o winmiscs.o winnet.o winnoise.o winnpc.o \ - winnps.o winpgntc.o winprint.o winproxy.o winsecur.o \ + windlg.o window.o gss.o handle-io.o help.o handle-socket.o \ + jump-list.o network.o noise.o named-pipe-client.o \ + named-pipe-server.o agent-client.o printing.o winproxy.o winsecur.o \ winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o winversion.o win_strerror.o \ adb.o \ cencode.o cdecode.o \ kitty.o kitty_commun.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o winpzmodem.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) \ ../../base64/base64.a ../../bcrypt/bcrypt.a ../../blocnote/notepad.a ../../jpeg/libjpeg.a \ @@ -471,9 +482,10 @@ puttygen.exe: conf.o ecc-arithmetic.o import.o marshal.o memory.o millerrabin.o dsa.o cryptodsa.o ecc-ssh.o ecdsa.o hmac.o md5.o \ prime.o prng.o sshpubk.o sshrand.o rsa.o rsag.o \ sha256.o sha512.o sha1.o sha3.o stripctrl.o \ - tree234.o utils.o version.o wcwidth.o controls.o winhelp.o \ - winmisc.o winmiscs.o winnoise.o winnojmp.o winpgen.o \ + tree234.o utils.o version.o wcwidth.o controls.o help.o \ + noise.o no-jump-list.o puttygen.o \ winsecur.o winstore.o wintime.o winutils.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o load_system32_dll.o win_strerror.o \ kitty_commun.o kitty_crypt.o kitty_registry.o kitty_keygen.o kitty_store.o kitty_tools.o $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttygen.map conf.o ecc-arithmetic.o \ import.o marshal.o memory.o millerrabin.o misc.o mpint.o \ @@ -483,9 +495,10 @@ puttygen.exe: conf.o ecc-arithmetic.o import.o marshal.o memory.o millerrabin.o dsa.o cryptodsa.o ecc-ssh.o ecdsa.o hmac.o md5.o \ prime.o prng.o sshpubk.o sshrand.o rsa.o rsag.o \ sha256.o sha512.o sha1.o sha3.o stripctrl.o \ - tree234.o utils.o version.o wcwidth.o controls.o winhelp.o \ - winmisc.o winmiscs.o winnoise.o winnojmp.o winpgen.o \ + tree234.o utils.o version.o wcwidth.o controls.o help.o \ + noise.o no-jump-list.o puttygen.o \ winsecur.o winstore.o wintime.o winutils.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o load_system32_dll.o win_strerror.o \ kitty_commun.o kitty_crypt.o kitty_registry.o kitty_keygen.o kitty_store.o kitty_tools.o \ ../../bcrypt/bcrypt.a ../../mini/mini.a \ -ladvapi32 \ @@ -497,9 +510,9 @@ puttytel.exe: be_misc.o be_nos_s.o callback.o cmdline.o conf.o config.o \ pinger.o proxy.o puttytel.res.o raw.o rlogin.o sessprep.o \ settings.o sizetip.o stripctrl.o supdup.o telnet.o \ terminal.o timing.o tree234.o utils.o version.o wcwidth.o \ - wincfg.o controls.o defaults.o windlg.o window.o winhandl.o \ - winhelp.o winhsock.o winjump.o winmisc.o winmiscs.o winnet.o \ - winprint.o winproxy.o winsecur.o winselgui.o winser.o \ + wincfg.o controls.o defaults.o windlg.o window.o handle-io.o \ + help.o handle-socket.o jump-list.o network.o \ + printing.o winproxy.o winsecur.o winselgui.o winser.o \ winstore.o wintime.o winucs.o winutils.o $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttytel.map be_misc.o \ be_nos_s.o callback.o cmdline.o conf.o config.o dialog.o \ @@ -508,8 +521,8 @@ puttytel.exe: be_misc.o be_nos_s.o callback.o cmdline.o conf.o config.o \ proxy.o puttytel.res.o raw.o rlogin.o sessprep.o settings.o \ sizetip.o stripctrl.o supdup.o telnet.o terminal.o timing.o \ tree234.o utils.o version.o wcwidth.o wincfg.o controls.o \ - defaults.o windlg.o window.o winhandl.o winhelp.o winhsock.o \ - winjump.o winmisc.o winmiscs.o winnet.o winprint.o \ + defaults.o windlg.o window.o handle-io.o help.o handle-socket.o \ + jump-list.o network.o printing.o \ winproxy.o winsecur.o winselgui.o winser.o winstore.o \ wintime.o winucs.o winutils.o \ -ladvapi32 -lcomdlg32 -lgdi32 \ @@ -521,7 +534,7 @@ testcrypt.exe: ecc-arithmetic.o marshal.o memory.o millerrabin.o mpint.o mpunsaf crc32.o crc-attack-detector.o des.o diffie-hellman.o dsa.o cryptodsa.o \ ecc-ssh.o ecdsa.o hmac.o md5.o prime.o prng.o \ sshpubk.o rsa.o rsag.o sha256.o sha512.o sha1.o \ - sha3.o testcrypt.o tree234.o utils.o winmiscs.o + sha3.o testcrypt.o tree234.o utils.o $(CC) $(LDFLAGS) -o $@ -Wl,-Map,testcrypt.map ecc-arithmetic.o marshal.o \ memory.o millerrabin.o mpint.o mpunsafe.o pockle.o \ primecandidate.o smallprimes.o aes.o arcfour.o \ @@ -529,113 +542,113 @@ testcrypt.exe: ecc-arithmetic.o marshal.o memory.o millerrabin.o mpint.o mpunsaf crc32.o crc-attack-detector.o des.o diffie-hellman.o dsa.o cryptodsa.o \ ecc-ssh.o ecdsa.o hmac.o md5.o prime.o prng.o \ sshpubk.o rsa.o rsag.o sha256.o sha512.o sha1.o \ - sha3.o testcrypt.o tree234.o utils.o winmiscs.o + sha3.o testcrypt.o tree234.o utils.o agentf.o: ../ssh/agentf.c ../putty.h ../ssh.h ../pageant.h ../ssh/channel.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/agentf.c aqsync.o: ../aqsync.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../aqsync.c be_all_s.o: ../be_all_s.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../be_all_s.c be_misc.o: ../be_misc.c ../putty.h ../network.h ../defs.h ../puttyps.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../be_misc.c be_none.o: ../be_none.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../be_none.c be_nos_s.o: ../be_nos_s.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../be_nos_s.c be_ssh.o: ../be_ssh.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../be_ssh.c callback.o: ../callback.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../callback.c cgtest.o: ../cgtest.c ../cmdgen.c ../putty.h ../ssh.h ../sshkeygen.h \ ../mpint.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../cgtest.c clicons.o: ../clicons.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../clicons.c cmdgen.o: ../cmdgen.c ../putty.h ../ssh.h ../sshkeygen.h ../mpint.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../cmdgen.c cmdline.o: ../cmdline.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../cmdline.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` conf.o: ../utils/conf.c ../tree234.h ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/conf.c config.o: ../config.c ../putty.h ../dialog.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../config.c console.o: ../console.c ../putty.h ../misc.h ../console.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../windows/winstuff.h ../unix/unix.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../console.c cproxy.o: ../proxy/cproxy.c ../putty.h ../ssh.h ../network.h ../proxy/proxy.h \ ../marshal.h ../defs.h ../puttyps.h ../misc.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../proxy/cproxy.c dialog.o: ../dialog.c ../putty.h ../dialog.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../dialog.c ecc-arithmetic.o: ../crypto/ecc-arithmetic.c ../ssh.h ../mpint.h ../crypto/ecc.h ../puttymem.h ../tree234.h \ @@ -646,7 +659,7 @@ ecc-arithmetic.o: ../crypto/ecc-arithmetic.c ../ssh.h ../mpint.h ../crypto/ecc.h errsock.o: ../errsock.c ../tree234.h ../putty.h ../network.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../errsock.c fromucs.o: ../charset/fromucs.c ../charset/charset.h ../charset/internal.h @@ -655,14 +668,14 @@ fromucs.o: ../charset/fromucs.c ../charset/charset.h ../charset/internal.h fuzzterm.o: ../fuzzterm.c ../putty.h ../dialog.h ../terminal/terminal.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../tree234.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../fuzzterm.c gtkapp.o: ../unix/gtkapp.c ../putty.h ../unix/gtkmisc.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkapp.c @@ -670,13 +683,13 @@ gtkask.o: ../unix/gtkask.c ../defs.h ../unix/gtkfont.h ../unix/gtkcompat.h \ ../unix/gtkmisc.h ../putty.h ../ssh.h ../misc.h ../puttyps.h \ ../network.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkask.c gtkcfg.o: ../unix/gtkcfg.c ../putty.h ../dialog.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkcfg.c @@ -687,7 +700,7 @@ gtkcomm.o: ../unix/gtkcomm.c ../putty.h ../terminal/terminal.h ../unix/gtkcompat ../unix/gtkfont.h ../unix/gtkmisc.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../tree234.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkcomm.c gtkdlg.o: ../unix/gtkdlg.c ../putty.h ../unix/gtkcompat.h ../unix/gtkcols.h \ @@ -695,7 +708,7 @@ gtkdlg.o: ../unix/gtkdlg.c ../putty.h ../unix/gtkcompat.h ../unix/gtkcols.h \ ../storage.h ../dialog.h ../tree234.h ../licence.h ../ssh.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkdlg.c @@ -703,7 +716,7 @@ gtkfont.o: ../unix/gtkfont.c ../putty.h ../unix/gtkfont.h \ ../unix/gtkcompat.h ../unix/gtkmisc.h ../tree234.h \ ../unix/x11misc.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkfont.c @@ -711,14 +724,14 @@ gtkmain.o: ../unix/gtkmain.c ../putty.h ../terminal/terminal.h ../unix/gtkcompat ../unix/gtkfont.h ../unix/gtkmisc.h ../unix/x11misc.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../tree234.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkmain.c gtkmisc.o: ../unix/gtkmisc.c ../putty.h ../unix/gtkcompat.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkmisc.c @@ -726,21 +739,21 @@ gtkwin.o: ../unix/gtkwin.c ../putty.h ../terminal/terminal.h ../unix/gtkcompat.h ../unix/gtkfont.h ../unix/gtkmisc.h ../unix/x11misc.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../tree234.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/gtkwin.c import.o: ../import.c ../putty.h ../ssh.h ../mpint.h ../misc.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../import.c ldisc.o: ../ldisc.c ../putty.h ../terminal/terminal.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../tree234.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ldisc.c @@ -750,7 +763,7 @@ localenc.o: ../charset/localenc.c ../charset/charset.h ../charset/internal.h logging.o: ../logging.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../logging.c macenc.o: ../charset/macenc.c ../charset/charset.h ../charset/internal.h @@ -760,7 +773,7 @@ mainchan.o: ../ssh/mainchan.c ../putty.h ../ssh.h ../ssh/ppl.h ../ssh/channel.h ../ssh/signal-list.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/mainchan.c marshal.o: ../utils/marshal.c ../marshal.h ../misc.h ../defs.h ../puttymem.h @@ -780,19 +793,19 @@ mimeenc.o: ../charset/mimeenc.c ../charset/charset.h ../charset/internal.h bidi.o: ../terminal/bidi.c ../putty.h ../misc.h ../defs.h ../puttyps.h \ ../network.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../windows/winstuff.h ../unix/unix.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../terminal/bidi.c misc.o: ../utils/misc.c ../defs.h ../putty.h ../misc.h ../puttyps.h ../network.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../windows/winstuff.h ../unix/unix.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/misc.c dup_mb_to_wc.o: ../utils/dup_mb_to_wc.c ../putty.h ../misc.h ../defs.h ../puttyps.h \ ../network.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../windows/winstuff.h ../unix/unix.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/dup_mb_to_wc.c mpint.o: ../crypto/mpint.c ../defs.h ../misc.h ../puttymem.h ../mpint.h \ @@ -806,43 +819,43 @@ mpunsafe.o: ../keygen/mpunsafe.c ../defs.h ../misc.h ../puttymem.h ../mpint.h \ nocmdline.o: ../nocmdline.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../nocmdline.c nocproxy.o: ../proxy/nocproxy.c ../putty.h ../network.h ../proxy/proxy.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../proxy/nocproxy.c nogss.o: ../nogss.c ../putty.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../nogss.c norand.o: ../norand.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../norand.c noterm.o: ../stubs/noterm.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../tree234.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../stubs/noterm.c notiming.o: ../stubs/notiming.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../stubs/notiming.c nullplug.o: ../stubs/nullplug.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../stubs/nullplug.c osxlaunch.o: ../unix/osxlaunch.c @@ -852,11 +865,11 @@ pageant.o: ../pageant.c ../putty.h ../mpint.h ../ssh.h ../sshcr.h \ ../pageant.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../pageant.c pageant.res.o: ../windows/pageant.rc ../windows/rcstuff.h \ - ../windows/pageant-rc.h ../windows/winhelp.rc2 \ + ../windows/pageant-rc.h ../windows/help.rc2 \ ../windows/pageant.ico ../windows/pageants.ico \ ../windows/version.rc2 ../windows/pageant.mft \ ../windows/putty-rc.h ../version.h ../licence.h @@ -865,13 +878,13 @@ pageant.res.o: ../windows/pageant.rc ../windows/rcstuff.h \ pgssapi.o: ../ssh/pgssapi.c ../putty.h ../ssh/pgssapi.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/pgssapi.c pinger.o: ../pinger.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../pinger.c plink.res.o: ../windows/plink.rc ../windows/rcstuff.h ../windows/putty.ico \ @@ -886,7 +899,7 @@ pockle.o: ../keygen/pockle.c ../ssh.h ../sshkeygen.h ../mpint.h ../keygen/mpunsa portfwd.o: ../ssh/portfwd.c ../putty.h ../ssh.h ../ssh/channel.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/portfwd.c @@ -901,13 +914,13 @@ procnet.o: ../unix/procnet.c ../misc.h ../defs.h ../puttymem.h ../marshal.h proxy.o: ../proxy/proxy.c ../putty.h ../network.h ../proxy/proxy.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../proxy/proxy.c pscp.o: ../pscp.c ../putty.h ../psftp.h ../ssh.h ../ssh/sftp.h ../storage.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../pscp.c @@ -918,7 +931,7 @@ pscp.res.o: ../windows/pscp.rc ../windows/rcstuff.h ../windows/pscp.ico \ psftp.o: ../psftp.c ../putty.h ../psftp.h ../storage.h ../ssh.h ../ssh/sftp.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../psftp.c @@ -929,18 +942,18 @@ psftp.res.o: ../windows/psftp.rc ../windows/rcstuff.h ../windows/pscp.ico \ psftpcommon.o: ../psftpcommon.c ../putty.h ../ssh/sftp.h ../psftp.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../psftpcommon.c psocks.o: ../psocks.c ../putty.h ../misc.h ../ssh.h ../ssh/channel.h ../psocks.h \ ../defs.h ../puttyps.h ../network.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../psocks.c -putty.res.o: ../windows/putty.rc ../windows/rcstuff.h ../windows/winhelp.rc2 \ +putty.res.o: ../windows/putty.rc ../windows/rcstuff.h ../windows/help.rc2 \ ../windows/putty-common.rc2 ../windows/putty.mft \ ../windows/putty-rc.h ../windows/putty.ico \ ../windows/puttycfg.ico ../windows/version.rc2 ../version.h \ @@ -949,13 +962,13 @@ putty.res.o: ../windows/putty.rc ../windows/rcstuff.h ../windows/winhelp.rc2 \ $(RC) $(RCFL) $(RCFLAGS) ../windows/putty.rc -o putty.res.o -DMOD_INTEGRATED_AGENT -DMOD_INTEGRATED_KEYGEN puttygen.res.o: ../windows/puttygen.rc ../windows/rcstuff.h \ - ../windows/winhelp.rc2 ../windows/puttygen.ico \ + ../windows/help.rc2 ../windows/puttygen.ico \ ../windows/version.rc2 ../windows/puttygen.mft \ ../windows/putty-rc.h ../version.h ../licence.h $(RC) $(RCFL) $(RCFLAGS) ../windows/puttygen.rc -o puttygen.res.o -DMOD_INTEGRATED_KEYGEN puttytel.res.o: ../windows/puttytel.rc ../windows/rcstuff.h \ - ../windows/winhelp.rc2 ../windows/putty-common.rc2 \ + ../windows/help.rc2 ../windows/putty-common.rc2 \ ../windows/puttytel.mft ../windows/putty-rc.h \ ../windows/putty.ico ../windows/puttycfg.ico \ ../windows/version.rc2 ../version.h ../licence.h @@ -964,13 +977,13 @@ puttytel.res.o: ../windows/puttytel.rc ../windows/rcstuff.h \ raw.o: ../otherbackends/raw.c ../putty.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../otherbackends/raw.c rlogin.o: ../otherbackends/rlogin.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../otherbackends/rlogin.c sbcs.o: ../charset/sbcs.c ../charset/charset.h ../charset/internal.h @@ -983,27 +996,27 @@ scpserver.o: ../ssh/scpserver.c ../putty.h ../ssh.h ../sshcr.h ../ssh/channel.h ../sftp.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/scpserver.c sesschan.o: ../ssh/sesschan.c ../putty.h ../ssh.h ../ssh/channel.h ../ssh/server.h \ ../sftp.h ../ssh/signal-list.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/sesschan.c sessprep.o: ../utils/sessprep.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/sessprep.c settings.o: ../settings.c ../putty.h ../storage.h ../ssh/gssc.h ../ssh/gss.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../ssh/pgssapi.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../settings.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` sftp.o: ../ssh/sftp.c ../misc.h ../tree234.h ../ssh/sftp.h ../defs.h ../puttymem.h \ @@ -1017,14 +1030,14 @@ sftpcommon.o: ../ssh/sftpcommon.c ../misc.h ../ssh/sftp.h ../defs.h ../puttymem. sftpserver.o: ../ssh/sftpserver.c ../putty.h ../ssh.h ../ssh/sftp.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/sftpserver.c sizetip.o: ../windows/sizetip.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/sizetip.c slookup.o: ../charset/slookup.c ../charset/charset.h ../charset/internal.h \ @@ -1041,20 +1054,20 @@ ssh.o: ../ssh/ssh.c ../putty.h ../pageant.h ../tree234.h ../storage.h \ ../ssh/channel.h ../ssh/gssc.h ../ssh/gss.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../ssh/signal-list.h ../puttymem.h \ ../ssh/ttymode-list.h ../ssh/pgssapi.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/ssh.c bpp1.o: ../ssh/bpp1.c ../putty.h ../ssh.h ../ssh/bpp.h ../sshcr.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/bpp1.c censor1.o: ../ssh/censor1.c ../putty.h ../ssh.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/censor1.c @@ -1062,7 +1075,7 @@ connection1.o: ../ssh/connection1.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../ssh/ppl.h ../ssh/channel.h ../sshcr.h ../ssh/connection1.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/connection1.c @@ -1071,7 +1084,7 @@ connection1-client.o: ../ssh/connection1-client.c ../putty.h ../ssh.h \ ../ssh/connection1.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/connection1-client.c ssh1connection-server.o: ../ssh1connection-server.c ../putty.h ../ssh.h \ @@ -1079,7 +1092,7 @@ ssh1connection-server.o: ../ssh1connection-server.c ../putty.h ../ssh.h \ ../ssh/connection1.h ../ssh/server.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh1connection-server.c @@ -1087,7 +1100,7 @@ login1.o: ../ssh/login1.c ../putty.h ../ssh.h ../mpint.h ../ssh/bpp.h \ ../ssh/ppl.h ../sshcr.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/login1.c login1-server.o: ../ssh/login1-server.c ../putty.h ../mpint.h ../ssh.h \ @@ -1095,27 +1108,27 @@ login1-server.o: ../ssh/login1-server.c ../putty.h ../mpint.h ../ssh.h \ ../sshkeygen.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/login1-server.c bpp2.o: ../ssh/bpp2.c ../putty.h ../ssh.h ../ssh/bpp.h ../sshcr.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/bpp2.c bpp-bare.o: ../ssh/bpp-bare.c ../putty.h ../ssh.h ../ssh/bpp.h ../sshcr.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/bpp-bare.c censor2.o: ../ssh/censor2.c ../putty.h ../ssh.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/censor2.c @@ -1123,7 +1136,7 @@ connection2.o: ../ssh/connection2.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../ssh/ppl.h ../ssh/channel.h ../sshcr.h ../ssh/connection2.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/connection2.c @@ -1132,7 +1145,7 @@ connection2-client.o: ../ssh/connection2-client.c ../putty.h ../ssh.h \ ../ssh/connection2.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/connection2-client.c connection2-server.o: ../ssh/connection2-server.c ../putty.h ../ssh.h \ @@ -1140,7 +1153,7 @@ connection2-server.o: ../ssh/connection2-server.c ../putty.h ../ssh.h \ ../ssh/connection2.h ../ssh/server.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/connection2-server.c @@ -1150,7 +1163,7 @@ kex2-client.o: ../ssh/kex2-client.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../ssh/gssc.h ../ssh/gss.h \ ../windows/winstuff.h ../unix/unix.h ../ssh/pgssapi.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/kex2-client.c kex2-server.o: ../ssh/kex2-server.c ../putty.h ../ssh.h ../ssh/bpp.h \ @@ -1159,14 +1172,14 @@ kex2-server.o: ../ssh/kex2-server.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ ../ssh/gssc.h ../ssh/gss.h ../windows/winstuff.h \ - ../unix/unix.h ../ssh/pgssapi.h ../windows/winhelp.h \ + ../unix/unix.h ../ssh/pgssapi.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/kex2-server.c transient-hostkey-cache.o: ../ssh/transient-hostkey-cache.c ../putty.h ../ssh.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/transient-hostkey-cache.c @@ -1176,7 +1189,7 @@ transport2.o: ../ssh/transport2.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h ../ssh/gssc.h \ ../ssh/gss.h ../windows/winstuff.h ../unix/unix.h \ - ../ssh/pgssapi.h ../windows/winhelp.h ../charset/charset.h + ../ssh/pgssapi.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/transport2.c userauth2-client.o: ../ssh/userauth2-client.c ../putty.h ../ssh.h ../ssh/bpp.h \ @@ -1184,7 +1197,7 @@ userauth2-client.o: ../ssh/userauth2-client.c ../putty.h ../ssh.h ../ssh/bpp.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ ../ssh/pgssapi.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/userauth2-client.c userauth2-server.o: ../ssh/userauth2-server.c ../putty.h ../ssh.h \ @@ -1192,7 +1205,7 @@ userauth2-server.o: ../ssh/userauth2-server.c ../putty.h ../ssh.h \ ../ssh/gssc.h ../ssh/gss.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../ssh/pgssapi.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/userauth2-server.c @@ -1208,7 +1221,7 @@ arcfour.o: ../crypto/arcfour.c ../ssh.h ../puttymem.h ../tree234.h ../network.h argon2.o: ../crypto/argon2.c ../putty.h ../ssh.h ../marshal.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../crypto/argon2.c @@ -1240,7 +1253,7 @@ common.o: ../ssh/common.c ../putty.h ../mpint.h ../ssh.h ../ssh/bpp.h \ ../ssh/ppl.h ../ssh/channel.h ../ssh/ttymode-list.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/common.c @@ -1284,7 +1297,7 @@ ecdsa.o: ../keygen/ecdsa.c ../ssh.h ../sshkeygen.h ../mpint.h ../puttymem.h \ gssc.o: ../ssh/gssc.c ../putty.h ../ssh/gssc.h ../misc.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../ssh/pgssapi.h ../ssh/gss.h ../puttymem.h ../windows/winstuff.h \ - ../unix/unix.h ../tree234.h ../windows/winhelp.h \ + ../unix/unix.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/gssc.c @@ -1308,21 +1321,21 @@ prime.o: ../keygen/prime.c ../ssh.h ../mpint.h ../keygen/mpunsafe.h ../sshkeygen prng.o: ../crypto/prng.c ../putty.h ../ssh.h ../crypto/mpint_i.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../crypto/prng.c sshpubk.o: ../sshpubk.c ../putty.h ../mpint.h ../ssh.h ../misc.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../sshpubk.c sshrand.o: ../sshrand.c ../putty.h ../ssh.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../sshrand.c @@ -1341,7 +1354,7 @@ sshserver.o: ../ssh/server.c ../putty.h ../ssh.h ../ssh/bpp.h ../ssh/ppl.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ ../ssh/pgssapi.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/server.c sha256.o: ../crypto/sha256.c ../ssh.h ../puttymem.h ../tree234.h ../network.h \ @@ -1363,21 +1376,21 @@ sha3.o: ../crypto/sha3.c ../ssh.h ../puttymem.h ../tree234.h ../network.h \ sharing.o: ../ssh/sharing.c ../putty.h ../tree234.h ../ssh.h ../sshcr.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/sharing.c sshutils.o: ../utils/sshutils.c ../putty.h ../ssh.h ../ssh/channel.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/sshutils.c verstring.o: ../ssh/verstring.c ../putty.h ../ssh.h ../ssh/bpp.h ../sshcr.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/verstring.c @@ -1388,25 +1401,25 @@ zlib.o: ../ssh/zlib.c ../defs.h ../ssh.h ../puttymem.h ../tree234.h \ stripctrl.o: ../utils/stripctrl.c ../putty.h ../terminal/terminal.h ../misc.h ../marshal.h \ ../defs.h ../puttyps.h ../network.h ../ssh/signal-list.h \ ../tree234.h ../puttymem.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/stripctrl.c supdup.o: ../otherbackends/supdup.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../otherbackends/supdup.c telnet.o: ../otherbackends/telnet.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../otherbackends/telnet.c terminal.o: ../terminal/terminal.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../tree234.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../terminal/terminal.c testcrypt.o: ../test/testcrypt.c ../defs.h ../ssh.h ../sshkeygen.h ../misc.h \ @@ -1417,7 +1430,7 @@ testcrypt.o: ../test/testcrypt.c ../defs.h ../ssh.h ../sshkeygen.h ../misc.h \ testsc.o: ../test/testsc.c ../defs.h ../putty.h ../ssh.h ../misc.h ../mpint.h \ ../crypto/ecc.h ../puttyps.h ../network.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../test/testsc.c @@ -1431,7 +1444,7 @@ ltime.o: ../utils/ltime.c timing.o: ../timing.c ../putty.h ../tree234.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../timing.c toucs.o: ../charset/toucs.c ../charset/charset.h ../charset/internal.h @@ -1450,142 +1463,142 @@ utils.o: ../utils/utils.c ../defs.h ../misc.h ../ssh.h ../puttymem.h ../marshal. ux_x11.o: ../unix/ux_x11.c ../putty.h ../ssh.h ../network.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/ux_x11.c uxagentc.o: ../unix/uxagentc.c ../putty.h ../misc.h ../tree234.h \ ../puttymem.h ../defs.h ../puttyps.h ../network.h \ ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxagentc.c uxagentsock.o: ../unix/uxagentsock.c ../putty.h ../ssh.h ../misc.h \ ../pageant.h ../defs.h ../puttyps.h ../network.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxagentsock.c uxcfg.o: ../unix/uxcfg.c ../putty.h ../dialog.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxcfg.c uxcliloop.o: ../unix/uxcliloop.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxcliloop.c uxcons.o: ../unix/uxcons.c ../putty.h ../storage.h ../ssh.h ../console.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxcons.c uxfdsock.o: ../unix/uxfdsock.c ../tree234.h ../putty.h ../network.h \ ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxfdsock.c uxgen.o: ../unix/uxgen.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxgen.c uxgss.o: ../unix/uxgss.c ../putty.h ../ssh/pgssapi.h ../ssh/gss.h ../ssh/gssc.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxgss.c uxmisc.o: ../unix/uxmisc.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxmisc.c uxnet.o: ../unix/uxnet.c ../putty.h ../network.h ../tree234.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxnet.c uxnogtk.o: ../unix/uxnogtk.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxnogtk.c uxnoise.o: ../unix/uxnoise.c ../putty.h ../ssh.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxnoise.c uxpeer.o: ../unix/uxpeer.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpeer.c uxpgnt.o: ../unix/uxpgnt.c ../putty.h ../ssh.h ../misc.h ../pageant.h \ ../defs.h ../puttyps.h ../network.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpgnt.c uxplink.o: ../unix/uxplink.c ../putty.h ../ssh.h ../storage.h ../tree234.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxplink.c uxpoll.o: ../unix/uxpoll.c ../putty.h ../tree234.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpoll.c uxprint.o: ../unix/uxprint.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxprint.c uxproxy.o: ../unix/uxproxy.c ../tree234.h ../putty.h ../network.h ../proxy/proxy.h \ ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxproxy.c uxpsusan.o: ../unix/uxpsusan.c ../putty.h ../mpint.h ../ssh.h ../ssh/server.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpsusan.c uxpterm.o: ../unix/uxpterm.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpterm.c uxpty.o: ../unix/uxpty.c ../putty.h ../ssh.h ../ssh/server.h ../tree234.h \ ../ssh/ttymode-list.h ../ssh/signal-list.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../puttymem.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxpty.c @@ -1593,32 +1606,32 @@ uxputty.o: ../unix/uxputty.c ../putty.h ../ssh.h ../storage.h \ ../unix/gtkcompat.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxputty.c uxsel.o: ../unix/uxsel.c ../putty.h ../tree234.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxsel.c uxser.o: ../unix/uxser.c ../putty.h ../tree234.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxser.c uxserver.o: ../unix/uxserver.c ../putty.h ../mpint.h ../ssh.h ../ssh/server.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxserver.c uxsftp.o: ../unix/uxsftp.c ../putty.h ../ssh.h ../psftp.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxsftp.c @@ -1626,13 +1639,13 @@ uxsftpserver.o: ../unix/uxsftpserver.c ../putty.h ../ssh.h ../ssh/server.h \ ../sftp.h ../tree234.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxsftpserver.c uxshare.o: ../unix/uxshare.c ../tree234.h ../putty.h ../network.h ../proxy/proxy.h \ ../ssh.h ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxshare.c @@ -1642,92 +1655,131 @@ uxsignal.o: ../unix/uxsignal.c ../defs.h uxsocks.o: ../unix/uxsocks.c ../putty.h ../ssh.h ../psocks.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxsocks.c uxstore.o: ../unix/uxstore.c ../putty.h ../storage.h ../tree234.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxstore.c uxucs.o: ../unix/uxucs.c ../putty.h ../charset/charset.h ../terminal/terminal.h \ ../misc.h ../defs.h ../puttyps.h ../network.h ../marshal.h \ ../ssh/signal-list.h ../tree234.h ../puttymem.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h + ../windows/winstuff.h ../unix/unix.h ../windows/help.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxucs.c uxutils.o: ../unix/uxutils.c ../putty.h ../ssh.h ../unix/uxutils.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/uxutils.c version.o: ../utils/version.c ../putty.h ../ssh.h ../version.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/version.c wcwidth.o: ../utils/wcwidth.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/wcwidth.c wildcard.o: ../utils/wildcard.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../utils/wildcard.c cryptoapi.o: ../windows/utils/cryptoapi.c ../putty.h ../ssh.h ../windows/cryptoapi.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/cryptoapi.c wincfg.o: ../windows/config.c ../putty.h ../dialog.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/config.c -o wincfg.o cliloop.o: ../windows/cliloop.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/cliloop.c wincons.o: ../windows/console.c ../putty.h ../storage.h ../ssh.h \ ../console.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/console.c -o wincons.o controls.o: ../windows/controls.c ../putty.h ../misc.h ../dialog.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../windows/winstuff.h ../unix/unix.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/controls.c -defaults.o: ../windows/defaults.c ../putty.h ../defs.h ../puttyps.h \ +defaults.o: ../windows/utils/defaults.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/defaults.c + ../tree234.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/defaults.c + +dll_hijacking_protection.o: ../windows/utils/dll_hijacking_protection.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/dll_hijacking_protection.c + +escape_registry_key.o: ../windows/utils/escape_registry_key.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/escape_registry_key.c + +filename.o: ../windows/utils/filename.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/filename.c + +fontspec.o: ../windows/utils/fontspec.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/fontspec.c + +get_username.o: ../windows/utils/get_username.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/get_username.c + +is_console_handle.o: ../windows/utils/is_console_handle.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/is_console_handle.c + +load_system32_dll.o: ../windows/utils/load_system32_dll.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/load_system32_dll.c + +open_for_write_would_lose_data.o: ../windows/utils/open_for_write_would_lose_data.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/open_for_write_would_lose_data.c + +platform_get_x_display.o: ../windows/utils/platform_get_x_display.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/platform_get_x_display.c + +smemclr.o: ../windows/utils/smemclr.c ../defs.h ../misc.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/smemclr.c + +strtoumax.o: ../windows/utils/strtoumax.c ../defs.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/strtoumax.c + +winversion.o: ../windows/utils/version.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/version.c -o winversion.o + +win_strerror.o: ../windows/utils/win_strerror.c ../putty.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/utils/win_strerror.c windlg.o: ../windows/dialog.c ../putty.h ../ssh.h ../windows/putty-rc.h \ ../windows/winseat.h ../storage.h ../dialog.h ../licence.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/dialog.c -o windlg.o @@ -1736,7 +1788,7 @@ window.o: ../windows/window.c ../putty.h ../terminal/terminal.h ../storage.h \ ../windows/winseat.h ../tree234.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/window.c \ -DBUILD_TIME=`date +'"%d/%m/%Y-%H:%M:%S(%Z)"'` \ -DBUILD_VERSION=`cat version_major.txt` \ @@ -1744,161 +1796,149 @@ window.o: ../windows/window.c ../putty.h ../terminal/terminal.h ../storage.h \ -DMASTER_PASSWORD=`cat ../../masterpassword.txt` \ -DMOD_INTEGRATED_AGENT -DMOD_INTEGRATED_KEYGEN -wingss.o: ../windows/wingss.c ../putty.h ../ssh/pgssapi.h ../ssh/gss.h \ +gss.o: ../windows/gss.c ../putty.h ../ssh/pgssapi.h ../ssh/gss.h \ ../ssh/gssc.h ../misc.h ../defs.h ../puttyps.h ../network.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../windows/winstuff.h ../unix/unix.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/wingss.c + ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/gss.c -winhandl.o: ../windows/winhandl.c ../putty.h ../defs.h ../puttyps.h \ +handle-io.o: ../windows/handle-io.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winhandl.c + ../tree234.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/handle-io.c -winhelp.o: ../windows/winhelp.c ../putty.h ../windows/putty-rc.h ../defs.h \ +help.o: ../windows/help.c ../putty.h ../windows/putty-rc.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winhelp.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/help.c -winhsock.o: ../windows/winhsock.c ../tree234.h ../putty.h ../network.h \ +handle-socket.o: ../windows/handle-socket.c ../tree234.h ../putty.h ../network.h \ ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winhsock.c + ../puttymem.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/handle-socket.c -winjump.o: ../windows/winjump.c ../putty.h ../storage.h ../defs.h \ +jump-list.o: ../windows/jump-list.c ../putty.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winjump.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/jump-list.c -winmisc.o: ../windows/winmisc.c ../putty.h ../defs.h ../puttyps.h \ - ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ - ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winmisc.c - -winmiscs.o: ../windows/winmiscs.c ../putty.h ../defs.h ../puttyps.h \ - ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ - ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winmiscs.c - -winnet.o: ../windows/winnet.c ../putty.h ../network.h ../tree234.h ../ssh.h \ +network.o: ../windows/network.c ../putty.h ../network.h ../tree234.h ../ssh.h \ ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnet.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/network.c -winnohlp.o: ../windows/winnohlp.c ../putty.h ../defs.h ../puttyps.h \ +nohelp.o: ../windows/nohelp.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnohlp.c + ../tree234.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/nohelp.c -winnoise.o: ../windows/winnoise.c ../putty.h ../ssh.h ../storage.h ../defs.h \ +noise.o: ../windows/noise.c ../putty.h ../ssh.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnoise.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/noise.c -winnojmp.o: ../windows/winnojmp.c - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnojmp.c +no-jump-list.o: ../windows/no-jump-list.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/no-jump-list.c -winnpc.o: ../windows/winnpc.c ../tree234.h ../putty.h ../network.h \ +named-pipe-client.o: ../windows/named-pipe-client.c ../tree234.h ../putty.h ../network.h \ ../proxy/proxy.h ../ssh.h ../windows/winsecur.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnpc.c + ../unix/unix.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/named-pipe-client.c -winnps.o: ../windows/winnps.c ../tree234.h ../putty.h ../network.h \ +named-pipe-server.o: ../windows/named-pipe-server.c ../tree234.h ../putty.h ../network.h \ ../proxy/proxy.h ../ssh.h ../windows/winsecur.h ../defs.h \ ../puttyps.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winnps.c + ../unix/unix.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/named-pipe-server.c -winpgen.o: ../windows/winpgen.c ../putty.h ../ssh.h ../sshkeygen.h \ +puttygen.o: ../windows/puttygen.c ../putty.h ../ssh.h ../sshkeygen.h \ ../licence.h ../windows/winsecur.h ../windows/puttygen-rc.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winpgen.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/puttygen.c -winpgnt.o: ../windows/winpgnt.c ../putty.h ../ssh.h ../misc.h ../tree234.h \ +winpageant.o: ../windows/pageant.c ../putty.h ../ssh.h ../misc.h ../tree234.h \ ../windows/winsecur.h ../windows/cryptoapi.h ../pageant.h \ ../licence.h ../windows/pageant-rc.h ../defs.h ../puttyps.h \ ../network.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winpgnt.c + ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/pageant.c -o winpageant.o -winpgntc.o: ../windows/winpgntc.c ../putty.h ../pageant.h \ +agent-client.o: ../windows/agent-client.c ../putty.h ../pageant.h \ ../windows/winsecur.h ../windows/cryptoapi.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winpgntc.c + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/agent-client.c -winplink.o: ../windows/winplink.c ../putty.h ../storage.h ../tree234.h \ +plink.o: ../windows/plink.c ../putty.h ../storage.h ../tree234.h \ ../windows/winsecur.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ - ../unix/unix.h ../puttymem.h ../windows/winhelp.h \ + ../unix/unix.h ../puttymem.h ../windows/help.h \ ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winplink.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/plink.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` -winprint.o: ../windows/winprint.c ../putty.h ../defs.h ../puttyps.h \ +printing.o: ../windows/printing.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winprint.c + ../tree234.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/printing.c winproxy.o: ../windows/winproxy.c ../tree234.h ../putty.h ../network.h \ ../proxy/proxy.h ../defs.h ../puttyps.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winproxy.c winsecur.o: ../windows/winsecur.c ../putty.h ../windows/winsecur.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winsecur.c winselcli.o: ../windows/winselcli.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winselcli.c winselgui.o: ../windows/winselgui.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winselgui.c winser.o: ../windows/winser.c ../putty.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winser.c winsftp.o: ../windows/winsftp.c ../putty.h ../psftp.h ../ssh.h \ ../windows/winsecur.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winsftp.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` winshare.o: ../windows/winshare.c ../tree234.h ../putty.h ../network.h \ @@ -1906,59 +1946,59 @@ winshare.o: ../windows/winshare.c ../tree234.h ../putty.h ../network.h \ ../windows/winsecur.h ../ssh/nosharing.c ../defs.h ../puttyps.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winshare.c winsocks.o: ../windows/winsocks.c ../putty.h ../ssh.h ../psocks.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winsocks.c winstore.o: ../windows/winstore.c ../putty.h ../storage.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winstore.c wintime.o: ../windows/wintime.c ../putty.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/wintime.c winucs.o: ../windows/winucs.c ../putty.h ../terminal/terminal.h ../misc.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../tree234.h ../puttymem.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h + ../unix/unix.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winucs.c winutils.o: ../windows/winutils.c ../putty.h ../misc.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../windows/winstuff.h ../unix/unix.h \ - ../tree234.h ../windows/winhelp.h ../charset/charset.h + ../tree234.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winutils.c winx11.o: ../windows/winx11.c ../putty.h ../ssh.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../tree234.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../windows/winx11.c x11fwd.o: ../ssh/x11fwd.c ../putty.h ../ssh.h ../ssh/channel.h ../tree234.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../puttymem.h ../ssh/ttymode-list.h \ - ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../ssh/x11fwd.c x11misc.o: ../unix/x11misc.c ../putty.h ../unix/x11misc.h ../defs.h \ ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../tree234.h ../windows/winhelp.h \ + ../puttymem.h ../tree234.h ../windows/help.h \ ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/x11misc.c @@ -1989,42 +2029,42 @@ FORCE: be_all_s_plink.o: ../be_all_s.c ../putty.h ../puttyps.h ../network.h ../misc.h \ ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS_PLINK) $(XFLAGS) -o be_all_s_plink.o -c ../be_all_s.c ldisc_plink.o: ../ldisc.c ../putty.h ../terminal/terminal.h ../defs.h ../puttyps.h \ ../network.h ../misc.h ../tree234.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS_PLINK) $(XFLAGS) -o ldisc_plink.o -c ../ldisc.c pageant_integrated.o: ../pageant.c ../putty.h ../mpint.h ../ssh.h ../sshcr.h \ ../pageant.h ../defs.h ../puttyps.h ../network.h ../misc.h \ ../marshal.h ../ssh/signal-list.h ../puttymem.h ../tree234.h \ ../ssh/ttymode-list.h ../windows/winstuff.h ../unix/unix.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o pageant_integrated.o -c ../pageant.c -DMOD_INTEGRATED_AGENT settings_nohyperlink.o: ../settings.c ../putty.h ../storage.h ../puttyps.h ../network.h \ ../misc.h ../windows/winstuff.h \ ../unix/unix.h ../puttymem.h ../tree234.h \ - ../windows/winhelp.h ../charset/charset.h + ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o settings_nohyperlink.o -c ../settings.c -DMOD_NOHYPERLINK \ -DMASTER_PASSWORD=`cat ../../masterpassword.txt` -winpgen_integrated.o: ../windows/winpgen.c ../putty.h ../ssh.h ../licence.h \ +winputtygen_integrated.o: ../windows/puttygen.c ../putty.h ../ssh.h ../licence.h \ ../windows/winsecur.h ../defs.h ../puttyps.h ../network.h \ ../misc.h ../marshal.h ../ssh/signal-list.h ../puttymem.h \ ../tree234.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o winpgen_integrated.o -c ../windows/winpgen.c -DMOD_INTEGRATED_KEYGEN + ../unix/unix.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o winputtygen_integrated.o -c ../windows/puttygen.c -DMOD_INTEGRATED_KEYGEN -winpgnt_integrated.o: ../windows/winpgnt.c ../putty.h ../ssh.h ../misc.h ../tree234.h \ +winpageant_integrated.o: ../windows/pageant.c ../putty.h ../ssh.h ../misc.h ../tree234.h \ ../windows/winsecur.h ../pageant.h ../licence.h ../defs.h \ ../puttyps.h ../network.h ../marshal.h ../ssh/signal-list.h \ ../puttymem.h ../ssh/ttymode-list.h ../windows/winstuff.h \ - ../unix/unix.h ../windows/winhelp.h ../charset/charset.h - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o winpgnt_integrated.o -c ../windows/winpgnt.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` -DMOD_INTEGRATED_AGENT + ../unix/unix.h ../windows/help.h ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o winpageant_integrated.o -c ../windows/pageant.c -DMASTER_PASSWORD=`cat ../../masterpassword.txt` -DMOD_INTEGRATED_AGENT adb.o: ../putty.h ../../adb/adb.c $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../../adb/adb.c -I../../adb -I../../ @@ -2116,7 +2156,7 @@ window_notrans.o: ../windows/window.c ../putty.h ../terminal/terminal.h ../stora ../windows/putty-rc.h ../windows/winsecur.h ../tree234.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o window_notrans.o -c ../windows/window.c \ -DMOD_NOTRANSPARENCY \ -DBUILD_TIME=`date +'"%d/%m/%Y-%H:%M:%S(%Z)"'` \ @@ -2129,7 +2169,7 @@ window_nohyperlink.o: ../windows/window.c ../putty.h ../terminal/terminal.h ../s ../windows/putty-rc.h ../puttyps.h ../network.h ../misc.h \ ../tree234.h ../windows/winstuff.h ../macosx/osx.h \ ../macosx/osx.h ../unix/unix.h ../puttymem.h \ - ../windows/winhelp.h ../charset/charset.h \ + ../windows/help.h ../charset/charset.h \ ../../kitty.c ../../kitty_launcher.c ../../kitty_image.c ../../kitty_crypt.c ../../kitty_savedump.c $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o window_nohyperlink.o -c ../windows/window.c \ -DMOD_NOHYPERLINK \ @@ -2142,7 +2182,7 @@ window_portable.o: ../windows/window.c ../putty.h ../terminal/terminal.h ../stor ../windows/putty-rc.h ../windows/winsecur.h ../tree234.h \ ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ ../ssh/signal-list.h ../windows/winstuff.h ../unix/unix.h \ - ../puttymem.h ../windows/winhelp.h ../charset/charset.h + ../puttymem.h ../windows/help.h ../charset/charset.h $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -o window_portable.o -c ../windows/window.c \ -DBUILD_TIME=`date +'"%d/%m/%Y-%H:%M:%S(%Z)"'` \ -DMOD_PORTABLE \ @@ -2210,12 +2250,12 @@ putty_notrans.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ timing.o tree234.o utils.o version.o wcwidth.o wildcard.o \ cryptoapi.o wincfg.o controls.o defaults.o windlg.o \ window_notrans.o \ - wingss.o winhandl.o winhelp.o winhsock.o winjump.o winmisc.o \ - winmiscs.o winnet.o winnoise.o winnpc.o winnps.o winpgntc.o \ - winprint.o winproxy.o winsecur.o winser.o winshare.o \ + gss.o handle-io.o help.o handle-socket.o jump-list.o \ + network.o noise.o named-pipe-client.o named-pipe-server.o agent-client.o \ + printing.o winproxy.o winsecur.o winser.o winshare.o \ winstore.o wintime.o winucs.o winutils.o winx11.o x11fwd.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_registry.o kitty_ssh.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o \ void.o $(UTF8MOUSE_OBJS) $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ @@ -2237,12 +2277,12 @@ putty_notrans.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ timing.o tree234.o utils.o version.o wcwidth.o wildcard.o \ cryptoapi.o wincfg.o controls.o defaults.o windlg.o \ window_notrans.o \ - wingss.o winhandl.o winhelp.o winhsock.o winjump.o winmisc.o \ - winmiscs.o winnet.o winnoise.o winnpc.o winnps.o winpgntc.o \ - winprint.o winproxy.o winsecur.o winser.o winshare.o \ + gss.o handle-io.o help.o handle-socket.o jump-list.o \ + network.o noise.o named-pipe-client.o named-pipe-server.o agent-client.o \ + printing.o winproxy.o winsecur.o winser.o winshare.o \ winstore.o wintime.o winucs.o winutils.o winx11.o x11fwd.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_registry.o kitty_ssh.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o \ void.o $(UTF8MOUSE_OBJS) \ ../../base64/base64.a ../../bcrypt/bcrypt.a ../../blocnote/notepad.a ../../md5/MD5check.a ../../mini/mini.a \ @@ -2270,16 +2310,17 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o wcwidth.o wildcard.o cryptoapi.o wincfg.o controls.o defaults.o \ windlg.o \ window_portable.o \ - wingss.o winhandl.o winhelp.o winhsock.o \ - winjump.o winmisc.o winmiscs.o winnet.o winnoise.o winnpc.o \ - winnps.o winpgntc.o winprint.o winproxy.o winsecur.o \ + gss.o handle-io.o help.o handle-socket.o \ + jump-list.o network.o noise.o named-pipe-client.o \ + named-pipe-server.o agent-client.o printing.o winproxy.o winsecur.o \ winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o winversion.o win_strerror.o \ adb.o \ cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o winpzmodem.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ @@ -2302,16 +2343,17 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o wcwidth.o wildcard.o cryptoapi.o wincfg.o controls.o defaults.o \ windlg.o \ window_portable.o \ - wingss.o winhandl.o winhelp.o winhsock.o \ - winjump.o winmisc.o winmiscs.o winnet.o winnoise.o winnpc.o \ - winnps.o winpgntc.o winprint.o winproxy.o winsecur.o \ + gss.o handle-io.o help.o handle-socket.o \ + jump-list.o network.o noise.o named-pipe-client.o \ + named-pipe-server.o agent-client.o printing.o winproxy.o winsecur.o \ winselgui.o winser.o winshare.o winstore.o wintime.o \ winucs.o winutils.o winx11.o x11fwd.o \ + dll_hijacking_protection.o escape_registry_key.o filename.o fontspec.o get_username.o load_system32_dll.o open_for_write_would_lose_data.o platform_get_x_display.o winversion.o win_strerror.o \ adb.o \ cencode.o cdecode.o \ kitty_portable.o kitty_commun_portable.o kitty_crypt.o kitty_image.o kitty_proxy.o kitty_registry.o kitty_ssh.o \ kitty_store.o kitty_tools.o kitty_win.o \ - urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ + urlhack.o pageant_integrated.o winpageant_integrated.o winputtygen_integrated.o winpzmodem.o \ import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) \ ../../base64/base64.a ../../bcrypt/bcrypt.a ../../blocnote/notepad.a ../../jpeg/libjpeg.a \ @@ -2365,7 +2407,7 @@ cross64: # AJOUTER # -DMASTER_PASSWORD=`cat ../../masterpassword.txt` à la compilation de cmdline.o # -DMASTER_PASSWORD=`cat ../../masterpassword.txt` à la compilation de settings.o -# -DMASTER_PASSWORD=`cat ../../masterpassword.txt` à la compilation de winplink.o +# -DMASTER_PASSWORD=`cat ../../masterpassword.txt` à la compilation de plink.o # -DMASTER_PASSWORD=`cat ../../masterpassword.txt` à la compilation de winsftp.o # -DBUILD_TIME=`date +'"%d/%m/%Y-%H:%M:%S(%Z)"'` \ à la compilation de window.o # -DBUILD_VERSION=`cat version_major.txt` \ @@ -2373,12 +2415,12 @@ cross64: # -DMASTER_PASSWORD=`cat ../../masterpassword.txt` \ # -DMOD_INTEGRATED_AGENT à la compilation de putty.res.o # -DMOD_INTEGRATED_AGENT à la compilation de window.o -# Ajouter winpgnt_integrated.o à la compilation de putty.exe +# Ajouter winpageant_integrated.o à la compilation de putty.exe # Ajouter pageant_integrated.o à la compilation de putty.exe # Ajouter ../../blocnote/notepad.rc à la compilation de putty.res.o # Ajouter -DMOD_INTEGRATED_KEYGEN à la compiltation de putty.res.o # Ajouter -DMOD_INTEGRATED_KEYGEN à la compiltation de window.o -# Ajouter winpgen_integrated.o à la compiltation de putty.exe +# Ajouter winputtygen_integrated.o à la compiltation de putty.exe # Ajouter import.o rsag.o cryptodsa.o prime.o ecdsa.o bcrypt.o à la compilation de putty.exe # Pour putty_notrans.exe copier putty.exe et remplacer window.o par window_notrans.o diff --git a/0.76b_My_PuTTY/windows/winpgntc.c b/0.76b_My_PuTTY/windows/agent-client.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winpgntc.c rename to 0.76b_My_PuTTY/windows/agent-client.c diff --git a/0.76b_My_PuTTY/windows/wingss.c b/0.76b_My_PuTTY/windows/gss.c similarity index 100% rename from 0.76b_My_PuTTY/windows/wingss.c rename to 0.76b_My_PuTTY/windows/gss.c diff --git a/0.76b_My_PuTTY/windows/winhandl.c b/0.76b_My_PuTTY/windows/handle-io.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winhandl.c rename to 0.76b_My_PuTTY/windows/handle-io.c diff --git a/0.76b_My_PuTTY/windows/winhsock.c b/0.76b_My_PuTTY/windows/handle-socket.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winhsock.c rename to 0.76b_My_PuTTY/windows/handle-socket.c diff --git a/0.76b_My_PuTTY/windows/winhelp.c b/0.76b_My_PuTTY/windows/help.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winhelp.c rename to 0.76b_My_PuTTY/windows/help.c diff --git a/0.76b_My_PuTTY/windows/winhelp.h b/0.76b_My_PuTTY/windows/help.h similarity index 100% rename from 0.76b_My_PuTTY/windows/winhelp.h rename to 0.76b_My_PuTTY/windows/help.h diff --git a/0.76b_My_PuTTY/windows/winhelp.rc2 b/0.76b_My_PuTTY/windows/help.rc2 similarity index 100% rename from 0.76b_My_PuTTY/windows/winhelp.rc2 rename to 0.76b_My_PuTTY/windows/help.rc2 diff --git a/0.76b_My_PuTTY/windows/winjump.c b/0.76b_My_PuTTY/windows/jump-list.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winjump.c rename to 0.76b_My_PuTTY/windows/jump-list.c diff --git a/0.76b_My_PuTTY/windows/winnpc.c b/0.76b_My_PuTTY/windows/named-pipe-client.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winnpc.c rename to 0.76b_My_PuTTY/windows/named-pipe-client.c diff --git a/0.76b_My_PuTTY/windows/winnps.c b/0.76b_My_PuTTY/windows/named-pipe-server.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winnps.c rename to 0.76b_My_PuTTY/windows/named-pipe-server.c diff --git a/0.76b_My_PuTTY/windows/winnet.c b/0.76b_My_PuTTY/windows/network.c similarity index 99% rename from 0.76b_My_PuTTY/windows/winnet.c rename to 0.76b_My_PuTTY/windows/network.c index 36780e1..acc0ea9 100644 --- a/0.76b_My_PuTTY/windows/winnet.c +++ b/0.76b_My_PuTTY/windows/network.c @@ -130,6 +130,7 @@ static tree234 *sktree; int get_param( const char * val ) ; #endif #ifdef MOD_ZMODEM +int GetPuttyFlag(void) ; static int curpass; #endif diff --git a/0.76b_My_PuTTY/windows/winnojmp.c b/0.76b_My_PuTTY/windows/no-jump-list.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winnojmp.c rename to 0.76b_My_PuTTY/windows/no-jump-list.c diff --git a/0.76b_My_PuTTY/windows/winnohlp.c b/0.76b_My_PuTTY/windows/nohelp.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winnohlp.c rename to 0.76b_My_PuTTY/windows/nohelp.c diff --git a/0.76b_My_PuTTY/windows/winnoise.c b/0.76b_My_PuTTY/windows/noise.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winnoise.c rename to 0.76b_My_PuTTY/windows/noise.c diff --git a/0.76b_My_PuTTY/windows/winpgnt.c b/0.76b_My_PuTTY/windows/pageant.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winpgnt.c rename to 0.76b_My_PuTTY/windows/pageant.c diff --git a/0.76b_My_PuTTY/windows/pageant.rc b/0.76b_My_PuTTY/windows/pageant.rc index 162702c..b402634 100644 --- a/0.76b_My_PuTTY/windows/pageant.rc +++ b/0.76b_My_PuTTY/windows/pageant.rc @@ -14,7 +14,7 @@ #define APPDESC "PuTTY SSH authentication agent" #endif -#include "winhelp.rc2" +#include "help.rc2" #ifdef MOD_INTEGRATED_AGENT 900 ICON "pageant.ico" diff --git a/0.76b_My_PuTTY/windows/platform.h b/0.76b_My_PuTTY/windows/platform.h new file mode 100644 index 0000000..e69de29 diff --git a/0.76b_My_PuTTY/windows/winplink.c b/0.76b_My_PuTTY/windows/plink.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winplink.c rename to 0.76b_My_PuTTY/windows/plink.c diff --git a/0.76b_My_PuTTY/windows/winprint.c b/0.76b_My_PuTTY/windows/printing.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winprint.c rename to 0.76b_My_PuTTY/windows/printing.c diff --git a/0.76b_My_PuTTY/windows/putty.rc b/0.76b_My_PuTTY/windows/putty.rc index a587a3f..d36a359 100644 --- a/0.76b_My_PuTTY/windows/putty.rc +++ b/0.76b_My_PuTTY/windows/putty.rc @@ -3,7 +3,7 @@ #define APPNAME "PuTTY" #define APPDESC "SSH, Telnet, Rlogin, and SUPDUP client" -#include "winhelp.rc2" +#include "help.rc2" IDI_MAINICON ICON "putty.ico" diff --git a/0.76b_My_PuTTY/windows/winpgen.c b/0.76b_My_PuTTY/windows/puttygen.c similarity index 100% rename from 0.76b_My_PuTTY/windows/winpgen.c rename to 0.76b_My_PuTTY/windows/puttygen.c diff --git a/0.76b_My_PuTTY/windows/puttygen.rc b/0.76b_My_PuTTY/windows/puttygen.rc index ff13c81..e312da9 100644 --- a/0.76b_My_PuTTY/windows/puttygen.rc +++ b/0.76b_My_PuTTY/windows/puttygen.rc @@ -8,7 +8,7 @@ #define APPNAME_KEYGEN "PuTTYgen" #define APPDESC_KEYGEN "PuTTY SSH key generation utility" -#include "winhelp.rc2" +#include "help.rc2" #include "puttygen-rc.h" 800 ICON "puttygen.ico" diff --git a/0.76b_My_PuTTY/windows/puttytel.rc b/0.76b_My_PuTTY/windows/puttytel.rc index 7a58eb1..6f2bfaa 100644 --- a/0.76b_My_PuTTY/windows/puttytel.rc +++ b/0.76b_My_PuTTY/windows/puttytel.rc @@ -3,7 +3,7 @@ #define APPNAME "PuTTYtel" #define APPDESC "Telnet and Rlogin client" -#include "winhelp.rc2" +#include "help.rc2" #include "putty-common.rc2" #ifndef NO_MANIFESTS diff --git a/0.76b_My_PuTTY/windows/defaults.c b/0.76b_My_PuTTY/windows/utils/defaults.c similarity index 100% rename from 0.76b_My_PuTTY/windows/defaults.c rename to 0.76b_My_PuTTY/windows/utils/defaults.c diff --git a/0.76b_My_PuTTY/windows/utils/dll_hijacking_protection.c b/0.76b_My_PuTTY/windows/utils/dll_hijacking_protection.c new file mode 100644 index 0000000..fe9ae59 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/dll_hijacking_protection.c @@ -0,0 +1,43 @@ +/* + * If the OS provides it, call SetDefaultDllDirectories() to prevent + * DLLs from being loaded from the directory containing our own + * binary, and instead only load from system32. + * + * This is a protection against hijacking attacks, if someone runs + * PuTTY directly from their web browser's download directory having + * previously been enticed into clicking on an unwise link that + * downloaded a malicious DLL to the same directory under one of + * various magic names that seem to be things that standard Windows + * DLLs delegate to. + * + * It shouldn't break deliberate loading of user-provided DLLs such as + * GSSAPI providers, because those are specified by their full + * pathname by the user-provided configuration. + */ + +#include "putty.h" + +void dll_hijacking_protection(void) +{ + static HMODULE kernel32_module; + DECL_WINDOWS_FUNCTION(static, BOOL, SetDefaultDllDirectories, (DWORD)); + + if (!kernel32_module) { + kernel32_module = load_system32_dll("kernel32.dll"); +#if !HAVE_SETDEFAULTDLLDIRECTORIES + /* For older Visual Studio, this function isn't available in + * the header files to type-check */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK( + kernel32_module, SetDefaultDllDirectories); +#else + GET_WINDOWS_FUNCTION(kernel32_module, SetDefaultDllDirectories); +#endif + } + + if (p_SetDefaultDllDirectories) { + /* LOAD_LIBRARY_SEARCH_SYSTEM32 and explicitly specified + * directories only */ + p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_USER_DIRS); + } +} diff --git a/0.76b_My_PuTTY/windows/utils/dputs.c b/0.76b_My_PuTTY/windows/utils/dputs.c new file mode 100644 index 0000000..f582509 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/dputs.c @@ -0,0 +1,39 @@ +/* + * Implementation of dputs() for Windows. + * + * The debug messages are written to STD_OUTPUT_HANDLE, except that + * first it has to make sure that handle _exists_, by calling + * AllocConsole first if necessary. + * + * They also go into a file called debug.log. + */ + +#include "putty.h" +#include "utils/utils.h" + +static HANDLE debug_fp = INVALID_HANDLE_VALUE; +static HANDLE debug_hdl = INVALID_HANDLE_VALUE; +static int debug_got_console = 0; + +void dputs(const char *buf) +{ + DWORD dw; + + if (!debug_got_console) { + if (AllocConsole()) { + debug_got_console = 1; + debug_hdl = GetStdHandle(STD_OUTPUT_HANDLE); + } + } + if (debug_fp == INVALID_HANDLE_VALUE) { + debug_fp = CreateFile("debug.log", GENERIC_WRITE, FILE_SHARE_READ, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + } + + if (debug_fp != INVALID_HANDLE_VALUE) { + WriteFile(debug_fp, buf, strlen(buf), &dw, NULL); + } + if (debug_hdl != INVALID_HANDLE_VALUE) { + WriteFile(debug_hdl, buf, strlen(buf), &dw, NULL); + } +} diff --git a/0.76b_My_PuTTY/windows/utils/escape_registry_key.c b/0.76b_My_PuTTY/windows/utils/escape_registry_key.c new file mode 100644 index 0000000..24b5384 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/escape_registry_key.c @@ -0,0 +1,48 @@ +/* + * Escaping/unescaping functions to translate between a saved session + * name, and the key name used to represent it in the Registry area + * where we store saved sessions. + * + * The basic technique is to %-escape characters we can't use in + * Registry keys. + */ + +#include "putty.h" + +void escape_registry_key(const char *in, strbuf *out) +{ + bool candot = false; + static const char hex[16] = "0123456789ABCDEF"; + + while (*in) { + if (*in == ' ' || *in == '\\' || *in == '*' || *in == '?' || + *in == '%' || *in < ' ' || *in > '~' || (*in == '.' + && !candot)) { + put_byte(out, '%'); + put_byte(out, hex[((unsigned char) *in) >> 4]); + put_byte(out, hex[((unsigned char) *in) & 15]); + } else + put_byte(out, *in); + in++; + candot = true; + } +} + +void unescape_registry_key(const char *in, strbuf *out) +{ + while (*in) { + if (*in == '%' && in[1] && in[2]) { + int i, j; + + i = in[1] - '0'; + i -= (i > 9 ? 7 : 0); + j = in[2] - '0'; + j -= (j > 9 ? 7 : 0); + + put_byte(out, (i << 4) + j); + in += 3; + } else { + put_byte(out, *in++); + } + } +} diff --git a/0.76b_My_PuTTY/windows/utils/filename.c b/0.76b_My_PuTTY/windows/utils/filename.c new file mode 100644 index 0000000..f4457ec --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/filename.c @@ -0,0 +1,54 @@ +/* + * Implementation of Filename for Windows. + */ + +#include "putty.h" + +Filename *filename_from_str(const char *str) +{ + Filename *ret = snew(Filename); + ret->path = dupstr(str); + return ret; +} + +Filename *filename_copy(const Filename *fn) +{ + return filename_from_str(fn->path); +} + +const char *filename_to_str(const Filename *fn) +{ + return fn->path; +} + +bool filename_equal(const Filename *f1, const Filename *f2) +{ + return !strcmp(f1->path, f2->path); +} + +bool filename_is_null(const Filename *fn) +{ + return !*fn->path; +} + +void filename_free(Filename *fn) +{ + sfree(fn->path); + sfree(fn); +} + +void filename_serialise(BinarySink *bs, const Filename *f) +{ + put_asciz(bs, f->path); +} +Filename *filename_deserialise(BinarySource *src) +{ + return filename_from_str(get_asciz(src)); +} + +char filename_char_sanitise(char c) +{ + if (strchr("<>:\"/\\|?*", c)) + return '.'; + return c; +} diff --git a/0.76b_My_PuTTY/windows/utils/fontspec.c b/0.76b_My_PuTTY/windows/utils/fontspec.c new file mode 100644 index 0000000..a4d6eae --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/fontspec.c @@ -0,0 +1,39 @@ +/* + * Implementation of FontSpec for Windows. + */ + +#include "putty.h" + +FontSpec *fontspec_new(const char *name, bool bold, int height, int charset) +{ + FontSpec *f = snew(FontSpec); + f->name = dupstr(name); + f->isbold = bold; + f->height = height; + f->charset = charset; + return f; +} +FontSpec *fontspec_copy(const FontSpec *f) +{ + return fontspec_new(f->name, f->isbold, f->height, f->charset); +} +void fontspec_free(FontSpec *f) +{ + sfree(f->name); + sfree(f); +} +void fontspec_serialise(BinarySink *bs, FontSpec *f) +{ + put_asciz(bs, f->name); + put_uint32(bs, f->isbold); + put_uint32(bs, f->height); + put_uint32(bs, f->charset); +} +FontSpec *fontspec_deserialise(BinarySource *src) +{ + const char *name = get_asciz(src); + unsigned isbold = get_uint32(src); + unsigned height = get_uint32(src); + unsigned charset = get_uint32(src); + return fontspec_new(name, isbold, height, charset); +} diff --git a/0.76b_My_PuTTY/windows/utils/get_username.c b/0.76b_My_PuTTY/windows/utils/get_username.c new file mode 100644 index 0000000..bc5780e --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/get_username.c @@ -0,0 +1,77 @@ +/* + * Implementation of get_username() for Windows. + */ + +#include "putty.h" + +#ifndef SECURITY_WIN32 +#define SECURITY_WIN32 +#endif +#include + +char *get_username(void) +{ + DWORD namelen; + char *user; + bool got_username = false; + DECL_WINDOWS_FUNCTION(static, BOOLEAN, GetUserNameExA, + (EXTENDED_NAME_FORMAT, LPSTR, PULONG)); + + { + static bool tried_usernameex = false; + if (!tried_usernameex) { + /* Not available on Win9x, so load dynamically */ + HMODULE secur32 = load_system32_dll("secur32.dll"); + /* If MIT Kerberos is installed, the following call to + GET_WINDOWS_FUNCTION makes Windows implicitly load + sspicli.dll WITHOUT proper path sanitizing, so better + load it properly before */ + HMODULE sspicli = load_system32_dll("sspicli.dll"); + (void)sspicli; /* squash compiler warning about unused variable */ + GET_WINDOWS_FUNCTION(secur32, GetUserNameExA); + tried_usernameex = true; + } + } + + if (p_GetUserNameExA) { + /* + * If available, use the principal -- this avoids the problem + * that the local username is case-insensitive but Kerberos + * usernames are case-sensitive. + */ + + /* Get the length */ + namelen = 0; + (void) p_GetUserNameExA(NameUserPrincipal, NULL, &namelen); + + user = snewn(namelen, char); + got_username = p_GetUserNameExA(NameUserPrincipal, user, &namelen); + if (got_username) { + char *p = strchr(user, '@'); + if (p) *p = 0; + } else { + sfree(user); + } + } + + if (!got_username) { + /* Fall back to local user name */ + namelen = 0; + if (!GetUserName(NULL, &namelen)) { + /* + * Apparently this doesn't work at least on Windows XP SP2. + * Thus assume a maximum of 256. It will fail again if it + * doesn't fit. + */ + namelen = 256; + } + + user = snewn(namelen, char); + got_username = GetUserName(user, &namelen); + if (!got_username) { + sfree(user); + } + } + + return got_username ? user : NULL; +} diff --git a/0.76b_My_PuTTY/windows/utils/is_console_handle.c b/0.76b_My_PuTTY/windows/utils/is_console_handle.c new file mode 100644 index 0000000..887069c --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/is_console_handle.c @@ -0,0 +1,13 @@ +/* + * Determine whether a Windows HANDLE points at a console device. + */ + +#include "putty.h" + +bool is_console_handle(HANDLE handle) +{ + DWORD ignored_output; + if (GetConsoleMode(handle, &ignored_output)) + return true; + return false; +} diff --git a/0.76b_My_PuTTY/windows/utils/load_system32_dll.c b/0.76b_My_PuTTY/windows/utils/load_system32_dll.c new file mode 100644 index 0000000..55b97d5 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/load_system32_dll.c @@ -0,0 +1,32 @@ +/* + * Wrapper function to load a DLL out of c:\windows\system32 without + * going through the full DLL search path. (Hence no attack is + * possible by placing a substitute DLL earlier on that path.) + */ + +#include "putty.h" + +HMODULE load_system32_dll(const char *libname) +{ + /* + * Wrapper function to load a DLL out of c:\windows\system32 + * without going through the full DLL search path. (Hence no + * attack is possible by placing a substitute DLL earlier on that + * path.) + */ + static char *sysdir = NULL; + static size_t sysdirsize = 0; + char *fullpath; + HMODULE ret; + + if (!sysdir) { + size_t len; + while ((len = GetSystemDirectory(sysdir, sysdirsize)) >= sysdirsize) + sgrowarray(sysdir, sysdirsize, len); + } + + fullpath = dupcat(sysdir, "\\", libname); + ret = LoadLibrary(fullpath); + sfree(fullpath); + return ret; +} diff --git a/0.76b_My_PuTTY/windows/winmiscs.c b/0.76b_My_PuTTY/windows/utils/minefield.c similarity index 77% rename from 0.76b_My_PuTTY/windows/winmiscs.c rename to 0.76b_My_PuTTY/windows/utils/minefield.c index 3f06970..5afe512 100644 --- a/0.76b_My_PuTTY/windows/winmiscs.c +++ b/0.76b_My_PuTTY/windows/utils/minefield.c @@ -1,26 +1,17 @@ /* - * winmiscs.c: Windows-specific standalone functions. Has the same - * relationship to winmisc.c that utils.c does to misc.c, but the - * corresponding name 'winutils.c' was already taken. + * 'Minefield' - a crude Windows memory debugger, similar in concept + * to the old Unix 'Electric Fence'. The main difference is that + * Electric Fence can be imposed on a program from outside, via + * LD_PRELOAD, whereas this has to be included in the program at + * compile time with its own cooperation. + * + * This module provides the Minefield allocator. Actually enabling it + * is done by a #define in force when the main utils/memory.c is + * compiled. */ #include "putty.h" -#ifndef NO_SECUREZEROMEMORY -/* - * Windows implementation of smemclr (see misc.c) using SecureZeroMemory. - */ -void smemclr(void *b, size_t n) { - if (b && n > 0) - SecureZeroMemory(b, n); -} -#endif - -#ifdef MINEFIELD -/* - * Minefield - a Windows equivalent for Electric Fence - */ - #define PAGESIZE 4096 /* @@ -234,52 +225,3 @@ void *minefield_c_realloc(void *p, size_t size) minefield_free(p); return q; } - -#endif /* MINEFIELD */ - -#if defined _MSC_VER && _MSC_VER < 1800 - -/* - * Work around lack of strtoumax in older MSVC libraries - */ -uintmax_t strtoumax(const char *nptr, char **endptr, int base) -{ - return _strtoui64(nptr, endptr, base); -} - -#endif - -#if defined _M_ARM || defined _M_ARM64 - -bool platform_aes_hw_available(void) -{ - return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); -} - -bool platform_sha256_hw_available(void) -{ - return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); -} - -bool platform_sha1_hw_available(void) -{ - return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); -} - -bool platform_sha512_hw_available(void) -{ - /* As of 2020-12-24, as far as I can tell from docs.microsoft.com, - * Windows on Arm does not yet provide a PF_ARM_V8_* flag for the - * SHA-512 architecture extension. */ - return false; -} - -#endif - -bool is_console_handle(HANDLE handle) -{ - DWORD ignored_output; - if (GetConsoleMode(handle, &ignored_output)) - return true; - return false; -} diff --git a/0.76b_My_PuTTY/windows/utils/open_for_write_would_lose_data.c b/0.76b_My_PuTTY/windows/utils/open_for_write_would_lose_data.c new file mode 100644 index 0000000..fa6f096 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/open_for_write_would_lose_data.c @@ -0,0 +1,47 @@ +/* + * Implementation of open_for_write_would_lose_data for Windows. + */ + +#include "putty.h" + +/* + * This is slightly fiddly because we want to be backwards-compatible + * with systems too old to have GetFileAttributesEx. The next best + * thing is FindFirstFile, which will return a different data + * structure, but one that also contains the fields we want. (But it + * will behave more unhelpfully - for this application - in the + * presence of wildcards, so we'd prefer to use GFAE if we can.) + */ + +bool open_for_write_would_lose_data(const Filename *fn) +{ + WIN32_FILE_ATTRIBUTE_DATA attrs; + if (!GetFileAttributesEx(fn->path, GetFileExInfoStandard, &attrs)) { + /* + * Generally, if we don't identify a specific reason why we + * should return true from this function, we return false, and + * let the subsequent attempt to open the file for real give a + * more useful error message. + */ + return false; + } + if (attrs.dwFileAttributes & (FILE_ATTRIBUTE_DEVICE | + FILE_ATTRIBUTE_DIRECTORY)) { + /* + * File is something other than an ordinary disk file, so + * opening it for writing will not cause truncation. (It may + * not _succeed_ either, but that's not our problem here!) + */ + return false; + } + if (attrs.nFileSizeHigh == 0 && attrs.nFileSizeLow == 0) { + /* + * File is zero-length (or may be a named pipe, which + * dwFileAttributes can't tell apart from a regular file), so + * opening it for writing won't truncate any data away because + * there's nothing to truncate anyway. + */ + return false; + } + return true; +} diff --git a/0.76b_My_PuTTY/windows/utils/platform_get_x_display.c b/0.76b_My_PuTTY/windows/utils/platform_get_x_display.c new file mode 100644 index 0000000..b3d11af --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/platform_get_x_display.c @@ -0,0 +1,12 @@ +/* + * Implementation of platform_get_x_display for Windows, common to all + * tools. + */ + +#include "putty.h" + +char *platform_get_x_display(void) +{ + /* We may as well check for DISPLAY in case it's useful. */ + return dupstr(getenv("DISPLAY")); +} diff --git a/0.76b_My_PuTTY/windows/utils/registry_get_string.c b/0.76b_My_PuTTY/windows/utils/registry_get_string.c new file mode 100644 index 0000000..c3745b9 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/registry_get_string.c @@ -0,0 +1,43 @@ +/* + * Self-contained function to try to fetch a single string value from + * the Registry, and return it as a dynamically allocated C string. + */ + +#include "putty.h" + +char *registry_get_string(HKEY root, const char *path, const char *leaf) +{ + HKEY key = root; + bool need_close_key = false; + char *toret = NULL, *str = NULL; + + if (path) { + if (RegCreateKey(key, path, &key) != ERROR_SUCCESS) + goto out; + need_close_key = true; + } + + DWORD type, size; + if (RegQueryValueEx(key, leaf, 0, &type, NULL, &size) != ERROR_SUCCESS) + goto out; + if (type != REG_SZ) + goto out; + + str = snewn(size + 1, char); + DWORD size_got = size; + if (RegQueryValueEx(key, leaf, 0, &type, (LPBYTE)str, + &size_got) != ERROR_SUCCESS) + goto out; + if (type != REG_SZ || size_got > size) + goto out; + str[size_got] = '\0'; + + toret = str; + str = NULL; + + out: + if (need_close_key) + RegCloseKey(key); + sfree(str); + return toret; +} diff --git a/0.76b_My_PuTTY/windows/utils/smemclr.c b/0.76b_My_PuTTY/windows/utils/smemclr.c new file mode 100644 index 0000000..5503bdc --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/smemclr.c @@ -0,0 +1,52 @@ +/* + * Securely wipe memory. + * + * The actual wiping is no different from what memset would do: the + * point of 'securely' is to try to be sure over-clever compilers + * won't optimise away memsets on variables that are about to be freed + * or go out of scope. See + * https://buildsecurityin.us-cert.gov/bsi-rules/home/g1/771-BSI.html + */ + +#include "defs.h" +#include "misc.h" + +/* + * Trivial function that is given a pointer to some memory and ignores + * it. + */ +static void no_op(void *ptr, size_t size) {} + +/* + * Function pointer that is given a pointer to some memory, and from + * the compiler's point of view, _might_ read it, or otherwise depend + * on its contents. + * + * In fact, this function pointer always points to no_op() above. But + * because the pointer itself is volatile-qualified, the compiler + * isn't allowed to optimise based on the assumption that that will + * always be the case. So it has to call through the function pointer + * anyway, on the basis that it _might_ have magically changed at run + * time into a pointer to some completely arbitrary function. And + * therefore it must also avoid optimising away any observable effect + * beforehand that a completely arbitrary function might depend on - + * such as the zeroing of our memory region. + */ +static void (*const volatile maybe_read)(void *ptr, size_t size) = no_op; + +void smemclr(void *b, size_t n) +{ + if (b && n > 0) { + /* + * Zero out the memory. + */ + memset(b, 0, n); + + /* + * Call the above function pointer, which (for all the + * compiler knows) might check that we've really zeroed the + * memory. + */ + maybe_read(b, n); + } +} diff --git a/0.76b_My_PuTTY/windows/utils/strtoumax.c b/0.76b_My_PuTTY/windows/utils/strtoumax.c new file mode 100644 index 0000000..38d0001 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/strtoumax.c @@ -0,0 +1,12 @@ +/* + * Work around lack of strtoumax in older MSVC libraries. + */ + +#include + +#include "defs.h" + +uintmax_t strtoumax(const char *nptr, char **endptr, int base) +{ + return _strtoui64(nptr, endptr, base); +} diff --git a/0.76b_My_PuTTY/windows/utils/version.c b/0.76b_My_PuTTY/windows/utils/version.c new file mode 100644 index 0000000..b626710 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/version.c @@ -0,0 +1,45 @@ +#include "putty.h" + +DWORD osMajorVersion, osMinorVersion, osPlatformId; + +void init_winver(void) +{ + static bool initialised = false; + if (initialised) + return; + initialised = true; + + OSVERSIONINFO osVersion; + static HMODULE kernel32_module; + DECL_WINDOWS_FUNCTION(static, BOOL, GetVersionExA, (LPOSVERSIONINFO)); + + if (!kernel32_module) { + kernel32_module = load_system32_dll("kernel32.dll"); + /* Deliberately don't type-check this function, because that + * would involve using its declaration in a header file which + * triggers a deprecation warning. I know it's deprecated (see + * below) and don't need telling. */ + GET_WINDOWS_FUNCTION_NO_TYPECHECK(kernel32_module, GetVersionExA); + } + + ZeroMemory(&osVersion, sizeof(osVersion)); + osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + if (p_GetVersionExA && p_GetVersionExA(&osVersion)) { + osMajorVersion = osVersion.dwMajorVersion; + osMinorVersion = osVersion.dwMinorVersion; + osPlatformId = osVersion.dwPlatformId; + } else { + /* + * GetVersionEx is deprecated, so allow for it perhaps going + * away in future API versions. If it's not there, simply + * assume that's because Windows is too _new_, so fill in the + * variables we care about to a value that will always compare + * higher than any given test threshold. + * + * Normally we should be checking against the presence of a + * specific function if possible in any case. + */ + osMajorVersion = osMinorVersion = UINT_MAX; /* a very high number */ + osPlatformId = VER_PLATFORM_WIN32_NT; /* not Win32s or Win95-like */ + } +} diff --git a/0.76b_My_PuTTY/windows/utils/win_strerror.c b/0.76b_My_PuTTY/windows/utils/win_strerror.c new file mode 100644 index 0000000..5572bc8 --- /dev/null +++ b/0.76b_My_PuTTY/windows/utils/win_strerror.c @@ -0,0 +1,72 @@ +/* + * Wrapper around the Windows FormatMessage system for retrieving the + * text of a system error code, with a simple API similar to strerror. + * + * Works by keeping a tree234 containing mappings from system error + * codes to strings. Entries allocated in this tree are simply never + * freed. + * + * Also, the returned string has its trailing newline removed (so it + * can go in places like the Event Log that never want a newline), and + * is prefixed with the error number (so that if a user sends an error + * report containing a translated error message we can't read, we can + * still find out what the error actually was). + */ + +#include "putty.h" + +struct errstring { + int error; + char *text; +}; + +static int errstring_find(void *av, void *bv) +{ + int *a = (int *)av; + struct errstring *b = (struct errstring *)bv; + if (*a < b->error) + return -1; + if (*a > b->error) + return +1; + return 0; +} +static int errstring_compare(void *av, void *bv) +{ + struct errstring *a = (struct errstring *)av; + return errstring_find(&a->error, bv); +} + +static tree234 *errstrings = NULL; + +const char *win_strerror(int error) +{ + struct errstring *es; + + if (!errstrings) + errstrings = newtree234(errstring_compare); + + es = find234(errstrings, &error, errstring_find); + + if (!es) { + char msgtext[65536]; /* maximum size for FormatMessage is 64K */ + + es = snew(struct errstring); + es->error = error; + if (!FormatMessage((FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS), NULL, error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + msgtext, lenof(msgtext)-1, NULL)) { + sprintf(msgtext, + "(unable to format: FormatMessage returned %u)", + (unsigned int)GetLastError()); + } else { + int len = strlen(msgtext); + if (len > 0 && msgtext[len-1] == '\n') + msgtext[len-1] = '\0'; + } + es->text = dupprintf("Error %d: %s", error, msgtext); + add234(errstrings, es); + } + + return es->text; +} diff --git a/0.76b_My_PuTTY/windows/version_minor.txt b/0.76b_My_PuTTY/windows/version_minor.txt index b8626c4..7ed6ff8 100644 --- a/0.76b_My_PuTTY/windows/version_minor.txt +++ b/0.76b_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -4 +5 diff --git a/0.76b_My_PuTTY/windows/winmisc.c b/0.76b_My_PuTTY/windows/winmisc.c deleted file mode 100644 index e80226a..0000000 --- a/0.76b_My_PuTTY/windows/winmisc.c +++ /dev/null @@ -1,467 +0,0 @@ -/* - * winmisc.c: miscellaneous Windows-specific things - */ - -#include -#include -#include -#include "putty.h" -#ifndef SECURITY_WIN32 -#define SECURITY_WIN32 -#endif -#include - -DWORD osMajorVersion, osMinorVersion, osPlatformId; - -char *platform_get_x_display(void) { - /* We may as well check for DISPLAY in case it's useful. */ - return dupstr(getenv("DISPLAY")); -} - -Filename *filename_from_str(const char *str) -{ - Filename *ret = snew(Filename); - ret->path = dupstr(str); - return ret; -} - -Filename *filename_copy(const Filename *fn) -{ - return filename_from_str(fn->path); -} - -const char *filename_to_str(const Filename *fn) -{ - return fn->path; -} - -bool filename_equal(const Filename *f1, const Filename *f2) -{ - return !strcmp(f1->path, f2->path); -} - -bool filename_is_null(const Filename *fn) -{ - return !*fn->path; -} - -void filename_free(Filename *fn) -{ - sfree(fn->path); - sfree(fn); -} - -void filename_serialise(BinarySink *bs, const Filename *f) -{ - put_asciz(bs, f->path); -} -Filename *filename_deserialise(BinarySource *src) -{ - return filename_from_str(get_asciz(src)); -} - -char filename_char_sanitise(char c) -{ - if (strchr("<>:\"/\\|?*", c)) - return '.'; - return c; -} - -char *get_username(void) -{ - DWORD namelen; - char *user; - bool got_username = false; - DECL_WINDOWS_FUNCTION(static, BOOLEAN, GetUserNameExA, - (EXTENDED_NAME_FORMAT, LPSTR, PULONG)); - - { - static bool tried_usernameex = false; - if (!tried_usernameex) { - /* Not available on Win9x, so load dynamically */ - HMODULE secur32 = load_system32_dll("secur32.dll"); - /* If MIT Kerberos is installed, the following call to - GET_WINDOWS_FUNCTION makes Windows implicitly load - sspicli.dll WITHOUT proper path sanitizing, so better - load it properly before */ - HMODULE sspicli = load_system32_dll("sspicli.dll"); - (void)sspicli; /* squash compiler warning about unused variable */ - GET_WINDOWS_FUNCTION(secur32, GetUserNameExA); - tried_usernameex = true; - } - } - - if (p_GetUserNameExA) { - /* - * If available, use the principal -- this avoids the problem - * that the local username is case-insensitive but Kerberos - * usernames are case-sensitive. - */ - - /* Get the length */ - namelen = 0; - (void) p_GetUserNameExA(NameUserPrincipal, NULL, &namelen); - - user = snewn(namelen, char); - got_username = p_GetUserNameExA(NameUserPrincipal, user, &namelen); - if (got_username) { - char *p = strchr(user, '@'); - if (p) *p = 0; - } else { - sfree(user); - } - } - - if (!got_username) { - /* Fall back to local user name */ - namelen = 0; - if (!GetUserName(NULL, &namelen)) { - /* - * Apparently this doesn't work at least on Windows XP SP2. - * Thus assume a maximum of 256. It will fail again if it - * doesn't fit. - */ - namelen = 256; - } - - user = snewn(namelen, char); - got_username = GetUserName(user, &namelen); - if (!got_username) { - sfree(user); - } - } - - return got_username ? user : NULL; -} - -void dll_hijacking_protection(void) -{ - /* - * If the OS provides it, call SetDefaultDllDirectories() to - * prevent DLLs from being loaded from the directory containing - * our own binary, and instead only load from system32. - * - * This is a protection against hijacking attacks, if someone runs - * PuTTY directly from their web browser's download directory - * having previously been enticed into clicking on an unwise link - * that downloaded a malicious DLL to the same directory under one - * of various magic names that seem to be things that standard - * Windows DLLs delegate to. - * - * It shouldn't break deliberate loading of user-provided DLLs - * such as GSSAPI providers, because those are specified by their - * full pathname by the user-provided configuration. - */ - static HMODULE kernel32_module; - DECL_WINDOWS_FUNCTION(static, BOOL, SetDefaultDllDirectories, (DWORD)); - - if (!kernel32_module) { - kernel32_module = load_system32_dll("kernel32.dll"); -#if (defined _MSC_VER && _MSC_VER < 1900) - /* For older Visual Studio, this function isn't available in - * the header files to type-check */ - GET_WINDOWS_FUNCTION_NO_TYPECHECK( - kernel32_module, SetDefaultDllDirectories); -#else - GET_WINDOWS_FUNCTION(kernel32_module, SetDefaultDllDirectories); -#endif - } - - if (p_SetDefaultDllDirectories) { - /* LOAD_LIBRARY_SEARCH_SYSTEM32 and explicitly specified - * directories only */ - p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_USER_DIRS); - } -} - -void init_winver(void) -{ - OSVERSIONINFO osVersion; - static HMODULE kernel32_module; - DECL_WINDOWS_FUNCTION(static, BOOL, GetVersionExA, (LPOSVERSIONINFO)); - - if (!kernel32_module) { - kernel32_module = load_system32_dll("kernel32.dll"); - /* Deliberately don't type-check this function, because that - * would involve using its declaration in a header file which - * triggers a deprecation warning. I know it's deprecated (see - * below) and don't need telling. */ - GET_WINDOWS_FUNCTION_NO_TYPECHECK(kernel32_module, GetVersionExA); - } - - ZeroMemory(&osVersion, sizeof(osVersion)); - osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); - if (p_GetVersionExA && p_GetVersionExA(&osVersion)) { - osMajorVersion = osVersion.dwMajorVersion; - osMinorVersion = osVersion.dwMinorVersion; - osPlatformId = osVersion.dwPlatformId; - } else { - /* - * GetVersionEx is deprecated, so allow for it perhaps going - * away in future API versions. If it's not there, simply - * assume that's because Windows is too _new_, so fill in the - * variables we care about to a value that will always compare - * higher than any given test threshold. - * - * Normally we should be checking against the presence of a - * specific function if possible in any case. - */ - osMajorVersion = osMinorVersion = UINT_MAX; /* a very high number */ - osPlatformId = VER_PLATFORM_WIN32_NT; /* not Win32s or Win95-like */ - } -} - -HMODULE load_system32_dll(const char *libname) -{ - /* - * Wrapper function to load a DLL out of c:\windows\system32 - * without going through the full DLL search path. (Hence no - * attack is possible by placing a substitute DLL earlier on that - * path.) - */ - static char *sysdir = NULL; - static size_t sysdirsize = 0; - char *fullpath; - HMODULE ret; - - if (!sysdir) { - size_t len; - while ((len = GetSystemDirectory(sysdir, sysdirsize)) >= sysdirsize) - sgrowarray(sysdir, sysdirsize, len); - } - - fullpath = dupcat(sysdir, "\\", libname); - ret = LoadLibrary(fullpath); - sfree(fullpath); - return ret; -} - -/* - * A tree234 containing mappings from system error codes to strings. - */ - -struct errstring { - int error; - char *text; -}; - -static int errstring_find(void *av, void *bv) -{ - int *a = (int *)av; - struct errstring *b = (struct errstring *)bv; - if (*a < b->error) - return -1; - if (*a > b->error) - return +1; - return 0; -} -static int errstring_compare(void *av, void *bv) -{ - struct errstring *a = (struct errstring *)av; - return errstring_find(&a->error, bv); -} - -static tree234 *errstrings = NULL; - -const char *win_strerror(int error) -{ - struct errstring *es; - - if (!errstrings) - errstrings = newtree234(errstring_compare); - - es = find234(errstrings, &error, errstring_find); - - if (!es) { - char msgtext[65536]; /* maximum size for FormatMessage is 64K */ - - es = snew(struct errstring); - es->error = error; - if (!FormatMessage((FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS), NULL, error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - msgtext, lenof(msgtext)-1, NULL)) { - sprintf(msgtext, - "(unable to format: FormatMessage returned %u)", - (unsigned int)GetLastError()); - } else { - int len = strlen(msgtext); - if (len > 0 && msgtext[len-1] == '\n') - msgtext[len-1] = '\0'; - } - es->text = dupprintf("Error %d: %s", error, msgtext); - add234(errstrings, es); - } - - return es->text; -} - -FontSpec *fontspec_new(const char *name, bool bold, int height, int charset) -{ - FontSpec *f = snew(FontSpec); - f->name = dupstr(name); - f->isbold = bold; - f->height = height; - f->charset = charset; - return f; -} -FontSpec *fontspec_copy(const FontSpec *f) -{ - return fontspec_new(f->name, f->isbold, f->height, f->charset); -} -void fontspec_free(FontSpec *f) -{ - sfree(f->name); - sfree(f); -} -void fontspec_serialise(BinarySink *bs, FontSpec *f) -{ - put_asciz(bs, f->name); - put_uint32(bs, f->isbold); - put_uint32(bs, f->height); - put_uint32(bs, f->charset); -} -FontSpec *fontspec_deserialise(BinarySource *src) -{ - const char *name = get_asciz(src); - unsigned isbold = get_uint32(src); - unsigned height = get_uint32(src); - unsigned charset = get_uint32(src); - return fontspec_new(name, isbold, height, charset); -} - -bool open_for_write_would_lose_data(const Filename *fn) -{ - WIN32_FILE_ATTRIBUTE_DATA attrs; - if (!GetFileAttributesEx(fn->path, GetFileExInfoStandard, &attrs)) { - /* - * Generally, if we don't identify a specific reason why we - * should return true from this function, we return false, and - * let the subsequent attempt to open the file for real give a - * more useful error message. - */ - return false; - } - if (attrs.dwFileAttributes & (FILE_ATTRIBUTE_DEVICE | - FILE_ATTRIBUTE_DIRECTORY)) { - /* - * File is something other than an ordinary disk file, so - * opening it for writing will not cause truncation. (It may - * not _succeed_ either, but that's not our problem here!) - */ - return false; - } - if (attrs.nFileSizeHigh == 0 && attrs.nFileSizeLow == 0) { - /* - * File is zero-length (or may be a named pipe, which - * dwFileAttributes can't tell apart from a regular file), so - * opening it for writing won't truncate any data away because - * there's nothing to truncate anyway. - */ - return false; - } - return true; -} - -void escape_registry_key(const char *in, strbuf *out) -{ - bool candot = false; - static const char hex[16] = "0123456789ABCDEF"; - - while (*in) { - if (*in == ' ' || *in == '\\' || *in == '*' || *in == '?' || - *in == '%' || *in < ' ' || *in > '~' || (*in == '.' - && !candot)) { - put_byte(out, '%'); - put_byte(out, hex[((unsigned char) *in) >> 4]); - put_byte(out, hex[((unsigned char) *in) & 15]); - } else - put_byte(out, *in); - in++; - candot = true; - } -} - -void unescape_registry_key(const char *in, strbuf *out) -{ - while (*in) { - if (*in == '%' && in[1] && in[2]) { - int i, j; - - i = in[1] - '0'; - i -= (i > 9 ? 7 : 0); - j = in[2] - '0'; - j -= (j > 9 ? 7 : 0); - - put_byte(out, (i << 4) + j); - in += 3; - } else { - put_byte(out, *in++); - } - } -} - -#ifdef DEBUG -static FILE *debug_fp = NULL; -static HANDLE debug_hdl = INVALID_HANDLE_VALUE; -static int debug_got_console = 0; - -void dputs(const char *buf) -{ - DWORD dw; - - if (!debug_got_console) { - if (AllocConsole()) { - debug_got_console = 1; - debug_hdl = GetStdHandle(STD_OUTPUT_HANDLE); - } - } - if (!debug_fp) { - debug_fp = fopen("debug.log", "w"); - } - - if (debug_hdl != INVALID_HANDLE_VALUE) { - WriteFile(debug_hdl, buf, strlen(buf), &dw, NULL); - } - fputs(buf, debug_fp); - fflush(debug_fp); -} -#endif - -char *registry_get_string(HKEY root, const char *path, const char *leaf) -{ - HKEY key = root; - bool need_close_key = false; - char *toret = NULL, *str = NULL; - - if (path) { - if (RegCreateKey(key, path, &key) != ERROR_SUCCESS) - goto out; - need_close_key = true; - } - - DWORD type, size; - if (RegQueryValueEx(key, leaf, 0, &type, NULL, &size) != ERROR_SUCCESS) - goto out; - if (type != REG_SZ) - goto out; - - str = snewn(size + 1, char); - DWORD size_got = size; - if (RegQueryValueEx(key, leaf, 0, &type, (LPBYTE)str, - &size_got) != ERROR_SUCCESS) - goto out; - if (type != REG_SZ || size_got > size) - goto out; - str[size_got] = '\0'; - - toret = str; - str = NULL; - - out: - if (need_close_key) - RegCloseKey(key); - sfree(str); - return toret; -} diff --git a/0.76b_My_PuTTY/windows/winstuff.h b/0.76b_My_PuTTY/windows/winstuff.h index a6e8021..5acbe6e 100644 --- a/0.76b_My_PuTTY/windows/winstuff.h +++ b/0.76b_My_PuTTY/windows/winstuff.h @@ -31,7 +31,7 @@ #include "tree234.h" -#include "winhelp.h" +#include "help.h" #if defined _M_IX86 || defined _M_AMD64 #define BUILDINFO_PLATFORM "x86 Windows" diff --git a/blocnote/notepad.a b/blocnote/notepad.a index fed79634cf639dc255dd56ef8225de06c0e016bf..2101a9c06908f02b9559cbf879c5fa651591fa11 100644 GIT binary patch delta 58 zcmezLm+{kI#tBj!<`#wq7Um{K8`2lk&wje_>+DfeDyx%D=+LXuSDqtt=w| DL{}26 delta 58 zcmezLm+{kI#tBj!CWZ!PCWfY_8