Commit 760ea903a50e646ee44be63a05d594e3b2bf9564

Authored by Perry Werneck
1 parent b90fd42b
Exists in master

Renaming dll.

@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 # 25 #
26 26
27 GLUELIB=@NATIVE_SONAME@ 27 GLUELIB=@NATIVE_SONAME@
28 -LIBNAME=tn3270-sharp.dll 28 +LIBNAME=tn3270.dll
29 TESTPROGRAM?=sample 29 TESTPROGRAM?=sample
30 30
31 #---[ Configuration values ]------------------------------------------------------------- 31 #---[ Configuration values ]-------------------------------------------------------------
@@ -70,19 +70,30 @@ $(BINDBG)/%.exe: \ @@ -70,19 +70,30 @@ $(BINDBG)/%.exe: \
70 src/testprograms/%.cs \ 70 src/testprograms/%.cs \
71 $(BINDBG)/$(LIBNAME) 71 $(BINDBG)/$(LIBNAME)
72 72
73 - @$(MCS) -reference:$(BINDBG)/$(LIBNAME) -debug -out:$@ $< 73 + @$(MCS) \
  74 + -reference:$(BINDBG)/$(LIBNAME) \
  75 + -debug \
  76 + -out:$@ \
  77 + $<
74 78
75 $(BINDBG)/%.exe: \ 79 $(BINDBG)/%.exe: \
76 src/testprograms/%.vb \ 80 src/testprograms/%.vb \
77 $(BINDBG)/$(LIBNAME) 81 $(BINDBG)/$(LIBNAME)
78 82
79 - @$(VBNC) -reference:$(BINDBG)/$(LIBNAME) -debug -out:$@ $< 83 + @$(VBNC) \
  84 + -reference:$(BINDBG)/$(LIBNAME) \
  85 + -debug \
  86 + -out:$@ \
  87 + $<
80 88
81 install-%: \ 89 install-%: \
82 src/%/Makefile \ 90 src/%/Makefile \
83 all 91 all
84 92
85 - @make -C `dirname $<` DESTDIR=$(DESTDIR) install 93 + @make \
  94 + -C `dirname $<` \
  95 + DESTDIR=$(DESTDIR) \
  96 + install
86 97
87 #---[ Release Targets ]------------------------------------------------------------------ 98 #---[ Release Targets ]------------------------------------------------------------------
88 99
@@ -97,13 +108,17 @@ $(BINRLS)/$(GLUELIB): \ @@ -97,13 +108,17 @@ $(BINRLS)/$(GLUELIB): \
97 src/native/* \ 108 src/native/* \
98 src/native/core/* 109 src/native/core/*
99 110
100 - @make -C src/native $@ 111 + @make \
  112 + -C src/native \
  113 + $@
101 114
102 $(BINRLS)/$(LIBNAME): \ 115 $(BINRLS)/$(LIBNAME): \
103 $(BINRLS)/$(GLUELIB) \ 116 $(BINRLS)/$(GLUELIB) \
104 src/core/* 117 src/core/*
105 118
106 - @make -C src/core $@ 119 + @make \
  120 + -C src/core \
  121 + $@
107 122
108 install: \ 123 install: \
109 install-native \ 124 install-native \
@@ -119,13 +134,17 @@ $(BINDBG)/$(GLUELIB): \ @@ -119,13 +134,17 @@ $(BINDBG)/$(GLUELIB): \
119 src/native/* \ 134 src/native/* \
120 src/native/core/* 135 src/native/core/*
121 136
122 - @make -C src/native $@ 137 + @make \
  138 + -C src/native \
  139 + $@
123 140
124 $(BINDBG)/$(LIBNAME): \ 141 $(BINDBG)/$(LIBNAME): \
125 $(BINDBG)/$(GLUELIB) \ 142 $(BINDBG)/$(GLUELIB) \
126 src/core/* 143 src/core/*
127 144
128 - @make -C src/core $@ 145 + @make \
  146 + -C src/core \
  147 + $@
129 148
130 #---[ Test targets ]--------------------------------------------------------------------- 149 #---[ Test targets ]---------------------------------------------------------------------
131 150
@@ -165,15 +165,11 @@ AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor) @@ -165,15 +165,11 @@ AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
165 165
166 case "$host" in 166 case "$host" in
167 *-mingw32|*-pc-msys) 167 *-mingw32|*-pc-msys)
168 - AC_SUBST(NATIVE_SONAME,lib3270-mono.dll)  
169 - ;;  
170 -  
171 - s390x-*)  
172 - AC_SUBST(NATIVE_SONAME,lib3270-mono.so) 168 + AC_SUBST(NATIVE_SONAME,mono-tn3270.dll)
173 ;; 169 ;;
174 170
175 *) 171 *)
176 - AC_SUBST(NATIVE_SONAME,lib3270-mono.so.$app_vrs_major.$app_vrs_minor) 172 + AC_SUBST(NATIVE_SONAME,mono-tn3270.so.$app_vrs_major.$app_vrs_minor)
177 173
178 esac 174 esac
179 175
src/core/Makefile.in
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 # 25 #
26 26
27 -MODULE_NAME=tn3270-sharp 27 +MODULE_NAME=tn3270
28 28
29 SOURCES=$(MODULE_NAME).cs 29 SOURCES=$(MODULE_NAME).cs
30 LIBNAME=$(MODULE_NAME).dll 30 LIBNAME=$(MODULE_NAME).dll
src/core/tn3270.cs
@@ -43,114 +43,114 @@ namespace tn3270 { @@ -43,114 +43,114 @@ namespace tn3270 {
43 public class Session { 43 public class Session {
44 44
45 /// <summary> 45 /// <summary>
46 - /// lib3270 session handle 46 + /// TN3270 Session handle
47 /// </summary> 47 /// </summary>
48 private IntPtr hSession; 48 private IntPtr hSession;
49 49
50 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 50 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
51 extern static IntPtr tn3270_create_session(string name); 51 extern static IntPtr tn3270_create_session(string name);
52 52
53 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 53 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
54 extern static int tn3270_destroy_session(IntPtr session); 54 extern static int tn3270_destroy_session(IntPtr session);
55 55
56 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 56 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
57 extern static int tn3270_get_version(IntPtr session, StringBuilder str, int strlen); 57 extern static int tn3270_get_version(IntPtr session, StringBuilder str, int strlen);
58 58
59 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 59 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
60 extern static int tn3270_get_revision(IntPtr session, StringBuilder str, int strlen); 60 extern static int tn3270_get_revision(IntPtr session, StringBuilder str, int strlen);
61 61
62 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 62 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
63 extern static int tn3270_connect(IntPtr Session, string host, int wait); 63 extern static int tn3270_connect(IntPtr Session, string host, int wait);
64 64
65 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 65 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
66 extern static int tn3270_is_connected(IntPtr Session); 66 extern static int tn3270_is_connected(IntPtr Session);
67 67
68 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 68 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
69 extern static int tn3270_is_ready(IntPtr Session); 69 extern static int tn3270_is_ready(IntPtr Session);
70 70
71 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 71 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
72 extern static int tn3270_disconnect(IntPtr Session); 72 extern static int tn3270_disconnect(IntPtr Session);
73 73
74 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 74 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
75 extern static int tn3270_wait_for_ready(IntPtr Session, int seconds); 75 extern static int tn3270_wait_for_ready(IntPtr Session, int seconds);
76 76
77 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 77 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
78 extern static int tn3270_wait(IntPtr Session, int seconds); 78 extern static int tn3270_wait(IntPtr Session, int seconds);
79 79
80 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 80 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
81 extern static int tn3270_get_cstate(IntPtr Session); 81 extern static int tn3270_get_cstate(IntPtr Session);
82 82
83 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 83 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
84 extern static int tn3270_get_program_message(IntPtr Session); 84 extern static int tn3270_get_program_message(IntPtr Session);
85 85
86 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 86 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
87 extern static int tn3270_get_secure(IntPtr Session); 87 extern static int tn3270_get_secure(IntPtr Session);
88 88
89 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 89 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
90 extern static int tn3270_get_contents(IntPtr Session, StringBuilder str, int strlen); 90 extern static int tn3270_get_contents(IntPtr Session, StringBuilder str, int strlen);
91 91
92 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 92 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
93 extern static int tn3270_get_string(IntPtr Session, int addr, StringBuilder str, int strlen); 93 extern static int tn3270_get_string(IntPtr Session, int addr, StringBuilder str, int strlen);
94 94
95 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 95 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
96 extern static int tn3270_get_string_at(IntPtr Session, int row, int col, StringBuilder str, int strlen); 96 extern static int tn3270_get_string_at(IntPtr Session, int row, int col, StringBuilder str, int strlen);
97 97
98 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 98 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
99 extern static int tn3270_set_string_at(IntPtr Session, int row, int col, string str); 99 extern static int tn3270_set_string_at(IntPtr Session, int row, int col, string str);
100 100
101 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 101 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
102 extern static int tn3270_wait_for_string_at(IntPtr Session, int row, int col, string key, int timeout); 102 extern static int tn3270_wait_for_string_at(IntPtr Session, int row, int col, string key, int timeout);
103 103
104 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 104 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
105 extern static int tn3270_cmp_string_at(IntPtr Session, int row, int col, string str); 105 extern static int tn3270_cmp_string_at(IntPtr Session, int row, int col, string str);
106 106
107 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 107 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
108 extern static int tn3270_set_unlock_delay(IntPtr Session, int ms); 108 extern static int tn3270_set_unlock_delay(IntPtr Session, int ms);
109 109
110 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 110 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
111 extern static int tn3270_set_cursor_position(IntPtr Session, int row, int col); 111 extern static int tn3270_set_cursor_position(IntPtr Session, int row, int col);
112 112
113 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 113 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
114 extern static int tn3270_set_cursor_addr(IntPtr Session, int addr); 114 extern static int tn3270_set_cursor_addr(IntPtr Session, int addr);
115 115
116 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 116 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
117 extern static int tn3270_get_cursor_addr(IntPtr Session); 117 extern static int tn3270_get_cursor_addr(IntPtr Session);
118 118
119 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 119 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
120 extern static int tn3270_enter(IntPtr Session); 120 extern static int tn3270_enter(IntPtr Session);
121 121
122 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 122 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
123 extern static int tn3270_pfkey(IntPtr Session, int key); 123 extern static int tn3270_pfkey(IntPtr Session, int key);
124 124
125 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 125 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
126 extern static int tn3270_pakey(IntPtr Session, int key); 126 extern static int tn3270_pakey(IntPtr Session, int key);
127 127
128 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 128 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
129 extern static int tn3270_get_width(IntPtr Session); 129 extern static int tn3270_get_width(IntPtr Session);
130 130
131 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 131 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
132 extern static int tn3270_get_height(IntPtr Session); 132 extern static int tn3270_get_height(IntPtr Session);
133 133
134 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 134 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
135 extern static int tn3270_get_length(IntPtr Session); 135 extern static int tn3270_get_length(IntPtr Session);
136 136
137 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 137 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
138 extern static int tn3270_set_charset(IntPtr Session, string str); 138 extern static int tn3270_set_charset(IntPtr Session, string str);
139 139
140 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 140 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
141 extern static int tn3270_set_url(IntPtr Session, string str); 141 extern static int tn3270_set_url(IntPtr Session, string str);
142 142
143 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 143 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
144 extern static int tn3270_get_url(IntPtr Session, StringBuilder str, int strlen); 144 extern static int tn3270_get_url(IntPtr Session, StringBuilder str, int strlen);
145 145
146 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 146 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
147 extern static int tn3270_set_error_message(IntPtr Session, string str); 147 extern static int tn3270_set_error_message(IntPtr Session, string str);
148 148
149 - [DllImport ("lib3270-mono",CallingConvention=CallingConvention.Cdecl)] 149 + [DllImport ("mono-tn3270",CallingConvention=CallingConvention.Cdecl)]
150 extern static int tn3270_get_error_message(IntPtr Session, StringBuilder str, int strlen); 150 extern static int tn3270_get_error_message(IntPtr Session, StringBuilder str, int strlen);
151 151
152 /// <summary> 152 /// <summary>
153 - /// Create a new session with lib3270/pw3270 153 + /// Create a new session with mono-tn327070
154 /// </summary> 154 /// </summary>
155 /// 155 ///
156 /// <param name="name">Session name or empty string for a hidden session</param> 156 /// <param name="name">Session name or empty string for a hidden session</param>
@@ -169,7 +169,7 @@ namespace tn3270 { @@ -169,7 +169,7 @@ namespace tn3270 {
169 } 169 }
170 170
171 /// <summary> 171 /// <summary>
172 - /// Get lib3270/pw3270 Version identifier 172 + /// Get mono-tn327070 Version identifier
173 /// </summary> 173 /// </summary>
174 /// 174 ///
175 /// <returns> 175 /// <returns>
@@ -197,7 +197,7 @@ namespace tn3270 { @@ -197,7 +197,7 @@ namespace tn3270 {
197 } 197 }
198 198
199 /// <summary> 199 /// <summary>
200 - /// Get lib3270/pw3270 Revision number 200 + /// Get mono-tn327070 Revision number
201 /// </summary> 201 /// </summary>
202 /// 202 ///
203 /// <returns> 203 /// <returns>
@@ -595,11 +595,11 @@ namespace tn3270 { @@ -595,11 +595,11 @@ namespace tn3270 {
595 } 595 }
596 596
597 /// <summary> 597 /// <summary>
598 - /// Last lib3270 error message 598 + /// Last mono-tn3270r message
599 /// </summary> 599 /// </summary>
600 /// 600 ///
601 /// <returns> 601 /// <returns>
602 - /// Last lib3270 error message 602 + /// Last mono-tn3270r message
603 /// </returns> 603 /// </returns>
604 /// 604 ///
605 public string Error { 605 public string Error {
src/native/Makefile.in
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 26
27 #---[ Library configuration ]------------------------------------------------------------ 27 #---[ Library configuration ]------------------------------------------------------------
28 28
29 -LIBNAME=lib3270-mono 29 +LIBNAME=mono-tn3270
30 SONAME=@NATIVE_SONAME@ 30 SONAME=@NATIVE_SONAME@
31 31
32 SOURCES= \ 32 SOURCES= \
src/native/windows/resources.rc.in
@@ -14,7 +14,7 @@ BEGIN @@ -14,7 +14,7 @@ BEGIN
14 VALUE "CompanyName", "Banco do Brasil S. A.\0" 14 VALUE "CompanyName", "Banco do Brasil S. A.\0"
15 VALUE "FileVersion", "@WIN32_VERSION@\0" 15 VALUE "FileVersion", "@WIN32_VERSION@\0"
16 VALUE "LegalCopyright", "(C) 2019 Banco do Brasil S. A. All Rights Reserved\0" 16 VALUE "LegalCopyright", "(C) 2019 Banco do Brasil S. A. All Rights Reserved\0"
17 - VALUE "OriginalFilename", "lib3270-mono-bindings@DLLEXT@s@DLLEXT@\0"" 17 + VALUE "OriginalFilename", "mono-tn3270s@DLLEXT@s@DLLEXT@\0""
18 VALUE "ProductName", "@PRODUCT_NAME@\0" 18 VALUE "ProductName", "@PRODUCT_NAME@\0"
19 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" 19 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0"
20 END 20 END
src/testprograms/ipc.cs
@@ -27,15 +27,15 @@ @@ -27,15 +27,15 @@
27 * 27 *
28 */ 28 */
29 29
30 -using pw3270; 30 +using tn3270;
31 31
32 class ipc { 32 class ipc {
33 33
34 static void Main(string[] args) { 34 static void Main(string[] args) {
35 35
36 - pw3270.Session host = new pw3270.Session("pw3270:A"); 36 + tn3270.Session host = new tn3270.Session(":A");
37 37
38 - System.Console.WriteLine("Using pw3270 version " + host.Version + " revision " + host.Revision); 38 + System.Console.WriteLine("Using tn3270 version " + host.Version + " revision " + host.Revision);
39 System.Console.WriteLine("Screen size is " + host.Width + "x" + host.Height + " (" + host.Length + ")"); 39 System.Console.WriteLine("Screen size is " + host.Width + "x" + host.Height + " (" + host.Length + ")");
40 40
41 // host.CharSet = "ISO-8859-1"; 41 // host.CharSet = "ISO-8859-1";
src/testprograms/simple.cs
@@ -35,16 +35,16 @@ using System.Runtime.InteropServices; @@ -35,16 +35,16 @@ using System.Runtime.InteropServices;
35 35
36 class test { 36 class test {
37 37
38 - [DllImport ("lib3270-mono")] 38 + [DllImport ("mono-tn3270")]
39 extern static IntPtr tn3270_create_session(string name); 39 extern static IntPtr tn3270_create_session(string name);
40 40
41 - [DllImport ("lib3270-mono")] 41 + [DllImport ("mono-tn3270")]
42 extern static void tn3270_destroy_session(IntPtr session); 42 extern static void tn3270_destroy_session(IntPtr session);
43 43
44 - [DllImport ("lib3270-mono")] 44 + [DllImport ("mono-tn3270")]
45 extern static void tn3270_get_version(IntPtr session, StringBuilder str, int strlen); 45 extern static void tn3270_get_version(IntPtr session, StringBuilder str, int strlen);
46 46
47 - [DllImport ("lib3270-mono")] 47 + [DllImport ("mono-tn3270")]
48 extern static void tn3270_get_revision(IntPtr session, StringBuilder str, int strlen); 48 extern static void tn3270_get_revision(IntPtr session, StringBuilder str, int strlen);
49 49
50 static void Main(string[] args) { 50 static void Main(string[] args) {
src/testprograms/vbclass.vb
@@ -32,95 +32,95 @@ Imports System.Runtime.InteropServices @@ -32,95 +32,95 @@ Imports System.Runtime.InteropServices
32 32
33 Public Class pw3270 33 Public Class pw3270
34 34
35 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 35 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
36 Private Shared Function tn3270_create_session(ByVal Name As String) As IntPtr 36 Private Shared Function tn3270_create_session(ByVal Name As String) As IntPtr
37 End Function 37 End Function
38 38
39 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 39 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
40 Private Shared Function tn3270_destroy_session(ByVal hSession As IntPtr) as Long 40 Private Shared Function tn3270_destroy_session(ByVal hSession As IntPtr) as Long
41 End Function 41 End Function
42 42
43 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 43 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
44 Private Shared Function tn3270_get_version(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer 44 Private Shared Function tn3270_get_version(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer
45 End Function 45 End Function
46 46
47 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 47 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
48 Private Shared Function tn3270_get_revision(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer 48 Private Shared Function tn3270_get_revision(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer
49 End Function 49 End Function
50 50
51 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 51 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
52 Private Shared Function tn3270_connect(ByVal hSession As IntPtr, ByVal buffer As String, ByVal seconds as Integer) as Integer 52 Private Shared Function tn3270_connect(ByVal hSession As IntPtr, ByVal buffer As String, ByVal seconds as Integer) as Integer
53 End Function 53 End Function
54 54
55 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 55 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
56 Private Shared Function tn3270_is_connected(ByVal hSession As IntPtr) as Integer 56 Private Shared Function tn3270_is_connected(ByVal hSession As IntPtr) as Integer
57 End Function 57 End Function
58 58
59 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 59 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
60 Private Shared Function tn3270_disconnect(ByVal hSession As IntPtr) as Integer 60 Private Shared Function tn3270_disconnect(ByVal hSession As IntPtr) as Integer
61 End Function 61 End Function
62 62
63 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 63 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
64 Private Shared Function tn3270_wait_for_ready(ByVal hSession As IntPtr, ByVal seconds as Integer) as Integer 64 Private Shared Function tn3270_wait_for_ready(ByVal hSession As IntPtr, ByVal seconds as Integer) as Integer
65 End Function 65 End Function
66 66
67 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 67 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
68 Private Shared Function tn3270_wait(ByVal hSession As IntPtr, ByVal seconds as Integer) as Integer 68 Private Shared Function tn3270_wait(ByVal hSession As IntPtr, ByVal seconds as Integer) as Integer
69 End Function 69 End Function
70 70
71 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 71 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
72 Private Shared Function tn3270_get_cstate(ByVal hSession As IntPtr) as Integer 72 Private Shared Function tn3270_get_cstate(ByVal hSession As IntPtr) as Integer
73 End Function 73 End Function
74 74
75 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 75 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
76 Private Shared Function tn3270_get_program_message(ByVal hSession As IntPtr) as Integer 76 Private Shared Function tn3270_get_program_message(ByVal hSession As IntPtr) as Integer
77 End Function 77 End Function
78 78
79 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 79 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
80 Private Shared Function tn3270_get_secure(ByVal hSession As IntPtr) as Integer 80 Private Shared Function tn3270_get_secure(ByVal hSession As IntPtr) as Integer
81 End Function 81 End Function
82 82
83 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 83 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
84 Private Shared Function tn3270_get_string(ByVal hSession As IntPtr, ByVal addr as Integer, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer 84 Private Shared Function tn3270_get_string(ByVal hSession As IntPtr, ByVal addr as Integer, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer
85 End Function 85 End Function
86 86
87 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 87 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
88 Private Shared Function tn3270_get_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer 88 Private Shared Function tn3270_get_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Integer
89 End Function 89 End Function
90 90
91 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 91 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
92 Private Shared Function tn3270_set_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As String) as Integer 92 Private Shared Function tn3270_set_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As String) as Integer
93 End Function 93 End Function
94 94
95 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 95 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
96 Private Shared Function tn3270_wait_for_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal key As String, ByVal timeout as Integer) as Integer 96 Private Shared Function tn3270_wait_for_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal key As String, ByVal timeout as Integer) as Integer
97 End Function 97 End Function
98 98
99 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 99 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
100 Private Shared Function tn3270_cmp_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As String) as Integer 100 Private Shared Function tn3270_cmp_string_at(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer, ByVal buffer As String) as Integer
101 End Function 101 End Function
102 102
103 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 103 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
104 Private Shared Function tn3270_set_unlock_delay(ByVal hSession As IntPtr, ByVal ms as Integer) as Integer 104 Private Shared Function tn3270_set_unlock_delay(ByVal hSession As IntPtr, ByVal ms as Integer) as Integer
105 End Function 105 End Function
106 106
107 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 107 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
108 Private Shared Function tn3270_set_cursor_position(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer) as Integer 108 Private Shared Function tn3270_set_cursor_position(ByVal hSession As IntPtr, ByVal row as Integer, ByVal col as Integer) as Integer
109 End Function 109 End Function
110 110
111 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 111 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
112 Private Shared Function tn3270_set_cursor_addr(ByVal hSession As IntPtr, ByVal addr as Integer) as Integer 112 Private Shared Function tn3270_set_cursor_addr(ByVal hSession As IntPtr, ByVal addr as Integer) as Integer
113 End Function 113 End Function
114 114
115 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 115 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
116 Private Shared Function tn3270_enter(ByVal hSession As IntPtr) as Integer 116 Private Shared Function tn3270_enter(ByVal hSession As IntPtr) as Integer
117 End Function 117 End Function
118 118
119 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 119 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
120 Private Shared Function tn3270_pfkey(ByVal hSession As IntPtr, ByVal key as Integer) as Integer 120 Private Shared Function tn3270_pfkey(ByVal hSession As IntPtr, ByVal key as Integer) as Integer
121 End Function 121 End Function
122 122
123 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 123 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
124 Private Shared Function tn3270_pakey(ByVal hSession As IntPtr, ByVal key as Integer) as Integer 124 Private Shared Function tn3270_pakey(ByVal hSession As IntPtr, ByVal key as Integer) as Integer
125 End Function 125 End Function
126 126
src/testprograms/vbsample.vb
@@ -34,7 +34,7 @@ Public Module modmain @@ -34,7 +34,7 @@ Public Module modmain
34 ' Application's entry point. 34 ' Application's entry point.
35 Sub Main() 35 Sub Main()
36 36
37 - dim host as new pw3270.Session("") 37 + dim host as new tn3270.Session("")
38 38
39 Console.WriteLine("Using pw3270 version " + host.getVersion() + " revision " + host.GetRevision()) 39 Console.WriteLine("Using pw3270 version " + host.getVersion() + " revision " + host.GetRevision())
40 Console.WriteLine("Screen size is " + host.GetWidth() + "x" + host.GetHeigth()) 40 Console.WriteLine("Screen size is " + host.GetWidth() + "x" + host.GetHeigth())
src/testprograms/vbtest.vb
@@ -7,19 +7,19 @@ Imports System.Runtime.InteropServices @@ -7,19 +7,19 @@ Imports System.Runtime.InteropServices
7 Public Module modmain 7 Public Module modmain
8 8
9 9
10 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 10 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
11 Private Shared Function tn3270_create_session(ByVal Name As String) As IntPtr 11 Private Shared Function tn3270_create_session(ByVal Name As String) As IntPtr
12 End Function 12 End Function
13 13
14 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 14 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
15 Private Shared Function tn3270_destroy_session(ByVal hSession As IntPtr) as Long 15 Private Shared Function tn3270_destroy_session(ByVal hSession As IntPtr) as Long
16 End Function 16 End Function
17 17
18 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 18 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
19 Private Shared Function tn3270_get_version(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Long 19 Private Shared Function tn3270_get_version(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Long
20 End Function 20 End Function
21 21
22 - <DllImport("lib3270-mono", CallingConvention := CallingConvention.Cdecl)> _ 22 + <DllImport("mono-tn3270", CallingConvention := CallingConvention.Cdecl)> _
23 Private Shared Function tn3270_get_revision(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Long 23 Private Shared Function tn3270_get_revision(ByVal hSession As IntPtr, ByVal buffer As StringBuilder, ByVal strlen as Integer) as Long
24 End Function 24 End Function
25 25