made main window resizable

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@146 fe716a7a-6dde-0310-88d9-d003556173a8

7 files changed, 124 insertions, 73 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 4cb1633..9786ef0 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -108,144 +108,163 @@ CPumpKINDlg::CPumpKINDlg(CWnd* pParent /*=NULL*/)
 	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32

 	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

 	m_bmpBack.LoadBitmap(IDB_BACKGROUND);

 	m_bmpBack.GetBitmap(&m_bitmapBack);

 	m_Retrier = new CRetrier(this);

 	ASSERT(m_Retrier);

 	m_Trayer = new CTrayer(this);

 	ASSERT(m_Trayer);

 	/* Ensure we're backwards compatible */

 	ASSERT(CPumpKINDlg::rrqGiveAll==0);

 	ASSERT(CPumpKINDlg::rrqAlwaysConfirm==1);

 	ASSERT(CPumpKINDlg::rrqDenyAll==2);

 	ASSERT(CPumpKINDlg::wrqTakeAll==0);

 	ASSERT(CPumpKINDlg::wrqConfirmIfExists==1);

 	ASSERT(CPumpKINDlg::wrqAlwaysConfirm==2);

 	ASSERT(CPumpKINDlg::wrqDenyAll==3);

 	/* -- */

 	LoadSettings();

 }

 

 void CPumpKINDlg::DoDataExchange(CDataExchange* pDX)

 {

 	CDialog::DoDataExchange(pDX);

 	//{{AFX_DATA_MAP(CPumpKINDlg)

+	DDX_Control(pDX, ID_HELP, m_HelpCtl);

+	DDX_Control(pDX, IDC_PUT, m_PutCtl);

+	DDX_Control(pDX, IDC_GET, m_GetCtl);

+	DDX_Control(pDX, IDC_EXIT, m_ExitCtl);

 	DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);

 	DDX_Control(pDX, IDC_ABORT, m_AbortCtl);

 	DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl);

 	DDX_Control(pDX, IDC_LOG, m_Log);

 	DDX_Control(pDX, IDC_CONNECTIONS, m_List);

 	//}}AFX_DATA_MAP

 }

 

 BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)

 	//{{AFX_MSG_MAP(CPumpKINDlg)

 	ON_WM_SYSCOMMAND()

 	ON_WM_DESTROY()

 	ON_WM_PAINT()

 	ON_WM_QUERYDRAGICON()

 	ON_WM_CREATE()

 	ON_BN_CLICKED(IDC_OPTIONS, OnOptions)

 	ON_WM_TIMER()

 	ON_BN_CLICKED(IDC_EXIT, OnExit)

 	ON_BN_CLICKED(IDC_PUT, OnPut)

 	ON_BN_CLICKED(IDC_GET, OnGet)

 	ON_NOTIFY(LVN_DELETEALLITEMS, IDC_CONNECTIONS, OnDeleteallitemsConnections)

 	ON_NOTIFY(LVN_DELETEITEM, IDC_CONNECTIONS, OnDeleteitemConnections)

 	ON_NOTIFY(LVN_INSERTITEM, IDC_CONNECTIONS, OnInsertitemConnections)

 	ON_NOTIFY(LVN_ITEMCHANGED, IDC_CONNECTIONS, OnItemchangedConnections)

 	ON_BN_CLICKED(IDC_ABORT, OnAbort)

 	ON_WM_CLOSE()

 	ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)

+	ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)

 	ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)

 	ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin)

 	ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile)

 	ON_COMMAND(ID_TRAY_HELP, OnTrayHelp)

 	ON_COMMAND(ID_TRAY_OPTIONS, OnTrayOptions)

 	ON_COMMAND(ID_TRAY_SENDFILE, OnTraySendfile)

 	ON_WM_WINDOWPOSCHANGING()

 	ON_LBN_SELCHANGE(IDC_LOG, OnSelchangeLog)

 	ON_COMMAND(ID_TRAY_OPENFILESFOLDER, OnTrayOpenfilesfolder)

 	ON_WM_DROPFILES()

 	ON_BN_CLICKED(ID_HELP, OnHelp)

 	ON_BN_CLICKED(IDC_LISTENING, OnListening)

-	ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)

+	ON_WM_GETMINMAXINFO()

+	ON_WM_SIZE()

 	//}}AFX_MSG_MAP

 END_MESSAGE_MAP()

 

 /////////////////////////////////////////////////////////////////////////////

 // CPumpKINDlg message handlers

 

 BOOL CPumpKINDlg::OnInitDialog()

 {

 	CDialog::OnInitDialog();

 

 	// Add "About..." menu item to system menu.

 

 	// IDM_ABOUTBOX must be in the system command range.

 	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);

 	ASSERT(IDM_ABOUTBOX < 0xF000);

 

 	CMenu* pSysMenu = GetSystemMenu(FALSE);

 	CString strAboutMenu;

 	strAboutMenu.LoadString(IDS_ABOUTBOX);

 	if (!strAboutMenu.IsEmpty())

 	{

 		pSysMenu->AppendMenu(MF_SEPARATOR);

 		pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);

 	}

 

 	// Set the icon for this dialog.  The framework does this automatically

 	//  when the application's main window is not a dialog

 	SetIcon(m_hIcon, TRUE);			// Set big icon

 	SetIcon(m_hIcon, FALSE);		// Set small icon

 

 	VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0));

 

-

 	m_Images.Create(16,16,TRUE,2,1);

 	m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));

 	m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));

 	ASSERT(m_iRRQ>=0);

 	ASSERT(m_iWRQ>=0);

 	m_List.SetImageList(&m_Images,LVSIL_NORMAL);

 	m_List.SetImageList(&m_Images,LVSIL_SMALL);

 	m_List.SetImageList(&m_Images,LVSIL_STATE);

 	m_List.SetTextColor(RGB(255,255,0));	// Yellow

 	m_List.SetTextBkColor(RGB(12,167,0));	// Green

 	m_List.SetBkColor(RGB(12,167,0));	// Green

 CRect listrc;

 	m_List.GetClientRect(&listrc);

 	m_List.InsertColumn(0,"File",LVCFMT_LEFT,listrc.Width()-((listrc.Width()/7)*3+listrc.Width()*2/7),subitemFile);

 	m_List.InsertColumn(1,"type",LVCFMT_CENTER,listrc.Width()/7,subitemType);

 	m_List.InsertColumn(2,"peer",LVCFMT_LEFT,listrc.Width()*2/7,subitemPeer);

 	m_List.InsertColumn(3,"ACK",LVCFMT_RIGHT,listrc.Width()/7,subitemBytes);

 	m_List.InsertColumn(4,"tsize",LVCFMT_RIGHT,listrc.Width()/7,subitemTSize);

 

 	LogLine(IDS_LOG_START);

 

 	SetupButtons();

 

+CRect wrci, wrco;

+	GetWindowRect(&wrco);

+	GetClientRect(&wrci);

+CRect brc;

+	m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_rightGapButtons = wrci.right-brc.right;

+	m_List.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_rightGapList = wrci.right-brc.right;

+	m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_bottomGapListen = wrci.bottom-brc.bottom;

+	m_Log.GetWindowRect(&brc);	ScreenToClient(&brc);

+	m_bottomGapLog = wrci.bottom-brc.bottom;

+	m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height();

+

 CRect rc, drc;

 	GetWindowRect(rc);

 	GetDesktopWindow()->GetWindowRect(drc);

 	SetWindowPos(NULL,drc.right-6-rc.Width(),6,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);

 

 	if(m_bShown)

 		ShowWindow(SW_SHOW);

 	else

 		ShowWindow(SW_HIDE);

 

 	m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);

 

 	// CG: The following block was added by the ToolTips component.

 	{

 		// Create the ToolTip control.

 		m_tooltip.Create(this);

 		m_tooltip.Activate(TRUE);

 

 		m_tooltip.AddTool(&m_List,IDC_CONNECTIONS);

 		m_tooltip.AddTool(GetDlgItem(IDC_PUT),IDC_PUT);

 		m_tooltip.AddTool(GetDlgItem(IDC_GET),IDC_GET);

 		m_tooltip.AddTool(&m_AbortCtl,IDC_ABORT);

 		m_tooltip.AddTool(GetDlgItem(IDC_OPTIONS),IDC_OPTIONS);

 		m_tooltip.AddTool(GetDlgItem(IDC_EXIT),IDC_EXIT);

@@ -2056,24 +2075,85 @@ void CPumpKINDlg::OnListening()
 void CPumpKINDlg::OnTrayListen() 

 {

 	if(!m_Listener.SetListen(!m_Listener.m_bListen)) {

 		TRACE0("Failed to create socket\n");

 		AfxMessageBox(IDS_BOX_CANTBIND,MB_OK|MB_ICONEXCLAMATION);

 	}

 	m_ListenCtl.SetCheck(m_Listener.m_bListen?1:0);

 	m_bListen=m_Listener.m_bListen;

 }

 

 void CPumpKINDlg::LogLine(LPCTSTR str)

 {

 	LogLineToScreen(str);

 	if(!m_LogFile.IsEmpty()) {

 		if(!Klever::LogRecord((LPCTSTR)m_LogFile,str)) {

 			if(m_lastlogerr!=m_LogFile) {

 				CString tmp;

 				tmp.Format(IDS_LOG_LOGERROR,m_LogFile);

 				LogLineToScreen(tmp);

 				m_lastlogerr=m_LogFile;

 			}

 		}

 	}

 }

+

+void CPumpKINDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) 

+{

+	CDialog::OnGetMinMaxInfo(lpMMI);

+	if(m_MinSize.cx>0 && m_MinSize.cy>0){

+		lpMMI->ptMinTrackSize.x = m_MinSize.cx;

+		lpMMI->ptMinTrackSize.y = m_MinSize.cy;

+	}

+}

+

+void CPumpKINDlg::OnSize(UINT nType, int cx, int cy) 

+{

+	CDialog::OnSize(nType, cx, cy);

+	if(nType==SIZE_RESTORED)

+		RecalcLayout(cx,cy);

+}

+

+void CPumpKINDlg::RecalcLayout(int,int)

+{

+	CRect wrc;

+	GetClientRect(&wrc);

+	AdjustButton(m_GetCtl,wrc);

+	AdjustButton(m_PutCtl,wrc);

+	AdjustButton(m_AbortCtl,wrc);

+	AdjustButton(m_HelpCtl,wrc);

+	AdjustButton(m_ExitCtl,wrc);

+	AdjustButton(m_OptionsCtl,wrc);

+	CRect brc;

+	m_List.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_List.SetWindowPos(

+		0,

+		brc.left, brc.top,

+		wrc.right-m_rightGapList-brc.left, brc.bottom-brc.top,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

+	m_Log.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_Log.SetWindowPos(

+		0,

+		brc.left, brc.top,

+		wrc.right-m_rightGapButtons-brc.left, wrc.bottom-m_bottomGapLog-brc.top,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );

+	m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);

+	m_ListenCtl.SetWindowPos(

+		0,

+		wrc.right-brc.Width()-m_rightGapButtons, wrc.bottom-brc.Height()-m_bottomGapListen,

+		0,0,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

+	int i = m_Log.GetCount();

+	if(i!=LB_ERR)

+		m_Log.SetCurSel(i-1);

+}

+

+void CPumpKINDlg::AdjustButton(CWnd& w,CRect& wrc)

+{

+	CRect brc;

+	w.GetWindowRect(&brc); ScreenToClient(&brc);

+	w.SetWindowPos(

+		0,

+		wrc.right-brc.Width()-m_rightGapButtons, brc.top,

+		0, 0,

+		SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );

+}

diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index b247c56..c5469f1 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -346,48 +346,55 @@ public:
 	BOOL ConfirmRequest();

 	WORD m_LastSlack;

 	UINT m_ACK;

 	BOOL OnTFTP(tftp* p);

 	ULONG GetACK(void);

 	void DoXfer();

 	CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin);

 	BOOL Create(LPCTSTR localFile=NULL,LPCTSTR hostName=NULL);

 

 	DECLARE_DYNAMIC(CRRQSocket)

 };

 

 typedef	CMap<SOCKET,SOCKET,CXferSocket*,CXferSocket*>	CTIDMap;

 typedef CMap<CTime*,CTime*,CTime*,CTime*> CTimeMap;

 

 /////////////////////////////////////////////////////////////////////////////

 // CPumpKINDlg dialog

 

 class CTrayer;

 class CRetrier;

 class CPumpKINDlg : public CDialog

 {

 // Construction

 public:

+	void AdjustButton(CWnd& w,CRect& wrc);

+	void RecalcLayout(int,int);

+	CSize m_MinSize;

+	UINT m_bottomGapLog;

+	UINT m_bottomGapListen;

+	UINT m_rightGapList;

+	UINT m_rightGapButtons;

 	CString m_lastlogerr;

 	void LogLine(LPCTSTR str);

 	CString m_LogFile;

 	BOOL m_bListen;

 	acl_rules_t m_aclRules;

 	CString m_bnwRequest;

 	CString m_bnwSuccess;

 	CString m_bnwAbort;

 	CBellsNWhistles m_bnw;

 	CTrayer *m_Trayer;

 	CTimeSpan m_RetryTimeOut;

 	virtual ~CPumpKINDlg();

 	CRetrier* m_Retrier;

 	virtual BOOL PreTranslateMessage(MSG* pMsg);

 	BOOL m_bShown;

 	BOOL m_bExiting;

 	void SaveSettings();

 	void LoadSettings();

 	void SetupButtons();

 	BITMAP m_bitmapBack;

 	CBitmap m_bmpBack;

 	UINT m_PromptTimeOut;

 	UINT m_SpeakPort;

 	void LogLine(UINT msgID);

@@ -409,48 +416,52 @@ public:
 		rrqDenyAll=acl_rule::rrqDeny,

 		rrqFallback=acl_rule::rrqNone,

 		rrqGrant=rrqGiveAll, rrqDeny=rrqDenyAll, rrqPrompt=rrqAlwaysConfirm

 	};

 	enum	{

 		wrqTakeAll=acl_rule::wrqGrant,

 		wrqConfirmIfExists=acl_rule::wrqPromptIfExists,

 		wrqAlwaysConfirm=acl_rule::wrqPrompt,

 		wrqDenyAll=acl_rule::wrqDeny,

 		wrqFallback=acl_rule::wrqNone,

 		wrqGrant=wrqTakeAll,wrqDeny=wrqDenyAll, wrqPrompt=wrqAlwaysConfirm

 	};

 	UINT m_RRQMode;

 	UINT m_WRQMode;

 	BOOL m_bTFTPSubdirs;

 	CString m_TFTPRoot;

 	UINT m_ListenPort;

 	UINT m_BlockSize;

 	CListenSocket m_Listener;

 	CPumpKINDlg(CWnd* pParent = NULL);	// standard constructor

 

 // Dialog Data

 	//{{AFX_DATA(CPumpKINDlg)

 	enum { IDD = IDD_PUMPKIN_DIALOG };

+	CButton	m_HelpCtl;

+	CButton	m_PutCtl;

+	CButton	m_GetCtl;

+	CButton	m_ExitCtl;

 	CButton	m_ListenCtl;

 	CButton	m_AbortCtl;

 	CButton	m_OptionsCtl;

 	CListBox	m_Log;

 	CListCtrl	m_List;

 	//}}AFX_DATA

 

 	// ClassWizard generated virtual function overrides

 	//{{AFX_VIRTUAL(CPumpKINDlg)

 	protected:

 	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support

 	//}}AFX_VIRTUAL

 

 // Implementation

 protected:

 	CToolTipCtrl m_tooltip;

 	HICON m_hIcon;

 

 	// Generated message map functions

 	//{{AFX_MSG(CPumpKINDlg)

 	virtual BOOL OnInitDialog();

 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);

 	afx_msg void OnDestroy();

 	afx_msg void OnPaint();

@@ -461,27 +472,29 @@ protected:
 	afx_msg void OnExit();

 	afx_msg void OnPut();

 	afx_msg void OnGet();

 	afx_msg void OnDeleteallitemsConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnDeleteitemConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnInsertitemConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnItemchangedConnections(NMHDR* pNMHDR, LRESULT* pResult);

 	afx_msg void OnAbort();

 	afx_msg void OnClose();

 	afx_msg void OnTrayShowpumpkinwindow();

 	afx_msg void OnTrayListen();

 	afx_msg void OnTrayExit();

 	afx_msg void OnTrayAboutpumpkin();

 	afx_msg void OnTrayFetchfile();

 	afx_msg void OnTrayHelp();

 	afx_msg void OnTrayOptions();

 	afx_msg void OnTraySendfile();

 	afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos);

 	afx_msg void OnSelchangeLog();

 	afx_msg void OnTrayOpenfilesfolder();

 	afx_msg void OnDropFiles(HDROP hDropInfo);

 	virtual void OnCancel();

 	afx_msg void OnHelp();

 	afx_msg void OnListening();

+	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);

+	afx_msg void OnSize(UINT nType, int cx, int cy);

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 };

diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index abdca4f..505cbf2 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -11,48 +11,49 @@ DO NOT MODIFY THIS FILE DIRECTLY. EDIT XML DOCUMENT INSTEAD
   

 \pard\plain\keepn

 #{\footnote About}

 ${\footnote About PumpKIN}

 K{\footnote about}

 { \f1\fs18\b\sb120 About {\b PumpKIN}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b PumpKIN} is a program designed to send and receive files over the net while having {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} session running using {\i TFTP} ({\uldb {\b RFC1350}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1350.txt")}) protocol. It includes full-functional {\i TFTP} server/client so it may be useful for maintaining {\uldb CISCO}{\v %!ExecFile("http://www.cisco.com/")} routers and other network equipment.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 {\b {\i Enjoy!}}

 {

 \par\pard\plain\sb360\sa120 \f1\fs16 Copyright (c) 1997-2006 {\uldb\cf0 Klever Group (http://www.klever.net/)}{\v %!ExecFile("http://www.klever.net/")}

 \par\qj\sb120\sa120Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

 \par The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 \par \sa360 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 }

 \page

 

 \pard\plain

 #{\footnote News}

 ${\footnote What's New}

 \par\pard\plain\f1\fs24\qc\cf2\b 2.7 - 

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added acess lists based on request IP address and TFTP opcode for automating access policy

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Added possibility to start/stop TFTP server, while keeping client functionality intact

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Logging to file

+\par\pard\plain\fi0\li0\f1\fs18 \bullet  Resizable main window

 \par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  more robust solution to the backslash/slash dilemma

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  A bit more elaborate error reporting

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Fixed uninstall procedure so that it works on XP

 \par\pard\plain\f1\fs24\qc\cf2\b 2.5 - July 11th, 2004

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Change of {\uldb license}{\v About} and opening the source.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Minor cosmetic changes

 \par\pard\plain\f1\fs24\qc\cf2\b 2.0 - June 13th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Sounds customization. Now you can customize {\b PumpKIN} bells and whistles or turn them off completely.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Previous version of {\b PumpKIN} had a bug causing it to misbehave when you're requesting file from remote {\i tftp} server using {\b IP Address} (as opposed to {\b hostname}).

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Typo causing {\b PumpKIN} to log outgoing request in reverse (i.e. {\i Requesting 'hostname' from 'filename'}) fixed.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Something else that you may not notice and I can not remember.

 \par\pard\plain\f1\fs24\qc\cf2\b 1.5 - February 12th, 1998

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  Support for {\b block size}, {\b trasnfer size} and {\b transfer timeout} options as described in {\uldb {\b RFC1782}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1782.txt")}, {\uldb {\b RFC1783}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1783.txt")} and {\uldb {\b RFC1784}}{\v %!ExecFile("http://www.rfc-editor.org/rfc/rfc1784.txt")}. I'm not sure if there are any other {\i TFTP} implementations supporting this, but at least it makes sense if you use {\b PumpKIN} on both ends.

 \par\pard\plain\fi0\li0\f1\fs18 \bullet  New Install program

 \page

 

 \pard\plain\keepn

 #{\footnote Using}

 ${\footnote Using PumpKIN}

 { \f1\fs18\b\sb120 Using {\b PumpKIN}}

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 This is a simple program for file exchange between two parties. It allows you to send files over the network to your party while having a {\uldb {\b T42}}{\v %!ExecFile("http://kin.klever.net/T42/")} or {\b\cf6 Wintalk} conversation. It uses open sessions to determine IP address of your party. Also you may use it as a {\i TFTP} client/server by itself. To get/put files from/to {\i TFTP} server you need to enter host name/IP address manually in the {\uldb Request Dialog}{\v Request}.

 \par\sa120\sb120\qj\pard \f1\fs18\sb120 To Abort transfer(s) currently in progress - select transfer(s) you want to terminate in the list and click {\b Abort xfer} button.

diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 46e3bbc..5c951bb 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -1,39 +1,40 @@
 <?xml version="1.0"?>

 <winhelp>

  <topic id="About" title="About PumpKIN" keywords="about">

   <heading scroll="no">About <kin>PumpKIN</kin></heading>

   <p><kin>PumpKIN</kin> is a program designed to send and receive files over the net while having <kin href="http://kin.klever.net/T42/">T42</kin> or <product>Wintalk</product> session running using <term>TFTP</term> (<rfc num="1350"/>) protocol. It includes full-functional <term>TFTP</term> server/client so it may be useful for maintaining <a href="http://www.cisco.com/">CISCO</a> routers and other network equipment.</p>

   <p/>

   <p><b><i>Enjoy!</i></b></p>

   <license years="1997-2006"/>

   <credist/>

  </topic>

  <topic id="News" title="What's New">

   <newsfor version="2.7" date="">

    <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni>

    <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni>

    <ni>Logging to file</ni>

+   <ni>Resizable main window</ni>

   </newsfor>

   <newsfor version="2.6" date="August 6th, 2005">

    <ni>more robust solution to the backslash/slash dilemma</ni>

    <ni>A bit more elaborate error reporting</ni>

    <ni>Fixed uninstall procedure so that it works on XP</ni>

   </newsfor>

   <newsfor version="2.5" date="July 11th, 2004">

    <ni>Change of <a href="#About">license</a> and opening the source.</ni>

    <ni>Minor cosmetic changes</ni>

   </newsfor>

   <newsfor version="2.0" date="June 13th, 1998">

    <ni>Sounds customization. Now you can customize <kin>PumpKIN</kin> bells and whistles or turn them off completely.</ni>

    <ni>Previous version of <kin>PumpKIN</kin> had a bug causing it to misbehave when you're requesting file from remote <term>tftp</term> server using <b>IP Address</b> (as opposed to <b>hostname</b>).</ni>

    <ni>Typo causing <kin>PumpKIN</kin> to log outgoing request in reverse (i.e. <i>Requesting 'hostname' from 'filename'</i>) fixed.</ni>

    <ni>Something else that you may not notice and I can not remember.</ni>

   </newsfor>

   <newsfor version="1.5" date="February 12th, 1998">

    <ni>Transfer resumes. No checking on file contents is done, so it's up to you to decide whether you want to start transmission from the beginning or resume unfinished transfer.</ni>

    <ni>Support for <b>block size</b>, <b>trasnfer size</b> and <b>transfer timeout</b> options as described in <rfc num="1782"/>, <rfc num="1783"/> and <rfc num="1784"/>. I'm not sure if there are any other <term>TFTP</term> implementations supporting this, but at least it makes sense if you use <kin>PumpKIN</kin> on both ends.</ni>

    <ni>New Install program</ni>

   </newsfor>

  </topic>

  <topic id="Using" title="Using PumpKIN">

   <heading scroll="no">Using <kin>PumpKIN</kin></heading>

diff --git a/pumpkin.clw b/pumpkin.clw
index 5344bfd..213d8c1 100644
--- a/pumpkin.clw
+++ b/pumpkin.clw
@@ -1,107 +1,107 @@
 ; CLW file contains information for the MFC ClassWizard

 

 [General Info]

 Version=1

-LastClass=CPropsServer

+LastClass=CPumpKINDlg

 LastTemplate=CComboBox

 NewFileInclude1=#include "stdafx.h"

 NewFileInclude2=#include "PumpKIN.h"

 

 ClassCount=14

 Class1=CPumpKINApp

 Class2=CPumpKINDlg

 Class3=CAboutDlg

 

 ResourceCount=10

 Resource1=IDD_REQUEST

 Resource2=IDD_PROPS_NETWORK

 Resource3=IDD_CONFIRM_RRQ

-Resource4=IDD_ABOUTBOX

+Resource4=IDD_PROPS_SERVER

 Class4=CPropsServer

 Class5=CPropsNetwork

 Resource5=IDD_CONFIRM_WRQ

 Resource6=IDD_PROPS_ACL

 Class6=CConfirmRRQDlg

 Class7=CConfirmWRQDlg

-Resource7=IDD_PUMPKIN_DIALOG

+Resource7=IDD_ABOUTBOX

 Class8=CRequestDlg

 Class9=CResolver

 Class10=CRetrier

 Class11=CTrayer

 Resource8=IDD_PROPS_SOUNDS

 Class12=CPropsSounds

 Resource9=IDM_POPUPS

 Class13=CPropsACL

 Class14=CACLTargetCombo

-Resource10=IDD_PROPS_SERVER

+Resource10=IDD_PUMPKIN_DIALOG

 

 [CLS:CPumpKINApp]

 Type=0

 HeaderFile=PumpKIN.h

 ImplementationFile=PumpKIN.cpp

 Filter=N

 

 [CLS:CPumpKINDlg]

 Type=0

 HeaderFile=PumpKINDlg.h

 ImplementationFile=PumpKINDlg.cpp

 Filter=W

 BaseClass=CDialog

 VirtualFilter=dWC

 LastObject=CPumpKINDlg

 

 [CLS:CAboutDlg]

 Type=0

 HeaderFile=PumpKINDlg.h

 ImplementationFile=PumpKINDlg.cpp

 Filter=D

 BaseClass=CDialog

 VirtualFilter=dWC

 LastObject=CAboutDlg

 

 [DLG:IDD_ABOUTBOX]

 Type=1

 Class=CAboutDlg

 ControlCount=5

 Control1=IDC_STATIC,static,1342177283

 Control2=IDC_STATIC,static,1342308480

 Control3=IDC_STATIC,static,1342308352

 Control4=IDOK,button,1342373889

 Control5=IDC_KLEVERNET,button,1342242816

 

 [DLG:IDD_PUMPKIN_DIALOG]

 Type=1

 Class=CPumpKINDlg

 ControlCount=10

 Control1=IDC_CONNECTIONS,SysListView32,1350631681

 Control2=IDC_GET,button,1342259200

 Control3=IDC_PUT,button,1342259200

 Control4=IDC_ABORT,button,1342259200

 Control5=IDC_OPTIONS,button,1342259200

 Control6=IDC_EXIT,button,1342259200

 Control7=ID_HELP,button,1342259200

-Control8=IDC_LOG,listbox,1353728129

+Control8=IDC_LOG,listbox,1353728385

 Control9=IDCANCEL,button,1073741824

 Control10=IDC_LISTENING,button,1342275619

 

 [DLG:IDD_PROPS_SERVER]

 Type=1

 Class=CPropsServer

 ControlCount=18

 Control1=IDC_STATIC,button,1342177287

 Control2=IDC_TFTPROOT,edit,1350631552

 Control3=IDC_BROWSE,button,1342242880

 Control4=IDC_TFTPSUBDIRS,button,1342242819

 Control5=IDC_STATIC,button,1342177287

 Control6=IDC_RRQ_GIVEALL,button,1342324745

 Control7=IDC_RRQ_ALWAYSCONFIRM,button,1342193673

 Control8=IDC_RRQ_DENYALL,button,1342193673

 Control9=IDC_STATIC,button,1342308359

 Control10=IDC_WRQ_TAKEALL,button,1342308361

 Control11=IDC_WRQ_PROMPTEXISTING,button,1342177289

 Control12=IDC_WRQ_ALWAYSCONFIRM,button,1342177289

 Control13=IDC_WRQ_DENYALL,button,1342177289

 Control14=IDC_STATIC,static,1342308609

 Control15=IDC_PROMPTTIMEOUT,msctls_trackbar32,1342242823

 Control16=IDC_STATIC,button,1342177287

 Control17=IDC_LOGFILE,edit,1350631552

@@ -113,49 +113,49 @@ Class=CPropsNetwork
 ControlCount=15

 Control1=IDC_STATIC,button,1342177287

 Control2=IDC_STATIC,static,1342308354

 Control3=IDC_LISTENPORT,edit,1350631552

 Control4=IDC_LISTENSPIN,msctls_updown32,1342177463

 Control5=IDC_STATIC,static,1342308354

 Control6=IDC_SPEAKPORT,edit,1350631552

 Control7=IDC_SPEAKSPIN,msctls_updown32,1342177463

 Control8=IDC_STATIC,static,1342308352

 Control9=IDC_TIMEOUT,edit,1350639744

 Control10=IDC_TIMESPIN,msctls_updown32,1342177463

 Control11=IDC_STATIC,static,1342308352

 Control12=IDC_STATIC,static,1342308352

 Control13=IDC_STATIC,static,1342308352

 Control14=IDC_BLOCKSIZE,edit,1350639744

 Control15=IDC_BSIZESPIN,msctls_updown32,1342177463

 

 [CLS:CPropsServer]

 Type=0

 HeaderFile=PropsServer.h

 ImplementationFile=PropsServer.cpp

 BaseClass=CPropertyPage

 Filter=D

 VirtualFilter=idWC

-LastObject=IDC_LOGFILE_BROWSE

+LastObject=CPropsServer

 

 [CLS:CPropsNetwork]

 Type=0

 HeaderFile=PropsNetwork.h

 ImplementationFile=PropsNetwork.cpp

 BaseClass=CPropertyPage

 Filter=D

 VirtualFilter=idWC

 LastObject=IDC_BLOCKSIZE

 

 [DLG:IDD_CONFIRM_RRQ]

 Type=1

 Class=CConfirmRRQDlg

 ControlCount=9

 Control1=IDOK,button,1342242817

 Control2=IDCANCEL,button,1342242816

 Control3=IDC_STATIC,static,1342308352

 Control4=IDC_HOST,static,1350701313

 Control5=IDC_STATIC,static,1342308353

 Control6=IDC_FILE,static,1350701313

 Control7=IDC_STATIC,static,1342177296

 Control8=IDC_STATIC,static,1342177283

 Control9=IDC_STATIC,static,1342177283

 

diff --git a/pumpkin.mak b/pumpkin.mak
index 7d2ec22..a22a6fa 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -17,49 +17,49 @@ CFG=Install - Win32 Debug
 !MESSAGE by defining the macro CFG on the command line.  For example:

 !MESSAGE 

 !MESSAGE NMAKE /f "pumpkin.mak" CFG="Install - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "PumpKIN - Win32 Release" (based on "Win32 (x86) Application")

 !MESSAGE "PumpKIN - Win32 Debug" (based on "Win32 (x86) Application")

 !MESSAGE "PumpKIN - Win32 Static" (based on "Win32 (x86) Application")

 !MESSAGE "Install - Win32 Debug" (based on "Win32 (x86) Application")

 !MESSAGE "Install - Win32 Pure" (based on "Win32 (x86) Application")

 !MESSAGE "Install - Win32 Static" (based on "Win32 (x86) Application")

 !MESSAGE "Install - Win32 Canned" (based on "Win32 (x86) Application")

 !MESSAGE 

 !ERROR An invalid configuration is specified.

 !ENDIF 

 

 !IF "$(OS)" == "Windows_NT"

 NULL=

 !ELSE 

 NULL=nul

 !ENDIF 

 ################################################################################

 # Begin Project

-# PROP Target_Last_Scanned "Install - Win32 Canned"

+# PROP Target_Last_Scanned "PumpKIN - Win32 Debug"

 CPP=cl.exe

 RSC=rc.exe

 MTL=mktyplib.exe

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 # PROP BASE Use_MFC 6

 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Release"

 # PROP BASE Intermediate_Dir "Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 6

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 OUTDIR=.\Release

 INTDIR=.\Release

 # Begin Custom Macros

 OutDir=.\Release

 TargetName=pumpkin

 # End Custom Macros

 

 ALL : "$(OUTDIR)\pumpkin.exe" "$(OUTDIR)\pumpkin.ex_" "$(OUTDIR)\pumpkin.hlp"\

@@ -685,154 +685,119 @@ LINK32_OBJS= \
 ################################################################################

 # Begin Source File

 

 SOURCE=.\PumpKIN.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_PUMPK=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PUMPK=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_PUMPK=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PumpKINDlg.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PUMPKI=\

 	".\ACLTargetCombo.h"\

 	".\ConfirmRRQDlg.h"\

 	".\ConfirmWRQDlg.h"\

 	".\PropsACL.h"\

 	".\PropsNetwork.h"\

 	".\PropsServer.h"\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\RequestDlg.h"\

 	".\Resolver.h"\

 	".\Retrier.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PUMPKI=\

-	".\ACLTargetCombo.h"\

-	".\ConfirmRRQDlg.h"\

-	".\ConfirmWRQDlg.h"\

-	".\PropsACL.h"\

-	".\PropsNetwork.h"\

-	".\PropsServer.h"\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\RequestDlg.h"\

-	".\Resolver.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PUMPKI=\

-	".\ACLTargetCombo.h"\

-	".\ConfirmRRQDlg.h"\

-	".\ConfirmWRQDlg.h"\

-	".\PropsACL.h"\

-	".\PropsNetwork.h"\

-	".\PropsServer.h"\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\RequestDlg.h"\

-	".\Resolver.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\StdAfx.cpp

 DEP_CPP_STDAF=\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 # ADD CPP /Yc"stdafx.h"

 

 BuildCmds= \

 	$(CPP) /nologo /Zp1 /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\

@@ -1020,48 +985,49 @@ BuildCmds= \
 ################################################################################

 # Begin Source File

 

 SOURCE=.\PropsServer.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_PROPS=\

 	".\PropsServer.h"\

 	".\pumpkin.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PROPS=\

 	".\PropsServer.h"\

 	".\pumpkin.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_PROPS=\

 	".\PropsServer.h"\

 	".\pumpkin.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

@@ -1113,48 +1079,49 @@ DEP_CPP_PROPSN=\
 

 SOURCE=.\ConfirmRRQDlg.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_CONFI=\

 	".\ConfirmRRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_CONFI=\

 	".\ConfirmRRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_CONFI=\

 	".\ConfirmRRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1168,48 +1135,49 @@ DEP_CPP_CONFI=\
 

 SOURCE=.\ConfirmWRQDlg.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_CONFIR=\

 	".\ConfirmWRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_CONFIR=\

 	".\ConfirmWRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_CONFIR=\

 	".\ConfirmWRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1262,48 +1230,49 @@ DEP_CPP_REQUE=\
 

 SOURCE=.\Resolver.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_RESOL=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Resolver.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_RESOL=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Resolver.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_RESOL=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Resolver.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1317,48 +1286,49 @@ DEP_CPP_RESOL=\
 

 SOURCE=.\Retrier.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_RETRI=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Retrier.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_RETRI=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Retrier.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_RETRI=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Retrier.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

@@ -1371,48 +1341,49 @@ DEP_CPP_RETRI=\
 # Begin Source File

 

 SOURCE=.\Trayer.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_TRAYE=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_TRAYE=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Trayer.sbr" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_TRAYE=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

@@ -1447,161 +1418,146 @@ SOURCE=.\help\pumpkin.cnt
 

 SOURCE=.\PropsSounds.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_PROPSS=\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_PROPSS=\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_PROPSS=\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PropsACL.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PROPSA=\

 	".\ACLTargetCombo.h"\

 	".\PropsACL.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PROPSA=\

-	".\ACLTargetCombo.h"\

-	".\PropsACL.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsACL.sbr" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PROPSA=\

-	".\ACLTargetCombo.h"\

-	".\PropsACL.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\ACLTargetCombo.cpp

 

 !IF  "$(CFG)" == "PumpKIN - Win32 Release"

 

 DEP_CPP_ACLTA=\

 	".\ACLTargetCombo.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

 DEP_CPP_ACLTA=\

 	".\ACLTargetCombo.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

+	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

 DEP_CPP_ACLTA=\

 	".\ACLTargetCombo.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

diff --git a/pumpkin.rc b/pumpkin.rc
index 87745db..9933454 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -73,73 +73,73 @@ IDI_PLAY                ICON    DISCARDABLE     "shared-data/play-icon.ico"
 IDI_UP                  ICON    DISCARDABLE     "res\\up.ico"

 IDI_DOWN                ICON    DISCARDABLE     "res\\down.ico"

 IDI_REMOVE              ICON    DISCARDABLE     "res\\remove.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

     LTEXT           "PumpKIN, Version 2.7",IDC_STATIC,40,15,119,8,

                     SS_NOPREFIX

     LTEXT           "Copyright © 1997-2006 Klever Group",IDC_STATIC,40,30,

                     170,8

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14

 END

 

 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193

-STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

-    WS_SYSMENU

+STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW

 CAPTION "  PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     CONTROL         "List1",IDC_CONNECTIONS,"SysListView32",LVS_REPORT | 

                     LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,7,295,108,

                     WS_EX_DLGMODALFRAME

     PUSHBUTTON      "&Get File",IDC_GET,305,7,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Put File",IDC_PUT,305,25,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Abort xfer",IDC_ABORT,305,43,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Options",IDC_OPTIONS,305,61,50,17,BS_NOTIFY,

                     WS_EX_CLIENTEDGE

     PUSHBUTTON      "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE

-    LISTBOX         IDC_LOG,7,115,348,65,LBS_USETABSTOPS | LBS_NOSEL | 

-                    WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME

+    LISTBOX         IDC_LOG,7,115,348,64,LBS_USETABSTOPS | 

+                    LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | 

+                    WS_HSCROLL,WS_EX_DLGMODALFRAME

     PUSHBUTTON      "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP

     CONTROL         "&Server is running",IDC_LISTENING,"Button",

                     BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286,

-                    180,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

+                    181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE

 END

 

 IDD_PROPS_SERVER DIALOG DISCARDABLE  0, 0, 300, 201

 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

 CAPTION "Server"

 FONT 8, "MS Sans Serif"

 BEGIN

     GROUPBOX        "TFTP filesystem &root (download path)",IDC_STATIC,7,7,

                     286,38

     EDITTEXT        IDC_TFTPROOT,13,16,256,13,ES_AUTOHSCROLL

     PUSHBUTTON      "&B",IDC_BROWSE,274,16,13,13,BS_ICON

     CONTROL         "Allow access to &subdirectories",IDC_TFTPSUBDIRS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,111,10

     GROUPBOX        "Read Request Behavior",IDC_STATIC,7,48,243,56

     CONTROL         "Give &all files",IDC_RRQ_GIVEALL,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY | WS_GROUP,13,63,53,10

     CONTROL         "&Prompt before giving file",IDC_RRQ_ALWAYSCONFIRM,

                     "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,43,75,91,10

     CONTROL         "&Deny all requests",IDC_RRQ_DENYALL,"Button",

                     BS_AUTORADIOBUTTON | BS_NOTIFY,73,87,70,10

     GROUPBOX        "Write Request Behavior",IDC_STATIC,7,106,243,56,

                     WS_GROUP

     CONTROL         "Take a&ll files",IDC_WRQ_TAKEALL,"Button",

                     BS_AUTORADIOBUTTON | WS_GROUP,13,116,55,10