Tera TermRevision: 10490
https://osdn.net/projects/ttssh2/scm/svn/commits/10490
Author: zmatsuo
Date: 2023-01-15 00:39:01 +0900 (Sun, 15 Jan 2023)
Log Message:
-----------
Revert "hostname_rec を別ファイルにした"
r10489
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10489
Modified Paths:
--------------
trunk/teraterm/common/ttplugin.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/ttdialog.h
trunk/teraterm/teraterm/ttplug.h
trunk/teraterm/ttpdlg/ttdlg.h
Removed Paths:
-------------
trunk/teraterm/common/hostname_rec.h
-------------- next part --------------
Deleted: trunk/teraterm/common/hostname_rec.h
===================================================================
--- trunk/teraterm/common/hostname_rec.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/common/hostname_rec.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -1,52 +0,0 @@
-/*
- * (C) 2023- 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.
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* GetHostName dialog record */
-typedef struct {
- PCHAR SetupFN; // setup file name
- const wchar_t *SetupFNW;
- WORD PortType; // TCPIP/Serial
- wchar_t *HostName; // host name
- WORD Telnet; // non-zero: enable telnet
- WORD TelPort; // default TCP port# for telnet
- WORD TCPPort; // TCP port #
- WORD ProtocolFamily; // Protocol Family (AF_INET/AF_INET6/AF_UNSPEC)
- WORD ComPort; // serial port #
- WORD MaxComPort; // max serial port #
-} TGetHNRec;
-typedef TGetHNRec *PGetHNRec;
-
-#ifdef __cplusplus
-}
-#endif
Modified: trunk/teraterm/common/ttplugin.h
===================================================================
--- trunk/teraterm/common/ttplugin.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/common/ttplugin.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -32,7 +32,6 @@
#include "ttwsk.h"
#include "ttsetup.h"
#include "ttfileio.h"
-#include "hostname_rec.h"
// \x83v\x83\x89\x83O\x83C\x83\x93\x82̃o\x81[\x83W\x83\x87\x83\x93
#define TTVERSION (WORD)500 /* version 5.00 */
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/common/tttypes.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -715,6 +715,22 @@
#define IdFlowNone 3
#define IdFlowHardDsrDtr 4 // DSR/DTR(hardware flow)
+
+/* GetHostName dialog record */
+typedef struct {
+ PCHAR SetupFN; // setup file name
+ const wchar_t *SetupFNW;
+ WORD PortType; // TCPIP/Serial
+ wchar_t *HostName; // host name
+ WORD Telnet; // non-zero: enable telnet
+ WORD TelPort; // default TCP port# for telnet
+ WORD TCPPort; // TCP port #
+ WORD ProtocolFamily; // Protocol Family (AF_INET/AF_INET6/AF_UNSPEC)
+ WORD ComPort; // serial port #
+ WORD MaxComPort; // max serial port #
+} TGetHNRec;
+typedef TGetHNRec *PGetHNRec;
+
/* Control Characters */
#define NUL 0x00
Modified: trunk/teraterm/teraterm/ttdialog.h
===================================================================
--- trunk/teraterm/teraterm/ttdialog.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/teraterm/ttdialog.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -28,9 +28,6 @@
*/
/* TERATERM.EXE, TTDLG interface */
-
-#include "hostname_rec.h"
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/teraterm/teraterm/ttplug.h
===================================================================
--- trunk/teraterm/teraterm/ttplug.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/teraterm/ttplug.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -30,8 +30,6 @@
#ifndef __TTPLUG_H
#define __TTPLUG_H
-#include "hostname_rec.h"
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/teraterm/ttpdlg/ttdlg.h
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.h 2023-01-14 15:33:54 UTC (rev 10489)
+++ trunk/teraterm/ttpdlg/ttdlg.h 2023-01-14 15:39:01 UTC (rev 10490)
@@ -28,7 +28,6 @@
#include "teraterm.h"
#include "tttypes.h"
-#include "hostname_rec.h"
BOOL WINAPI _SetupTerminal(HWND WndParent, PTTSet ts);
BOOL WINAPI _SetupWin(HWND WndParent, PTTSet ts);