[7251] proxyが動かなかったので修正 (Ttssh2-commit) - Tera Term

Revision: 7251
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7251
Author:   zmatsuo
Date:     2018-09-22 02:37:23 +0900 (Sat, 22 Sep 2018)
Log Message:
-----------
proxyが動かなかったので修正

Modified Paths:
--------------
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/TTProxy/StdAfx.h
    branches/cmake/TTProxy/TTProxy.cpp
    branches/cmake/TTProxy/TTProxy.h

-------------- next part --------------
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================

--- branches/cmake/TTProxy/CMakeLists.txt	2018-09-21 17:37:13 UTC (rev 7250)
+++ branches/cmake/TTProxy/CMakeLists.txt	2018-09-21 17:37:23 UTC (rev 7251)
@@ -5,9 +5,7 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake)
 
 set(COMMON_SRC
-  ../teraterm/common/ttlib.c
   ../teraterm/common/ttlib.h
-  ../teraterm/common/i18n.c
   ../teraterm/common/i18n.h
   ../teraterm/teraterm/ttdialog.h
   ../teraterm/teraterm/ttfileio.h
@@ -80,6 +78,8 @@
 	)
 endif()
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-uTTXBind ＠ 8")
+
 add_library(
   ttproxy SHARED
   ${SRC}
@@ -91,6 +91,7 @@
   ttproxy
   PROPERTIES
   PREFIX ""
+  OUTPUT_NAME "TTXProxy"
   )
 
 target_link_libraries(

Modified: branches/cmake/TTProxy/StdAfx.h
===================================================================
--- branches/cmake/TTProxy/StdAfx.h	2018-09-21 17:37:13 UTC (rev 7250)
+++ branches/cmake/TTProxy/StdAfx.h	2018-09-21 17:37:23 UTC (rev 7251)
@@ -10,7 +10,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#define _WINSOCKAPI_
+//#define _WINSOCKAPI_
 
 /* VS2015(VC14.0)\x82\xBE\x82ƁAWSASocketA(), inet_ntoa() \x82Ȃǂ\xCCAPI\x82\xAAdeprecated\x82ł\xA0\x82\xE9\x82\xC6
 * \x8Cx\x8D\x90\x82\xB7\x82邽\x82߂ɁA\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9\x81B\x91\xE3\x91֊֐\x94\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82ƁAVS2005(VC8.0)\x82Ńr\x83\x8B\x83h
@@ -24,6 +24,7 @@
 
 // \x82\xB1\x82̈ʒu\x82Ƀw\x83b\x83_\x81[\x82\xF0\x91}\x93\xFC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
 #include <winsock2.h>
+#include <windows.h>
 
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
@@ -32,9 +33,9 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 
-#include <teraterm.h>
-#include <tttypes.h>
-#include <ttplugin.h>
+#include "teraterm.h"
+#include "tttypes.h"
+#include "ttplugin.h"
 
 // TODO: \x83v\x83\x8D\x83O\x83\x89\x83\x80\x82ŕK\x97v\x82ȃw\x83b\x83_\x81[\x8EQ\x8FƂ\xF0\x92ǉ\xC1\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 

Modified: branches/cmake/TTProxy/TTProxy.cpp
===================================================================
--- branches/cmake/TTProxy/TTProxy.cpp	2018-09-21 17:37:13 UTC (rev 7250)
+++ branches/cmake/TTProxy/TTProxy.cpp	2018-09-21 17:37:23 UTC (rev 7251)
@@ -17,7 +17,7 @@
 	}
 }
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
+extern "C" __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
 	switch (reason) {
 	case DLL_PROCESS_ATTACH:
 		myInstance = instance;
@@ -28,6 +28,9 @@
 		return TTProxy::getInstance().threadAttach();
 	case DLL_THREAD_DETACH:
 		return TTProxy::getInstance().threadDetach();
+	default:
+		TTXBind(0, NULL);	// dummy TODO \x96\xA2\x8Eg\x97p\x82ō폜\x82\xB3\x82\xEA\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9
+		break;
 	}
 	return FALSE;
 }

Modified: branches/cmake/TTProxy/TTProxy.h
===================================================================
--- branches/cmake/TTProxy/TTProxy.h	2018-09-21 17:37:13 UTC (rev 7250)
+++ branches/cmake/TTProxy/TTProxy.h	2018-09-21 17:37:23 UTC (rev 7251)
@@ -6,7 +6,7 @@
 
 #include "ProxyWSockHook.h"
 
-__declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports);
+extern "C" __declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports);
 
 char UILanguageFile[MAX_PATH];
 
@@ -97,7 +97,7 @@
 	}
 
 	static void PASCAL TTXParseParam(PCHAR param, PTTSet ts, PCHAR DDETopic) {
-		int param_len=strlen(param);
+		//int param_len=strlen(param);
 		char option[1024];
 		int opt_len = sizeof(option);
 		int action;
@@ -289,7 +289,7 @@
 		}
 	}
 
-	friend BOOL PASCAL TTXBind(WORD Version, TTXExports* exports) {
+	friend __declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports) {
 		static const TTXExports EXPORTS = {
 			/* This must contain the size of the structure. See below for its usage. */
 			sizeof EXPORTS,


Tera Term

[Ttssh2-commit] [7251] proxyが動かなかったので修正