summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PumpKINDlg.cpp84
-rw-r--r--PumpKINDlg.h13
-rw-r--r--help/pumpkin.rtf1
-rw-r--r--help/pumpkin.xml1
-rw-r--r--pumpkin.clw12
-rw-r--r--pumpkin.mak76
-rw-r--r--pumpkin.rc10
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
@@ -129,6 +129,10 @@ void CPumpKINDlg::DoDataExchange(CDataExchange* pDX)
129{ 129{
130 CDialog::DoDataExchange(pDX); 130 CDialog::DoDataExchange(pDX);
131 //{{AFX_DATA_MAP(CPumpKINDlg) 131 //{{AFX_DATA_MAP(CPumpKINDlg)
132 DDX_Control(pDX, ID_HELP, m_HelpCtl);
133 DDX_Control(pDX, IDC_PUT, m_PutCtl);
134 DDX_Control(pDX, IDC_GET, m_GetCtl);
135 DDX_Control(pDX, IDC_EXIT, m_ExitCtl);
132 DDX_Control(pDX, IDC_LISTENING, m_ListenCtl); 136 DDX_Control(pDX, IDC_LISTENING, m_ListenCtl);
133 DDX_Control(pDX, IDC_ABORT, m_AbortCtl); 137 DDX_Control(pDX, IDC_ABORT, m_AbortCtl);
134 DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl); 138 DDX_Control(pDX, IDC_OPTIONS, m_OptionsCtl);
@@ -156,6 +160,7 @@ BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)
156 ON_BN_CLICKED(IDC_ABORT, OnAbort) 160 ON_BN_CLICKED(IDC_ABORT, OnAbort)
157 ON_WM_CLOSE() 161 ON_WM_CLOSE()
158 ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow) 162 ON_COMMAND(ID_TRAY_SHOWPUMPKINWINDOW, OnTrayShowpumpkinwindow)
163 ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen)
159 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit) 164 ON_COMMAND(ID_TRAY_EXIT, OnTrayExit)
160 ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin) 165 ON_COMMAND(ID_TRAY_ABOUTPUMPKIN, OnTrayAboutpumpkin)
161 ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile) 166 ON_COMMAND(ID_TRAY_FETCHFILE, OnTrayFetchfile)
@@ -168,7 +173,8 @@ BEGIN_MESSAGE_MAP(CPumpKINDlg, CDialog)
168 ON_WM_DROPFILES() 173 ON_WM_DROPFILES()
169 ON_BN_CLICKED(ID_HELP, OnHelp) 174 ON_BN_CLICKED(ID_HELP, OnHelp)
170 ON_BN_CLICKED(IDC_LISTENING, OnListening) 175 ON_BN_CLICKED(IDC_LISTENING, OnListening)
171 ON_COMMAND(ID_TRAY_LISTEN, OnTrayListen) 176 ON_WM_GETMINMAXINFO()
177 ON_WM_SIZE()
172 //}}AFX_MSG_MAP 178 //}}AFX_MSG_MAP
173END_MESSAGE_MAP() 179END_MESSAGE_MAP()
174 180
@@ -201,7 +207,6 @@ BOOL CPumpKINDlg::OnInitDialog()
201 207
202 VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0)); 208 VERIFY(m_Retrier->Create(NULL,"PumpKIN-Retrier",WS_CHILD,CRect(0,0,0,0),this,0));
203 209
204
205 m_Images.Create(16,16,TRUE,2,1); 210 m_Images.Create(16,16,TRUE,2,1);
206 m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ)); 211 m_iRRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_RRQ));
207 m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ)); 212 m_iWRQ = m_Images.Add(AfxGetApp()->LoadIcon(IDI_WRQ));
@@ -225,6 +230,20 @@ CRect listrc;
225 230
226 SetupButtons(); 231 SetupButtons();
227 232
233CRect wrci, wrco;
234 GetWindowRect(&wrco);
235 GetClientRect(&wrci);
236CRect brc;
237 m_GetCtl.GetWindowRect(&brc); ScreenToClient(&brc);
238 m_rightGapButtons = wrci.right-brc.right;
239 m_List.GetWindowRect(&brc); ScreenToClient(&brc);
240 m_rightGapList = wrci.right-brc.right;
241 m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);
242 m_bottomGapListen = wrci.bottom-brc.bottom;
243 m_Log.GetWindowRect(&brc);ScreenToClient(&brc);
244 m_bottomGapLog = wrci.bottom-brc.bottom;
245 m_MinSize.cx = wrco.Width(); m_MinSize.cy=wrco.Height();
246
228CRect rc, drc; 247CRect rc, drc;
229 GetWindowRect(rc); 248 GetWindowRect(rc);
230 GetDesktopWindow()->GetWindowRect(drc); 249 GetDesktopWindow()->GetWindowRect(drc);
@@ -2077,3 +2096,64 @@ void CPumpKINDlg::LogLine(LPCTSTR str)
2077 } 2096 }
2078 } 2097 }
2079} 2098}
2099
2100void CPumpKINDlg::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
2101{
2102 CDialog::OnGetMinMaxInfo(lpMMI);
2103 if(m_MinSize.cx>0 && m_MinSize.cy>0){
2104 lpMMI->ptMinTrackSize.x = m_MinSize.cx;
2105 lpMMI->ptMinTrackSize.y = m_MinSize.cy;
2106 }
2107}
2108
2109void CPumpKINDlg::OnSize(UINT nType, int cx, int cy)
2110{
2111 CDialog::OnSize(nType, cx, cy);
2112 if(nType==SIZE_RESTORED)
2113 RecalcLayout(cx,cy);
2114}
2115
2116void CPumpKINDlg::RecalcLayout(int,int)
2117{
2118 CRect wrc;
2119 GetClientRect(&wrc);
2120 AdjustButton(m_GetCtl,wrc);
2121 AdjustButton(m_PutCtl,wrc);
2122 AdjustButton(m_AbortCtl,wrc);
2123 AdjustButton(m_HelpCtl,wrc);
2124 AdjustButton(m_ExitCtl,wrc);
2125 AdjustButton(m_OptionsCtl,wrc);
2126 CRect brc;
2127 m_List.GetWindowRect(&brc); ScreenToClient(&brc);
2128 m_List.SetWindowPos(
2129 0,
2130 brc.left, brc.top,
2131 wrc.right-m_rightGapList-brc.left, brc.bottom-brc.top,
2132 SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );
2133 m_Log.GetWindowRect(&brc); ScreenToClient(&brc);
2134 m_Log.SetWindowPos(
2135 0,
2136 brc.left, brc.top,
2137 wrc.right-m_rightGapButtons-brc.left, wrc.bottom-m_bottomGapLog-brc.top,
2138 SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOZORDER|SWP_NOCOPYBITS );
2139 m_ListenCtl.GetWindowRect(&brc); ScreenToClient(&brc);
2140 m_ListenCtl.SetWindowPos(
2141 0,
2142 wrc.right-brc.Width()-m_rightGapButtons, wrc.bottom-brc.Height()-m_bottomGapListen,
2143 0,0,
2144 SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );
2145 int i = m_Log.GetCount();
2146 if(i!=LB_ERR)
2147 m_Log.SetCurSel(i-1);
2148}
2149
2150void CPumpKINDlg::AdjustButton(CWnd& w,CRect& wrc)
2151{
2152 CRect brc;
2153 w.GetWindowRect(&brc); ScreenToClient(&brc);
2154 w.SetWindowPos(
2155 0,
2156 wrc.right-brc.Width()-m_rightGapButtons, brc.top,
2157 0, 0,
2158 SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER|SWP_NOCOPYBITS );
2159}
diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index b247c56..c5469f1 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -367,6 +367,13 @@ class CPumpKINDlg : public CDialog
367{ 367{
368// Construction 368// Construction
369public: 369public:
370 void AdjustButton(CWnd& w,CRect& wrc);
371 void RecalcLayout(int,int);
372 CSize m_MinSize;
373 UINT m_bottomGapLog;
374 UINT m_bottomGapListen;
375 UINT m_rightGapList;
376 UINT m_rightGapButtons;
370 CString m_lastlogerr; 377 CString m_lastlogerr;
371 void LogLine(LPCTSTR str); 378 void LogLine(LPCTSTR str);
372 CString m_LogFile; 379 CString m_LogFile;
@@ -430,6 +437,10 @@ public:
430// Dialog Data 437// Dialog Data
431 //{{AFX_DATA(CPumpKINDlg) 438 //{{AFX_DATA(CPumpKINDlg)
432 enum { IDD = IDD_PUMPKIN_DIALOG }; 439 enum { IDD = IDD_PUMPKIN_DIALOG };
440 CButtonm_HelpCtl;
441 CButtonm_PutCtl;
442 CButtonm_GetCtl;
443 CButtonm_ExitCtl;
433 CButtonm_ListenCtl; 444 CButtonm_ListenCtl;
434 CButtonm_AbortCtl; 445 CButtonm_AbortCtl;
435 CButtonm_OptionsCtl; 446 CButtonm_OptionsCtl;
@@ -482,6 +493,8 @@ protected:
482 virtual void OnCancel(); 493 virtual void OnCancel();
483 afx_msg void OnHelp(); 494 afx_msg void OnHelp();
484 afx_msg void OnListening(); 495 afx_msg void OnListening();
496 afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
497 afx_msg void OnSize(UINT nType, int cx, int cy);
485 //}}AFX_MSG 498 //}}AFX_MSG
486 DECLARE_MESSAGE_MAP() 499 DECLARE_MESSAGE_MAP()
487}; 500};
diff --git a/help/pumpkin.rtf b/help/pumpkin.rtf
index abdca4f..505cbf2 100644
--- a/help/pumpkin.rtf
+++ b/help/pumpkin.rtf
@@ -32,6 +32,7 @@ ${\footnote What's New}
32\par\pard\plain\fi0\li0\f1\fs18 \bullet Added acess lists based on request IP address and TFTP opcode for automating access policy 32\par\pard\plain\fi0\li0\f1\fs18 \bullet Added acess lists based on request IP address and TFTP opcode for automating access policy
33\par\pard\plain\fi0\li0\f1\fs18 \bullet Added possibility to start/stop TFTP server, while keeping client functionality intact 33\par\pard\plain\fi0\li0\f1\fs18 \bullet Added possibility to start/stop TFTP server, while keeping client functionality intact
34\par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file 34\par\pard\plain\fi0\li0\f1\fs18 \bullet Logging to file
35\par\pard\plain\fi0\li0\f1\fs18 \bullet Resizable main window
35\par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005 36\par\pard\plain\f1\fs24\qc\cf2\b 2.6 - August 6th, 2005
36\par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma 37\par\pard\plain\fi0\li0\f1\fs18 \bullet more robust solution to the backslash/slash dilemma
37\par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting 38\par\pard\plain\fi0\li0\f1\fs18 \bullet A bit more elaborate error reporting
diff --git a/help/pumpkin.xml b/help/pumpkin.xml
index 46e3bbc..5c951bb 100644
--- a/help/pumpkin.xml
+++ b/help/pumpkin.xml
@@ -13,6 +13,7 @@
13 <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni> 13 <ni>Added acess lists based on request IP address and TFTP opcode for automating access policy</ni>
14 <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni> 14 <ni>Added possibility to start/stop TFTP server, while keeping client functionality intact</ni>
15 <ni>Logging to file</ni> 15 <ni>Logging to file</ni>
16 <ni>Resizable main window</ni>
16 </newsfor> 17 </newsfor>
17 <newsfor version="2.6" date="August 6th, 2005"> 18 <newsfor version="2.6" date="August 6th, 2005">
18 <ni>more robust solution to the backslash/slash dilemma</ni> 19 <ni>more robust solution to the backslash/slash dilemma</ni>
diff --git a/pumpkin.clw b/pumpkin.clw
index 5344bfd..213d8c1 100644
--- a/pumpkin.clw
+++ b/pumpkin.clw
@@ -2,7 +2,7 @@
2 2
3[General Info] 3[General Info]
4Version=1 4Version=1
5LastClass=CPropsServer 5LastClass=CPumpKINDlg
6LastTemplate=CComboBox 6LastTemplate=CComboBox
7NewFileInclude1=#include "stdafx.h" 7NewFileInclude1=#include "stdafx.h"
8NewFileInclude2=#include "PumpKIN.h" 8NewFileInclude2=#include "PumpKIN.h"
@@ -16,14 +16,14 @@ ResourceCount=10
16Resource1=IDD_REQUEST 16Resource1=IDD_REQUEST
17Resource2=IDD_PROPS_NETWORK 17Resource2=IDD_PROPS_NETWORK
18Resource3=IDD_CONFIRM_RRQ 18Resource3=IDD_CONFIRM_RRQ
19Resource4=IDD_ABOUTBOX 19Resource4=IDD_PROPS_SERVER
20Class4=CPropsServer 20Class4=CPropsServer
21Class5=CPropsNetwork 21Class5=CPropsNetwork
22Resource5=IDD_CONFIRM_WRQ 22Resource5=IDD_CONFIRM_WRQ
23Resource6=IDD_PROPS_ACL 23Resource6=IDD_PROPS_ACL
24Class6=CConfirmRRQDlg 24Class6=CConfirmRRQDlg
25Class7=CConfirmWRQDlg 25Class7=CConfirmWRQDlg
26Resource7=IDD_PUMPKIN_DIALOG 26Resource7=IDD_ABOUTBOX
27Class8=CRequestDlg 27Class8=CRequestDlg
28Class9=CResolver 28Class9=CResolver
29Class10=CRetrier 29Class10=CRetrier
@@ -33,7 +33,7 @@ Class12=CPropsSounds
33Resource9=IDM_POPUPS 33Resource9=IDM_POPUPS
34Class13=CPropsACL 34Class13=CPropsACL
35Class14=CACLTargetCombo 35Class14=CACLTargetCombo
36Resource10=IDD_PROPS_SERVER 36Resource10=IDD_PUMPKIN_DIALOG
37 37
38[CLS:CPumpKINApp] 38[CLS:CPumpKINApp]
39Type=0 39Type=0
@@ -80,7 +80,7 @@ Control4=IDC_ABORT,button,1342259200
80Control5=IDC_OPTIONS,button,1342259200 80Control5=IDC_OPTIONS,button,1342259200
81Control6=IDC_EXIT,button,1342259200 81Control6=IDC_EXIT,button,1342259200
82Control7=ID_HELP,button,1342259200 82Control7=ID_HELP,button,1342259200
83Control8=IDC_LOG,listbox,1353728129 83Control8=IDC_LOG,listbox,1353728385
84Control9=IDCANCEL,button,1073741824 84Control9=IDCANCEL,button,1073741824
85Control10=IDC_LISTENING,button,1342275619 85Control10=IDC_LISTENING,button,1342275619
86 86
@@ -134,7 +134,7 @@ ImplementationFile=PropsServer.cpp
134BaseClass=CPropertyPage 134BaseClass=CPropertyPage
135Filter=D 135Filter=D
136VirtualFilter=idWC 136VirtualFilter=idWC
137LastObject=IDC_LOGFILE_BROWSE 137LastObject=CPropsServer
138 138
139[CLS:CPropsNetwork] 139[CLS:CPropsNetwork]
140Type=0 140Type=0
diff --git a/pumpkin.mak b/pumpkin.mak
index 7d2ec22..a22a6fa 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -38,7 +38,7 @@ NULL=nul
38!ENDIF 38!ENDIF
39################################################################################ 39################################################################################
40# Begin Project 40# Begin Project
41# PROP Target_Last_Scanned "Install - Win32 Canned" 41# PROP Target_Last_Scanned "PumpKIN - Win32 Debug"
42CPP=cl.exe 42CPP=cl.exe
43RSC=rc.exe 43RSC=rc.exe
44MTL=mktyplib.exe 44MTL=mktyplib.exe
@@ -706,6 +706,7 @@ DEP_CPP_PUMPK=\
706DEP_CPP_PUMPK=\ 706DEP_CPP_PUMPK=\
707 ".\pumpkin.h"\ 707 ".\pumpkin.h"\
708 ".\PumpKINDlg.h"\ 708 ".\PumpKINDlg.h"\
709 ".\shared-code\BellsNWhistles.h"\
709 ".\shared-code\kHelpers.h"\ 710 ".\shared-code\kHelpers.h"\
710 ".\stdafx.h"\ 711 ".\stdafx.h"\
711 712
@@ -738,9 +739,6 @@ DEP_CPP_PUMPK=\
738# Begin Source File 739# Begin Source File
739 740
740SOURCE=.\PumpKINDlg.cpp 741SOURCE=.\PumpKINDlg.cpp
741
742!IF "$(CFG)" == "PumpKIN - Win32 Release"
743
744DEP_CPP_PUMPKI=\ 742DEP_CPP_PUMPKI=\
745 ".\ACLTargetCombo.h"\ 743 ".\ACLTargetCombo.h"\
746 ".\ConfirmRRQDlg.h"\ 744 ".\ConfirmRRQDlg.h"\
@@ -760,30 +758,15 @@ DEP_CPP_PUMPKI=\
760 ".\Trayer.h"\ 758 ".\Trayer.h"\
761 759
762 760
761!IF "$(CFG)" == "PumpKIN - Win32 Release"
762
763
763"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 764"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
764 "$(INTDIR)\pumpkin.pch" 765 "$(INTDIR)\pumpkin.pch"
765 766
766 767
767!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 768!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
768 769
769DEP_CPP_PUMPKI=\
770 ".\ACLTargetCombo.h"\
771 ".\ConfirmRRQDlg.h"\
772 ".\ConfirmWRQDlg.h"\
773 ".\PropsACL.h"\
774 ".\PropsNetwork.h"\
775 ".\PropsServer.h"\
776 ".\PropsSounds.h"\
777 ".\pumpkin.h"\
778 ".\PumpKINDlg.h"\
779 ".\RequestDlg.h"\
780 ".\Resolver.h"\
781 ".\Retrier.h"\
782 ".\shared-code\BellsNWhistles.h"\
783 ".\shared-code\kHelpers.h"\
784 ".\stdafx.h"\
785 ".\Trayer.h"\
786
787 770
788"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 771"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
789 "$(INTDIR)\pumpkin.pch" 772 "$(INTDIR)\pumpkin.pch"
@@ -794,24 +777,6 @@ DEP_CPP_PUMPKI=\
794 777
795!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 778!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
796 779
797DEP_CPP_PUMPKI=\
798 ".\ACLTargetCombo.h"\
799 ".\ConfirmRRQDlg.h"\
800 ".\ConfirmWRQDlg.h"\
801 ".\PropsACL.h"\
802 ".\PropsNetwork.h"\
803 ".\PropsServer.h"\
804 ".\PropsSounds.h"\
805 ".\pumpkin.h"\
806 ".\PumpKINDlg.h"\
807 ".\RequestDlg.h"\
808 ".\Resolver.h"\
809 ".\Retrier.h"\
810 ".\shared-code\BellsNWhistles.h"\
811 ".\shared-code\kHelpers.h"\
812 ".\stdafx.h"\
813 ".\Trayer.h"\
814
815 780
816"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 781"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
817 "$(INTDIR)\pumpkin.pch" 782 "$(INTDIR)\pumpkin.pch"
@@ -1041,6 +1006,7 @@ DEP_CPP_PROPS=\
1041DEP_CPP_PROPS=\ 1006DEP_CPP_PROPS=\
1042 ".\PropsServer.h"\ 1007 ".\PropsServer.h"\
1043 ".\pumpkin.h"\ 1008 ".\pumpkin.h"\
1009 ".\shared-code\BellsNWhistles.h"\
1044 ".\shared-code\kHelpers.h"\ 1010 ".\shared-code\kHelpers.h"\
1045 ".\stdafx.h"\ 1011 ".\stdafx.h"\
1046 1012
@@ -1134,6 +1100,7 @@ DEP_CPP_CONFI=\
1134 ".\ConfirmRRQDlg.h"\ 1100 ".\ConfirmRRQDlg.h"\
1135 ".\pumpkin.h"\ 1101 ".\pumpkin.h"\
1136 ".\PumpKINDlg.h"\ 1102 ".\PumpKINDlg.h"\
1103 ".\shared-code\BellsNWhistles.h"\
1137 ".\shared-code\kHelpers.h"\ 1104 ".\shared-code\kHelpers.h"\
1138 ".\stdafx.h"\ 1105 ".\stdafx.h"\
1139 1106
@@ -1189,6 +1156,7 @@ DEP_CPP_CONFIR=\
1189 ".\ConfirmWRQDlg.h"\ 1156 ".\ConfirmWRQDlg.h"\
1190 ".\pumpkin.h"\ 1157 ".\pumpkin.h"\
1191 ".\PumpKINDlg.h"\ 1158 ".\PumpKINDlg.h"\
1159 ".\shared-code\BellsNWhistles.h"\
1192 ".\shared-code\kHelpers.h"\ 1160 ".\shared-code\kHelpers.h"\
1193 ".\stdafx.h"\ 1161 ".\stdafx.h"\
1194 1162
@@ -1283,6 +1251,7 @@ DEP_CPP_RESOL=\
1283 ".\pumpkin.h"\ 1251 ".\pumpkin.h"\
1284 ".\PumpKINDlg.h"\ 1252 ".\PumpKINDlg.h"\
1285 ".\Resolver.h"\ 1253 ".\Resolver.h"\
1254 ".\shared-code\BellsNWhistles.h"\
1286 ".\shared-code\kHelpers.h"\ 1255 ".\shared-code\kHelpers.h"\
1287 ".\stdafx.h"\ 1256 ".\stdafx.h"\
1288 1257
@@ -1338,6 +1307,7 @@ DEP_CPP_RETRI=\
1338 ".\pumpkin.h"\ 1307 ".\pumpkin.h"\
1339 ".\PumpKINDlg.h"\ 1308 ".\PumpKINDlg.h"\
1340 ".\Retrier.h"\ 1309 ".\Retrier.h"\
1310 ".\shared-code\BellsNWhistles.h"\
1341 ".\shared-code\kHelpers.h"\ 1311 ".\shared-code\kHelpers.h"\
1342 ".\stdafx.h"\ 1312 ".\stdafx.h"\
1343 1313
@@ -1392,6 +1362,7 @@ DEP_CPP_TRAYE=\
1392DEP_CPP_TRAYE=\ 1362DEP_CPP_TRAYE=\
1393 ".\pumpkin.h"\ 1363 ".\pumpkin.h"\
1394 ".\PumpKINDlg.h"\ 1364 ".\PumpKINDlg.h"\
1365 ".\shared-code\BellsNWhistles.h"\
1395 ".\shared-code\kHelpers.h"\ 1366 ".\shared-code\kHelpers.h"\
1396 ".\stdafx.h"\ 1367 ".\stdafx.h"\
1397 ".\Trayer.h"\ 1368 ".\Trayer.h"\
@@ -1468,6 +1439,7 @@ DEP_CPP_PROPSS=\
1468 ".\PropsSounds.h"\ 1439 ".\PropsSounds.h"\
1469 ".\pumpkin.h"\ 1440 ".\pumpkin.h"\
1470 ".\PumpKINDlg.h"\ 1441 ".\PumpKINDlg.h"\
1442 ".\shared-code\BellsNWhistles.h"\
1471 ".\shared-code\kHelpers.h"\ 1443 ".\shared-code\kHelpers.h"\
1472 ".\stdafx.h"\ 1444 ".\stdafx.h"\
1473 1445
@@ -1501,9 +1473,6 @@ DEP_CPP_PROPSS=\
1501# Begin Source File 1473# Begin Source File
1502 1474
1503SOURCE=.\PropsACL.cpp 1475SOURCE=.\PropsACL.cpp
1504
1505!IF "$(CFG)" == "PumpKIN - Win32 Release"
1506
1507DEP_CPP_PROPSA=\ 1476DEP_CPP_PROPSA=\
1508 ".\ACLTargetCombo.h"\ 1477 ".\ACLTargetCombo.h"\
1509 ".\PropsACL.h"\ 1478 ".\PropsACL.h"\
@@ -1514,20 +1483,15 @@ DEP_CPP_PROPSA=\
1514 ".\stdafx.h"\ 1483 ".\stdafx.h"\
1515 1484
1516 1485
1486!IF "$(CFG)" == "PumpKIN - Win32 Release"
1487
1488
1517"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ 1489"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
1518 "$(INTDIR)\pumpkin.pch" 1490 "$(INTDIR)\pumpkin.pch"
1519 1491
1520 1492
1521!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1493!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1522 1494
1523DEP_CPP_PROPSA=\
1524 ".\ACLTargetCombo.h"\
1525 ".\PropsACL.h"\
1526 ".\pumpkin.h"\
1527 ".\PumpKINDlg.h"\
1528 ".\shared-code\kHelpers.h"\
1529 ".\stdafx.h"\
1530
1531 1495
1532"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ 1496"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
1533 "$(INTDIR)\pumpkin.pch" 1497 "$(INTDIR)\pumpkin.pch"
@@ -1538,15 +1502,6 @@ DEP_CPP_PROPSA=\
1538 1502
1539!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1503!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1540 1504
1541DEP_CPP_PROPSA=\
1542 ".\ACLTargetCombo.h"\
1543 ".\PropsACL.h"\
1544 ".\pumpkin.h"\
1545 ".\PumpKINDlg.h"\
1546 ".\shared-code\BellsNWhistles.h"\
1547 ".\shared-code\kHelpers.h"\
1548 ".\stdafx.h"\
1549
1550 1505
1551"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\ 1506"$(INTDIR)\PropsACL.obj" : $(SOURCE) $(DEP_CPP_PROPSA) "$(INTDIR)"\
1552 "$(INTDIR)\pumpkin.pch" 1507 "$(INTDIR)\pumpkin.pch"
@@ -1581,6 +1536,7 @@ DEP_CPP_ACLTA=\
1581 ".\ACLTargetCombo.h"\ 1536 ".\ACLTargetCombo.h"\
1582 ".\pumpkin.h"\ 1537 ".\pumpkin.h"\
1583 ".\PumpKINDlg.h"\ 1538 ".\PumpKINDlg.h"\
1539 ".\shared-code\BellsNWhistles.h"\
1584 ".\shared-code\kHelpers.h"\ 1540 ".\shared-code\kHelpers.h"\
1585 ".\stdafx.h"\ 1541 ".\stdafx.h"\
1586 1542
diff --git a/pumpkin.rc b/pumpkin.rc
index 87745db..9933454 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -94,8 +94,7 @@ BEGIN
94END 94END
95 95
96IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193 96IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 193
97STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 97STYLE DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
98 WS_SYSMENU
99EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW 98EXSTYLE WS_EX_ACCEPTFILES | WS_EX_APPWINDOW
100CAPTION " PumpKIN" 99CAPTION " PumpKIN"
101FONT 8, "MS Sans Serif" 100FONT 8, "MS Sans Serif"
@@ -113,12 +112,13 @@ BEGIN
113 WS_EX_CLIENTEDGE 112 WS_EX_CLIENTEDGE
114 PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE 113 PUSHBUTTON "E&xit",IDC_EXIT,305,79,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
115 PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE 114 PUSHBUTTON "&Help",ID_HELP,305,97,50,17,BS_NOTIFY,WS_EX_CLIENTEDGE
116 LISTBOX IDC_LOG,7,115,348,65,LBS_USETABSTOPS | LBS_NOSEL | 115 LISTBOX IDC_LOG,7,115,348,64,LBS_USETABSTOPS |
117 WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME 116 LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL |
117 WS_HSCROLL,WS_EX_DLGMODALFRAME
118 PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP 118 PUSHBUTTON "..",IDCANCEL,0,183,6,7,NOT WS_VISIBLE | NOT WS_TABSTOP
119 CONTROL "&Server is running",IDC_LISTENING,"Button", 119 CONTROL "&Server is running",IDC_LISTENING,"Button",
120 BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286, 120 BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | WS_TABSTOP,286,
121 180,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE 121 181,69,11,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
122END 122END
123 123
124IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201 124IDD_PROPS_SERVER DIALOG DISCARDABLE 0, 0, 300, 201