eliminate FAR keyword.
削除漏れがあった orz
@@ -46,7 +46,7 @@ | ||
46 | 46 | static TInstVar *pvar; |
47 | 47 | static TInstVar InstVar; |
48 | 48 | |
49 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
49 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
50 | 50 | pvar->ts = ts; |
51 | 51 | pvar->cv = cv; |
52 | 52 | pvar->origPrecv = NULL; |
@@ -174,7 +174,7 @@ | ||
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | -int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
177 | +int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
178 | 178 | int rlen; |
179 | 179 | |
180 | 180 | if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) { |
@@ -183,7 +183,7 @@ | ||
183 | 183 | return rlen; |
184 | 184 | } |
185 | 185 | |
186 | -BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
186 | +BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
187 | 187 | BOOL result; |
188 | 188 | |
189 | 189 | if ((result = pvar->origPReadFile(fh, buff, len, rbytes, rol)) != FALSE) |
@@ -191,29 +191,29 @@ | ||
191 | 191 | return result; |
192 | 192 | } |
193 | 193 | |
194 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
194 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
195 | 195 | pvar->origPrecv = *hooks->Precv; |
196 | 196 | *hooks->Precv = TTXrecv; |
197 | 197 | } |
198 | 198 | |
199 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
199 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
200 | 200 | if (pvar->origPrecv) { |
201 | 201 | *hooks->Precv = pvar->origPrecv; |
202 | 202 | } |
203 | 203 | } |
204 | 204 | |
205 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
205 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
206 | 206 | pvar->origPReadFile = *hooks->PReadFile; |
207 | 207 | *hooks->PReadFile = TTXReadFile; |
208 | 208 | } |
209 | 209 | |
210 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
210 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
211 | 211 | if (pvar->origPReadFile) { |
212 | 212 | *hooks->PReadFile = pvar->origPReadFile; |
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | -static BOOL FAR PASCAL TTXSetupWin(HWND parent, PTTSet ts) { | |
216 | +static BOOL PASCAL TTXSetupWin(HWND parent, PTTSet ts) { | |
217 | 217 | BOOL ret; |
218 | 218 | |
219 | 219 | strncpy_s(pvar->ts->Title, sizeof(pvar->ts->Title), pvar->orig_title, _TRUNCATE); |
@@ -226,11 +226,11 @@ | ||
226 | 226 | return ret; |
227 | 227 | } |
228 | 228 | |
229 | -static BOOL FAR PASCAL TTXDummySetupWin(HWND parent, PTTSet ts) { | |
229 | +static BOOL PASCAL TTXDummySetupWin(HWND parent, PTTSet ts) { | |
230 | 230 | return (TRUE); |
231 | 231 | } |
232 | 232 | |
233 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
233 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
234 | 234 | if (pvar->ChangeTitle) { |
235 | 235 | pvar->ChangeTitle = FALSE; |
236 | 236 | *hooks->SetupWin = TTXDummySetupWin; |
@@ -242,7 +242,7 @@ | ||
242 | 242 | return; |
243 | 243 | } |
244 | 244 | |
245 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
245 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
246 | 246 | char buff[sizeof(pvar->ts->Title)]; |
247 | 247 | |
248 | 248 | (pvar->origReadIniFile)(fn, ts); |
@@ -266,7 +266,7 @@ | ||
266 | 266 | } |
267 | 267 | } |
268 | 268 | |
269 | -static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
269 | +static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
270 | 270 | strncpy_s(pvar->ts->Title, sizeof(pvar->ts->Title), pvar->orig_title, _TRUNCATE); |
271 | 271 | (pvar->origWriteIniFile)(fn, ts); |
272 | 272 | SetTitleStr(pvar->orig_title, FALSE); |
@@ -287,7 +287,7 @@ | ||
287 | 287 | } |
288 | 288 | } |
289 | 289 | |
290 | -static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
290 | +static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
291 | 291 | char buff[1024]; |
292 | 292 | PCHAR next; |
293 | 293 |
@@ -303,7 +303,7 @@ | ||
303 | 303 | } |
304 | 304 | } |
305 | 305 | |
306 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
306 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
307 | 307 | pvar->origReadIniFile = *hooks->ReadIniFile; |
308 | 308 | *hooks->ReadIniFile = TTXReadIniFile; |
309 | 309 | pvar->origWriteIniFile = *hooks->WriteIniFile; |
@@ -313,7 +313,7 @@ | ||
313 | 313 | } |
314 | 314 | |
315 | 315 | /* |
316 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
316 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
317 | 317 | if (cmd==ID_MENUITEM) { |
318 | 318 | return 1; |
319 | 319 | } |
@@ -340,7 +340,7 @@ | ||
340 | 340 | TTXCloseFile |
341 | 341 | }; |
342 | 342 | |
343 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
343 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
344 | 344 | int size = sizeof(Exports) - sizeof(exports->size); |
345 | 345 | |
346 | 346 | if (size > exports->size) { |
@@ -57,12 +57,12 @@ | ||
57 | 57 | return NULL; |
58 | 58 | } |
59 | 59 | |
60 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
60 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
61 | 61 | pvar->ts = ts; |
62 | 62 | pvar->ontop = FALSE; |
63 | 63 | } |
64 | 64 | |
65 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
65 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
66 | 66 | UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED; |
67 | 67 | |
68 | 68 | pvar->ControlMenu = GetControlMenu(menu); |
@@ -78,7 +78,7 @@ | ||
78 | 78 | MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); |
79 | 79 | } |
80 | 80 | |
81 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
81 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
82 | 82 | switch (cmd) { |
83 | 83 | case ID_MENU_BASE: |
84 | 84 | if (pvar->ontop) { |
@@ -130,7 +130,7 @@ | ||
130 | 130 | NULL, // TTXEnd |
131 | 131 | }; |
132 | 132 | |
133 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
133 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
134 | 134 | int size = sizeof(Exports) - sizeof(exports->size); |
135 | 135 | |
136 | 136 | if (size > exports->size) { |
@@ -20,7 +20,7 @@ | ||
20 | 20 | static TInstVar *pvar; |
21 | 21 | static TInstVar InstVar; |
22 | 22 | |
23 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
23 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
24 | 24 | if (cmd==MENU_ID) { |
25 | 25 | PostMessage(hWin, WM_SYSCOMMAND, SC_KEYMENU, MAKELPARAM(0x20, 0)); |
26 | 26 | return 1; |
@@ -48,7 +48,7 @@ | ||
48 | 48 | NULL, // TTXCloseFile |
49 | 49 | }; |
50 | 50 | |
51 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
51 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
52 | 52 | int size = sizeof(Exports) - sizeof(exports->size); |
53 | 53 | /* do version checking if necessary */ |
54 | 54 | /* if (Version!=TTVERSION) return FALSE; */ |
@@ -20,7 +20,7 @@ | ||
20 | 20 | static TInstVar *pvar; |
21 | 21 | static TInstVar InstVar; |
22 | 22 | |
23 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
23 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
24 | 24 | pvar->ts = ts; |
25 | 25 | pvar->cv = cv; |
26 | 26 | } |
@@ -54,7 +54,7 @@ | ||
54 | 54 | return TRUE; |
55 | 55 | } |
56 | 56 | |
57 | -static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
57 | +static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
58 | 58 | char buff[1024]; |
59 | 59 | PCHAR start, cur, next; |
60 | 60 | int x, y; |
@@ -85,7 +85,7 @@ | ||
85 | 85 | pvar->origParseParam(Param, ts, DDETopic); |
86 | 86 | } |
87 | 87 | |
88 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
88 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
89 | 89 | pvar->origParseParam = *hooks->ParseParam; |
90 | 90 | *hooks->ParseParam = TTXParseParam; |
91 | 91 | } |
@@ -106,7 +106,7 @@ | ||
106 | 106 | NULL, // TTXEnd |
107 | 107 | }; |
108 | 108 | |
109 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
109 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
110 | 110 | int size = sizeof(Exports) - sizeof(exports->size); |
111 | 111 | |
112 | 112 | if (size > exports->size) { |
@@ -21,17 +21,17 @@ | ||
21 | 21 | static TInstVar *pvar; |
22 | 22 | static TInstVar InstVar; |
23 | 23 | |
24 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
24 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
25 | 25 | strcpy_s(pvar->origIniFileName, sizeof(pvar->origIniFileName), fn); |
26 | 26 | (pvar->origReadIniFile)(fn, ts); |
27 | 27 | } |
28 | 28 | |
29 | -static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
29 | +static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
30 | 30 | CopyFile(pvar->origIniFileName, fn, TRUE); |
31 | 31 | (pvar->origWriteIniFile)(fn, ts); |
32 | 32 | } |
33 | 33 | |
34 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
34 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
35 | 35 | if (pvar->origIniFileName[0] == 0) { |
36 | 36 | pvar->origReadIniFile = *hooks->ReadIniFile; |
37 | 37 | *hooks->ReadIniFile = TTXReadIniFile; |
@@ -61,7 +61,7 @@ | ||
61 | 61 | NULL // TTXCloseFile |
62 | 62 | }; |
63 | 63 | |
64 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
64 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
65 | 65 | int size = sizeof(Exports) - sizeof(exports->size); |
66 | 66 | |
67 | 67 | if (size > exports->size) { |
@@ -26,7 +26,7 @@ | ||
26 | 26 | static TInstVar *pvar; |
27 | 27 | static TInstVar InstVar; |
28 | 28 | |
29 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
29 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
30 | 30 | pvar->ts = ts; |
31 | 31 | pvar->cv = cv; |
32 | 32 |
@@ -35,7 +35,7 @@ | ||
35 | 35 | pvar->origReadIniFile = NULL; |
36 | 36 | } |
37 | 37 | |
38 | -static BOOL FAR PASCAL FixedSizeSetupTerminalDlg(HWND parent, PTTSet ts) { | |
38 | +static BOOL PASCAL FixedSizeSetupTerminalDlg(HWND parent, PTTSet ts) { | |
39 | 39 | BOOL ret; |
40 | 40 | if (pvar->sizeModify) { |
41 | 41 | pvar->ts->TerminalWidth = WIDTH; |
@@ -54,23 +54,23 @@ | ||
54 | 54 | return ret; |
55 | 55 | } |
56 | 56 | |
57 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
57 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
58 | 58 | pvar->origSetupTerminalDlg = *hooks->SetupTerminal; |
59 | 59 | *hooks->SetupTerminal = FixedSizeSetupTerminalDlg; |
60 | 60 | } |
61 | 61 | |
62 | -static void PASCAL FAR FixedSizeReadIniFile(PCHAR fn, PTTSet ts) { | |
62 | +static void PASCAL FixedSizeReadIniFile(PCHAR fn, PTTSet ts) { | |
63 | 63 | (pvar->origReadIniFile)(fn, ts); |
64 | 64 | ts->TerminalWidth = WIDTH; |
65 | 65 | ts->TerminalHeight = HEIGHT; |
66 | 66 | } |
67 | 67 | |
68 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
68 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
69 | 69 | pvar->origReadIniFile = *hooks->ReadIniFile; |
70 | 70 | *hooks->ReadIniFile = FixedSizeReadIniFile; |
71 | 71 | } |
72 | 72 | |
73 | -static void PASCAL FAR TTXSetWinSize(int rows, int cols) { | |
73 | +static void PASCAL TTXSetWinSize(int rows, int cols) { | |
74 | 74 | if (rows != HEIGHT || cols != WIDTH) { |
75 | 75 | pvar->sizeModify = TRUE; |
76 | 76 | // Call Setup-Terminal dialog |
@@ -94,7 +94,7 @@ | ||
94 | 94 | NULL, // TTXEnd |
95 | 95 | }; |
96 | 96 | |
97 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
97 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
98 | 98 | int size = sizeof(Exports) - sizeof(exports->size); |
99 | 99 | |
100 | 100 | if (size > exports->size) { |
@@ -41,7 +41,7 @@ | ||
41 | 41 | static TInstVar *pvar; |
42 | 42 | static TInstVar InstVar; |
43 | 43 | |
44 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
44 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
45 | 45 | pvar->ts = ts; |
46 | 46 | pvar->cv = cv; |
47 | 47 | pvar->config[0] = NULL; |
@@ -322,7 +322,7 @@ | ||
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
325 | -int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
325 | +int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
326 | 326 | int rlen; |
327 | 327 | |
328 | 328 | if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) { |
@@ -331,7 +331,7 @@ | ||
331 | 331 | return rlen; |
332 | 332 | } |
333 | 333 | |
334 | -BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
334 | +BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
335 | 335 | BOOL result; |
336 | 336 | |
337 | 337 | if ((result = pvar->origPReadFile(fh, buff, len, rbytes, rol)) != FALSE) |
@@ -339,23 +339,23 @@ | ||
339 | 339 | return result; |
340 | 340 | } |
341 | 341 | |
342 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
342 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
343 | 343 | pvar->origPrecv = *hooks->Precv; |
344 | 344 | *hooks->Precv = TTXrecv; |
345 | 345 | } |
346 | 346 | |
347 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
347 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
348 | 348 | if (pvar->origPrecv) { |
349 | 349 | *hooks->Precv = pvar->origPrecv; |
350 | 350 | } |
351 | 351 | } |
352 | 352 | |
353 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
353 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
354 | 354 | pvar->origPReadFile = *hooks->PReadFile; |
355 | 355 | *hooks->PReadFile = TTXReadFile; |
356 | 356 | } |
357 | 357 | |
358 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
358 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
359 | 359 | if (pvar->origPReadFile) { |
360 | 360 | *hooks->PReadFile = pvar->origPReadFile; |
361 | 361 | } |
@@ -380,7 +380,7 @@ | ||
380 | 380 | TTXCloseFile |
381 | 381 | }; |
382 | 382 | |
383 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
383 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
384 | 384 | int size = sizeof(Exports) - sizeof(exports->size); |
385 | 385 | |
386 | 386 | if (size > exports->size) { |
@@ -27,7 +27,7 @@ | ||
27 | 27 | // |
28 | 28 | // TTXInit -- 起動時処理 |
29 | 29 | // |
30 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
30 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
31 | 31 | pvar->ts = ts; |
32 | 32 | pvar->cv = cv; |
33 | 33 | pvar->origPsend = NULL; |
@@ -63,7 +63,7 @@ | ||
63 | 63 | // |
64 | 64 | // TTXSend -- キー入力処理 |
65 | 65 | // |
66 | -static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
66 | +static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
67 | 67 | int i, wlen, left_len; |
68 | 68 | |
69 | 69 | if (len > 0 && pvar->enable) { |
@@ -121,7 +121,7 @@ | ||
121 | 121 | // TTXOpen -- セッション開始処理 |
122 | 122 | // Psend をフックする。 |
123 | 123 | // |
124 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
124 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
125 | 125 | pvar->origPsend = *hooks->Psend; |
126 | 126 | *hooks->Psend = TTXsend; |
127 | 127 | pvar->buff_used = 0; |
@@ -131,7 +131,7 @@ | ||
131 | 131 | // TTXCloseTCP -- セッション終了時処理 |
132 | 132 | // Psend のフックを解除する。 |
133 | 133 | // |
134 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
134 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
135 | 135 | if (pvar->origPsend) { |
136 | 136 | *hooks->Psend = pvar->origPsend; |
137 | 137 | } |
@@ -156,7 +156,7 @@ | ||
156 | 156 | NULL, // TTXCloseFile |
157 | 157 | }; |
158 | 158 | |
159 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
159 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
160 | 160 | int size = sizeof(Exports) - sizeof(exports->size); |
161 | 161 | /* do version checking if necessary */ |
162 | 162 | /* if (Version!=TTVERSION) return FALSE; */ |
@@ -258,7 +258,7 @@ | ||
258 | 258 | // |
259 | 259 | // TTXInit -- 起動時処理 |
260 | 260 | // |
261 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
261 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
262 | 262 | pvar->ts = ts; |
263 | 263 | pvar->cv = cv; |
264 | 264 | pvar->origPsend = NULL; |
@@ -272,7 +272,7 @@ | ||
272 | 272 | // TTXSend, TTXWriteFile -- キー入力処理 |
273 | 273 | // キー入力があったら、タイマを延長する |
274 | 274 | // |
275 | -static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
275 | +static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
276 | 276 | if (pvar->enable && len > 0) { |
277 | 277 | SetTimer(pvar->cv->HWin, IdRecurringTimer, pvar->interval * 1000, RecurringTimerProc); |
278 | 278 | } |
@@ -279,7 +279,7 @@ | ||
279 | 279 | return pvar->origPsend(s, buf, len, flags); |
280 | 280 | } |
281 | 281 | |
282 | -static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
282 | +static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
283 | 283 | if (pvar->enable && len > 0) { |
284 | 284 | SetTimer(pvar->cv->HWin, IdRecurringTimer, pvar->interval * 1000, RecurringTimerProc); |
285 | 285 | } |
@@ -290,7 +290,7 @@ | ||
290 | 290 | // TTXOpenTCP, TTXOpenFile -- セッション開始処理 |
291 | 291 | // Psend, WriteFileをフックし、有効ならばタイマをセットする。 |
292 | 292 | // |
293 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
293 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
294 | 294 | pvar->origPsend = *hooks->Psend; |
295 | 295 | *hooks->Psend = TTXsend; |
296 | 296 |
@@ -299,7 +299,7 @@ | ||
299 | 299 | } |
300 | 300 | } |
301 | 301 | |
302 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
302 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
303 | 303 | pvar->origPWriteFile = *hooks->PWriteFile; |
304 | 304 | *hooks->PWriteFile = TTXWriteFile; |
305 | 305 |
@@ -312,7 +312,7 @@ | ||
312 | 312 | // TTXCloseTCP, TTXCloseFile -- セッション終了時処理 |
313 | 313 | // Psend, WriteFileのフックを解除し、タイマを止める。 |
314 | 314 | // |
315 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
315 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
316 | 316 | if (pvar->origPsend) { |
317 | 317 | *hooks->Psend = pvar->origPsend; |
318 | 318 | } |
@@ -319,7 +319,7 @@ | ||
319 | 319 | KillTimer(pvar->cv->HWin, IdRecurringTimer); |
320 | 320 | } |
321 | 321 | |
322 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
322 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
323 | 323 | if (pvar->origPWriteFile) { |
324 | 324 | *hooks->PWriteFile = pvar->origPWriteFile; |
325 | 325 | } |
@@ -365,7 +365,7 @@ | ||
365 | 365 | pvar->enable = GetOnOff(SECTION, "Enable", sect, FALSE); |
366 | 366 | } |
367 | 367 | |
368 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
368 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
369 | 369 | pvar->origReadIniFile(fn, ts); |
370 | 370 | ReadINI(fn, ts); |
371 | 371 |
@@ -372,7 +372,7 @@ | ||
372 | 372 | return; |
373 | 373 | } |
374 | 374 | |
375 | -static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
375 | +static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
376 | 376 | char buff[20]; |
377 | 377 | |
378 | 378 | pvar->origWriteIniFile(fn, ts); |
@@ -395,7 +395,7 @@ | ||
395 | 395 | // /F= による設定ファイルの切り替えのみ対応。 |
396 | 396 | // |
397 | 397 | |
398 | -static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
398 | +static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
399 | 399 | char buff[1024]; |
400 | 400 | PCHAR next; |
401 | 401 | pvar->origParseParam(Param, ts, DDETopic); |
@@ -411,7 +411,7 @@ | ||
411 | 411 | return; |
412 | 412 | } |
413 | 413 | |
414 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
414 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
415 | 415 | pvar->origReadIniFile = *hooks->ReadIniFile; |
416 | 416 | *hooks->ReadIniFile = TTXReadIniFile; |
417 | 417 |
@@ -428,7 +428,7 @@ | ||
428 | 428 | // メニュー処理 |
429 | 429 | // コントロールメニューにRecurringCommandを追加。 |
430 | 430 | // |
431 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
431 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
432 | 432 | UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED; |
433 | 433 | |
434 | 434 | pvar->SetupMenu = GetSetupMenu(menu); |
@@ -449,7 +449,7 @@ | ||
449 | 449 | InsertMenu(pvar->ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); |
450 | 450 | } |
451 | 451 | |
452 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
452 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
453 | 453 | if (menu==pvar->ControlMenu) { |
454 | 454 | if (pvar->enable) { |
455 | 455 | CheckMenuItem(pvar->ControlMenu, ID_MENU_CONTROL, MF_BYCOMMAND | MF_CHECKED); |
@@ -568,7 +568,7 @@ | ||
568 | 568 | // |
569 | 569 | // メニューコマンド処理 |
570 | 570 | // |
571 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
571 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
572 | 572 | switch (cmd) { |
573 | 573 | case ID_MENU_SETUP: |
574 | 574 | switch (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SETUP_RECURRINGCOMMAND), |
@@ -632,7 +632,7 @@ | ||
632 | 632 | TTXCloseFile |
633 | 633 | }; |
634 | 634 | |
635 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
635 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
636 | 636 | int size = sizeof(Exports) - sizeof(exports->size); |
637 | 637 | /* do version checking if necessary */ |
638 | 638 | /* if (Version!=TTVERSION) return FALSE; */ |
@@ -152,7 +152,7 @@ | ||
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
155 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
155 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
156 | 156 | pvar->ts = ts; |
157 | 157 | pvar->cv = cv; |
158 | 158 | pvar->ReplaceTermDlg = FALSE; |
@@ -167,12 +167,12 @@ | ||
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | -static BOOL FAR PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) { | |
170 | +static BOOL PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) { | |
171 | 171 | pvar->ReplaceTermDlg = FALSE; |
172 | 172 | return (TRUE); |
173 | 173 | } |
174 | 174 | |
175 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
175 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
176 | 176 | if (pvar->ReplaceTermDlg) { |
177 | 177 | *hooks->SetupTerminal = TTXSetupTerminal; |
178 | 178 | } |
@@ -179,7 +179,7 @@ | ||
179 | 179 | return; |
180 | 180 | } |
181 | 181 | |
182 | -static void PASCAL FAR ResizeMenuReadIniFile(PCHAR fn, PTTSet ts) { | |
182 | +static void PASCAL ResizeMenuReadIniFile(PCHAR fn, PTTSet ts) { | |
183 | 183 | int i, x, y; |
184 | 184 | char Key[20], Buff[100]; |
185 | 185 |
@@ -221,12 +221,12 @@ | ||
221 | 221 | pvar->MenuItems = i; |
222 | 222 | } |
223 | 223 | |
224 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
224 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
225 | 225 | pvar->origReadIniFile = *hooks->ReadIniFile; |
226 | 226 | *hooks->ReadIniFile = ResizeMenuReadIniFile; |
227 | 227 | } |
228 | 228 | |
229 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
229 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
230 | 230 | MENUITEMINFO mi; |
231 | 231 | |
232 | 232 | if (pvar->MenuItems > 0) { |
@@ -242,13 +242,13 @@ | ||
242 | 242 | } |
243 | 243 | } |
244 | 244 | |
245 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
245 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
246 | 246 | if (menu == pvar->ResizeMenu) { |
247 | 247 | UpdateMenu(); |
248 | 248 | } |
249 | 249 | } |
250 | 250 | |
251 | -static int PASCAL FAR TTXProcessCommand(HWND HWin, WORD cmd) { | |
251 | +static int PASCAL TTXProcessCommand(HWND HWin, WORD cmd) { | |
252 | 252 | int num, full_h, full_w; |
253 | 253 | if (cmd >= ID_MENUID_BASE && cmd < ID_MENUID_BASE + pvar->MenuItems) { |
254 | 254 | GetMonitorSizeByChar(&full_w, &full_h); |
@@ -290,7 +290,7 @@ | ||
290 | 290 | NULL, // TTXEnd |
291 | 291 | }; |
292 | 292 | |
293 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
293 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
294 | 294 | int size = sizeof(Exports) - sizeof(exports->size); |
295 | 295 | |
296 | 296 | if (size > exports->size) { |
@@ -27,18 +27,18 @@ | ||
27 | 27 | static TInstVar *pvar; |
28 | 28 | static TInstVar InstVar; |
29 | 29 | |
30 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
30 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
31 | 31 | pvar->ts = ts; |
32 | 32 | pvar->cv = cv; |
33 | 33 | pvar->ReplaceTermDlg = FALSE; |
34 | 34 | } |
35 | 35 | |
36 | -static BOOL FAR PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) { | |
36 | +static BOOL PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) { | |
37 | 37 | pvar->ReplaceTermDlg = FALSE; |
38 | 38 | return (TRUE); |
39 | 39 | } |
40 | 40 | |
41 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
41 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
42 | 42 | if (pvar->ReplaceTermDlg) { |
43 | 43 | *hooks->SetupTerminal = TTXSetupTerminal; |
44 | 44 | } |
@@ -45,12 +45,12 @@ | ||
45 | 45 | return; |
46 | 46 | } |
47 | 47 | |
48 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
48 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
49 | 49 | pvar->SetupMenu = menu; |
50 | 50 | InsertMenu(pvar->SetupMenu, ID_HELPMENU, MF_ENABLED, ID_MENUITEM, MENU_STR); |
51 | 51 | } |
52 | 52 | |
53 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
53 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
54 | 54 | if (cmd == ID_MENUITEM) { |
55 | 55 | pvar->ts->TerminalWidth = TERM_WIDTH; |
56 | 56 | pvar->ts->TerminalHeight = TERM_HEIGHT; |
@@ -79,7 +79,7 @@ | ||
79 | 79 | NULL, // TTXEnd |
80 | 80 | }; |
81 | 81 | |
82 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
82 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
83 | 83 | int size = sizeof(Exports) - sizeof(exports->size); |
84 | 84 | |
85 | 85 | if (size > exports->size) { |
@@ -18,12 +18,12 @@ | ||
18 | 18 | static TInstVar *pvar; |
19 | 19 | static TInstVar InstVar; |
20 | 20 | |
21 | -static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
21 | +static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
22 | 22 | MessageBox(NULL, Param, "TTXShowCommandLine", MB_OK|MB_ICONEXCLAMATION); |
23 | 23 | pvar->origParseParam(Param, ts, DDETopic); |
24 | 24 | } |
25 | 25 | |
26 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
26 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
27 | 27 | pvar->origParseParam = *hooks->ParseParam; |
28 | 28 | *hooks->ParseParam = TTXParseParam; |
29 | 29 | } |
@@ -44,7 +44,7 @@ | ||
44 | 44 | NULL, // TTXEnd |
45 | 45 | }; |
46 | 46 | |
47 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
47 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
48 | 48 | int size = sizeof(Exports) - sizeof(exports->size); |
49 | 49 | |
50 | 50 | if (size > exports->size) { |
@@ -61,7 +61,7 @@ | ||
61 | 61 | return NULL; |
62 | 62 | } |
63 | 63 | |
64 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
64 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
65 | 65 | pvar->ts = ts; |
66 | 66 | pvar->cv = cv; |
67 | 67 | pvar->origPsend = NULL; |
@@ -70,7 +70,7 @@ | ||
70 | 70 | pvar->origWriteIniFile = NULL; |
71 | 71 | } |
72 | 72 | |
73 | -static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
73 | +static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) { | |
74 | 74 | if (pvar->enable) { |
75 | 75 | return len; |
76 | 76 | } |
@@ -79,7 +79,7 @@ | ||
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | -static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
82 | +static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
83 | 83 | if (pvar->enable) { |
84 | 84 | *wbytes = len; |
85 | 85 | return TRUE; |
@@ -89,41 +89,41 @@ | ||
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
92 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
93 | 93 | pvar->origPsend = *hooks->Psend; |
94 | 94 | *hooks->Psend = TTXsend; |
95 | 95 | } |
96 | 96 | |
97 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
97 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
98 | 98 | if (pvar->origPsend) { |
99 | 99 | *hooks->Psend = pvar->origPsend; |
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
103 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
103 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
104 | 104 | pvar->origPWriteFile = *hooks->PWriteFile; |
105 | 105 | *hooks->PWriteFile = TTXWriteFile; |
106 | 106 | } |
107 | 107 | |
108 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
108 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
109 | 109 | if (pvar->origPWriteFile) { |
110 | 110 | *hooks->PWriteFile = pvar->origPWriteFile; |
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
114 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
115 | 115 | pvar->origReadIniFile(fn, ts); |
116 | 116 | GetPrivateProfileString(SECTION, "Password", "", pvar->password, sizeof(pvar->password), fn); |
117 | 117 | return; |
118 | 118 | } |
119 | 119 | |
120 | -static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
120 | +static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) { | |
121 | 121 | pvar->origWriteIniFile(fn, ts); |
122 | 122 | // WritePrivateProfileString(SECTION, "Password", pvar->password, fn); |
123 | 123 | return; |
124 | 124 | } |
125 | 125 | |
126 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
126 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
127 | 127 | pvar->origReadIniFile = *hooks->ReadIniFile; |
128 | 128 | *hooks->ReadIniFile = TTXReadIniFile; |
129 | 129 | pvar->origWriteIniFile = *hooks->WriteIniFile; |
@@ -130,7 +130,7 @@ | ||
130 | 130 | *hooks->WriteIniFile = TTXWriteIniFile; |
131 | 131 | } |
132 | 132 | |
133 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
133 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
134 | 134 | UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED; |
135 | 135 | |
136 | 136 | pvar->SetupMenu = GetSetupMenu(menu); |
@@ -142,7 +142,7 @@ | ||
142 | 142 | InsertMenu(pvar->ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); |
143 | 143 | } |
144 | 144 | |
145 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
145 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
146 | 146 | if (menu == pvar->ControlMenu) { |
147 | 147 | if (pvar->cv->Ready) |
148 | 148 | EnableMenuItem(pvar->ControlMenu, ID_MENU_VIEWMODE, MF_BYCOMMAND | MF_ENABLED); |
@@ -217,7 +217,7 @@ | ||
217 | 217 | return FALSE; |
218 | 218 | } |
219 | 219 | |
220 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
220 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
221 | 221 | switch (cmd) { |
222 | 222 | case ID_MENU_VIEWMODE: |
223 | 223 | if (pvar->enable) { |
@@ -281,7 +281,7 @@ | ||
281 | 281 | TTXCloseFile |
282 | 282 | }; |
283 | 283 | |
284 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
284 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
285 | 285 | int size = sizeof(Exports) - sizeof(exports->size); |
286 | 286 | /* do version checking if necessary */ |
287 | 287 | /* if (Version!=TTVERSION) return FALSE; */ |
@@ -97,7 +97,7 @@ | ||
97 | 97 | return NULL; |
98 | 98 | } |
99 | 99 | |
100 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
100 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
101 | 101 | pvar->ts = ts; |
102 | 102 | pvar->cv = cv; |
103 | 103 | pvar->origPReadFile = NULL; |
@@ -129,7 +129,7 @@ | ||
129 | 129 | SendMessage(pvar->cv->HWin, WM_COMMAND, MAKELONG(ID_SETUP_WINDOW, 0), 0); |
130 | 130 | } |
131 | 131 | |
132 | -static BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID obuff, DWORD oblen, LPDWORD rbytes, LPOVERLAPPED rol) { | |
132 | +static BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID obuff, DWORD oblen, LPDWORD rbytes, LPOVERLAPPED rol) { | |
133 | 133 | static struct recheader prh = { 0, 0, 0 }; |
134 | 134 | static unsigned int lbytes; |
135 | 135 | static char ibuff[BUFFSIZE]; |
@@ -236,7 +236,7 @@ | ||
236 | 236 | return FALSE; |
237 | 237 | } |
238 | 238 | |
239 | -static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
239 | +static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) { | |
240 | 240 | char tmpbuff[2048]; |
241 | 241 | unsigned int spos, dpos; |
242 | 242 | char *ptr; |
@@ -293,7 +293,7 @@ | ||
293 | 293 | return TRUE; |
294 | 294 | } |
295 | 295 | |
296 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
296 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
297 | 297 | if (pvar->cv->PortType == IdFile && pvar->enable) { |
298 | 298 | pvar->origPReadFile = *hooks->PReadFile; |
299 | 299 | pvar->origPWriteFile = *hooks->PWriteFile; |
@@ -304,7 +304,7 @@ | ||
304 | 304 | } |
305 | 305 | } |
306 | 306 | |
307 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
307 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
308 | 308 | if (pvar->origPReadFile) { |
309 | 309 | *hooks->PReadFile = pvar->origPReadFile; |
310 | 310 | } |
@@ -318,7 +318,7 @@ | ||
318 | 318 | } |
319 | 319 | } |
320 | 320 | |
321 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
321 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
322 | 322 | UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED; |
323 | 323 | |
324 | 324 | pvar->FileMenu = GetFileMenu(menu); |
@@ -336,7 +336,7 @@ | ||
336 | 336 | // InsertMenu(menu, ID_HELPMENU, MF_ENABLED, ID_MENU_REPLAY, "&t"); |
337 | 337 | } |
338 | 338 | |
339 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
339 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
340 | 340 | if (menu==pvar->FileMenu) { |
341 | 341 | if (pvar->enable) { |
342 | 342 | EnableMenuItem(pvar->FileMenu, ID_MENU_REPLAY, MF_BYCOMMAND | MF_GRAYED); |
@@ -347,7 +347,7 @@ | ||
347 | 347 | } |
348 | 348 | } |
349 | 349 | |
350 | -static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
350 | +static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) { | |
351 | 351 | char buff[1024]; |
352 | 352 | PCHAR next; |
353 | 353 | pvar->origParseParam(Param, ts, DDETopic); |
@@ -363,7 +363,7 @@ | ||
363 | 363 | } |
364 | 364 | } |
365 | 365 | |
366 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
366 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
367 | 367 | (pvar->origReadIniFile)(fn, ts); |
368 | 368 | // ts->TitleFormat = 0; |
369 | 369 | pvar->maxwait = GetPrivateProfileInt(INISECTION, "MaxWait", 0, fn); |
@@ -370,7 +370,7 @@ | ||
370 | 370 | pvar->speed = GetPrivateProfileInt(INISECTION, "Speed", 0, fn); |
371 | 371 | } |
372 | 372 | |
373 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
373 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
374 | 374 | pvar->origParseParam = *hooks->ParseParam; |
375 | 375 | *hooks->ParseParam = TTXParseParam; |
376 | 376 | pvar->origReadIniFile = *hooks->ReadIniFile; |
@@ -377,7 +377,7 @@ | ||
377 | 377 | *hooks->ReadIniFile = TTXReadIniFile; |
378 | 378 | } |
379 | 379 | |
380 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
380 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
381 | 381 | OPENFILENAME ofn; |
382 | 382 | |
383 | 383 | switch (cmd) { |
@@ -414,17 +414,17 @@ | ||
414 | 414 | return 0; |
415 | 415 | } |
416 | 416 | |
417 | -static BOOL FAR PASCAL TTXSetupWin(HWND parent, PTTSet ts) { | |
417 | +static BOOL PASCAL TTXSetupWin(HWND parent, PTTSet ts) { | |
418 | 418 | return (TRUE); |
419 | 419 | } |
420 | 420 | |
421 | -static BOOL FAR PASCAL TTXGetHostName(HWND parent, PGetHNRec GetHNRec) { | |
421 | +static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec GetHNRec) { | |
422 | 422 | GetHNRec->PortType = IdTCPIP; |
423 | 423 | _snprintf_s(GetHNRec->HostName, MAXPATHLEN, _TRUNCATE, "/R=\"%s\" /TP", pvar->openfn); |
424 | 424 | return (TRUE); |
425 | 425 | } |
426 | 426 | |
427 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
427 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
428 | 428 | if (pvar->ChangeTitle) { |
429 | 429 | pvar->ChangeTitle = FALSE; |
430 | 430 | *hooks->SetupWin = TTXSetupWin; |
@@ -455,7 +455,7 @@ | ||
455 | 455 | TTXCloseFile |
456 | 456 | }; |
457 | 457 | |
458 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
458 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
459 | 459 | int size = sizeof(Exports) - sizeof(exports->size); |
460 | 460 | |
461 | 461 | if (size > exports->size) { |
@@ -89,7 +89,7 @@ | ||
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
92 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
93 | 93 | pvar->ts = ts; |
94 | 94 | pvar->cv = cv; |
95 | 95 | pvar->origPrecv = NULL; |
@@ -99,7 +99,7 @@ | ||
99 | 99 | pvar->record = FALSE; |
100 | 100 | } |
101 | 101 | |
102 | -static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
102 | +static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) { | |
103 | 103 | (pvar->origReadIniFile)(fn, ts); |
104 | 104 | pvar->rec_stsize = GetOnOff(INISECTION, "RecordStartSize", fn, TRUE); |
105 | 105 | } |
@@ -118,12 +118,12 @@ | ||
118 | 118 | return; |
119 | 119 | } |
120 | 120 | |
121 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
121 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
122 | 122 | pvar->origReadIniFile = *hooks->ReadIniFile; |
123 | 123 | *hooks->ReadIniFile = TTXReadIniFile; |
124 | 124 | } |
125 | 125 | |
126 | -int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
126 | +int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) { | |
127 | 127 | int rlen; |
128 | 128 | |
129 | 129 | rlen = pvar->origPrecv(s, buff, len, flags); |
@@ -133,7 +133,7 @@ | ||
133 | 133 | return rlen; |
134 | 134 | } |
135 | 135 | |
136 | -BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
136 | +BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) { | |
137 | 137 | if (!pvar->origPReadFile(fh, buff, len, rbytes, rol)) |
138 | 138 | return FALSE; |
139 | 139 |
@@ -143,18 +143,18 @@ | ||
143 | 143 | return TRUE; |
144 | 144 | } |
145 | 145 | |
146 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
146 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
147 | 147 | pvar->origPrecv = *hooks->Precv; |
148 | 148 | *hooks->Precv = TTXrecv; |
149 | 149 | } |
150 | 150 | |
151 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
151 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
152 | 152 | if (pvar->origPrecv) { |
153 | 153 | *hooks->Precv = pvar->origPrecv; |
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
157 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
158 | 158 | if (pvar->cv->PortType == IdSerial) { |
159 | 159 | pvar->origPReadFile = *hooks->PReadFile; |
160 | 160 | *hooks->PReadFile = TTXReadFile; |
@@ -161,13 +161,13 @@ | ||
161 | 161 | } |
162 | 162 | } |
163 | 163 | |
164 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
164 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
165 | 165 | if (pvar->origPReadFile) { |
166 | 166 | *hooks->PReadFile = pvar->origPReadFile; |
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
170 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
171 | 171 | UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED; |
172 | 172 | |
173 | 173 | pvar->FileMenu = GetFileMenu(menu); |
@@ -180,7 +180,7 @@ | ||
180 | 180 | // MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); |
181 | 181 | } |
182 | 182 | |
183 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
183 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
184 | 184 | if (menu==pvar->FileMenu) { |
185 | 185 | if (pvar->cv->Ready) |
186 | 186 | EnableMenuItem(pvar->FileMenu, ID_MENUITEM, MF_BYCOMMAND | MF_ENABLED); |
@@ -189,7 +189,7 @@ | ||
189 | 189 | } |
190 | 190 | } |
191 | 191 | |
192 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
192 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
193 | 193 | OPENFILENAME ofn; |
194 | 194 | char fname[MAX_PATH]; |
195 | 195 | char buff[20]; |
@@ -237,7 +237,7 @@ | ||
237 | 237 | return 0; |
238 | 238 | } |
239 | 239 | |
240 | -static void PASCAL FAR TTXEnd(void) { | |
240 | +static void PASCAL TTXEnd(void) { | |
241 | 241 | if (pvar->fh != INVALID_HANDLE_VALUE) { |
242 | 242 | CloseHandle(pvar->fh); |
243 | 243 | pvar->fh = INVALID_HANDLE_VALUE; |
@@ -263,7 +263,7 @@ | ||
263 | 263 | TTXCloseFile |
264 | 264 | }; |
265 | 265 | |
266 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
266 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
267 | 267 | int size = sizeof(Exports) - sizeof(exports->size); |
268 | 268 | |
269 | 269 | if (size > exports->size) { |
@@ -94,7 +94,7 @@ | ||
94 | 94 | or you will slow down the startup process even if your extension is not |
95 | 95 | going to be used. |
96 | 96 | */ |
97 | -static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) { | |
97 | +static void PASCAL TTXInit(PTTSet ts, PComVar cv) { | |
98 | 98 | pvar->ts = ts; |
99 | 99 | pvar->cv = cv; |
100 | 100 | } |
@@ -125,7 +125,7 @@ | ||
125 | 125 | This function is called for each extension, in load order (see below). |
126 | 126 | Thus, the extension with highest load order puts its hooks in last. |
127 | 127 | */ |
128 | -static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) { | |
128 | +static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) { | |
129 | 129 | printf("TTXOpenTCP %d\n", ORDER); |
130 | 130 | } |
131 | 131 |
@@ -139,7 +139,7 @@ | ||
139 | 139 | This function is called for each extension, in reverse load order (see |
140 | 140 | below). |
141 | 141 | */ |
142 | -static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) { | |
142 | +static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) { | |
143 | 143 | printf("TTXCloseTCP %d\n", ORDER); |
144 | 144 | } |
145 | 145 |
@@ -175,7 +175,7 @@ | ||
175 | 175 | This function is called for each extension, in load order (see below). |
176 | 176 | Thus, the extension with highest load order puts its hooks in last. |
177 | 177 | */ |
178 | -static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) { | |
178 | +static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) { | |
179 | 179 | printf("TTXSetUIHooks %d\n", ORDER); |
180 | 180 | } |
181 | 181 |
@@ -197,7 +197,7 @@ | ||
197 | 197 | This function is called for each extension, in load order (see below). |
198 | 198 | Thus, the extension with highest load order puts its hooks in last. |
199 | 199 | */ |
200 | -static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
200 | +static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) { | |
201 | 201 | printf("TTXSetSetupHooks %d\n", ORDER); |
202 | 202 | } |
203 | 203 |
@@ -205,7 +205,7 @@ | ||
205 | 205 | |
206 | 206 | This function is called for each extension, in load order (see below). |
207 | 207 | */ |
208 | -static void PASCAL FAR TTXSetWinSize(int rows, int cols) { | |
208 | +static void PASCAL TTXSetWinSize(int rows, int cols) { | |
209 | 209 | printf("TTXSetWinSize %d\n", ORDER); |
210 | 210 | } |
211 | 211 |
@@ -221,7 +221,7 @@ | ||
221 | 221 | Thus, the extension with highest load order number puts its items in last. |
222 | 222 | */ |
223 | 223 | #define ID_MENUITEM 6000 |
224 | -static void PASCAL FAR TTXModifyMenu(HMENU menu) { | |
224 | +static void PASCAL TTXModifyMenu(HMENU menu) { | |
225 | 225 | UINT flag = MF_ENABLED; |
226 | 226 | |
227 | 227 | printf("TTXModifyMenu %d\n", ORDER); |
@@ -241,7 +241,7 @@ | ||
241 | 241 | |
242 | 242 | This function is called for each extension, in load order (see below). |
243 | 243 | */ |
244 | -static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) { | |
244 | +static void PASCAL TTXModifyPopupMenu(HMENU menu) { | |
245 | 245 | printf("TTXModifyPopupMenu %d\n", ORDER); |
246 | 246 | |
247 | 247 | if (menu==pvar->SetupMenu) |
@@ -264,7 +264,7 @@ | ||
264 | 264 | below). Thus, the extension that has highest load order number gets to |
265 | 265 | process the command first. |
266 | 266 | */ |
267 | -static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) { | |
267 | +static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) { | |
268 | 268 | printf("TTXProcessCommand %d\n", ORDER); |
269 | 269 | |
270 | 270 | if (cmd==ID_MENUITEM) |
@@ -289,13 +289,13 @@ | ||
289 | 289 | This function is called for each extension, in reverse load order (see |
290 | 290 | below). |
291 | 291 | */ |
292 | -static void PASCAL FAR TTXEnd(void) { | |
292 | +static void PASCAL TTXEnd(void) { | |
293 | 293 | printf("TTXEnd %d\n", ORDER); |
294 | 294 | } |
295 | 295 | |
296 | 296 | /* |
297 | 297 | */ |
298 | -static void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) { | |
298 | +static void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) { | |
299 | 299 | printf("TTXSetCommandLine %d\n", ORDER); |
300 | 300 | } |
301 | 301 |
@@ -325,7 +325,7 @@ | ||
325 | 325 | This function is called for each extension, in load order (see below). |
326 | 326 | Thus, the extension with highest load order puts its hooks in last. |
327 | 327 | */ |
328 | -static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) { | |
328 | +static void PASCAL TTXOpenFile(TTXFileHooks *hooks) { | |
329 | 329 | printf("TTXOpenFile %d\n", ORDER); |
330 | 330 | } |
331 | 331 |
@@ -339,7 +339,7 @@ | ||
339 | 339 | This function is called for each extension, in reverse load order (see |
340 | 340 | below). |
341 | 341 | */ |
342 | -static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) { | |
342 | +static void PASCAL TTXCloseFile(TTXFileHooks *hooks) { | |
343 | 343 | printf("TTXCloseFile %d\n", ORDER); |
344 | 344 | } |
345 | 345 |
@@ -414,7 +414,7 @@ | ||
414 | 414 | extra functions that have been added since this extension was compiled |
415 | 415 | will automatically be NULL and thus get default behaviour.) |
416 | 416 | */ |
417 | -BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) { | |
417 | +BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) { | |
418 | 418 | int size = sizeof(Exports) - sizeof(exports->size); |
419 | 419 | /* do version checking if necessary */ |
420 | 420 | /* if (Version!=TTVERSION) return FALSE; */ |