summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PumpKINDlg.cpp70
-rw-r--r--PumpKINDlg.h3
-rw-r--r--pumpkin.mak238
3 files changed, 107 insertions, 204 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 070f3e8..2a01918 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -578,12 +578,12 @@ int rv = socket->SendTo(udpBase(),length,(SOCKADDR*)saddr,sizeof(SOCKADDR_IN));
578 return FALSE; 578 return FALSE;
579 return TRUE; 579 return TRUE;
580} 580}
581 581
582void CXferSocket::DoSelect() 582void CXferSocket::DoSelect(BOOL do_select)
583{ 583{
584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE) 584 if(m_Peer.sin_addr.s_addr!=INADDR_NONE)
585 AsyncSelect(FD_CLOSE|FD_READ|(m_Queue.IsEmpty()?0:FD_WRITE)); 585 AsyncSelect(FD_CLOSE|FD_READ|((m_Queue.IsEmpty()&&!do_select)?0:FD_WRITE));
586} 586}
587 587
588void CXferSocket::OnReceive(int nErrorCode) 588void CXferSocket::OnReceive(int nErrorCode)
589{ 589{
@@ -853,13 +853,9 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
853 p->length=p->length-m_blkSize+bytes; 853 p->length=p->length-m_blkSize+bytes;
854 m_LastSlack = m_blkSize-bytes; 854 m_LastSlack = m_blkSize-bytes;
855 PostTFTP(p); 855 PostTFTP(p);
856 if(bytes<m_blkSize){ 856 if(bytes<m_blkSize){
857 state=stateFinish; 857 state=stateClosing; m_ACKtoClose = m_ACK+1;
858 ASSERT(m_Daddy);
859 CString tmp;
860 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
861 m_Daddy->LogLine(tmp);
862 } 858 }
863 }CATCH(CFileException,e){ 859 }CATCH(CFileException,e){
864 Deny(e); 860 Deny(e);
865 }END_CATCH 861 }END_CATCH
@@ -935,41 +931,49 @@ BOOL CRRQSocket::OnTFTP(tftp* p)
935{ 931{
936BOOL rv = TRUE; 932BOOL rv = TRUE;
937 switch(p->Opcode()){ 933 switch(p->Opcode()){
938 case tftp::opOACK: 934 case tftp::opOACK:
939 m_ACK=0; 935 {
940 ASSERT(state!=stateFinish); 936 m_ACK=0;
941 { 937 ASSERT(state!=stateFinish);
942 tftp::tftpOptions o; 938 tftp::tftpOptions o;
943 if(p->GetOptions(&o)){ 939 if(p->GetOptions(&o)){
944 CString v; 940 CString v;
945 if(o.Lookup(tftpoBSize,v)){ 941 if(o.Lookup(tftpoBSize,v)){
946 m_blkSize=atoi(v); 942 m_blkSize=atoi(v);
947 if(!m_blkSize){// *** More sanity checks 943 if(!m_blkSize){// *** More sanity checks
948 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE); 944 Deny(tftp::errOption,IDS_TFTP_ERROR_BSIZE);
949 rv = TRUE; 945 rv = TRUE;
950 break; 946 break;
947 }
951 } 948 }
952 } 949 if(o.Lookup(tftpoTOut,v)){
953 if(o.Lookup(tftpoTOut,v)){ 950 m_timeOut=atoi(v);
954 m_timeOut=atoi(v); 951 if(!m_timeOut){// *** More sanity checks
955 if(!m_timeOut){// *** More sanity checks 952 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT);
956 Deny(tftp::errOption,IDS_TFTP_ERROR_TOUT); 953 rv = TRUE;
957 rv = TRUE; 954 break;
958 break; 955 }
956 }
957 if(o.Lookup(tftpoXResume,v)){
958 m_ACK=atoi(v);
959 } 959 }
960 } 960 }
961 if(o.Lookup(tftpoXResume,v)){ 961 UpdateList();
962 m_ACK=atoi(v); 962 DoXfer();
963 }
964 } 963 }
965 UpdateList();
966 DoXfer();
967 }
968 break; 964 break;
969 case tftp::opACK: 965 case tftp::opACK:
970 m_ACK=p->data.m_ACK.Block(); 966 m_ACK=p->data.m_ACK.Block();
971 if(state!=stateFinish){ 967 if(state==stateClosing && m_ACK==m_ACKtoClose) {
968 state = stateFinish;
969 ASSERT(m_Daddy);
970 CString tmp;
971 tmp.Format(IDS_LOG_XFERRRQFINISHED,(LPCTSTR)m_FileName);
972 m_Daddy->LogLine(tmp);
973 rv = FALSE;
974 DoSelect(TRUE);
975 }else if(state!=stateFinish){
972 UpdateList(); 976 UpdateList();
973 DoXfer(); 977 DoXfer();
974 } 978 }
975 break; 979 break;
diff --git a/PumpKINDlg.h b/PumpKINDlg.h
index c5469f1..23c2657 100644
--- a/PumpKINDlg.h
+++ b/PumpKINDlg.h
@@ -311,9 +311,9 @@ public:
311 void UpdateList(); 311 void UpdateList();
312 void SetPeer(SOCKADDR_IN *sin); 312 void SetPeer(SOCKADDR_IN *sin);
313 virtual BOOL OnTFTP(tftp* p) = 0; 313 virtual BOOL OnTFTP(tftp* p) = 0;
314 virtual void OnReceive(int nErrorCode); 314 virtual void OnReceive(int nErrorCode);
315 void DoSelect(); 315 void DoSelect(BOOL do_select=FALSE);
316 SOCKADDR_IN m_Peer; 316 SOCKADDR_IN m_Peer;
317 virtual void OnSend(int nErrorCode); 317 virtual void OnSend(int nErrorCode);
318 CPumpKINDlg* m_Daddy; 318 CPumpKINDlg* m_Daddy;
319 CTFTPList m_Queue; 319 CTFTPList m_Queue;
@@ -340,8 +340,9 @@ public:
340 DECLARE_DYNAMIC(CWRQSocket) 340 DECLARE_DYNAMIC(CWRQSocket)
341}; 341};
342class CRRQSocket : public CXferSocket { 342class CRRQSocket : public CXferSocket {
343public: 343public:
344 UINT m_ACKtoClose;
344 void OnHostKnown(); 345 void OnHostKnown();
345 virtual void OnResolved(); 346 virtual void OnResolved();
346 BOOL ConfirmRequest(); 347 BOOL ConfirmRequest();
347 WORD m_LastSlack; 348 WORD m_LastSlack;
diff --git a/pumpkin.mak b/pumpkin.mak
index a22a6fa..bf9e895 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -685,32 +685,25 @@ LINK32_OBJS= \
685################################################################################ 685################################################################################
686# Begin Source File 686# Begin Source File
687 687
688SOURCE=.\PumpKIN.cpp 688SOURCE=.\PumpKIN.cpp
689
690!IF "$(CFG)" == "PumpKIN - Win32 Release"
691
692DEP_CPP_PUMPK=\ 689DEP_CPP_PUMPK=\
693 ".\pumpkin.h"\ 690 ".\pumpkin.h"\
694 ".\PumpKINDlg.h"\ 691 ".\PumpKINDlg.h"\
695 ".\shared-code\BellsNWhistles.h"\ 692 ".\shared-code\BellsNWhistles.h"\
696 ".\shared-code\kHelpers.h"\ 693 ".\shared-code\kHelpers.h"\
697 ".\stdafx.h"\ 694 ".\stdafx.h"\
698 695
699 696
697!IF "$(CFG)" == "PumpKIN - Win32 Release"
698
699
700"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 700"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
701 "$(INTDIR)\pumpkin.pch" 701 "$(INTDIR)\pumpkin.pch"
702 702
703 703
704!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 704!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
705 705
706DEP_CPP_PUMPK=\
707 ".\pumpkin.h"\
708 ".\PumpKINDlg.h"\
709 ".\shared-code\BellsNWhistles.h"\
710 ".\shared-code\kHelpers.h"\
711 ".\stdafx.h"\
712
713 706
714"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 707"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
715 "$(INTDIR)\pumpkin.pch" 708 "$(INTDIR)\pumpkin.pch"
716 709
@@ -719,15 +712,8 @@ DEP_CPP_PUMPK=\
719 712
720 713
721!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 714!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
722 715
723DEP_CPP_PUMPK=\
724 ".\pumpkin.h"\
725 ".\PumpKINDlg.h"\
726 ".\shared-code\BellsNWhistles.h"\
727 ".\shared-code\kHelpers.h"\
728 ".\stdafx.h"\
729
730 716
731"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\ 717"$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\
732 "$(INTDIR)\pumpkin.pch" 718 "$(INTDIR)\pumpkin.pch"
733 719
@@ -738,8 +724,11 @@ DEP_CPP_PUMPK=\
738################################################################################ 724################################################################################
739# Begin Source File 725# Begin Source File
740 726
741SOURCE=.\PumpKINDlg.cpp 727SOURCE=.\PumpKINDlg.cpp
728
729!IF "$(CFG)" == "PumpKIN - Win32 Release"
730
742DEP_CPP_PUMPKI=\ 731DEP_CPP_PUMPKI=\
743 ".\ACLTargetCombo.h"\ 732 ".\ACLTargetCombo.h"\
744 ".\ConfirmRRQDlg.h"\ 733 ".\ConfirmRRQDlg.h"\
745 ".\ConfirmWRQDlg.h"\ 734 ".\ConfirmWRQDlg.h"\
@@ -757,17 +746,34 @@ DEP_CPP_PUMPKI=\
757 ".\stdafx.h"\ 746 ".\stdafx.h"\
758 ".\Trayer.h"\ 747 ".\Trayer.h"\
759 748
760 749
761!IF "$(CFG)" == "PumpKIN - Win32 Release"
762
763
764"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 750"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
765 "$(INTDIR)\pumpkin.pch" 751 "$(INTDIR)\pumpkin.pch"
766 752
767 753
768!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 754!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
769 755
756DEP_CPP_PUMPKI=\
757 ".\ACLTargetCombo.h"\
758 ".\ConfirmRRQDlg.h"\
759 ".\ConfirmWRQDlg.h"\
760 ".\PropsACL.h"\
761 ".\PropsNetwork.h"\
762 ".\PropsServer.h"\
763 ".\PropsSounds.h"\
764 ".\pumpkin.h"\
765 ".\PumpKINDlg.h"\
766 ".\RequestDlg.h"\
767 ".\Resolver.h"\
768 ".\Retrier.h"\
769 ".\shared-code\kHelpers.h"\
770 ".\stdafx.h"\
771 ".\Trayer.h"\
772
773NODEP_CPP_PUMPKI=\
774 ".\DoSelect"\
775
770 776
771"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 777"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
772 "$(INTDIR)\pumpkin.pch" 778 "$(INTDIR)\pumpkin.pch"
773 779
@@ -776,8 +782,26 @@ DEP_CPP_PUMPKI=\
776 782
777 783
778!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 784!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
779 785
786DEP_CPP_PUMPKI=\
787 ".\ACLTargetCombo.h"\
788 ".\ConfirmRRQDlg.h"\
789 ".\ConfirmWRQDlg.h"\
790 ".\PropsACL.h"\
791 ".\PropsNetwork.h"\
792 ".\PropsServer.h"\
793 ".\PropsSounds.h"\
794 ".\pumpkin.h"\
795 ".\PumpKINDlg.h"\
796 ".\RequestDlg.h"\
797 ".\Resolver.h"\
798 ".\Retrier.h"\
799 ".\shared-code\BellsNWhistles.h"\
800 ".\shared-code\kHelpers.h"\
801 ".\stdafx.h"\
802 ".\Trayer.h"\
803
780 804
781"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\ 805"$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\
782 "$(INTDIR)\pumpkin.pch" 806 "$(INTDIR)\pumpkin.pch"
783 807
@@ -985,32 +1009,25 @@ BuildCmds= \
985################################################################################ 1009################################################################################
986# Begin Source File 1010# Begin Source File
987 1011
988SOURCE=.\PropsServer.cpp 1012SOURCE=.\PropsServer.cpp
989
990!IF "$(CFG)" == "PumpKIN - Win32 Release"
991
992DEP_CPP_PROPS=\ 1013DEP_CPP_PROPS=\
993 ".\PropsServer.h"\ 1014 ".\PropsServer.h"\
994 ".\pumpkin.h"\ 1015 ".\pumpkin.h"\
995 ".\shared-code\BellsNWhistles.h"\ 1016 ".\shared-code\BellsNWhistles.h"\
996 ".\shared-code\kHelpers.h"\ 1017 ".\shared-code\kHelpers.h"\
997 ".\stdafx.h"\ 1018 ".\stdafx.h"\
998 1019
999 1020
1021!IF "$(CFG)" == "PumpKIN - Win32 Release"
1022
1023
1000"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1024"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1001 "$(INTDIR)\pumpkin.pch" 1025 "$(INTDIR)\pumpkin.pch"
1002 1026
1003 1027
1004!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1028!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1005 1029
1006DEP_CPP_PROPS=\
1007 ".\PropsServer.h"\
1008 ".\pumpkin.h"\
1009 ".\shared-code\BellsNWhistles.h"\
1010 ".\shared-code\kHelpers.h"\
1011 ".\stdafx.h"\
1012
1013 1030
1014"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1031"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1015 "$(INTDIR)\pumpkin.pch" 1032 "$(INTDIR)\pumpkin.pch"
1016 1033
@@ -1019,15 +1036,8 @@ DEP_CPP_PROPS=\
1019 1036
1020 1037
1021!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1038!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1022 1039
1023DEP_CPP_PROPS=\
1024 ".\PropsServer.h"\
1025 ".\pumpkin.h"\
1026 ".\shared-code\BellsNWhistles.h"\
1027 ".\shared-code\kHelpers.h"\
1028 ".\stdafx.h"\
1029
1030 1040
1031"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\ 1041"$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\
1032 "$(INTDIR)\pumpkin.pch" 1042 "$(INTDIR)\pumpkin.pch"
1033 1043
@@ -1077,11 +1087,8 @@ DEP_CPP_PROPSN=\
1077################################################################################ 1087################################################################################
1078# Begin Source File 1088# Begin Source File
1079 1089
1080SOURCE=.\ConfirmRRQDlg.cpp 1090SOURCE=.\ConfirmRRQDlg.cpp
1081
1082!IF "$(CFG)" == "PumpKIN - Win32 Release"
1083
1084DEP_CPP_CONFI=\ 1091DEP_CPP_CONFI=\
1085 ".\ConfirmRRQDlg.h"\ 1092 ".\ConfirmRRQDlg.h"\
1086 ".\pumpkin.h"\ 1093 ".\pumpkin.h"\
1087 ".\PumpKINDlg.h"\ 1094 ".\PumpKINDlg.h"\
@@ -1089,22 +1096,17 @@ DEP_CPP_CONFI=\
1089 ".\shared-code\kHelpers.h"\ 1096 ".\shared-code\kHelpers.h"\
1090 ".\stdafx.h"\ 1097 ".\stdafx.h"\
1091 1098
1092 1099
1100!IF "$(CFG)" == "PumpKIN - Win32 Release"
1101
1102
1093"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1103"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1094 "$(INTDIR)\pumpkin.pch" 1104 "$(INTDIR)\pumpkin.pch"
1095 1105
1096 1106
1097!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1107!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1098 1108
1099DEP_CPP_CONFI=\
1100 ".\ConfirmRRQDlg.h"\
1101 ".\pumpkin.h"\
1102 ".\PumpKINDlg.h"\
1103 ".\shared-code\BellsNWhistles.h"\
1104 ".\shared-code\kHelpers.h"\
1105 ".\stdafx.h"\
1106
1107 1109
1108"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1110"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1109 "$(INTDIR)\pumpkin.pch" 1111 "$(INTDIR)\pumpkin.pch"
1110 1112
@@ -1113,16 +1115,8 @@ DEP_CPP_CONFI=\
1113 1115
1114 1116
1115!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1117!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1116 1118
1117DEP_CPP_CONFI=\
1118 ".\ConfirmRRQDlg.h"\
1119 ".\pumpkin.h"\
1120 ".\PumpKINDlg.h"\
1121 ".\shared-code\BellsNWhistles.h"\
1122 ".\shared-code\kHelpers.h"\
1123 ".\stdafx.h"\
1124
1125 1119
1126"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\ 1120"$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\
1127 "$(INTDIR)\pumpkin.pch" 1121 "$(INTDIR)\pumpkin.pch"
1128 1122
@@ -1133,11 +1127,8 @@ DEP_CPP_CONFI=\
1133################################################################################ 1127################################################################################
1134# Begin Source File 1128# Begin Source File
1135 1129
1136SOURCE=.\ConfirmWRQDlg.cpp 1130SOURCE=.\ConfirmWRQDlg.cpp
1137
1138!IF "$(CFG)" == "PumpKIN - Win32 Release"
1139
1140DEP_CPP_CONFIR=\ 1131DEP_CPP_CONFIR=\
1141 ".\ConfirmWRQDlg.h"\ 1132 ".\ConfirmWRQDlg.h"\
1142 ".\pumpkin.h"\ 1133 ".\pumpkin.h"\
1143 ".\PumpKINDlg.h"\ 1134 ".\PumpKINDlg.h"\
@@ -1145,22 +1136,17 @@ DEP_CPP_CONFIR=\
1145 ".\shared-code\kHelpers.h"\ 1136 ".\shared-code\kHelpers.h"\
1146 ".\stdafx.h"\ 1137 ".\stdafx.h"\
1147 1138
1148 1139
1140!IF "$(CFG)" == "PumpKIN - Win32 Release"
1141
1142
1149"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1143"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1150 "$(INTDIR)\pumpkin.pch" 1144 "$(INTDIR)\pumpkin.pch"
1151 1145
1152 1146
1153!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1147!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1154 1148
1155DEP_CPP_CONFIR=\
1156 ".\ConfirmWRQDlg.h"\
1157 ".\pumpkin.h"\
1158 ".\PumpKINDlg.h"\
1159 ".\shared-code\BellsNWhistles.h"\
1160 ".\shared-code\kHelpers.h"\
1161 ".\stdafx.h"\
1162
1163 1149
1164"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1150"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1165 "$(INTDIR)\pumpkin.pch" 1151 "$(INTDIR)\pumpkin.pch"
1166 1152
@@ -1169,16 +1155,8 @@ DEP_CPP_CONFIR=\
1169 1155
1170 1156
1171!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1157!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1172 1158
1173DEP_CPP_CONFIR=\
1174 ".\ConfirmWRQDlg.h"\
1175 ".\pumpkin.h"\
1176 ".\PumpKINDlg.h"\
1177 ".\shared-code\BellsNWhistles.h"\
1178 ".\shared-code\kHelpers.h"\
1179 ".\stdafx.h"\
1180
1181 1159
1182"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\ 1160"$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\
1183 "$(INTDIR)\pumpkin.pch" 1161 "$(INTDIR)\pumpkin.pch"
1184 1162
@@ -1228,11 +1206,8 @@ DEP_CPP_REQUE=\
1228################################################################################ 1206################################################################################
1229# Begin Source File 1207# Begin Source File
1230 1208
1231SOURCE=.\Resolver.cpp 1209SOURCE=.\Resolver.cpp
1232
1233!IF "$(CFG)" == "PumpKIN - Win32 Release"
1234
1235DEP_CPP_RESOL=\ 1210DEP_CPP_RESOL=\
1236 ".\pumpkin.h"\ 1211 ".\pumpkin.h"\
1237 ".\PumpKINDlg.h"\ 1212 ".\PumpKINDlg.h"\
1238 ".\Resolver.h"\ 1213 ".\Resolver.h"\
@@ -1240,22 +1215,17 @@ DEP_CPP_RESOL=\
1240 ".\shared-code\kHelpers.h"\ 1215 ".\shared-code\kHelpers.h"\
1241 ".\stdafx.h"\ 1216 ".\stdafx.h"\
1242 1217
1243 1218
1219!IF "$(CFG)" == "PumpKIN - Win32 Release"
1220
1221
1244"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1222"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1245 "$(INTDIR)\pumpkin.pch" 1223 "$(INTDIR)\pumpkin.pch"
1246 1224
1247 1225
1248!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1226!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1249 1227
1250DEP_CPP_RESOL=\
1251 ".\pumpkin.h"\
1252 ".\PumpKINDlg.h"\
1253 ".\Resolver.h"\
1254 ".\shared-code\BellsNWhistles.h"\
1255 ".\shared-code\kHelpers.h"\
1256 ".\stdafx.h"\
1257
1258 1228
1259"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1229"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1260 "$(INTDIR)\pumpkin.pch" 1230 "$(INTDIR)\pumpkin.pch"
1261 1231
@@ -1264,16 +1234,8 @@ DEP_CPP_RESOL=\
1264 1234
1265 1235
1266!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1236!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1267 1237
1268DEP_CPP_RESOL=\
1269 ".\pumpkin.h"\
1270 ".\PumpKINDlg.h"\
1271 ".\Resolver.h"\
1272 ".\shared-code\BellsNWhistles.h"\
1273 ".\shared-code\kHelpers.h"\
1274 ".\stdafx.h"\
1275
1276 1238
1277"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\ 1239"$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\
1278 "$(INTDIR)\pumpkin.pch" 1240 "$(INTDIR)\pumpkin.pch"
1279 1241
@@ -1284,11 +1246,8 @@ DEP_CPP_RESOL=\
1284################################################################################ 1246################################################################################
1285# Begin Source File 1247# Begin Source File
1286 1248
1287SOURCE=.\Retrier.cpp 1249SOURCE=.\Retrier.cpp
1288
1289!IF "$(CFG)" == "PumpKIN - Win32 Release"
1290
1291DEP_CPP_RETRI=\ 1250DEP_CPP_RETRI=\
1292 ".\pumpkin.h"\ 1251 ".\pumpkin.h"\
1293 ".\PumpKINDlg.h"\ 1252 ".\PumpKINDlg.h"\
1294 ".\Retrier.h"\ 1253 ".\Retrier.h"\
@@ -1296,22 +1255,17 @@ DEP_CPP_RETRI=\
1296 ".\shared-code\kHelpers.h"\ 1255 ".\shared-code\kHelpers.h"\
1297 ".\stdafx.h"\ 1256 ".\stdafx.h"\
1298 1257
1299 1258
1259!IF "$(CFG)" == "PumpKIN - Win32 Release"
1260
1261
1300"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1262"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1301 "$(INTDIR)\pumpkin.pch" 1263 "$(INTDIR)\pumpkin.pch"
1302 1264
1303 1265
1304!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1266!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1305 1267
1306DEP_CPP_RETRI=\
1307 ".\pumpkin.h"\
1308 ".\PumpKINDlg.h"\
1309 ".\Retrier.h"\
1310 ".\shared-code\BellsNWhistles.h"\
1311 ".\shared-code\kHelpers.h"\
1312 ".\stdafx.h"\
1313
1314 1268
1315"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1269"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1316 "$(INTDIR)\pumpkin.pch" 1270 "$(INTDIR)\pumpkin.pch"
1317 1271
@@ -1320,16 +1274,8 @@ DEP_CPP_RETRI=\
1320 1274
1321 1275
1322!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1276!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1323 1277
1324DEP_CPP_RETRI=\
1325 ".\pumpkin.h"\
1326 ".\PumpKINDlg.h"\
1327 ".\Retrier.h"\
1328 ".\shared-code\BellsNWhistles.h"\
1329 ".\shared-code\kHelpers.h"\
1330 ".\stdafx.h"\
1331
1332 1278
1333"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\ 1279"$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\
1334 "$(INTDIR)\pumpkin.pch" 1280 "$(INTDIR)\pumpkin.pch"
1335 1281
@@ -1340,11 +1286,8 @@ DEP_CPP_RETRI=\
1340################################################################################ 1286################################################################################
1341# Begin Source File 1287# Begin Source File
1342 1288
1343SOURCE=.\Trayer.cpp 1289SOURCE=.\Trayer.cpp
1344
1345!IF "$(CFG)" == "PumpKIN - Win32 Release"
1346
1347DEP_CPP_TRAYE=\ 1290DEP_CPP_TRAYE=\
1348 ".\pumpkin.h"\ 1291 ".\pumpkin.h"\
1349 ".\PumpKINDlg.h"\ 1292 ".\PumpKINDlg.h"\
1350 ".\shared-code\BellsNWhistles.h"\ 1293 ".\shared-code\BellsNWhistles.h"\
@@ -1352,22 +1295,17 @@ DEP_CPP_TRAYE=\
1352 ".\stdafx.h"\ 1295 ".\stdafx.h"\
1353 ".\Trayer.h"\ 1296 ".\Trayer.h"\
1354 1297
1355 1298
1299!IF "$(CFG)" == "PumpKIN - Win32 Release"
1300
1301
1356"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1302"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1357 "$(INTDIR)\pumpkin.pch" 1303 "$(INTDIR)\pumpkin.pch"
1358 1304
1359 1305
1360!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1306!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1361 1307
1362DEP_CPP_TRAYE=\
1363 ".\pumpkin.h"\
1364 ".\PumpKINDlg.h"\
1365 ".\shared-code\BellsNWhistles.h"\
1366 ".\shared-code\kHelpers.h"\
1367 ".\stdafx.h"\
1368 ".\Trayer.h"\
1369
1370 1308
1371"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1309"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1372 "$(INTDIR)\pumpkin.pch" 1310 "$(INTDIR)\pumpkin.pch"
1373 1311
@@ -1376,16 +1314,8 @@ DEP_CPP_TRAYE=\
1376 1314
1377 1315
1378!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1316!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1379 1317
1380DEP_CPP_TRAYE=\
1381 ".\pumpkin.h"\
1382 ".\PumpKINDlg.h"\
1383 ".\shared-code\BellsNWhistles.h"\
1384 ".\shared-code\kHelpers.h"\
1385 ".\stdafx.h"\
1386 ".\Trayer.h"\
1387
1388 1318
1389"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\ 1319"$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\
1390 "$(INTDIR)\pumpkin.pch" 1320 "$(INTDIR)\pumpkin.pch"
1391 1321
@@ -1416,11 +1346,8 @@ SOURCE=.\help\pumpkin.cnt
1416################################################################################ 1346################################################################################
1417# Begin Source File 1347# Begin Source File
1418 1348
1419SOURCE=.\PropsSounds.cpp 1349SOURCE=.\PropsSounds.cpp
1420
1421!IF "$(CFG)" == "PumpKIN - Win32 Release"
1422
1423DEP_CPP_PROPSS=\ 1350DEP_CPP_PROPSS=\
1424 ".\PropsSounds.h"\ 1351 ".\PropsSounds.h"\
1425 ".\pumpkin.h"\ 1352 ".\pumpkin.h"\
1426 ".\PumpKINDlg.h"\ 1353 ".\PumpKINDlg.h"\
@@ -1428,22 +1355,17 @@ DEP_CPP_PROPSS=\
1428 ".\shared-code\kHelpers.h"\ 1355 ".\shared-code\kHelpers.h"\
1429 ".\stdafx.h"\ 1356 ".\stdafx.h"\
1430 1357
1431 1358
1359!IF "$(CFG)" == "PumpKIN - Win32 Release"
1360
1361
1432"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1362"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1433 "$(INTDIR)\pumpkin.pch" 1363 "$(INTDIR)\pumpkin.pch"
1434 1364
1435 1365
1436!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1366!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1437 1367
1438DEP_CPP_PROPSS=\
1439 ".\PropsSounds.h"\
1440 ".\pumpkin.h"\
1441 ".\PumpKINDlg.h"\
1442 ".\shared-code\BellsNWhistles.h"\
1443 ".\shared-code\kHelpers.h"\
1444 ".\stdafx.h"\
1445
1446 1368
1447"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1369"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1448 "$(INTDIR)\pumpkin.pch" 1370 "$(INTDIR)\pumpkin.pch"
1449 1371
@@ -1452,16 +1374,8 @@ DEP_CPP_PROPSS=\
1452 1374
1453 1375
1454!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1376!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1455 1377
1456DEP_CPP_PROPSS=\
1457 ".\PropsSounds.h"\
1458 ".\pumpkin.h"\
1459 ".\PumpKINDlg.h"\
1460 ".\shared-code\BellsNWhistles.h"\
1461 ".\shared-code\kHelpers.h"\
1462 ".\stdafx.h"\
1463
1464 1378
1465"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\ 1379"$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\
1466 "$(INTDIR)\pumpkin.pch" 1380 "$(INTDIR)\pumpkin.pch"
1467 1381
@@ -1513,11 +1427,8 @@ DEP_CPP_PROPSA=\
1513################################################################################ 1427################################################################################
1514# Begin Source File 1428# Begin Source File
1515 1429
1516SOURCE=.\ACLTargetCombo.cpp 1430SOURCE=.\ACLTargetCombo.cpp
1517
1518!IF "$(CFG)" == "PumpKIN - Win32 Release"
1519
1520DEP_CPP_ACLTA=\ 1431DEP_CPP_ACLTA=\
1521 ".\ACLTargetCombo.h"\ 1432 ".\ACLTargetCombo.h"\
1522 ".\pumpkin.h"\ 1433 ".\pumpkin.h"\
1523 ".\PumpKINDlg.h"\ 1434 ".\PumpKINDlg.h"\
@@ -1525,22 +1436,17 @@ DEP_CPP_ACLTA=\
1525 ".\shared-code\kHelpers.h"\ 1436 ".\shared-code\kHelpers.h"\
1526 ".\stdafx.h"\ 1437 ".\stdafx.h"\
1527 1438
1528 1439
1440!IF "$(CFG)" == "PumpKIN - Win32 Release"
1441
1442
1529"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1443"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1530 "$(INTDIR)\pumpkin.pch" 1444 "$(INTDIR)\pumpkin.pch"
1531 1445
1532 1446
1533!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug" 1447!ELSEIF "$(CFG)" == "PumpKIN - Win32 Debug"
1534 1448
1535DEP_CPP_ACLTA=\
1536 ".\ACLTargetCombo.h"\
1537 ".\pumpkin.h"\
1538 ".\PumpKINDlg.h"\
1539 ".\shared-code\BellsNWhistles.h"\
1540 ".\shared-code\kHelpers.h"\
1541 ".\stdafx.h"\
1542
1543 1449
1544"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1450"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1545 "$(INTDIR)\pumpkin.pch" 1451 "$(INTDIR)\pumpkin.pch"
1546 1452
@@ -1549,16 +1455,8 @@ DEP_CPP_ACLTA=\
1549 1455
1550 1456
1551!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static" 1457!ELSEIF "$(CFG)" == "PumpKIN - Win32 Static"
1552 1458
1553DEP_CPP_ACLTA=\
1554 ".\ACLTargetCombo.h"\
1555 ".\pumpkin.h"\
1556 ".\PumpKINDlg.h"\
1557 ".\shared-code\BellsNWhistles.h"\
1558 ".\shared-code\kHelpers.h"\
1559 ".\stdafx.h"\
1560
1561 1459
1562"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\ 1460"$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\
1563 "$(INTDIR)\pumpkin.pch" 1461 "$(INTDIR)\pumpkin.pch"
1564 1462