summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2004-09-12 11:46:21 (UTC)
committer Michael Krelin <hacker@klever.net>2004-09-12 11:46:21 (UTC)
commit4435ed85c3acb4df42135e009b133fb8e9d2f09c (patch) (unidiff)
treec1f4b4da029153459465d3679acdf48c594943ae
parent9bd9ea789778ff25ba61a22bca0eacc14ae47cb7 (diff)
downloadpumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.zip
pumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.tar.gz
pumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.tar.bz2
quick fix to the backslash conversion problem.
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@46 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PumpKINDlg.cpp8
-rw-r--r--install/install.cpp2
-rw-r--r--install/install.rc8
-rw-r--r--pumpkin.rc10
4 files changed, 16 insertions, 12 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 1e6d03f..0b3bf41 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1215,15 +1215,19 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
1215{ 1215{
1216 if(!CAsyncSocket::Create(0,SOCK_DGRAM)) 1216 if(!CAsyncSocket::Create(0,SOCK_DGRAM))
1217 return FALSE; 1217 return FALSE;
1218 ASSERT(m_Daddy); 1218 ASSERT(m_Daddy);
1219 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName); 1219 ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);
1220 m_Daddy->m_Xfers[m_hSocket]=this; 1220 m_Daddy->m_Xfers[m_hSocket]=this;
1221 TurnSlashes(m_FileName,TRUE);
1222 UpdateList(); 1221 UpdateList();
1223CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(m_FileName); 1222CString lf;
1223 if(!localFile) {
1224 lf = m_FileName;
1225 TurnSlashes(lf,TRUE);
1226 }
1227CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf);
1224 if(!localFile){// This is an incoming request.. 1228 if(!localFile){// This is an incoming request..
1225 if(CheckBadRelativeness(m_FileName)){ 1229 if(CheckBadRelativeness(m_FileName)){
1226 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS); 1230 Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
1227 return TRUE; 1231 return TRUE;
1228 } 1232 }
1229 BOOL exists; 1233 BOOL exists;
diff --git a/install/install.cpp b/install/install.cpp
index 62f1e20..6fa4ae4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,10 +1,10 @@
1#include "resource.h" 1#include "resource.h"
2#include "../shared-code/install.h" 2#include "../shared-code/install.h"
3 3
4 #defineKINAME "PumpKIN 2.5" 4 #defineKINAME "PumpKIN 2.5.1-trunk"
5#define SKINAME "PumpKIN" 5#define SKINAME "PumpKIN"
6 6
7BOOL Install(void) 7BOOL Install(void)
8{ 8{
9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path"); 9STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");
10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath"); 10STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");
diff --git a/install/install.rc b/install/install.rc
index b1a3037..30907ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -128,14 +128,14 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
128///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
129// 129//
130// Version 130// Version
131// 131//
132 132
133VS_VERSION_INFO VERSIONINFO 133VS_VERSION_INFO VERSIONINFO
134 FILEVERSION 2,5,0,0 134 FILEVERSION 2,5,1,0
135 PRODUCTVERSION 2,5,0,0 135 PRODUCTVERSION 2,5,1,0
136 FILEFLAGSMASK 0x3fL 136 FILEFLAGSMASK 0x3fL
137#ifdef _DEBUG 137#ifdef _DEBUG
138 FILEFLAGS 0x1L 138 FILEFLAGS 0x1L
139#else 139#else
140 FILEFLAGS 0x0L 140 FILEFLAGS 0x0L
141#endif 141#endif
@@ -146,19 +146,19 @@ BEGIN
146 BLOCK "StringFileInfo" 146 BLOCK "StringFileInfo"
147 BEGIN 147 BEGIN
148 BLOCK "040904b0" 148 BLOCK "040904b0"
149 BEGIN 149 BEGIN
150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 150 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0" 151 VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
152 VALUE "FileVersion", "2, 5, 0, 0\0" 152 VALUE "FileVersion", "2, 5, 1, 0\0"
153 VALUE "InternalName", "INSTALL\0" 153 VALUE "InternalName", "INSTALL\0"
154 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net/)\0" 154 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net/)\0"
155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 155 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
156 VALUE "OriginalFilename", "INSTALL.EXE\0" 156 VALUE "OriginalFilename", "INSTALL.EXE\0"
157 VALUE "ProductName", "PumpKIN\0" 157 VALUE "ProductName", "PumpKIN\0"
158 VALUE "ProductVersion", "2, 5, 0, 0\0" 158 VALUE "ProductVersion", "2, 5, 1, 0\0"
159 END 159 END
160 END 160 END
161 BLOCK "VarFileInfo" 161 BLOCK "VarFileInfo"
162 BEGIN 162 BEGIN
163 VALUE "Translation", 0x409, 1200 163 VALUE "Translation", 0x409, 1200
164 END 164 END
diff --git a/pumpkin.rc b/pumpkin.rc
index 67e5b24..7380e12 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -79,13 +79,13 @@ IDI_PLAY ICON DISCARDABLE "shared-data/play-icon.ico"
79IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74 79IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 217, 74
80STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU 80STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
81CAPTION "About PumpKIN" 81CAPTION "About PumpKIN"
82FONT 8, "MS Sans Serif" 82FONT 8, "MS Sans Serif"
83BEGIN 83BEGIN
84 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 84 ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20
85 LTEXT "PumpKIN, Version 2.5",IDC_STATIC,40,15,119,8,SS_NOPREFIX 85 LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,SS_NOPREFIX
86 LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,170, 86 LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,170,
87 8 87 8
88 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP 88 DEFPUSHBUTTON "OK",IDOK,178,7,32,14,WS_GROUP
89 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14 89 PUSHBUTTON "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
90END 90END
91 91
@@ -283,14 +283,14 @@ END
283///////////////////////////////////////////////////////////////////////////// 283/////////////////////////////////////////////////////////////////////////////
284// 284//
285// Version 285// Version
286// 286//
287 287
288VS_VERSION_INFO VERSIONINFO 288VS_VERSION_INFO VERSIONINFO
289 FILEVERSION 2,5,0,0 289 FILEVERSION 2,5,1,0
290 PRODUCTVERSION 2,5,0,0 290 PRODUCTVERSION 2,5,1,0
291 FILEFLAGSMASK 0x3fL 291 FILEFLAGSMASK 0x3fL
292#ifdef _DEBUG 292#ifdef _DEBUG
293 FILEFLAGS 0x1L 293 FILEFLAGS 0x1L
294#else 294#else
295 FILEFLAGS 0x0L 295 FILEFLAGS 0x0L
296#endif 296#endif
@@ -301,19 +301,19 @@ BEGIN
301 BLOCK "StringFileInfo" 301 BLOCK "StringFileInfo"
302 BEGIN 302 BEGIN
303 BLOCK "040904b0" 303 BLOCK "040904b0"
304 BEGIN 304 BEGIN
305 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0" 305 VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
306 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0" 306 VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
307 VALUE "FileVersion", "2, 5, 0, 0\0" 307 VALUE "FileVersion", "2, 5, 1, 0\0"
308 VALUE "InternalName", "PUMPKIN\0" 308 VALUE "InternalName", "PUMPKIN\0"
309 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net)\0" 309 VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net)\0"
310 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0" 310 VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
311 VALUE "OriginalFilename", "PUMPKIN.EXE\0" 311 VALUE "OriginalFilename", "PUMPKIN.EXE\0"
312 VALUE "ProductName", "PumpKIN\0" 312 VALUE "ProductName", "PumpKIN\0"
313 VALUE "ProductVersion", "2, 5, 0, 0\0" 313 VALUE "ProductVersion", "2, 5, 1, 0\0"
314 END 314 END
315 END 315 END
316 BLOCK "VarFileInfo" 316 BLOCK "VarFileInfo"
317 BEGIN 317 BEGIN
318 VALUE "Translation", 0x409, 1200 318 VALUE "Translation", 0x409, 1200
319 END 319 END