• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8279 (tree)
Time2019-10-08 23:38:32
Authorzmatsuo

Log Message

ttpfile.dllのSerialPortConfconvertId2Str()のexport方法を変更

- プロトタイプを正しく認識できるよう ttpset/ttset.h を追加

- teraterm/ttsetup.h から inlucde

- declspec(dllimport)を使用するようにした

Change Summary

Incremental Difference

--- trunk/teraterm/teraterm/ttsetup.h (revision 8278)
+++ trunk/teraterm/teraterm/ttsetup.h (revision 8279)
@@ -27,6 +27,8 @@
2727 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828 */
2929
30+#pragma once
31+
3032 #include "ttlib.h"
3133
3234 /* TERATERM.EXE, TTSET interface */
@@ -64,8 +66,8 @@
6466 BOOL LoadTTSET();
6567 void FreeTTSET();
6668
67-int PASCAL SerialPortConfconvertId2Str(enum serial_port_conf type, WORD id, PCHAR str, int strlen);
68-
6969 #ifdef __cplusplus
7070 }
7171 #endif
72+
73+#include "../ttpset/ttset.h"
--- trunk/teraterm/ttpset/ttset.c (revision 8278)
+++ trunk/teraterm/ttpset/ttset.c (revision 8279)
@@ -44,6 +44,9 @@
4444
4545 #include "compat_w95.h"
4646
47+#define DllExport __declspec(dllexport)
48+#include "ttset.h"
49+
4750 #ifndef CLEARTYPE_QUALITY
4851 #define CLEARTYPE_QUALITY 5
4952 #endif
@@ -111,7 +114,7 @@
111114 * TRUE: 変換成功
112115 * FALSE: 変換失敗
113116 */
114-int PASCAL SerialPortConfconvertId2Str(enum serial_port_conf type, WORD id, PCHAR str, int strlen)
117+int WINAPI SerialPortConfconvertId2Str(enum serial_port_conf type, WORD id, PCHAR str, int strlen)
115118 {
116119 id_str_pair_t *conf;
117120 int ret = FALSE;
--- trunk/teraterm/ttpset/ttset.h (nonexistent)
+++ trunk/teraterm/ttpset/ttset.h (revision 8279)
@@ -0,0 +1,15 @@
1+#pragma once
2+
3+#ifdef __cplusplus
4+extern "C" {
5+#endif
6+
7+#if !defined(DllExport)
8+#define DllExport __declspec(dllimport)
9+#endif
10+
11+DllExport int WINAPI SerialPortConfconvertId2Str(enum serial_port_conf type, WORD id, PCHAR str, int strlen);
12+
13+#ifdef __cplusplus
14+}
15+#endif
Show on old repository browser