Tera TermRevision: 9106
https://osdn.net/projects/ttssh2/scm/svn/commits/9106
Author: zmatsuo
Date: 2020-12-20 21:16:47 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
ttpfile/ttfile_proto.cpp 削除
Modified Paths:
--------------
trunk/teraterm/teraterm/CMakeLists.txt
trunk/teraterm/teraterm/filesys_proto.cpp
trunk/teraterm/teraterm/ttermpro.v16.vcxproj
trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters
trunk/teraterm/teraterm/ttermpro.v8.vcproj
Removed Paths:
-------------
trunk/teraterm/ttpfile/CMakeLists.txt
trunk/teraterm/ttpfile/ttfile_proto.cpp
trunk/teraterm/ttpfile/ttfile_proto.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2020-12-20 12:16:47 UTC (rev 9106)
@@ -191,8 +191,6 @@
../ttpfile/kermit.h
../ttpfile/quickvan.c
../ttpfile/quickvan.h
- ../ttpfile/ttfile_proto.cpp
- ../ttpfile/ttfile_proto.h
../ttpfile/xmodem.c
../ttpfile/xmodem.h
../ttpfile/ymodem.c
Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:16:47 UTC (rev 9106)
@@ -57,7 +57,6 @@
#include "filesys.h"
#include "filesys_proto.h"
-#include "ttfile_proto.h"
#include "tt_res.h"
#include "filesys_win32.h"
@@ -263,6 +262,15 @@
*pfv = NULL;
}
+static int _ProtoSetOpt(PFileVarProto fv, int request, ...)
+{
+ va_list ap;
+ va_start(ap, request);
+ int r = fv->SetOptV(fv, request, ap);
+ va_end(ap);
+ return r;
+}
+
static BOOL OpenProtoDlg(PFileVarProto fv, int IdProto, int Mode, WORD Opt1, WORD Opt2)
{
PProtoDlg pd;
@@ -745,7 +753,8 @@
if (PtDlg==NULL)
return P;
- if (_ProtoParse(ProtoId,FileVar,&cv))
+ PFileVarProto fv = FileVar;
+ if (fv->Parse(fv, &cv))
P = 0; /* continue */
else {
CommSend(&cv);
@@ -756,15 +765,19 @@
void ProtoDlgTimeOut(void)
{
- if (PtDlg!=NULL)
- _ProtoTimeOutProc(ProtoId,FileVar,&cv);
+ if (PtDlg!=NULL) {
+ PFileVarProto fv = FileVar;
+ fv->TimeOutProc(fv, &cv);
+ }
}
void ProtoDlgCancel(void)
{
- if ((PtDlg!=NULL) &&
- _ProtoCancel(ProtoId,FileVar,&cv))
+ if (PtDlg!=NULL) {
+ PFileVarProto fv = FileVar;
+ fv->Cancel(fv, &cv);
ProtoEnd();
+ }
}
static INT_PTR CALLBACK GetFnDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-12-20 12:16:47 UTC (rev 9106)
@@ -142,7 +142,6 @@
<ClCompile Include="..\ttpfile\ftlib.c" />
<ClCompile Include="..\ttpfile\kermit.c" />
<ClCompile Include="..\ttpfile\quickvan.c" />
- <ClCompile Include="..\ttpfile\ttfile_proto.cpp" />
<ClCompile Include="..\ttpfile\xmodem.c" />
<ClCompile Include="..\ttpfile\ymodem.c" />
<ClCompile Include="..\ttpfile\zmodem.c" />
@@ -193,7 +192,6 @@
<ClInclude Include="..\ttpfile\ftlib.h" />
<ClInclude Include="..\ttpfile\kermit.h" />
<ClInclude Include="..\ttpfile\quickvan.h" />
- <ClInclude Include="..\ttpfile\ttfile_proto.h" />
<ClInclude Include="..\ttpfile\xmodem.h" />
<ClInclude Include="..\ttpfile\ymodem.h" />
<ClInclude Include="..\ttpfile\zmodem.h" />
@@ -313,4 +311,4 @@
<UserProperties RESOURCE_FILE="ttermpro.rc" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-12-20 12:16:47 UTC (rev 9106)
@@ -168,9 +168,6 @@
<ClCompile Include="..\ttpfile\quickvan.c">
<Filter>ffpfile</Filter>
</ClCompile>
- <ClCompile Include="..\ttpfile\ttfile_proto.cpp">
- <Filter>ffpfile</Filter>
- </ClCompile>
<ClCompile Include="..\ttpfile\xmodem.c">
<Filter>ffpfile</Filter>
</ClCompile>
@@ -432,9 +429,6 @@
<ClInclude Include="..\ttpfile\quickvan.h">
<Filter>ffpfile</Filter>
</ClInclude>
- <ClInclude Include="..\ttpfile\ttfile_proto.h">
- <Filter>ffpfile</Filter>
- </ClInclude>
<ClInclude Include="..\ttpfile\xmodem.h">
<Filter>ffpfile</Filter>
</ClInclude>
Modified: trunk/teraterm/teraterm/ttermpro.v8.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v8.vcproj 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/teraterm/ttermpro.v8.vcproj 2020-12-20 12:16:47 UTC (rev 9106)
@@ -743,14 +743,6 @@
>
</File>
<File
- RelativePath="..\ttpfile\ttfile_proto.cpp"
- >
- </File>
- <File
- RelativePath="..\ttpfile\ttfile_proto.h"
- >
- </File>
- <File
RelativePath="..\ttpfile\xmodem.c"
>
</File>
Deleted: trunk/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpfile/CMakeLists.txt 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/ttpfile/CMakeLists.txt 2020-12-20 12:16:47 UTC (rev 9106)
@@ -1,72 +0,0 @@
-project(ttpfile)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-
-set(COMMON_SRC
- ../common/dlglib.h
- ../common/ttlib.h
- ../common/ttlib.c
- ../common/win16api.h
- )
-
-source_group(
- "common"
- FILES
- ${COMMON_SRC}
- )
-
-set(SRC
- bplus.c
- bplus.h
- ftlib.c
- ftlib.h
- kermit.c
- kermit.h
- quickvan.c
- quickvan.h
- ttfile.c
- xmodem.c
- xmodem.h
- ymodem.c
- ymodem.h
- zmodem.c
- zmodem.h
- file_res.h
- ttpfile-version.rc
- ttpfile.rc
- ttpfile.def
- ${COMMON_SRC}
- )
-
-include_directories(
- ../common
- )
-
-add_library(
- ttpfile SHARED
- ${SRC}
- )
-
-if(MINGW)
- set_target_properties(
- ttpfile
- PROPERTIES PREFIX ""
- SUFFIX ".dll"
- )
-endif()
-
-target_link_libraries(
- ttpfile
- PRIVATE
- common_static
- ttpcmn
- #
- gdi32
- comdlg32
- )
-
-install(
- TARGETS ttpfile
- RUNTIME
- DESTINATION .
- )
Deleted: trunk/teraterm/ttpfile/ttfile_proto.cpp
===================================================================
--- trunk/teraterm/ttpfile/ttfile_proto.cpp 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/ttpfile/ttfile_proto.cpp 2020-12-20 12:16:47 UTC (rev 9106)
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2020 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* TTFILE.DLL, file transfer, VT window printing */
-#include "teraterm.h"
-#include "tttypes.h"
-#include "ttftypes.h"
-#include <direct.h>
-#include <commdlg.h>
-#include <string.h>
-
-#include "ttlib.h"
-#include "ftlib.h"
-#include "dlglib.h"
-#include "kermit.h"
-#include "xmodem.h"
-#include "ymodem.h"
-#include "zmodem.h"
-#include "bplus.h"
-#include "quickvan.h"
-
-#include "filesys_proto.h"
-#include "ttfile_proto.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <io.h>
-#include <assert.h>
-
-#if 0
-void _ProtoInit(int Proto, PFileVarProto fv, PComVar cv, PTTSet ts)
-{
- switch (Proto) {
- case PROTO_KMT:
- fv->Init(fv,cv,ts);
- break;
- case PROTO_XM:
- fv->Init(fv,cv,ts);
- break;
- case PROTO_YM:
- fv->Init(fv,cv,ts);
- break;
- case PROTO_ZM:
- fv->Init(fv,cv,ts);
- break;
- case PROTO_BP:
- fv->Init(fv,cv,ts);
- break;
- case PROTO_QV:
- fv->Init(fv,cv,ts);
- break;
- }
-}
-#endif
-
-BOOL _ProtoParse(int Proto, PFileVarProto fv, PComVar cv)
-{
- BOOL Ok;
-
- Ok = FALSE;
- switch (Proto) {
- case PROTO_KMT:
- Ok = fv->Parse(fv,cv);
- break;
- case PROTO_XM:
- Ok = fv->Parse(fv, cv);
- break;
- case PROTO_YM:
- Ok = fv->Parse(fv, cv);
- break;
- case PROTO_ZM:
- Ok = fv->Parse(fv, cv);
- break;
- case PROTO_BP:
- Ok = fv->Parse(fv, cv);
- break;
- case PROTO_QV:
- Ok = fv->Parse(fv,cv);
- break;
- }
- return Ok;
-}
-
-void _ProtoTimeOutProc(int Proto, PFileVarProto fv, PComVar cv)
-{
- switch (Proto) {
- case PROTO_KMT:
- fv->TimeOutProc(fv,cv);
- break;
- case PROTO_XM:
- fv->TimeOutProc(fv,cv);
- break;
- case PROTO_YM:
- fv->TimeOutProc(fv,cv);
- break;
- case PROTO_ZM:
- fv->TimeOutProc(fv, cv);
- break;
- case PROTO_BP:
- fv->TimeOutProc(fv, cv);
- break;
- case PROTO_QV:
- fv->TimeOutProc(fv,cv);
- break;
- }
-}
-
-BOOL _ProtoCancel(int Proto, PFileVarProto fv, PComVar cv)
-{
- switch (Proto) {
- case PROTO_KMT:
- fv->Cancel(fv,cv);
- break;
- case PROTO_XM:
- fv->Cancel(fv,cv);
- break;
- case PROTO_YM:
- fv->Cancel(fv,cv);
- break;
- case PROTO_ZM:
- fv->Cancel(fv, cv);
- break;
- case PROTO_BP:
- fv->Cancel(fv, cv);
- break;
- case PROTO_QV:
- fv->Cancel(fv,cv);
- break;
- }
- return TRUE;
-}
-
-int _ProtoSetOpt(PFileVarProto fv, int request, ...)
-{
- va_list ap;
- va_start(ap, request);
- int r = fv->SetOptV(fv, request, ap);
- va_end(ap);
- return r;
-}
Deleted: trunk/teraterm/ttpfile/ttfile_proto.h
===================================================================
--- trunk/teraterm/ttpfile/ttfile_proto.h 2020-12-20 12:16:38 UTC (rev 9105)
+++ trunk/teraterm/ttpfile/ttfile_proto.h 2020-12-20 12:16:47 UTC (rev 9106)
@@ -1,43 +0,0 @@
-/*
- * (C) 2020 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "filesys_proto.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void _ProtoInit(int Proto, PFileVarProto fv, PComVar cv, PTTSet ts);
-BOOL _ProtoParse(int Proto, PFileVarProto fv, PComVar cv);
-void _ProtoTimeOutProc(int Proto, PFileVarProto fv, PComVar cv);
-BOOL _ProtoCancel(int Proto, PFileVarProto fv, PComVar cv);
-int _ProtoSetOpt(PFileVarProto fv, int request, ...);
-
-#ifdef __cplusplus
-}
-#endif