Tera Term

[Ttssh2-commit] [6860] eliminate FAR keyword.

svnno****@sourc***** svnno****@sourc*****
2017年 7月 13日 (木) 19:01:34 JST

• 前の記事 [Ttssh2-commit] [6859] typo fix.
• 次の記事 [Ttssh2-commit] [6861] LtoR 転送と Dynamic 転送で同じポートだった場合にはじくようにした。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 6860
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6860
Author:   doda
Date:     2017-07-13 19:01:34 +0900 (Thu, 13 Jul 2017)
Log Message:
-----------
eliminate FAR keyword.

削除漏れがあった orz

Modified Paths:
--------------
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
    trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
    trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c
    trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
    trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c
    trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c
    trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
    trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c
    trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
    trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c
    trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c
    trunk/TTXSamples/TTXViewMode/TTXViewMode.c
    trunk/TTXSamples/TTXttyrec/TTXttyplay.c
    trunk/TTXSamples/TTXttyrec/TTXttyrec.c
    trunk/TTXSamples/ttxtest/ttxtest.c

-------------- next part --------------
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -46,7 +46,7 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->origPrecv = NULL;
@@ -174,7 +174,7 @@
   }
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
+int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -183,7 +183,7 @@
   return rlen;
 }
 
-BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
+BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
   BOOL result;
 
   if ((result = pvar->origPReadFile(fh, buff, len, rbytes, rol)) != FALSE)
@@ -191,29 +191,29 @@
   return result;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPReadFile = *hooks->PReadFile;
   *hooks->PReadFile = TTXReadFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
 }
 
-static BOOL FAR PASCAL TTXSetupWin(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXSetupWin(HWND parent, PTTSet ts) {
   BOOL ret;
 
   strncpy_s(pvar->ts->Title, sizeof(pvar->ts->Title), pvar->orig_title, _TRUNCATE);
@@ -226,11 +226,11 @@
   return ret;
 }
 
-static BOOL FAR PASCAL TTXDummySetupWin(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXDummySetupWin(HWND parent, PTTSet ts) {
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ChangeTitle) {
     pvar->ChangeTitle = FALSE;
     *hooks->SetupWin = TTXDummySetupWin;
@@ -242,7 +242,7 @@
   return;
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
   char buff[sizeof(pvar->ts->Title)];
 
   (pvar->origReadIniFile)(fn, ts);
@@ -266,7 +266,7 @@
   }
 }
 
-static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) {
   strncpy_s(pvar->ts->Title, sizeof(pvar->ts->Title), pvar->orig_title, _TRUNCATE);
   (pvar->origWriteIniFile)(fn, ts);
   SetTitleStr(pvar->orig_title, FALSE);
@@ -287,7 +287,7 @@
   }
 }
 
-static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
   char buff[1024];
   PCHAR next;
 
@@ -303,7 +303,7 @@
   }
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
   pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -313,7 +313,7 @@
 }
 
 /*
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   if (cmd==ID_MENUITEM) {
     return 1;
   }
@@ -340,7 +340,7 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -57,12 +57,12 @@
   return NULL;
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->ontop = FALSE;
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
   pvar->ControlMenu = GetControlMenu(menu);
@@ -78,7 +78,7 @@
 		MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   switch (cmd) {
     case ID_MENU_BASE:
       if (pvar->ontop) {
@@ -130,7 +130,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -20,7 +20,7 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   if (cmd==MENU_ID) {
     PostMessage(hWin, WM_SYSCOMMAND, SC_KEYMENU, MAKELPARAM(0x20, 0));
     return 1;
@@ -48,7 +48,7 @@
   NULL, // TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */

Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -20,7 +20,7 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
 }
@@ -54,7 +54,7 @@
   return TRUE;
 }
 
-static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
   char buff[1024];
   PCHAR start, cur, next;
   int x, y;
@@ -85,7 +85,7 @@
   pvar->origParseParam(Param, ts, DDETopic);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origParseParam = *hooks->ParseParam;
   *hooks->ParseParam = TTXParseParam;
 }
@@ -106,7 +106,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -21,17 +21,17 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
 	strcpy_s(pvar->origIniFileName, sizeof(pvar->origIniFileName), fn);
 	(pvar->origReadIniFile)(fn, ts);
 }
 
-static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) {
 	CopyFile(pvar->origIniFileName, fn, TRUE);
 	(pvar->origWriteIniFile)(fn, ts);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	if (pvar->origIniFileName[0] == 0) {
 		pvar->origReadIniFile = *hooks->ReadIniFile;
 		*hooks->ReadIniFile = TTXReadIniFile;
@@ -61,7 +61,7 @@
 	NULL	// TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 
 	if (size > exports->size) {

Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -26,7 +26,7 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
     pvar->ts = ts;
     pvar->cv = cv;
 
@@ -35,7 +35,7 @@
     pvar->origReadIniFile = NULL;
 }
 
-static BOOL FAR PASCAL FixedSizeSetupTerminalDlg(HWND parent, PTTSet ts) {
+static BOOL PASCAL FixedSizeSetupTerminalDlg(HWND parent, PTTSet ts) {
     BOOL ret;
     if (pvar->sizeModify) {
 	pvar->ts->TerminalWidth = WIDTH;
@@ -54,23 +54,23 @@
     return ret;
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
     pvar->origSetupTerminalDlg = *hooks->SetupTerminal;
     *hooks->SetupTerminal = FixedSizeSetupTerminalDlg;
 }
 
-static void PASCAL FAR FixedSizeReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL FixedSizeReadIniFile(PCHAR fn, PTTSet ts) {
     (pvar->origReadIniFile)(fn, ts);
     ts->TerminalWidth = WIDTH;
     ts->TerminalHeight = HEIGHT;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
     pvar->origReadIniFile = *hooks->ReadIniFile;
     *hooks->ReadIniFile = FixedSizeReadIniFile;
 }
 
-static void PASCAL FAR TTXSetWinSize(int rows, int cols) {
+static void PASCAL TTXSetWinSize(int rows, int cols) {
     if (rows != HEIGHT || cols != WIDTH) {
 	pvar->sizeModify = TRUE;
 	// Call Setup-Terminal dialog
@@ -94,7 +94,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -41,7 +41,7 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->config[0] = NULL;
@@ -322,7 +322,7 @@
   }
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
+int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -331,7 +331,7 @@
   return rlen;
 }
 
-BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
+BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
   BOOL result;
 
   if ((result = pvar->origPReadFile(fh, buff, len, rbytes, rol)) != FALSE)
@@ -339,23 +339,23 @@
   return result;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPReadFile = *hooks->PReadFile;
   *hooks->PReadFile = TTXReadFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
@@ -380,7 +380,7 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -27,7 +27,7 @@
 //
 //  TTXInit -- \x8BN\x93\xAE\x8E\x9E\x8F\x88\x97\x9D
 //
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
 	pvar->ts = ts;
 	pvar->cv = cv;
 	pvar->origPsend = NULL;
@@ -63,7 +63,7 @@
 //
 //  TTXSend -- \x83L\x81[\x93\xFC\x97͏\x88\x97\x9D
 //
-static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
+static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) {
 	int i, wlen, left_len;
 
 	if (len > 0 && pvar->enable) {
@@ -121,7 +121,7 @@
 // TTXOpen -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8AJ\x8En\x8F\x88\x97\x9D
 //	Psend \x82\xF0\x83t\x83b\x83N\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
 	pvar->origPsend = *hooks->Psend;
 	*hooks->Psend = TTXsend;
 	pvar->buff_used = 0;
@@ -131,7 +131,7 @@
 // TTXCloseTCP -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x8F\x88\x97\x9D
 //	Psend \x82̃t\x83b\x83N\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
 	if (pvar->origPsend) {
 		*hooks->Psend = pvar->origPsend;
 	}
@@ -156,7 +156,7 @@
 	NULL, // TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
 	/* if (Version!=TTVERSION) return FALSE; */

Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -258,7 +258,7 @@
 //
 //  TTXInit -- \x8BN\x93\xAE\x8E\x9E\x8F\x88\x97\x9D
 //
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
 	pvar->ts = ts;
 	pvar->cv = cv;
 	pvar->origPsend = NULL;
@@ -272,7 +272,7 @@
 //  TTXSend, TTXWriteFile -- \x83L\x81[\x93\xFC\x97͏\x88\x97\x9D
 //	\x83L\x81[\x93\xFC\x97͂\xAA\x82\xA0\x82\xC1\x82\xBD\x82\xE7\x81A\x83^\x83C\x83}\x82\xF0\x89\x84\x92\xB7\x82\xB7\x82\xE9
 //
-static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
+static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) {
 	if (pvar->enable && len > 0) {
 		SetTimer(pvar->cv->HWin, IdRecurringTimer, pvar->interval * 1000, RecurringTimerProc);
 	}
@@ -279,7 +279,7 @@
 	return pvar->origPsend(s, buf, len, flags);
 }
 
-static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
+static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
 	if (pvar->enable && len > 0) {
 		SetTimer(pvar->cv->HWin, IdRecurringTimer, pvar->interval * 1000, RecurringTimerProc);
 	}
@@ -290,7 +290,7 @@
 // TTXOpenTCP, TTXOpenFile -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8AJ\x8En\x8F\x88\x97\x9D
 //	Psend, WriteFile\x82\xF0\x83t\x83b\x83N\x82\xB5\x81A\x97L\x8C\xF8\x82Ȃ\xE7\x82΃^\x83C\x83}\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
 	pvar->origPsend = *hooks->Psend;
 	*hooks->Psend = TTXsend;
 
@@ -299,7 +299,7 @@
 	}
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
 	pvar->origPWriteFile = *hooks->PWriteFile;
 	*hooks->PWriteFile = TTXWriteFile;
 
@@ -312,7 +312,7 @@
 // TTXCloseTCP, TTXCloseFile -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x8F\x88\x97\x9D
 //	Psend, WriteFile\x82̃t\x83b\x83N\x82\xF0\x89\xF0\x8F\x9C\x82\xB5\x81A\x83^\x83C\x83}\x82\xF0\x8E~\x82߂\xE9\x81B
 //
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
 	if (pvar->origPsend) {
 		*hooks->Psend = pvar->origPsend;
 	}
@@ -319,7 +319,7 @@
 	KillTimer(pvar->cv->HWin, IdRecurringTimer);
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
 	if (pvar->origPWriteFile) {
 		*hooks->PWriteFile = pvar->origPWriteFile;
 	}
@@ -365,7 +365,7 @@
 	pvar->enable = GetOnOff(SECTION, "Enable", sect, FALSE);
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
 	pvar->origReadIniFile(fn, ts);
 	ReadINI(fn, ts);
 
@@ -372,7 +372,7 @@
 	return;
 }
 
-static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) {
 	char buff[20];
 
 	pvar->origWriteIniFile(fn, ts);
@@ -395,7 +395,7 @@
 //	/F= \x82ɂ\xE6\x82\xE9\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̐؂\xE8\x91ւ\xA6\x82̂ݑΉ\x9E\x81B
 //
 
-static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
 	char buff[1024];
 	PCHAR next;
 	pvar->origParseParam(Param, ts, DDETopic);
@@ -411,7 +411,7 @@
 	return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	pvar->origReadIniFile = *hooks->ReadIniFile;
 	*hooks->ReadIniFile = TTXReadIniFile;
 
@@ -428,7 +428,7 @@
 // \x83\x81\x83j\x83\x85\x81[\x8F\x88\x97\x9D
 //	\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xC9RecurringCommand\x82\xF0\x92lj\xC1\x81B
 //
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
 	UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
 	pvar->SetupMenu = GetSetupMenu(menu);
@@ -449,7 +449,7 @@
 	InsertMenu(pvar->ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
 	if (menu==pvar->ControlMenu) {
 		if (pvar->enable) {
 			CheckMenuItem(pvar->ControlMenu, ID_MENU_CONTROL, MF_BYCOMMAND | MF_CHECKED);
@@ -568,7 +568,7 @@
 //
 // \x83\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x8F\x88\x97\x9D
 //
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
 	switch (cmd) {
 	  case ID_MENU_SETUP:
 		switch (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SETUP_RECURRINGCOMMAND),
@@ -632,7 +632,7 @@
 	TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
 	/* if (Version!=TTVERSION) return FALSE; */

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -152,7 +152,7 @@
   }
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->ReplaceTermDlg = FALSE;
@@ -167,12 +167,12 @@
   }
 }
 
-static BOOL FAR PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) {
   pvar->ReplaceTermDlg = FALSE;
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ReplaceTermDlg) {
     *hooks->SetupTerminal = TTXSetupTerminal;
   }
@@ -179,7 +179,7 @@
   return;
 }
 
-static void PASCAL FAR ResizeMenuReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL ResizeMenuReadIniFile(PCHAR fn, PTTSet ts) {
   int i, x, y;
   char Key[20], Buff[100];
 
@@ -221,12 +221,12 @@
   pvar->MenuItems = i;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = ResizeMenuReadIniFile;
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   MENUITEMINFO mi;
 
   if (pvar->MenuItems > 0) {
@@ -242,13 +242,13 @@
   }
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
   if (menu == pvar->ResizeMenu) {
     UpdateMenu();
   }
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND HWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND HWin, WORD cmd) {
   int num, full_h, full_w;
   if (cmd >= ID_MENUID_BASE && cmd < ID_MENUID_BASE + pvar->MenuItems) {
     GetMonitorSizeByChar(&full_w, &full_h);
@@ -290,7 +290,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -27,18 +27,18 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->ReplaceTermDlg = FALSE;
 }
 
-static BOOL FAR PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXSetupTerminal(HWND parent, PTTSet ts) {
   pvar->ReplaceTermDlg = FALSE;
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ReplaceTermDlg) {
     *hooks->SetupTerminal = TTXSetupTerminal;
   }
@@ -45,12 +45,12 @@
   return;
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   pvar->SetupMenu = menu;
   InsertMenu(pvar->SetupMenu, ID_HELPMENU, MF_ENABLED, ID_MENUITEM, MENU_STR);
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   if (cmd == ID_MENUITEM) {
     pvar->ts->TerminalWidth = TERM_WIDTH;
     pvar->ts->TerminalHeight = TERM_HEIGHT;
@@ -79,7 +79,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -18,12 +18,12 @@
 static TInstVar *pvar;
 static TInstVar InstVar;
 
-static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
   MessageBox(NULL, Param, "TTXShowCommandLine", MB_OK|MB_ICONEXCLAMATION);
   pvar->origParseParam(Param, ts, DDETopic);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origParseParam = *hooks->ParseParam;
   *hooks->ParseParam = TTXParseParam;
 }
@@ -44,7 +44,7 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.c
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -61,7 +61,7 @@
   return NULL;
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->origPsend = NULL;
@@ -70,7 +70,7 @@
   pvar->origWriteIniFile = NULL;
 }
 
-static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
+static int PASCAL TTXsend(SOCKET s, const char *buf, int len, int flags) {
   if (pvar->enable) {
     return len;
   }
@@ -79,7 +79,7 @@
   }
 }
 
-static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
+static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
   if (pvar->enable) {
     *wbytes = len;
     return TRUE;
@@ -89,41 +89,41 @@
   }
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPsend = *hooks->Psend;
   *hooks->Psend = TTXsend;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPsend) {
     *hooks->Psend = pvar->origPsend;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPWriteFile = *hooks->PWriteFile;
   *hooks->PWriteFile = TTXWriteFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPWriteFile) {
     *hooks->PWriteFile = pvar->origPWriteFile;
   }
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
   pvar->origReadIniFile(fn, ts);
   GetPrivateProfileString(SECTION, "Password", "", pvar->password, sizeof(pvar->password), fn);
   return;
 }
 
-static void PASCAL FAR TTXWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXWriteIniFile(PCHAR fn, PTTSet ts) {
   pvar->origWriteIniFile(fn, ts);
 //  WritePrivateProfileString(SECTION, "Password", pvar->password, fn);
   return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
   pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -130,7 +130,7 @@
   *hooks->WriteIniFile = TTXWriteIniFile;
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
   pvar->SetupMenu = GetSetupMenu(menu);
@@ -142,7 +142,7 @@
   InsertMenu(pvar->ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND | MF_SEPARATOR,  0, NULL);
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
   if (menu == pvar->ControlMenu) {
     if (pvar->cv->Ready)
       EnableMenuItem(pvar->ControlMenu, ID_MENU_VIEWMODE, MF_BYCOMMAND | MF_ENABLED);
@@ -217,7 +217,7 @@
   return FALSE;
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   switch (cmd) {
     case ID_MENU_VIEWMODE:
       if (pvar->enable) {
@@ -281,7 +281,7 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -97,7 +97,7 @@
   return NULL;
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
 	pvar->ts = ts;
 	pvar->cv = cv;
 	pvar->origPReadFile = NULL;
@@ -129,7 +129,7 @@
 	SendMessage(pvar->cv->HWin, WM_COMMAND, MAKELONG(ID_SETUP_WINDOW, 0), 0);
 }
 
-static BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID obuff, DWORD oblen, LPDWORD rbytes, LPOVERLAPPED rol) {
+static BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID obuff, DWORD oblen, LPDWORD rbytes, LPOVERLAPPED rol) {
 	static struct recheader prh = { 0, 0, 0 };
 	static unsigned int lbytes;
 	static char ibuff[BUFFSIZE];
@@ -236,7 +236,7 @@
 	return FALSE;
 }
 
-static BOOL PASCAL FAR TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
+static BOOL PASCAL TTXWriteFile(HANDLE fh, LPCVOID buff, DWORD len, LPDWORD wbytes, LPOVERLAPPED wol) {
 	char tmpbuff[2048];
 	unsigned int spos, dpos;
 	char *ptr;
@@ -293,7 +293,7 @@
 	return TRUE;
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
 	if (pvar->cv->PortType == IdFile && pvar->enable) {
 		pvar->origPReadFile = *hooks->PReadFile;
 		pvar->origPWriteFile = *hooks->PWriteFile;
@@ -304,7 +304,7 @@
 	}
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
 	if (pvar->origPReadFile) {
 		*hooks->PReadFile = pvar->origPReadFile;
 	}
@@ -318,7 +318,7 @@
 	}
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
 	UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
 	pvar->FileMenu = GetFileMenu(menu);
@@ -336,7 +336,7 @@
 //	InsertMenu(menu, ID_HELPMENU, MF_ENABLED, ID_MENU_REPLAY, "&t");
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
 	if (menu==pvar->FileMenu) {
 		if (pvar->enable) {
 			EnableMenuItem(pvar->FileMenu, ID_MENU_REPLAY, MF_BYCOMMAND | MF_GRAYED);
@@ -347,7 +347,7 @@
 	}
 }
 
-static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
 	char buff[1024];
 	PCHAR next;
 	pvar->origParseParam(Param, ts, DDETopic);
@@ -363,7 +363,7 @@
 	}
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
 	(pvar->origReadIniFile)(fn, ts);
 //	ts->TitleFormat = 0;
 	pvar->maxwait = GetPrivateProfileInt(INISECTION, "MaxWait", 0, fn);
@@ -370,7 +370,7 @@
 	pvar->speed = GetPrivateProfileInt(INISECTION, "Speed", 0, fn);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	pvar->origParseParam = *hooks->ParseParam;
 	*hooks->ParseParam = TTXParseParam;
 	pvar->origReadIniFile = *hooks->ReadIniFile;
@@ -377,7 +377,7 @@
 	*hooks->ReadIniFile = TTXReadIniFile;
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
 	OPENFILENAME ofn;
 
 	switch (cmd) {
@@ -414,17 +414,17 @@
 	return 0;
 }
 
-static BOOL FAR PASCAL TTXSetupWin(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXSetupWin(HWND parent, PTTSet ts) {
 	return (TRUE);
 }
 
-static BOOL FAR PASCAL TTXGetHostName(HWND parent, PGetHNRec GetHNRec) {
+static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec GetHNRec) {
 	GetHNRec->PortType = IdTCPIP;
 	_snprintf_s(GetHNRec->HostName, MAXPATHLEN, _TRUNCATE, "/R=\"%s\" /TP", pvar->openfn);
 	return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
 	if (pvar->ChangeTitle) {
 		pvar->ChangeTitle = FALSE;
 		*hooks->SetupWin = TTXSetupWin;
@@ -455,7 +455,7 @@
 	TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 
 	if (size > exports->size) {

Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -89,7 +89,7 @@
   }
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->origPrecv = NULL;
@@ -99,7 +99,7 @@
   pvar->record = FALSE;
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
   (pvar->origReadIniFile)(fn, ts);
   pvar->rec_stsize = GetOnOff(INISECTION, "RecordStartSize", fn, TRUE);
 }
@@ -118,12 +118,12 @@
   return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
+int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   rlen = pvar->origPrecv(s, buff, len, flags);
@@ -133,7 +133,7 @@
   return rlen;
 }
 
-BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
+BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
   if (!pvar->origPReadFile(fh, buff, len, rbytes, rol))
     return FALSE;
 
@@ -143,18 +143,18 @@
   return TRUE;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   if (pvar->cv->PortType == IdSerial) {
     pvar->origPReadFile = *hooks->PReadFile;
     *hooks->PReadFile = TTXReadFile;
@@ -161,13 +161,13 @@
   }
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   UINT flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
   pvar->FileMenu = GetFileMenu(menu);
@@ -180,7 +180,7 @@
 //		MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
   if (menu==pvar->FileMenu) {
     if (pvar->cv->Ready)
       EnableMenuItem(pvar->FileMenu, ID_MENUITEM, MF_BYCOMMAND | MF_ENABLED);
@@ -189,7 +189,7 @@
   }
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   OPENFILENAME ofn;
   char fname[MAX_PATH];
   char buff[20];
@@ -237,7 +237,7 @@
   return 0;
 }
 
-static void PASCAL FAR TTXEnd(void) {
+static void PASCAL TTXEnd(void) {
   if (pvar->fh != INVALID_HANDLE_VALUE) {
     CloseHandle(pvar->fh);
     pvar->fh = INVALID_HANDLE_VALUE;
@@ -263,7 +263,7 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {

Modified: trunk/TTXSamples/ttxtest/ttxtest.c
===================================================================
--- trunk/TTXSamples/ttxtest/ttxtest.c	2017-07-12 10:07:16 UTC (rev 6859)
+++ trunk/TTXSamples/ttxtest/ttxtest.c	2017-07-13 10:01:34 UTC (rev 6860)
@@ -94,7 +94,7 @@
    or you will slow down the startup process even if your extension is not
    going to be used.
 */
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
 }
@@ -125,7 +125,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   printf("TTXOpenTCP %d\n", ORDER);
 }
 
@@ -139,7 +139,7 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   printf("TTXCloseTCP %d\n", ORDER);
 }
 
@@ -175,7 +175,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
   printf("TTXSetUIHooks %d\n", ORDER);
 }
 
@@ -197,7 +197,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   printf("TTXSetSetupHooks %d\n", ORDER);
 }
 
@@ -205,7 +205,7 @@
 
    This function is called for each extension, in load order (see below).
 */
-static void PASCAL FAR TTXSetWinSize(int rows, int cols) {
+static void PASCAL TTXSetWinSize(int rows, int cols) {
   printf("TTXSetWinSize %d\n", ORDER);
 }
 
@@ -221,7 +221,7 @@
    Thus, the extension with highest load order number puts its items in last.
 */
 #define ID_MENUITEM 6000
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   UINT flag = MF_ENABLED;
 
   printf("TTXModifyMenu %d\n", ORDER);
@@ -241,7 +241,7 @@
 
    This function is called for each extension, in load order (see below).
 */
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
   printf("TTXModifyPopupMenu %d\n", ORDER);
 
   if (menu==pvar->SetupMenu)
@@ -264,7 +264,7 @@
    below). Thus, the extension that has highest load order number gets to
    process the command first.
 */
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   printf("TTXProcessCommand %d\n", ORDER);
 
   if (cmd==ID_MENUITEM)
@@ -289,13 +289,13 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXEnd(void) {
+static void PASCAL TTXEnd(void) {
   printf("TTXEnd %d\n", ORDER);
 }
 
 /*
 */
-static void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
+static void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
   printf("TTXSetCommandLine %d\n", ORDER);
 }
 
@@ -325,7 +325,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   printf("TTXOpenFile %d\n", ORDER);
 }
 
@@ -339,7 +339,7 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   printf("TTXCloseFile %d\n", ORDER);
 }
 
@@ -414,7 +414,7 @@
    extra functions that have been added since this extension was compiled
    will automatically be NULL and thus get default behaviour.)
 */
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */

• 前の記事 [Ttssh2-commit] [6859] typo fix.
• 次の記事 [Ttssh2-commit] [6861] LtoR 転送と Dynamic 転送で同じポートだった場合にはじくようにした。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]