svnno****@sourc*****
svnno****@sourc*****
2017年 6月 13日 (火) 19:30:13 JST
Tera TermRevision: 6801
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6801
Author: doda
Date: 2017-06-13 19:30:12 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
eliminate FAR keyword.
Modified Paths:
--------------
trunk/TTXKanjiMenu/ttxkanjimenu.c
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
trunk/teraterm/common/compat_w95.h
trunk/teraterm/common/i18n.c
trunk/teraterm/common/i18n.h
trunk/teraterm/common/ttcommon.h
trunk/teraterm/common/ttlib.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/common/ttplugin.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/filesys.h
trunk/teraterm/teraterm/teklib.h
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/tekwin.h
trunk/teraterm/teraterm/ttdialog.h
trunk/teraterm/teraterm/ttfileio.c
trunk/teraterm/teraterm/ttfileio.h
trunk/teraterm/teraterm/ttime.c
trunk/teraterm/teraterm/ttplug.c
trunk/teraterm/teraterm/ttplug.h
trunk/teraterm/teraterm/ttsetup.h
trunk/teraterm/teraterm/ttwinman.c
trunk/teraterm/teraterm/ttwsk.h
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
trunk/teraterm/ttpcmn/language.c
trunk/teraterm/ttpcmn/language.h
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpdlg/ttdlg.h
trunk/teraterm/ttpfile/bplus.c
trunk/teraterm/ttpfile/ftlib.h
trunk/teraterm/ttpfile/ttfile.c
trunk/teraterm/ttpset/ttset.c
trunk/teraterm/ttptek/tekesc.h
trunk/teraterm/ttptek/tttek.c
trunk/ttpmenu/winmisc.cpp
trunk/ttssh2/matcher/matcher.c
trunk/ttssh2/matcher/matcher.h
trunk/ttssh2/ttxssh/auth.c
trunk/ttssh2/ttxssh/auth.h
trunk/ttssh2/ttxssh/crypt.c
trunk/ttssh2/ttxssh/crypt.h
trunk/ttssh2/ttxssh/dns.c
trunk/ttssh2/ttxssh/dns.h
trunk/ttssh2/ttxssh/fwd.c
trunk/ttssh2/ttxssh/fwd.h
trunk/ttssh2/ttxssh/fwdui.c
trunk/ttssh2/ttxssh/hosts.c
trunk/ttssh2/ttxssh/hosts.h
trunk/ttssh2/ttxssh/key.c
trunk/ttssh2/ttxssh/keyfiles.c
trunk/ttssh2/ttxssh/pkt.c
trunk/ttssh2/ttxssh/pkt.h
trunk/ttssh2/ttxssh/sftp.c
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ssh.h
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
trunk/ttssh2/ttxssh/util.c
trunk/ttssh2/ttxssh/util.h
trunk/ttssh2/ttxssh/x11util.c
trunk/ttssh2/ttxssh/x11util.h
-------------- next part --------------
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.c
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
BOOL NeedResetCharSet;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
/* WIN32 allows multiple instances of a DLL */
static TInstVar InstVar;
@@ -61,7 +61,7 @@
/*
* This function is called when Tera Term starts up.
*/
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
pvar->ts = ts;
pvar->cv = cv;
pvar->origReadIniFile = NULL;
@@ -70,7 +70,7 @@
pvar->NeedResetCharSet = FALSE;
}
-static BOOL FAR PASCAL TTXKanjiMenuSetupTerminal(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXKanjiMenuSetupTerminal(HWND parent, PTTSet ts) {
WORD orgRecvCode, orgSendCode;
BOOL ret;
@@ -101,12 +101,12 @@
return ret;
}
-static BOOL FAR PASCAL ResetCharSet(HWND parent, PTTSet ts) {
+static BOOL PASCAL ResetCharSet(HWND parent, PTTSet ts) {
pvar->NeedResetCharSet = FALSE;
return TRUE;
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
if (pvar->NeedResetCharSet) {
*hooks->SetupTerminal = ResetCharSet;
}
@@ -116,7 +116,7 @@
}
}
-static void PASCAL FAR TTXKanjiMenuReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXKanjiMenuReadIniFile(PCHAR fn, PTTSet ts) {
char buff[20];
/* Call original ReadIniFile */
@@ -143,7 +143,7 @@
return;
}
-static void PASCAL FAR TTXKanjiMenuWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXKanjiMenuWriteIniFile(PCHAR fn, PTTSet ts) {
/* Call original WriteIniFile */
pvar->origWriteIniFile(fn, ts);
@@ -152,7 +152,7 @@
return;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXKanjiMenuReadIniFile;
pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -164,7 +164,7 @@
#define ID_MI_KANJISEND 54109
#define ID_MI_USEONESETTING 54200
-static void PASCAL FAR InsertSendKcodeMenu(HMENU menu) {
+static void PASCAL InsertSendKcodeMenu(HMENU menu) {
UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
if (pvar->ts->Language == IdJapanese) {
@@ -196,7 +196,7 @@
}
}
-static void PASCAL FAR DeleteSendKcodeMenu(HMENU menu) {
+static void PASCAL DeleteSendKcodeMenu(HMENU menu) {
if (pvar->ts->Language == IdJapanese) {
DeleteMenu(menu, 5, MF_BYPOSITION);
DeleteMenu(menu, 5, MF_BYPOSITION);
@@ -211,7 +211,7 @@
}
}
-static void PASCAL FAR UpdateRecvMenuCaption(HMENU menu, BOOL UseOneSetting) {
+static void PASCAL UpdateRecvMenuCaption(HMENU menu, BOOL UseOneSetting) {
if (UseOneSetting) {
if (pvar->ts->Language == IdJapanese) {
GetI18nStr(IniSection, "MENU_SJIS", pvar->ts->UIMsg, sizeof(pvar->ts->UIMsg),
@@ -285,7 +285,7 @@
/*
* This function is called when Tera Term creates a new menu.
*/
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
UINT flag = MF_ENABLED;
// \x8C\xBE\x8Cꂪ\x93\xFA\x96{\x8C\xEA\x82̂Ƃ\xAB\x82̂݃\x81\x83j\x83\x85\x81[\x82ɒlj\xC1\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B (2007.7.14 maya)
@@ -373,7 +373,7 @@
/*
* This function is called when Tera Term pops up a submenu menu.
*/
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
// \x83\x81\x83j\x83\x85\x81[\x82\xAA\x8CĂяo\x82\xB3\x82ꂽ\x82\xE7\x81A\x8DŐV\x82̐ݒ\xE8\x82ɍX\x90V\x82\xB7\x82\xE9\x81B(2007.5.25 yutaka)
UpdateRecvMenu(pvar->ts->KanjiCode);
if (!pvar->UseOneSetting) {
@@ -386,7 +386,7 @@
/*
* This function is called when Tera Term receives a command message.
*/
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
WORD val;
if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8m)) {
@@ -476,7 +476,7 @@
NULL // TTXSetCommandLine
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * 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; */
@@ -484,8 +484,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -43,7 +43,7 @@
char orig_title[TitleBuffSize];
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -174,7 +174,7 @@
}
}
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
int rlen;
if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -191,23 +191,23 @@
return result;
}
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
pvar->origPrecv = *hooks->Precv;
*hooks->Precv = TTXrecv;
}
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
if (pvar->origPrecv) {
*hooks->Precv = pvar->origPrecv;
}
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
pvar->origPReadFile = *hooks->PReadFile;
*hooks->PReadFile = TTXReadFile;
}
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPReadFile) {
*hooks->PReadFile = pvar->origPReadFile;
}
@@ -230,7 +230,7 @@
return (TRUE);
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
if (pvar->ChangeTitle) {
pvar->ChangeTitle = FALSE;
*hooks->SetupWin = TTXDummySetupWin;
@@ -303,7 +303,7 @@
}
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXReadIniFile;
pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -340,14 +340,14 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -28,7 +28,7 @@
BOOL ontop;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
#define GetFileMenu(menu) GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -130,14 +130,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
PComVar cv;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
@@ -48,7 +48,7 @@
NULL, // TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
@@ -56,8 +56,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
PParseParam origParseParam;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -85,7 +85,7 @@
pvar->origParseParam(Param, ts, DDETopic);
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origParseParam = *hooks->ParseParam;
*hooks->ParseParam = TTXParseParam;
}
@@ -106,14 +106,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -18,7 +18,7 @@
char origIniFileName[MAXPATHLEN];
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
@@ -31,7 +31,7 @@
(pvar->origWriteIniFile)(fn, ts);
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
if (pvar->origIniFileName[0] == 0) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXReadIniFile;
@@ -61,14 +61,14 @@
NULL // TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -23,7 +23,7 @@
PReadIniFile origReadIniFile;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -54,7 +54,7 @@
return ret;
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
pvar->origSetupTerminalDlg = *hooks->SetupTerminal;
*hooks->SetupTerminal = FixedSizeSetupTerminalDlg;
}
@@ -65,7 +65,7 @@
ts->TerminalHeight = HEIGHT;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = FixedSizeReadIniFile;
}
@@ -94,14 +94,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -38,7 +38,7 @@
TWriteFile origPWriteFile;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -322,7 +322,7 @@
}
}
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
int rlen;
if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -339,23 +339,23 @@
return result;
}
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
pvar->origPrecv = *hooks->Precv;
*hooks->Precv = TTXrecv;
}
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
if (pvar->origPrecv) {
*hooks->Precv = pvar->origPrecv;
}
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
pvar->origPReadFile = *hooks->PReadFile;
*hooks->PReadFile = TTXReadFile;
}
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPReadFile) {
*hooks->PReadFile = pvar->origPReadFile;
}
@@ -380,14 +380,14 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -20,7 +20,7 @@
char buff[BUFF_SIZE];
} TInstVar;
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
PTInstVar pvar;
static TInstVar InstVar;
@@ -63,7 +63,7 @@
//
// TTXSend -- \x83L\x81[\x93\xFC\x97͏\x88\x97\x9D
//
-static int PASCAL FAR TTXsend(SOCKET s, const char FAR *buf, int len, int flags) {
+static int PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
@@ -164,8 +164,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size), size);
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size), size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -45,7 +45,7 @@
unsigned char orgCommand[OutBuffSize];
} TInstVar;
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
PTInstVar pvar;
static TInstVar InstVar;
@@ -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 FAR *buf, int len, int flags) {
+static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
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 FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
pvar->origPsend = *hooks->Psend;
*hooks->Psend = TTXsend;
@@ -299,7 +299,7 @@
}
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPWriteFile) {
*hooks->PWriteFile = pvar->origPWriteFile;
}
@@ -411,7 +411,7 @@
return;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXReadIniFile;
@@ -632,7 +632,7 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
@@ -640,8 +640,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size), size);
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size), size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -27,7 +27,7 @@
int ResizeList[MAX_MENU_ITEMS][2];
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
/* WIN32 allows multiple instances of a DLL */
static TInstVar InstVar;
@@ -172,7 +172,7 @@
return (TRUE);
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
if (pvar->ReplaceTermDlg) {
*hooks->SetupTerminal = TTXSetupTerminal;
}
@@ -221,7 +221,7 @@
pvar->MenuItems = i;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = ResizeMenuReadIniFile;
}
@@ -290,14 +290,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -24,7 +24,7 @@
BOOL ReplaceTermDlg;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -38,7 +38,7 @@
return (TRUE);
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
if (pvar->ReplaceTermDlg) {
*hooks->SetupTerminal = TTXSetupTerminal;
}
@@ -79,14 +79,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -15,7 +15,7 @@
PParseParam origParseParam;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
@@ -23,7 +23,7 @@
pvar->origParseParam(Param, ts, DDETopic);
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origParseParam = *hooks->ParseParam;
*hooks->ParseParam = TTXParseParam;
}
@@ -44,14 +44,14 @@
NULL, // TTXEnd
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.c
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -31,7 +31,7 @@
char password[50];
} TInstVar;
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
PTInstVar pvar;
static TInstVar InstVar;
@@ -70,7 +70,7 @@
pvar->origWriteIniFile = NULL;
}
-static int PASCAL FAR TTXsend(SOCKET s, const char FAR *buf, int len, int flags) {
+static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
if (pvar->enable) {
return len;
}
@@ -89,23 +89,23 @@
}
}
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
pvar->origPsend = *hooks->Psend;
*hooks->Psend = TTXsend;
}
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
if (pvar->origPsend) {
*hooks->Psend = pvar->origPsend;
}
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
pvar->origPWriteFile = *hooks->PWriteFile;
*hooks->PWriteFile = TTXWriteFile;
}
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPWriteFile) {
*hooks->PWriteFile = pvar->origPWriteFile;
}
@@ -123,7 +123,7 @@
return;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXReadIniFile;
pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -281,7 +281,7 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
@@ -289,8 +289,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
char origOLDTitle[TitleBuffSize];
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
#define GetFileMenu(menu) GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -293,7 +293,7 @@
return TRUE;
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPReadFile) {
*hooks->PReadFile = pvar->origPReadFile;
}
@@ -370,7 +370,7 @@
pvar->speed = GetPrivateProfileInt(INISECTION, "Speed", 0, fn);
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origParseParam = *hooks->ParseParam;
*hooks->ParseParam = TTXParseParam;
pvar->origReadIniFile = *hooks->ReadIniFile;
@@ -424,7 +424,7 @@
return (TRUE);
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
if (pvar->ChangeTitle) {
pvar->ChangeTitle = FALSE;
*hooks->SetupWin = TTXSetupWin;
@@ -455,14 +455,14 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
int len;
};
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
static TInstVar InstVar;
#define GetFileMenu(menu) GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -118,12 +118,12 @@
return;
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
pvar->origReadIniFile = *hooks->ReadIniFile;
*hooks->ReadIniFile = TTXReadIniFile;
}
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
int rlen;
rlen = pvar->origPrecv(s, buff, len, flags);
@@ -143,18 +143,18 @@
return TRUE;
}
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
pvar->origPrecv = *hooks->Precv;
*hooks->Precv = TTXrecv;
}
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
if (pvar->origPrecv) {
*hooks->Precv = pvar->origPrecv;
}
}
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
if (pvar->cv->PortType == IdSerial) {
pvar->origPReadFile = *hooks->PReadFile;
*hooks->PReadFile = TTXReadFile;
@@ -161,7 +161,7 @@
}
}
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
if (pvar->origPReadFile) {
*hooks->PReadFile = pvar->origPReadFile;
}
@@ -263,14 +263,14 @@
TTXCloseFile
};
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/TTXSamples/ttxtest/ttxtest.c
===================================================================
--- trunk/TTXSamples/ttxtest/ttxtest.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/ttxtest/ttxtest.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -78,7 +78,7 @@
HMENU SetupMenu;
} TInstVar;
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
/* WIN32 allows multiple instances of a DLL */
static TInstVar InstVar;
@@ -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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
printf("TTXSetSetupHooks %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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * hooks) {
+static void PASCAL FAR 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 FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
@@ -422,8 +422,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *)exports + sizeof(exports->size),
- (char FAR *)&Exports + sizeof(exports->size),
+ memcpy((char *)exports + sizeof(exports->size),
+ (char *)&Exports + sizeof(exports->size),
size);
return TRUE;
}
Modified: trunk/teraterm/common/compat_w95.h
===================================================================
--- trunk/teraterm/common/compat_w95.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/compat_w95.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -35,7 +35,7 @@
void __stdcall DoCover_IsDebuggerPresent()
{
DWORD dw;
- DWORD_PTR FAR* lpdw;
+ DWORD_PTR *lpdw;
OSVERSIONINFO osvi;
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
// Windows95 \x82łȂ\xAF\x82\xEA\x82\xB1\x82\xB1\x82ł\xA8\x82\xED\x82\xE8
@@ -47,7 +47,7 @@
return;
}
// \x89\xA1\x8E\xE6\x82\xE8\x8A\x94\x82\xF0\x90ݒ肷\x82\xE9\x83A\x83h\x83\x8C\x83X\x82\xF0\x8E擾
- lpdw = (DWORD_PTR FAR*) &_imp__IsDebuggerPresent;
+ lpdw = (DWORD_PTR *) &_imp__IsDebuggerPresent;
// \x82\xB1\x82̃A\x83h\x83\x8C\x83X\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82߂\xE9\x82悤\x82ɐݒ\xE8
// (\x93\xAF\x82\xB6\x83v\x83\x8D\x83O\x83\x89\x83\x80\x93\xE0\x82Ȃ̂ŏ\xE1\x8AQ\x82Ȃ\xAD\x8Ds\x82\xA6\x82\xE9)
VirtualProtect(lpdw, sizeof(DWORD_PTR), PAGE_READWRITE, &dw);
Modified: trunk/teraterm/common/i18n.c
===================================================================
--- trunk/teraterm/common/i18n.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/i18n.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -4,13 +4,13 @@
#include "i18n.h"
-void FAR PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile)
+void PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile)
{
GetPrivateProfileString(section, key, def, buf, buf_len, iniFile);
RestoreNewLine(buf);
}
-int FAR PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile)
+int PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile)
{
static char tmp[MAX_UIMSG];
static char font[LF_FACESIZE];
@@ -30,4 +30,4 @@
logfont->lfWidth = 0;
return TRUE;
-}
\ No newline at end of file
+}
Modified: trunk/teraterm/common/i18n.h
===================================================================
--- trunk/teraterm/common/i18n.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/i18n.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,8 +14,8 @@
extern "C" {
#endif
-void FAR PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile);
-int FAR PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile);
+void PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile);
+int PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile);
#ifdef __cplusplus
}
Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttcommon.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -13,64 +13,64 @@
int PASCAL CheckComPort(WORD ComPort);
void PASCAL CopyShmemToTTSet(PTTSet ts);
void PASCAL CopyTTSetToShmem(PTTSet ts);
-BOOL FAR PASCAL StartTeraTerm(PTTSet ts);
-void PASCAL FAR RestartTeraTerm(HWND hwnd, PTTSet ts);
-void FAR PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
-void FAR PASCAL GetDefaultSet(PTTSet ts);
-// void FAR PASCAL LoadDefaultSet(PCHAR SetupFName);
-WORD FAR PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
-void FAR PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+BOOL PASCAL StartTeraTerm(PTTSet ts);
+void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts);
+void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
+void PASCAL GetDefaultSet(PTTSet ts);
+// void PASCAL LoadDefaultSet(PCHAR SetupFName);
+WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
+void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
BOOL AppliKeyMode, BOOL AppliCursorMode,
BOOL Send8BitMode, PCHAR KeyStr,
int destlen, LPINT Len, LPWORD Type);
-void FAR PASCAL SetCOMFlag(int com);
-void FAR PASCAL ClearCOMFlag(int com);
-int FAR PASCAL CheckCOMFlag(int com);
+void PASCAL SetCOMFlag(int com);
+void PASCAL ClearCOMFlag(int com);
+int PASCAL CheckCOMFlag(int com);
-int FAR PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
-void FAR PASCAL UnregWin(HWND HWin);
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
-void FAR PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
-void FAR PASCAL SelectWin(int WinId);
-void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
-HWND FAR PASCAL GetNthWin(int n);
-void FAR PASCAL ShowAllWin(int stat);
-void FAR PASCAL ShowAllWinSidebySide(HWND);
-void FAR PASCAL ShowAllWinStacked(HWND);
-void FAR PASCAL ShowAllWinCascade(HWND);
-void FAR PASCAL BroadcastClosingMessage(HWND myhwnd);
-void FAR PASCAL UndoAllWin();
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
+int PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
+void PASCAL UnregWin(HWND HWin);
+void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
+void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
+void PASCAL SelectWin(int WinId);
+void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
+HWND PASCAL GetNthWin(int n);
+void PASCAL ShowAllWin(int stat);
+void PASCAL ShowAllWinSidebySide(HWND);
+void PASCAL ShowAllWinStacked(HWND);
+void PASCAL ShowAllWinCascade(HWND);
+void PASCAL BroadcastClosingMessage(HWND myhwnd);
+void PASCAL UndoAllWin();
+void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
-int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
-int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
-void FAR PASCAL CommInsert1Byte(PComVar cv, BYTE b);
-int FAR PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
+int PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
+int PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
+void PASCAL CommInsert1Byte(PComVar cv, BYTE b);
+int PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
-void FAR PASCAL CreateNotifyIcon(PComVar cv);
-void FAR PASCAL DeleteNotifyIcon(PComVar cv);
-void FAR PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
-void FAR PASCAL ShowNotifyIcon(PComVar cv);
-void FAR PASCAL HideNotifyIcon(PComVar cv);
-void FAR PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
-void FAR PASCAL SetCustomNotifyIcon(HICON icon);
-HICON FAR PASCAL GetCustomNotifyIcon();
+void PASCAL CreateNotifyIcon(PComVar cv);
+void PASCAL DeleteNotifyIcon(PComVar cv);
+void PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
+void PASCAL ShowNotifyIcon(PComVar cv);
+void PASCAL HideNotifyIcon(PComVar cv);
+void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
+void PASCAL SetCustomNotifyIcon(HICON icon);
+HICON PASCAL GetCustomNotifyIcon();
#define NotifyInfoMessage(cv, msg, title) NotifyMessage(cv, msg, title, 1)
#define NotifyWarnMessage(cv, msg, title) NotifyMessage(cv, msg, title, 2)
#define NotifyErrorMessage(cv, msg, title) NotifyMessage(cv, msg, title, 3)
-WORD FAR PASCAL SJIS2JIS(WORD KCode);
-WORD FAR PASCAL SJIS2EUC(WORD KCode);
-WORD FAR PASCAL JIS2SJIS(WORD KCode);
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b);
-void FAR PASCAL RussConvStr
+WORD PASCAL SJIS2JIS(WORD KCode);
+WORD PASCAL SJIS2EUC(WORD KCode);
+WORD PASCAL JIS2SJIS(WORD KCode);
+BYTE PASCAL RussConv(int cin, int cout, BYTE b);
+void PASCAL RussConvStr
(int cin, int cout, PCHAR Str, int count);
#ifdef __cplusplus
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttlib.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -1555,7 +1555,7 @@
return strtime;
}
-PCHAR FAR PASCAL GetParam(PCHAR buff, int size, PCHAR param)
+PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param)
{
int i = 0;
BOOL quoted = FALSE;
@@ -1593,7 +1593,7 @@
return (param);
}
-void FAR PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src)
+void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src)
{
BOOL quoted = FALSE;
PCHAR dest_end = dest + dest_len - 1;
@@ -1616,7 +1616,7 @@
*dest = '\0';
}
-void FAR PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src)
+void PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src)
{
BOOL quoted = FALSE;
PCHAR dest_end = dest + dest_size - 1;
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttlib.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -68,9 +68,9 @@
void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
int b64decode(PCHAR dst, int dsize, PCHAR src);
-PCHAR FAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
-void FAR PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
-void FAR PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src);
+PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
+void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
+void PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src);
void split_buffer(char *buffer, int delimiter, char **head, char **body);
Modified: trunk/teraterm/common/ttplugin.h
===================================================================
--- trunk/teraterm/common/ttplugin.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttplugin.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,72 +14,72 @@
#include "ttfileio.h"
typedef struct {
- Tclosesocket FAR * Pclosesocket;
- Tconnect FAR * Pconnect;
- Thtonl FAR * Phtonl;
- Thtons FAR * Phtons;
- Tinet_addr FAR * Pinet_addr;
- Tioctlsocket FAR * Pioctlsocket;
- Trecv FAR * Precv;
- Tselect FAR * Pselect;
- Tsend FAR * Psend;
- Tsetsockopt FAR * Psetsockopt;
- Tsocket FAR * Psocket;
- TWSAAsyncSelect FAR * PWSAAsyncSelect;
- TWSAAsyncGetHostByName FAR * PWSAAsyncGetHostByName;
- TWSACancelAsyncRequest FAR * PWSACancelAsyncRequest;
- TWSAGetLastError FAR * PWSAGetLastError;
-// Tgetaddrinfo FAR * Pgetaddrinfo;
- Tfreeaddrinfo FAR * Pfreeaddrinfo;
- TWSAAsyncGetAddrInfo FAR * PWSAAsyncGetAddrInfo;
+ Tclosesocket * Pclosesocket;
+ Tconnect * Pconnect;
+ Thtonl * Phtonl;
+ Thtons * Phtons;
+ Tinet_addr * Pinet_addr;
+ Tioctlsocket * Pioctlsocket;
+ Trecv * Precv;
+ Tselect * Pselect;
+ Tsend * Psend;
+ Tsetsockopt * Psetsockopt;
+ Tsocket * Psocket;
+ TWSAAsyncSelect * PWSAAsyncSelect;
+ TWSAAsyncGetHostByName * PWSAAsyncGetHostByName;
+ TWSACancelAsyncRequest * PWSACancelAsyncRequest;
+ TWSAGetLastError * PWSAGetLastError;
+// Tgetaddrinfo * Pgetaddrinfo;
+ Tfreeaddrinfo * Pfreeaddrinfo;
+ TWSAAsyncGetAddrInfo * PWSAAsyncGetAddrInfo;
} TTXSockHooks;
typedef struct {
- TCreateFile FAR * PCreateFile;
- TCloseFile FAR * PCloseFile;
- TReadFile FAR * PReadFile;
- TWriteFile FAR * PWriteFile;
+ TCreateFile * PCreateFile;
+ TCloseFile * PCloseFile;
+ TReadFile * PReadFile;
+ TWriteFile * PWriteFile;
} TTXFileHooks;
typedef struct {
- PReadIniFile FAR * ReadIniFile;
- PWriteIniFile FAR * WriteIniFile;
- PReadKeyboardCnf FAR * ReadKeyboardCnf;
- PCopyHostList FAR * CopyHostList;
- PAddHostToList FAR * AddHostToList;
- PParseParam FAR * ParseParam;
+ PReadIniFile * ReadIniFile;
+ PWriteIniFile * WriteIniFile;
+ PReadKeyboardCnf * ReadKeyboardCnf;
+ PCopyHostList * CopyHostList;
+ PAddHostToList * AddHostToList;
+ PParseParam * ParseParam;
} TTXSetupHooks;
typedef struct {
- PSetupTerminal FAR * SetupTerminal;
- PSetupWin FAR * SetupWin;
- PSetupKeyboard FAR * SetupKeyboard;
- PSetupSerialPort FAR * SetupSerialPort;
- PSetupTCPIP FAR * SetupTCPIP;
- PGetHostName FAR * GetHostName;
- PChangeDirectory FAR * ChangeDirectory;
- PAboutDialog FAR * AboutDialog;
- PChooseFontDlg FAR * ChooseFontDlg;
- PSetupGeneral FAR * SetupGeneral;
- PWindowWindow FAR * WindowWindow;
+ PSetupTerminal * SetupTerminal;
+ PSetupWin * SetupWin;
+ PSetupKeyboard * SetupKeyboard;
+ PSetupSerialPort * SetupSerialPort;
+ PSetupTCPIP * SetupTCPIP;
+ PGetHostName * GetHostName;
+ PChangeDirectory * ChangeDirectory;
+ PAboutDialog * AboutDialog;
+ PChooseFontDlg * ChooseFontDlg;
+ PSetupGeneral * SetupGeneral;
+ PWindowWindow * WindowWindow;
} TTXUIHooks;
typedef struct {
int size;
int loadOrder; /* smaller numbers get loaded first */
- void (PASCAL FAR * TTXInit)(PTTSet ts, PComVar cv); /* called first to last */
- void (PASCAL FAR * TTXGetUIHooks)(TTXUIHooks FAR * UIHooks); /* called first to last */
- void (PASCAL FAR * TTXGetSetupHooks)(TTXSetupHooks FAR * setupHooks); /* called first to last */
- void (PASCAL FAR * TTXOpenTCP)(TTXSockHooks FAR * hooks); /* called first to last */
- void (PASCAL FAR * TTXCloseTCP)(TTXSockHooks FAR * hooks); /* called last to first */
- void (PASCAL FAR * TTXSetWinSize)(int rows, int cols); /* called first to last */
- void (PASCAL FAR * TTXModifyMenu)(HMENU menu); /* called first to last */
- void (PASCAL FAR * TTXModifyPopupMenu)(HMENU menu); /* called first to last */
- int (PASCAL FAR * TTXProcessCommand)(HWND hWin, WORD cmd); /* returns TRUE if handled, called last to first */
- void (PASCAL FAR * TTXEnd)(void); /* called last to first */
- void (PASCAL FAR * TTXSetCommandLine)(PCHAR cmd, int cmdlen, PGetHNRec rec); /* called first to last */
- void (PASCAL FAR * TTXOpenFile)(TTXFileHooks FAR * hooks); /* called first to last */
- void (PASCAL FAR * TTXCloseFile)(TTXFileHooks FAR * hooks); /* called last to first */
+ void (PASCAL * TTXInit)(PTTSet ts, PComVar cv); /* called first to last */
+ void (PASCAL * TTXGetUIHooks)(TTXUIHooks * UIHooks); /* called first to last */
+ void (PASCAL * TTXGetSetupHooks)(TTXSetupHooks * setupHooks); /* called first to last */
+ void (PASCAL * TTXOpenTCP)(TTXSockHooks * hooks); /* called first to last */
+ void (PASCAL * TTXCloseTCP)(TTXSockHooks * hooks); /* called last to first */
+ void (PASCAL * TTXSetWinSize)(int rows, int cols); /* called first to last */
+ void (PASCAL * TTXModifyMenu)(HMENU menu); /* called first to last */
+ void (PASCAL * TTXModifyPopupMenu)(HMENU menu); /* called first to last */
+ int (PASCAL * TTXProcessCommand)(HWND hWin, WORD cmd); /* returns TRUE if handled, called last to first */
+ void (PASCAL * TTXEnd)(void); /* called last to first */
+ void (PASCAL * TTXSetCommandLine)(PCHAR cmd, int cmdlen, PGetHNRec rec); /* called first to last */
+ void (PASCAL * TTXOpenFile)(TTXFileHooks * hooks); /* called first to last */
+ void (PASCAL * TTXCloseFile)(TTXFileHooks * hooks); /* called last to first */
} TTXExports;
/* On entry, 'size' is set to the size of the structure and the rest of
@@ -88,6 +88,6 @@
default behaviour, i.e. do nothing.
This is all for binary compatibility across releases; if the record gets bigger,
then the extra functions will be NULL for DLLs that don't understand them. */
-typedef BOOL (PASCAL FAR * TTXBindProc)(WORD Version, TTXExports FAR * exports);
+typedef BOOL (PASCAL * TTXBindProc)(WORD Version, TTXExports * exports);
#endif
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/tttypes.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -1010,8 +1010,8 @@
WORD NoMsg;
/* if TRUE, teraterm trys to connect other protocol family */
BOOL RetryWithOtherProtocol;
- struct addrinfo FAR * res0;
- struct addrinfo FAR * res;
+ struct addrinfo * res0;
+ struct addrinfo * res;
char *Locale;
int *CodePage;
int *ConnetingTimeout;
Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,23 +9,23 @@
#include "WSAASyncGetAddrInfo.h"
#include "ttwsk.h"
-static unsigned __stdcall getaddrinfo_thread(void FAR * p);
+static unsigned __stdcall getaddrinfo_thread(void * p);
-HANDLE FAR PASCAL WSAAsyncGetAddrInfo(HWND hWnd, unsigned int wMsg,
- const char FAR * hostname,
- const char FAR * portname,
- struct addrinfo FAR * hints,
- struct addrinfo FAR * FAR * res)
+HANDLE PASCAL WSAAsyncGetAddrInfo(HWND hWnd, unsigned int wMsg,
+ const char *hostname,
+ const char *portname,
+ struct addrinfo *hints,
+ struct addrinfo **res)
{
HANDLE thread;
unsigned tid;
- struct getaddrinfo_args FAR * ga;
+ struct getaddrinfo_args * ga;
/*
* allocate structure to pass args to sub-thread dynamically
* WSAAsyncGetAddrInfo() is reentrant
*/
- if ((ga = (struct getaddrinfo_args FAR *)malloc(sizeof(struct getaddrinfo_args))) == NULL)
+ if ((ga = (struct getaddrinfo_args *)malloc(sizeof(struct getaddrinfo_args))) == NULL)
return NULL;
/* packing arguments struct addrinfo_args */
@@ -36,7 +36,7 @@
ga->hints = *hints; // \x83|\x83C\x83\x93\x83^\x82\xBE\x82\xAF\x93n\x82\xB7\x82ƁA\x83X\x83\x8C\x83b\x83h\x90\xE6\x82ŕs\x92\xE8\x82ƂȂ\xE9\x81B(2016.3.11 yutaka)
ga->res = res;
- ga->lpHandle = (HANDLE FAR *)malloc(sizeof(HANDLE));
+ ga->lpHandle = (HANDLE *)malloc(sizeof(HANDLE));
if (ga->lpHandle == NULL) {
free(ga->hostname);
free(ga->portname);
@@ -59,19 +59,19 @@
return (HANDLE)thread;
}
-static unsigned __stdcall getaddrinfo_thread(void FAR * p)
+static unsigned __stdcall getaddrinfo_thread(void * p)
{
int gai;
HWND hWnd;
unsigned int wMsg;
- const char FAR * hostname;
- const char FAR * portname;
- struct addrinfo FAR * hints;
- struct addrinfo FAR * FAR * res;
- struct getaddrinfo_args FAR * ga;
+ const char *hostname;
+ const char *portname;
+ struct addrinfo *hints;
+ struct addrinfo **res;
+ struct getaddrinfo_args *ga;
/* unpacking arguments */
- ga = (struct getaddrinfo_args FAR *)p;
+ ga = (struct getaddrinfo_args *)p;
hWnd = ga->hWnd;
wMsg = ga->wMsg;
hostname = ga->hostname;
Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -12,18 +12,18 @@
struct getaddrinfo_args {
HWND hWnd;
unsigned int wMsg;
- char FAR * hostname;
- char FAR * portname;
+ char *hostname;
+ char *portname;
struct addrinfo hints;
- struct addrinfo FAR * FAR * res;
- HANDLE FAR * lpHandle;
+ struct addrinfo **res;
+ HANDLE *lpHandle;
};
-HANDLE FAR PASCAL WSAAsyncGetAddrInfo(HWND hWnd,
+HANDLE PASCAL WSAAsyncGetAddrInfo(HWND hWnd,
unsigned int wMsg,
- const char FAR * hostname,
- const char FAR * portname,
- struct addrinfo FAR * hints,
- struct addrinfo FAR * FAR * res);
+ const char *hostname,
+ const char *portname,
+ struct addrinfo *hints,
+ struct addrinfo **res);
#endif /* __WSAASYNCGETADDRINFO__ */
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/commlib.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -42,7 +42,7 @@
BBuf = TRUE;
/* set synchronous mode */
PWSAAsyncSelect(cv->s,cv->HWin,0,0);
- Psetsockopt(cv->s,(int)SOL_SOCKET,SO_OOBINLINE,(char FAR *)&BBuf,sizeof(BBuf));
+ Psetsockopt(cv->s,(int)SOL_SOCKET,SO_OOBINLINE,(char *)&BBuf,sizeof(BBuf));
/* set asynchronous mode */
PWSAAsyncSelect(cv->s,cv->HWin,WM_USER_COMMOPEN, FD_CONNECT);
Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/filesys.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -6,24 +6,24 @@
#ifdef __cplusplus
extern "C" {
#endif
-typedef BOOL (FAR PASCAL *PGetSetupFname)
+typedef BOOL (PASCAL *PGetSetupFname)
(HWND HWin, WORD FuncId, PTTSet ts);
-typedef BOOL (FAR PASCAL *PGetTransFname)
+typedef BOOL (PASCAL *PGetTransFname)
(PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option);
-typedef BOOL (FAR PASCAL *PGetMultiFname)
+typedef BOOL (PASCAL *PGetMultiFname)
(PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option);
-typedef BOOL (FAR PASCAL *PGetGetFname)
+typedef BOOL (PASCAL *PGetGetFname)
(HWND HWin, PFileVar fv);
-typedef void (FAR PASCAL *PSetFileVar) (PFileVar fv);
-typedef BOOL (FAR PASCAL *PGetXFname)
+typedef void (PASCAL *PSetFileVar) (PFileVar fv);
+typedef BOOL (PASCAL *PGetXFname)
(HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir);
-typedef void (FAR PASCAL *PProtoInit)
+typedef void (PASCAL *PProtoInit)
(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts);
-typedef BOOL (FAR PASCAL *PProtoParse)
+typedef BOOL (PASCAL *PProtoParse)
(int Proto, PFileVar fv, PCHAR pv, PComVar cv);
-typedef void (FAR PASCAL *PProtoTimeOutProc)
+typedef void (PASCAL *PProtoTimeOutProc)
(int Proto, PFileVar fv, PCHAR pv, PComVar cv);
-typedef BOOL (FAR PASCAL *PProtoCancel)
+typedef BOOL (PASCAL *PProtoCancel)
(int Proto, PFileVar fv, PCHAR pv, PComVar cv);
extern PGetSetupFname GetSetupFname;
Modified: trunk/teraterm/teraterm/teklib.h
===================================================================
--- trunk/teraterm/teraterm/teklib.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/teklib.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -8,43 +8,43 @@
extern "C" {
#endif
-typedef void (FAR PASCAL *PTEKInit)
+typedef void (PASCAL *PTEKInit)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKResizeWindow)
+typedef void (PASCAL *PTEKResizeWindow)
(PTEKVar tk, PTTSet ts, int W, int H);
-typedef void (FAR PASCAL *PTEKChangeCaret)
+typedef void (PASCAL *PTEKChangeCaret)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKDestroyCaret)
+typedef void (PASCAL *PTEKDestroyCaret)
(PTEKVar tk, PTTSet ts);
-typedef int (FAR PASCAL *PTEKParse)
+typedef int (PASCAL *PTEKParse)
(PTEKVar tk, PTTSet ts, PComVar cv);
-typedef void (FAR PASCAL *PTEKReportGIN)
+typedef void (PASCAL *PTEKReportGIN)
(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode);
-typedef void (FAR PASCAL *PTEKPaint)
+typedef void (PASCAL *PTEKPaint)
(PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo);
-typedef void (FAR PASCAL *PTEKWMLButtonDown)
+typedef void (PASCAL *PTEKWMLButtonDown)
(PTEKVar tk, PTTSet ts, PComVar cv, POINT pos);
-typedef void (FAR PASCAL *PTEKWMLButtonUp)
+typedef void (PASCAL *PTEKWMLButtonUp)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKWMMouseMove)
+typedef void (PASCAL *PTEKWMMouseMove)
(PTEKVar tk, PTTSet ts, POINT p);
-typedef void (FAR PASCAL *PTEKWMSize)
+typedef void (PASCAL *PTEKWMSize)
(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy);
-typedef void (FAR PASCAL *PTEKCMCopy)
+typedef void (PASCAL *PTEKCMCopy)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKCMCopyScreen)
+typedef void (PASCAL *PTEKCMCopyScreen)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKPrint)
+typedef void (PASCAL *PTEKPrint)
(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag);
-typedef void (FAR PASCAL *PTEKClearScreen)
+typedef void (PASCAL *PTEKClearScreen)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKSetupFont)
+typedef void (PASCAL *PTEKSetupFont)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKResetWin)
+typedef void (PASCAL *PTEKResetWin)
(PTEKVar tk, PTTSet ts, WORD EmuOld);
-typedef void (FAR PASCAL *PTEKRestoreSetup)
+typedef void (PASCAL *PTEKRestoreSetup)
(PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKEnd)
+typedef void (PASCAL *PTEKEnd)
(PTEKVar tk);
extern PTEKInit TEKInit;
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/tekwin.cpp 2017-06-13 10:30:12 UTC (rev 6801)
@@ -349,7 +349,7 @@
ActiveWin = IdVT;
}
-void CTEKWindow::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
+void CTEKWindow::OnGetMinMaxInfo(MINMAXINFO *lpMMI)
{
lpMMI->ptMaxSize.x = 10000;
lpMMI->ptMaxSize.y = 10000;
Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/tekwin.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -39,7 +39,7 @@
afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnDestroy();
- afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
+ afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
Modified: trunk/teraterm/teraterm/ttdialog.h
===================================================================
--- trunk/teraterm/teraterm/ttdialog.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttdialog.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,27 +7,27 @@
extern "C" {
#endif
-typedef BOOL (FAR PASCAL *PSetupTerminal)
+typedef BOOL (PASCAL *PSetupTerminal)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupWin)
+typedef BOOL (PASCAL *PSetupWin)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupKeyboard)
+typedef BOOL (PASCAL *PSetupKeyboard)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupSerialPort)
+typedef BOOL (PASCAL *PSetupSerialPort)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupTCPIP)
+typedef BOOL (PASCAL *PSetupTCPIP)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PGetHostName)
+typedef BOOL (PASCAL *PGetHostName)
(HWND WndParent, PGetHNRec GetHNRec);
-typedef BOOL (FAR PASCAL *PChangeDirectory)
+typedef BOOL (PASCAL *PChangeDirectory)
(HWND WndParent, PCHAR CurDir);
-typedef BOOL (FAR PASCAL *PAboutDialog)
+typedef BOOL (PASCAL *PAboutDialog)
(HWND WndParent);
-typedef BOOL (FAR PASCAL *PChooseFontDlg)
+typedef BOOL (PASCAL *PChooseFontDlg)
(HWND WndParent, LPLOGFONT LogFont, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupGeneral)
+typedef BOOL (PASCAL *PSetupGeneral)
(HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PWindowWindow)
+typedef BOOL (PASCAL *PWindowWindow)
(HWND WndParent, PBOOL Close);
extern PSetupTerminal SetupTerminal;
@@ -42,7 +42,7 @@
extern PSetupGeneral SetupGeneral;
extern PWindowWindow WindowWindow;
-extern void FAR PASCAL TTDLGSetUILanguageFile(char *file);
+extern void PASCAL TTDLGSetUILanguageFile(char *file);
/* proto types */
BOOL LoadTTDLG();
Modified: trunk/teraterm/teraterm/ttfileio.c
===================================================================
--- trunk/teraterm/teraterm/ttfileio.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttfileio.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,7 +14,7 @@
TCreateFile PCreateFile;
TCloseFile PCloseFile;
-static BOOL PASCAL FAR DummyWriteFile(HANDLE fh, LPCVOID buff,
+static BOOL PASCAL DummyWriteFile(HANDLE fh, LPCVOID buff,
DWORD len, LPDWORD wbytes, LPOVERLAPPED wol)
{
*wbytes = len;
Modified: trunk/teraterm/teraterm/ttfileio.h
===================================================================
--- trunk/teraterm/teraterm/ttfileio.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttfileio.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,16 +7,16 @@
extern "C" {
#endif
-typedef BOOL (PASCAL FAR *TReadFile)
+typedef BOOL (PASCAL *TReadFile)
(HANDLE FHandle, LPVOID Buff, DWORD ReadSize, LPDWORD ReadBytes,
LPOVERLAPPED ReadOverLap);
-typedef BOOL (PASCAL FAR *TWriteFile)
+typedef BOOL (PASCAL *TWriteFile)
(HANDLE FHandle, LPCVOID Buff, DWORD WriteSize, LPDWORD WriteBytes,
LPOVERLAPPED WriteOverLap);
-typedef HANDLE (PASCAL FAR *TCreateFile)
+typedef HANDLE (PASCAL *TCreateFile)
(LPCTSTR FName, DWORD AcMode, DWORD ShMode, LPSECURITY_ATTRIBUTES SecAttr,
DWORD CreateDisposition, DWORD FileAttr, HANDLE Template);
-typedef BOOL (PASCAL FAR *TCloseFile)
+typedef BOOL (PASCAL *TCloseFile)
(HANDLE FHandle);
extern TReadFile PReadFile;
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttime.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -22,7 +22,7 @@
DWORD dwStyle;
POINT ptCurrentPos;
RECT rcArea;
- } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, FAR *LPCOMPOSITIONFORM;
+ } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, *LPCOMPOSITIONFORM;
#endif //_IMM_
#define GCS_RESULTSTR 0x0800
Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttplug.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
newExtension->exports = (TTXExports *)malloc(sizeof(TTXExports));
memset(newExtension->exports, 0, sizeof(TTXExports));
newExtension->exports->size = sizeof(TTXExports);
- if (bind(TTVERSION,(TTXExports FAR *)newExtension->exports)) {
+ if (bind(TTVERSION,(TTXExports *)newExtension->exports)) {
newExtension->next = *extensions;
*extensions = newExtension;
NumExtensions++;
@@ -75,7 +75,7 @@
MessageBox(NULL, buf, uimsg, MB_OK | MB_ICONEXCLAMATION);
}
-void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+void PASCAL TTXInit(PTTSet ts, PComVar cv) {
ExtensionList * extensionList = NULL;
int i;
@@ -119,7 +119,7 @@
}
}
-void PASCAL FAR TTXInternalOpenTCP(TTXSockHooks FAR * hooks) {
+void PASCAL TTXInternalOpenTCP(TTXSockHooks * hooks) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -129,7 +129,7 @@
}
}
-void PASCAL FAR TTXInternalCloseTCP(TTXSockHooks FAR * hooks) {
+void PASCAL TTXInternalCloseTCP(TTXSockHooks * hooks) {
int i;
for (i = NumExtensions - 1; i >= 0; i--) {
@@ -139,7 +139,7 @@
}
}
-void PASCAL FAR TTXInternalOpenFile(TTXFileHooks FAR * hooks) {
+void PASCAL TTXInternalOpenFile(TTXFileHooks * hooks) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -149,7 +149,7 @@
}
}
-void PASCAL FAR TTXInternalCloseFile(TTXFileHooks FAR * hooks) {
+void PASCAL TTXInternalCloseFile(TTXFileHooks * hooks) {
int i;
for (i = NumExtensions - 1; i >= 0; i--) {
@@ -159,7 +159,7 @@
}
}
-void PASCAL FAR TTXInternalGetUIHooks(TTXUIHooks FAR * hooks) {
+void PASCAL TTXInternalGetUIHooks(TTXUIHooks * hooks) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -169,7 +169,7 @@
}
}
-void PASCAL FAR TTXInternalGetSetupHooks(TTXSetupHooks FAR * hooks) {
+void PASCAL TTXInternalGetSetupHooks(TTXSetupHooks * hooks) {
int i;
for (i = NumExtensions - 1; i >= 0; i--) {
@@ -179,7 +179,7 @@
}
}
-void PASCAL FAR TTXSetWinSize(int rows, int cols) {
+void PASCAL TTXSetWinSize(int rows, int cols) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -189,7 +189,7 @@
}
}
-void PASCAL FAR TTXModifyMenu(HMENU menu) {
+void PASCAL TTXModifyMenu(HMENU menu) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -199,7 +199,7 @@
}
}
-void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+void PASCAL TTXModifyPopupMenu(HMENU menu) {
int i;
for (i = 0; i < NumExtensions; i++) {
@@ -209,7 +209,7 @@
}
}
-BOOL PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+BOOL PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
int i;
for (i = NumExtensions - 1; i >= 0; i--) {
@@ -223,7 +223,7 @@
return FALSE;
}
-void PASCAL FAR TTXEnd(void) {
+void PASCAL TTXEnd(void) {
int i;
if (NumExtensions==0) return;
@@ -245,7 +245,7 @@
NumExtensions = 0;
}
-void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
+void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
int i;
for (i = 0; i < NumExtensions; i++) {
Modified: trunk/teraterm/teraterm/ttplug.h
===================================================================
--- trunk/teraterm/teraterm/ttplug.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttplug.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,12 +9,12 @@
/* This function initializes the extensions and is called at the beginning
of the program. */
-void PASCAL FAR TTXInit(PTTSet ts, PComVar cv);
+void PASCAL TTXInit(PTTSet ts, PComVar cv);
/* This function is called when a TCP connection is about to be opened.
This macro stuff is to make sure that the functions in the caller's
EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalOpenTCP(TTXSockHooks FAR * hooks);
+void PASCAL TTXInternalOpenTCP(TTXSockHooks * hooks);
#define TTXOpenTCP() \
do { \
static TTXSockHooks SockHooks = { \
@@ -30,7 +30,7 @@
/* This function is called when a TCP connection has been closed.
This macro stuff is to make sure that the functions in the caller's
EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalCloseTCP(TTXSockHooks FAR * hooks);
+void PASCAL TTXInternalCloseTCP(TTXSockHooks * hooks);
#define TTXCloseTCP() \
do { \
static TTXSockHooks SockHooks = { \
@@ -43,7 +43,7 @@
TTXInternalCloseTCP(&SockHooks); \
} while (0)
-void PASCAL FAR TTXInternalOpenFile(TTXFileHooks FAR * hooks);
+void PASCAL TTXInternalOpenFile(TTXFileHooks * hooks);
#define TTXOpenFile() \
do { \
static TTXFileHooks FileHooks = { \
@@ -52,7 +52,7 @@
TTXInternalOpenFile(&FileHooks); \
} while (0)
-void PASCAL FAR TTXInternalCloseFile(TTXFileHooks FAR * hooks);
+void PASCAL TTXInternalCloseFile(TTXFileHooks * hooks);
#define TTXCloseFile() \
do { \
static TTXFileHooks FileHooks = { \
@@ -64,7 +64,7 @@
/* This function is called after the TTDLG DLL has been loaded.
This macro stuff is to make sure that the functions in the caller's
EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalGetUIHooks(TTXUIHooks FAR * hooks);
+void PASCAL TTXInternalGetUIHooks(TTXUIHooks * hooks);
#define TTXGetUIHooks() \
do { \
static TTXUIHooks UIHooks = { \
@@ -78,7 +78,7 @@
/* This function is called after the TTSET DLL has been loaded.
This macro stuff is to make sure that the functions in the caller's
EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalGetSetupHooks(TTXSetupHooks FAR * hooks);
+void PASCAL TTXInternalGetSetupHooks(TTXSetupHooks * hooks);
#define TTXGetSetupHooks() \
do { \
static TTXSetupHooks SetupHooks = { \
@@ -89,27 +89,27 @@
} while (0)
/* This function is called when the window size has changed. */
-void PASCAL FAR TTXSetWinSize(int rows, int cols);
+void PASCAL TTXSetWinSize(int rows, int cols);
/* This function adds the extensions' entries to the menu, which is the
handle for the program's menubar. */
-void PASCAL FAR TTXModifyMenu(HMENU menu);
+void PASCAL TTXModifyMenu(HMENU menu);
/* This function is called when a popup menu is about to be displayed.
The status of the entries is set appropriately. */
-void PASCAL FAR TTXModifyPopupMenu(HMENU menu);
+void PASCAL TTXModifyPopupMenu(HMENU menu);
/* This function calls on the extensions to handle a command. It returns
TRUE if they handle it, otherwise FALSE. */
-BOOL PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd);
+BOOL PASCAL TTXProcessCommand(HWND hWin, WORD cmd);
/* This function is called to see whether Telnet mode can be turned on when
Tera Term thinks it has detected a telnetd */
-void PASCAL FAR TTXEnd(void);
+void PASCAL TTXEnd(void);
/* This function is called when a new Tera Term is being started with certain
settings and the extension may wish to add some options to the command line */
-void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec);
+void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec);
#ifdef __cplusplus
}
#endif
Modified: trunk/teraterm/teraterm/ttsetup.h
===================================================================
--- trunk/teraterm/teraterm/ttsetup.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttsetup.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,21 +7,21 @@
extern "C" {
#endif
-typedef void (PASCAL FAR *PReadIniFile)
+typedef void (PASCAL *PReadIniFile)
(PCHAR FName, PTTSet ts);
-typedef void (PASCAL FAR *PWriteIniFile)
+typedef void (PASCAL *PWriteIniFile)
(PCHAR FName, PTTSet ts);
-typedef void (PASCAL FAR *PReadKeyboardCnf)
+typedef void (PASCAL *PReadKeyboardCnf)
(PCHAR FName, PKeyMap KeyMap, BOOL ShowWarning);
-typedef void (PASCAL FAR *PCopyHostList)
+typedef void (PASCAL *PCopyHostList)
(PCHAR IniSrc, PCHAR IniDest);
-typedef void (PASCAL FAR *PAddHostToList)
+typedef void (PASCAL *PAddHostToList)
(PCHAR FName, PCHAR Host);
-typedef void (PASCAL FAR *PParseParam)
+typedef void (PASCAL *PParseParam)
(PCHAR Param, PTTSet ts, PCHAR DDETopic);
-typedef void (PASCAL FAR *PCopySerialList)
+typedef void (PASCAL *PCopySerialList)
(PCHAR IniSrc, PCHAR IniDest, PCHAR section, PCHAR key, int MaxList);
-typedef void (PASCAL FAR *PAddValueToList)
+typedef void (PASCAL *PAddValueToList)
(PCHAR FName, PCHAR Host, PCHAR section, PCHAR key, int MaxList);
extern PReadIniFile ReadIniFile;
Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttwinman.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
{
#define IS_SJIS(n) (ts.KanjiCode == IdSJIS && IsDBCSLeadByte(n))
#define IS_EUC(n) (ts.KanjiCode == IdEUC && (n & 0x80))
- extern WORD FAR PASCAL JIS2SJIS(WORD KCode);
+ extern WORD PASCAL JIS2SJIS(WORD KCode);
int len = strlen(str);
char *cc = _alloca(len + 1);
char *c = cc;
Modified: trunk/teraterm/teraterm/ttwsk.h
===================================================================
--- trunk/teraterm/teraterm/ttwsk.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttwsk.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -11,46 +11,46 @@
extern "C" {
#endif
-typedef int (PASCAL FAR *Tclosesocket) (SOCKET s);
-typedef int (PASCAL FAR *Tconnect)
- (SOCKET s, const struct sockaddr FAR *name, int namelen);
-typedef u_long (PASCAL FAR *Thtonl)
+typedef int (PASCAL *Tclosesocket) (SOCKET s);
+typedef int (PASCAL *Tconnect)
+ (SOCKET s, const struct sockaddr *name, int namelen);
+typedef u_long (PASCAL *Thtonl)
(u_long hostlong);
-typedef u_short (PASCAL FAR *Thtons)
+typedef u_short (PASCAL *Thtons)
(u_short hostshort);
-typedef unsigned long (PASCAL FAR *Tinet_addr)
- (const char FAR * cp);
-typedef int (PASCAL FAR *Tioctlsocket)
- (SOCKET s, long cmd, u_long FAR *argp);
-typedef int (PASCAL FAR *Trecv)
- (SOCKET s, char FAR * buf, int len, int flags);
-typedef int (PASCAL FAR *Tselect)
- (int nfds, fd_set FAR *readfds, fd_set FAR *writefds,
- fd_set FAR *exceptfds, const struct timeval FAR *timeout);
-typedef int (PASCAL FAR *Tsend)
- (SOCKET s, const char FAR * buf, int len, int flags);
-typedef int (PASCAL FAR *Tsetsockopt)
+typedef unsigned long (PASCAL *Tinet_addr)
+ (const char * cp);
+typedef int (PASCAL *Tioctlsocket)
+ (SOCKET s, long cmd, u_long *argp);
+typedef int (PASCAL *Trecv)
+ (SOCKET s, char * buf, int len, int flags);
+typedef int (PASCAL *Tselect)
+ (int nfds, fd_set *readfds, fd_set *writefds,
+ fd_set *exceptfds, const struct timeval *timeout);
+typedef int (PASCAL *Tsend)
+ (SOCKET s, const char * buf, int len, int flags);
+typedef int (PASCAL *Tsetsockopt)
(SOCKET s, int level, int optname,
- const char FAR * optval, int optlen);
-typedef SOCKET (PASCAL FAR *Tsocket)
+ const char * optval, int optlen);
+typedef SOCKET (PASCAL *Tsocket)
(int af, int type, int protocol);
-//typedef struct hostent FAR * (PASCAL FAR *Tgethostbyname)
-// (const char FAR * name);
-typedef int (PASCAL FAR *TWSAStartup)
+//typedef struct hostent * (PASCAL *Tgethostbyname)
+// (const char * name);
+typedef int (PASCAL *TWSAStartup)
(WORD wVersionRequired, LPWSADATA lpWSAData);
-typedef int (PASCAL FAR *TWSACleanup)(void);
-typedef int (PASCAL FAR *TWSAAsyncSelect)
+typedef int (PASCAL *TWSACleanup)(void);
+typedef int (PASCAL *TWSAAsyncSelect)
(SOCKET s, HWND hWnd, u_int wMsg,long lEvent);
-typedef HANDLE (PASCAL FAR *TWSAAsyncGetHostByName)
- (HWND hWnd, u_int wMsg, const char FAR * name, char FAR * buf, int buflen);
-typedef int (PASCAL FAR *TWSACancelAsyncRequest)(HANDLE hAsyncTaskHandle);
-typedef int (PASCAL FAR *TWSAGetLastError)(void);
-typedef HANDLE (PASCAL FAR *TWSAAsyncGetAddrInfo)
- (HWND hWnd, unsigned int wMsg, const char FAR * hostname,
- const char FAR * portname, struct addrinfo FAR * hints,
- struct addrinfo FAR * FAR * res);
-// typedef int (PASCAL FAR *Tgetaddrinfo)(const char *name, const char *port, const struct addrinfo *hints, struct addrinfo **res);
-typedef void (PASCAL FAR *Tfreeaddrinfo)(struct addrinfo *ai);
+typedef HANDLE (PASCAL *TWSAAsyncGetHostByName)
+ (HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen);
+typedef int (PASCAL *TWSACancelAsyncRequest)(HANDLE hAsyncTaskHandle);
+typedef int (PASCAL *TWSAGetLastError)(void);
+typedef HANDLE (PASCAL *TWSAAsyncGetAddrInfo)
+ (HWND hWnd, unsigned int wMsg, const char * hostname,
+ const char * portname, struct addrinfo * hints,
+ struct addrinfo * * res);
+// typedef int (PASCAL *Tgetaddrinfo)(const char *name, const char *port, const struct addrinfo *hints, struct addrinfo **res);
+typedef void (PASCAL *Tfreeaddrinfo)(struct addrinfo *ai);
BOOL LoadWinsock();
void FreeWinsock();
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtdisp.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -174,8 +174,8 @@
BYTE AlphaFormat;
}BGBLENDFUNCTION;
-BOOL (FAR WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BGBLENDFUNCTION);
-BOOL (FAR WINAPI *BGEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+BOOL (WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BGBLENDFUNCTION);
+BOOL (WINAPI *BGEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
static HBITMAP GetBitmapHandle(char *File);
@@ -414,9 +414,9 @@
{
HINSTANCE hSPI;
char spiVersion[8];
- int (FAR PASCAL *SPI_IsSupported)(LPSTR,DWORD);
- int (FAR PASCAL *SPI_GetPicture)(LPSTR,long,unsigned int,HANDLE *,HANDLE *,FARPROC,long);
- int (FAR PASCAL *SPI_GetPluginInfo)(int,LPSTR,int);
+ int (PASCAL *SPI_IsSupported)(LPSTR,DWORD);
+ int (PASCAL *SPI_GetPicture)(LPSTR,long,unsigned int,HANDLE *,HANDLE *,FARPROC,long);
+ int (PASCAL *SPI_GetPluginInfo)(int,LPSTR,int);
int ret;
ret = FALSE;
@@ -504,7 +504,7 @@
return TRUE;
}
-BOOL FAR WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BGBLENDFUNCTION bf)
+BOOL WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BGBLENDFUNCTION bf)
{
HDC hdcDestWork,hdcSrcWork;
int i,invAlpha,alpha;
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtwin.cpp 2017-06-13 10:30:12 UTC (rev 6801)
@@ -2200,7 +2200,7 @@
DragFinish(hDropInfo);
}
-void CVTWindow::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
+void CVTWindow::OnGetMinMaxInfo(MINMAXINFO *lpMMI)
{
#ifndef WINDOW_MAXMIMUM_ENABLED
lpMMI->ptMaxSize.x = 10000;
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtwin.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -61,7 +61,7 @@
afx_msg void OnAllClose();
afx_msg void OnDestroy();
afx_msg void OnDropFiles(HDROP hDropInfo);
- afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
+ afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/language.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
return (result);
}
-unsigned int FAR PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale)
+unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale)
{
wchar_t wchar;
int ret;
@@ -97,7 +97,7 @@
// Japanese SJIS -> JIS
-WORD FAR PASCAL SJIS2JIS(WORD KCode)
+WORD PASCAL SJIS2JIS(WORD KCode)
{
WORD x0,x1,x2,y0;
BYTE b = LOBYTE(KCode);
@@ -124,13 +124,13 @@
}
// Japanese SJIS -> EUC
-WORD FAR PASCAL SJIS2EUC(WORD KCode)
+WORD PASCAL SJIS2EUC(WORD KCode)
{
return (SJIS2JIS(KCode) | 0x8080);
}
// Japanese JIS -> SJIS
-WORD FAR PASCAL JIS2SJIS(WORD KCode)
+WORD PASCAL JIS2SJIS(WORD KCode)
{
WORD n1, n2, SJIS;
@@ -564,7 +564,7 @@
};
// Russian character set conversion
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b)
+BYTE PASCAL RussConv(int cin, int cout, BYTE b)
// cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
// cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
{
@@ -575,7 +575,7 @@
}
// Russian character set conversion for a character string
-void FAR PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
+void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
// cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
// cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
{
Modified: trunk/teraterm/ttpcmn/language.h
===================================================================
--- trunk/teraterm/ttpcmn/language.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/language.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,12 +9,12 @@
#endif
/* proto types */
-unsigned int FAR PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale);
-WORD FAR PASCAL SJIS2JIS(WORD KCode);
-WORD FAR PASCAL SJIS2EUC(WORD KCode);
-WORD FAR PASCAL JIS2SJIS(WORD KCode);
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b);
-void FAR PASCAL RussConvStr
+unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale);
+WORD PASCAL SJIS2JIS(WORD KCode);
+WORD PASCAL SJIS2EUC(WORD KCode);
+WORD PASCAL JIS2SJIS(WORD KCode);
+BYTE PASCAL RussConv(int cin, int cout, BYTE b);
+void PASCAL RussConvStr
(int cin, int cout, PCHAR Str, int count);
#ifdef __cplusplus
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -56,7 +56,7 @@
}
-BOOL PASCAL FAR StartTeraTerm(PTTSet ts)
+BOOL PASCAL StartTeraTerm(PTTSet ts)
{
char Temp[MAX_PATH];
@@ -99,7 +99,7 @@
// \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xF0\x83f\x83B\x83X\x83N\x82ɕۑ\xB6\x82\xB5\x81ATera Term\x96{\x91̂\xF0\x8DċN\x93\xAE\x82\xB7\x82\xE9\x81B
// (2012.4.30 yutaka)
-void PASCAL FAR RestartTeraTerm(HWND hwnd, PTTSet ts)
+void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts)
{
char path[1024];
STARTUPINFO si;
@@ -132,7 +132,7 @@
}
}
-void PASCAL FAR ChangeDefaultSet(PTTSet ts, PKeyMap km)
+void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km)
{
if ((ts!=NULL) &&
(_stricmp(ts->SetupFName, pm->ts.SetupFName) == 0)) {
@@ -143,7 +143,7 @@
}
}
-void PASCAL FAR GetDefaultSet(PTTSet ts)
+void PASCAL GetDefaultSet(PTTSet ts)
{
memcpy(ts,&(pm->ts),sizeof(TTTSet));
}
@@ -150,7 +150,7 @@
/* Key scan code -> Tera Term key code */
-WORD PASCAL FAR GetKeyCode(PKeyMap KeyMap, WORD Scan)
+WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan)
{
WORD Key;
@@ -164,7 +164,7 @@
return Key;
}
-void PASCAL FAR GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
BOOL AppliKeyMode, BOOL AppliCursorMode,
BOOL Send8BitMode, PCHAR KeyStr, int destlen,
LPINT Len, LPWORD Type)
@@ -818,22 +818,22 @@
PeekMessage(&Msg,HWin, WM_CHAR, WM_CHAR,PM_REMOVE);
}
-void FAR PASCAL SetCOMFlag(int Com)
+void PASCAL SetCOMFlag(int Com)
{
pm->ComFlag[(Com-1)/CHAR_BIT] |= 1 << ((Com-1)%CHAR_BIT);
}
-void FAR PASCAL ClearCOMFlag(int Com)
+void PASCAL ClearCOMFlag(int Com)
{
pm->ComFlag[(Com-1)/CHAR_BIT] &= ~(1 << ((Com-1)%CHAR_BIT));
}
-int FAR PASCAL CheckCOMFlag(int Com)
+int PASCAL CheckCOMFlag(int Com)
{
return ((pm->ComFlag[(Com-1)/CHAR_BIT] & 1 << (Com-1)%CHAR_BIT) > 0);
}
-int FAR PASCAL RegWin(HWND HWinVT, HWND HWinTEK)
+int PASCAL RegWin(HWND HWinVT, HWND HWinTEK)
{
int i, j;
@@ -864,7 +864,7 @@
}
}
-void FAR PASCAL UnregWin(HWND HWin)
+void PASCAL UnregWin(HWND HWin)
{
int i, j;
@@ -902,7 +902,7 @@
return '+';
}
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
+void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
{
int i;
char Temp[MAXPATHLEN];
@@ -974,7 +974,7 @@
}
}
-void FAR PASCAL SetWinList(HWND HWin, HWND HDlg, int IList)
+void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList)
{
int i;
char Temp[MAXPATHLEN];
@@ -1000,7 +1000,7 @@
}
}
-void FAR PASCAL SelectWin(int WinId)
+void PASCAL SelectWin(int WinId)
{
if ((WinId>=0) && (WinId<pm->NWin)) {
/* \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8Dő剻\x82\xA8\x82\xE6\x82эŏ\xAC\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8Fꍇ\x81A\x82\xBB\x82̏\xF3\x91Ԃ\xF0\x88ێ\x9D\x82ł\xAB\x82\xE9\x82悤\x82ɁA
@@ -1019,7 +1019,7 @@
}
}
-void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
+void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
{
int i;
@@ -1048,7 +1048,7 @@
SelectWin(i);
}
-void FAR PASCAL ShowAllWin(int stat) {
+void PASCAL ShowAllWin(int stat) {
int i;
for (i=0; i < pm->NWin; i++) {
@@ -1056,7 +1056,7 @@
}
}
-void FAR PASCAL UndoAllWin(void) {
+void PASCAL UndoAllWin(void) {
int i;
WINDOWPLACEMENT rc0;
RECT rc;
@@ -1123,7 +1123,7 @@
}
}
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
+void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
{
char HomeDir[MAX_PATH];
char Temp[MAX_PATH];
@@ -1152,7 +1152,7 @@
}
}
-HWND FAR PASCAL GetNthWin(int n)
+HWND PASCAL GetNthWin(int n)
{
if (n<pm->NWin) {
return pm->WinList[n];
@@ -1202,7 +1202,7 @@
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Side by Side)
-void FAR PASCAL ShowAllWinSidebySide(HWND myhwnd)
+void PASCAL ShowAllWinSidebySide(HWND myhwnd)
{
int n;
HWND hwnd[MAXNWIN];
@@ -1212,7 +1212,7 @@
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
-void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
+void PASCAL ShowAllWinStacked(HWND myhwnd)
{
int n;
HWND hwnd[MAXNWIN];
@@ -1222,7 +1222,7 @@
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82˂ĕ\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
-void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
+void PASCAL ShowAllWinCascade(HWND myhwnd)
{
int n;
HWND hwnd[MAXNWIN];
@@ -1232,7 +1232,7 @@
}
// \x91STera Term\x82ɏI\x97\xB9\x8Ew\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
-void FAR PASCAL BroadcastClosingMessage(HWND myhwnd)
+void PASCAL BroadcastClosingMessage(HWND myhwnd)
{
int i, max;
HWND hwnd[MAXNWIN];
@@ -1255,7 +1255,7 @@
}
-int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
+int PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
{
if ( ! cv->Ready ) {
return 0;
@@ -1276,7 +1276,7 @@
}
}
-void PASCAL FAR CommInsert1Byte(PComVar cv, BYTE b)
+void PASCAL CommInsert1Byte(PComVar cv, BYTE b)
{
if ( ! cv->Ready ) {
return;
@@ -1319,7 +1319,7 @@
}
}
-int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b)
+int PASCAL CommRead1Byte(PComVar cv, LPBYTE b)
{
int c;
@@ -1389,7 +1389,7 @@
return c;
}
-int FAR PASCAL CommRawOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommRawOut(PComVar cv, PCHAR B, int C)
{
int a;
@@ -1412,7 +1412,7 @@
return a;
}
-int FAR PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C)
{
int a, i, Len;
char d[3];
@@ -1449,7 +1449,7 @@
return i;
}
-int FAR PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
{
int a, i, Len, OutLen;
char d[3];
@@ -1751,7 +1751,7 @@
return i;
}
-int FAR PASCAL CommTextOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommTextOut(PComVar cv, PCHAR B, int C)
{
int i, TempLen, OutLen;
char TempStr[12];
@@ -1854,7 +1854,7 @@
return i;
}
-int FAR PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C)
{
int a, i, Len;
char d[3];
@@ -1898,7 +1898,7 @@
return i;
}
-int FAR PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
+int PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
{
int i, TempLen;
WORD K;
@@ -2073,7 +2073,7 @@
return i;
}
-int FAR PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
+int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
{
int i, TempLen;
char TempStr[11];
@@ -2386,17 +2386,17 @@
static int NotifyIconShowCount = 0;
static HICON CustomIcon = NULL;
-void FAR PASCAL SetCustomNotifyIcon(HICON icon)
+void PASCAL SetCustomNotifyIcon(HICON icon)
{
CustomIcon = icon;
}
-HICON FAR PASCAL GetCustomNotifyIcon()
+HICON PASCAL GetCustomNotifyIcon()
{
return CustomIcon;
}
-void FAR PASCAL CreateNotifyIcon(PComVar cv)
+void PASCAL CreateNotifyIcon(PComVar cv)
{
if (cv->NotifyIcon == NULL) {
notify_icon.cbSize = sizeof(notify_icon);
@@ -2428,7 +2428,7 @@
return;
}
-void FAR PASCAL DeleteNotifyIcon(PComVar cv)
+void PASCAL DeleteNotifyIcon(PComVar cv)
{
if (cv->NotifyIcon) {
Shell_NotifyIcon(NIM_DELETE, cv->NotifyIcon);
@@ -2439,7 +2439,7 @@
return;
}
-void FAR PASCAL ShowNotifyIcon(PComVar cv)
+void PASCAL ShowNotifyIcon(PComVar cv)
{
if (cv->NotifyIcon == NULL) {
CreateNotifyIcon(cv);
@@ -2454,7 +2454,7 @@
return;
}
-void FAR PASCAL HideNotifyIcon(PComVar cv)
+void PASCAL HideNotifyIcon(PComVar cv)
{
if (NotifyIconShowCount > 1) {
NotifyIconShowCount -= 1;
@@ -2472,7 +2472,7 @@
return;
}
-void FAR PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver)
+void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver)
{
if (cv->NotifyIcon) {
cv->NotifyIcon->uVersion = ver;
@@ -2481,7 +2481,7 @@
return;
}
-void FAR PASCAL NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
+void PASCAL NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
{
if (msg == NULL) {
return;
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -25,7 +25,7 @@
#undef ONIG_EXTERN
#include <winsock2.h>
-static char FAR * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
+static char * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
#undef EFFECT_ENABLED // \x83G\x83t\x83F\x83N\x83g\x82̗L\x8C\xF8\x89”\xDB
#undef TEXTURE_ENABLED // \x83e\x83N\x83X\x83`\x83\x83\x82̗L\x8C\xF8\x89”\xDB
@@ -3421,7 +3421,7 @@
return FALSE;
}
-BOOL FAR PASCAL SetupTerminal(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupTerminal(HWND WndParent, PTTSet ts)
{
int i;
@@ -3446,7 +3446,7 @@
WndParent, TermDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL SetupWin(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupWin(HWND WndParent, PTTSet ts)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3454,7 +3454,7 @@
WndParent, WinDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL SetupKeyboard(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupKeyboard(HWND WndParent, PTTSet ts)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3462,7 +3462,7 @@
WndParent, KeybDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL SetupSerialPort(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupSerialPort(HWND WndParent, PTTSet ts)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3470,7 +3470,7 @@
WndParent, SerialDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL SetupTCPIP(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupTCPIP(HWND WndParent, PTTSet ts)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3478,7 +3478,7 @@
WndParent, TCPIPDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL GetHostName(HWND WndParent, PGetHNRec GetHNRec)
+BOOL PASCAL GetHostName(HWND WndParent, PGetHNRec GetHNRec)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3486,7 +3486,7 @@
WndParent, HostDlg, (LPARAM)GetHNRec);
}
-BOOL FAR PASCAL ChangeDirectory(HWND WndParent, PCHAR CurDir)
+BOOL PASCAL ChangeDirectory(HWND WndParent, PCHAR CurDir)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3494,7 +3494,7 @@
WndParent, DirDlg, (LPARAM)CurDir);
}
-BOOL FAR PASCAL AboutDialog(HWND WndParent)
+BOOL PASCAL AboutDialog(HWND WndParent)
{
return
(BOOL)DialogBox(hInst,
@@ -3544,7 +3544,7 @@
return FALSE;
}
-BOOL FAR PASCAL ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
+BOOL PASCAL ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
{
CHOOSEFONT cf;
BOOL Ok;
@@ -3564,7 +3564,7 @@
return Ok;
}
-BOOL FAR PASCAL SetupGeneral(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupGeneral(HWND WndParent, PTTSet ts)
{
return
(BOOL)DialogBoxParam(hInst,
@@ -3572,7 +3572,7 @@
WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
}
-BOOL FAR PASCAL WindowWindow(HWND WndParent, PBOOL Close)
+BOOL PASCAL WindowWindow(HWND WndParent, PBOOL Close)
{
*Close = FALSE;
return
@@ -3582,7 +3582,7 @@
(DLGPROC)&WinListDlg, (LPARAM)Close);
}
-void FAR PASCAL TTDLGSetUILanguageFile(char *file)
+void PASCAL TTDLGSetUILanguageFile(char *file)
{
strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
}
Modified: trunk/teraterm/ttpdlg/ttdlg.h
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpdlg/ttdlg.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -1 +1 @@
-void FAR PASCAL TTDLGSetUILanguageFile(char *file);
+void PASCAL TTDLGSetUILanguageFile(char *file);
Modified: trunk/teraterm/ttpfile/bplus.c
===================================================================
--- trunk/teraterm/ttpfile/bplus.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/bplus.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -15,7 +15,7 @@
#include "ttlib.h"
/* proto type */
-BOOL FAR PASCAL GetTransFname
+BOOL PASCAL GetTransFname
(PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option);
#define BPTimeOut 10
Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/ftlib.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -19,8 +19,8 @@
#ifdef __cplusplus
extern "C" {
#endif
-void FAR PASCAL TTFILESetUILanguageFile(char *file);
-void FAR PASCAL TTFILESetFileSendFilter(char *file);
+void PASCAL TTFILESetUILanguageFile(char *file);
+void PASCAL TTFILESetFileSendFilter(char *file);
#ifdef __cplusplus
}
#endif
Modified: trunk/teraterm/ttpfile/ttfile.c
===================================================================
--- trunk/teraterm/ttpfile/ttfile.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/ttfile.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
char UILanguageFile[MAX_PATH];
char FileSendFilter[128];
-BOOL FAR PASCAL GetSetupFname(HWND HWin, WORD FuncId, PTTSet ts)
+BOOL PASCAL GetSetupFname(HWND HWin, WORD FuncId, PTTSet ts)
{
int i, j;
OPENFILENAME ofn;
@@ -319,7 +319,7 @@
return FALSE;
}
-BOOL FAR PASCAL GetTransFname
+BOOL PASCAL GetTransFname
(PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option)
{
char uimsg[MAX_UIMSG];
@@ -520,7 +520,7 @@
return FALSE;
}
-BOOL FAR PASCAL GetMultiFname
+BOOL PASCAL GetMultiFname
(PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option)
{
int i, len;
@@ -760,7 +760,7 @@
return FALSE;
}
-BOOL FAR PASCAL GetGetFname(HWND HWin, PFileVar fv)
+BOOL PASCAL GetGetFname(HWND HWin, PFileVar fv)
{
return (BOOL)DialogBoxParam(hInst,
MAKEINTRESOURCE(IDD_GETFNDLG),
@@ -767,7 +767,7 @@
HWin, GetFnDlg, (LONG)fv);
}
-void FAR PASCAL SetFileVar(PFileVar fv)
+void PASCAL SetFileVar(PFileVar fv)
{
int i;
char uimsg[MAX_UIMSG];
@@ -980,7 +980,7 @@
return FALSE;
}
-BOOL FAR PASCAL GetXFname
+BOOL PASCAL GetXFname
(HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir)
{
char uimsg[MAX_UIMSG];
@@ -1079,7 +1079,7 @@
return Ok;
}
-void FAR PASCAL ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
+void PASCAL ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
{
switch (Proto) {
case PROTO_KMT:
@@ -1103,7 +1103,7 @@
}
}
-BOOL FAR PASCAL ProtoParse
+BOOL PASCAL ProtoParse
(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
{
BOOL Ok;
@@ -1153,7 +1153,7 @@
return Ok;
}
-void FAR PASCAL ProtoTimeOutProc
+void PASCAL ProtoTimeOutProc
(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
{
switch (Proto) {
@@ -1178,7 +1178,7 @@
}
}
-BOOL FAR PASCAL ProtoCancel
+BOOL PASCAL ProtoCancel
(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
{
switch (Proto) {
@@ -1208,12 +1208,12 @@
return TRUE;
}
-void FAR PASCAL TTFILESetUILanguageFile(char *file)
+void PASCAL TTFILESetUILanguageFile(char *file)
{
strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
}
-void FAR PASCAL TTFILESetFileSendFilter(char *file)
+void PASCAL TTFILESetFileSendFilter(char *file)
{
strncpy_s(FileSendFilter, sizeof(FileSendFilter), file, _TRUNCATE);
}
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpset/ttset.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -493,7 +493,7 @@
}
-void FAR PASCAL ReadIniFile(PCHAR FName, PTTSet ts)
+void PASCAL ReadIniFile(PCHAR FName, PTTSet ts)
{
int i;
HDC TmpDC;
@@ -1950,7 +1950,7 @@
ReadCygtermConfFile(ts);
}
-void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
+void PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
{
int i;
char Temp[MAX_PATH];
@@ -3240,7 +3240,7 @@
KeyMap->Map[KeyId - 1] = Num;
}
-void FAR PASCAL ReadKeyboardCnf
+void PASCAL ReadKeyboardCnf
(PCHAR FName, PKeyMap KeyMap, BOOL ShowWarning) {
int i, j, Ptr;
char EntName[7];
@@ -3493,7 +3493,7 @@
}
}
-void FAR PASCAL CopySerialList(PCHAR IniSrc, PCHAR IniDest, PCHAR section,
+void PASCAL CopySerialList(PCHAR IniSrc, PCHAR IniDest, PCHAR section,
PCHAR key, int MaxList)
{
int i, j;
@@ -3526,7 +3526,7 @@
WritePrivateProfileString(NULL, NULL, NULL, IniDest);
}
-void FAR PASCAL AddValueToList(PCHAR FName, PCHAR Host, PCHAR section,
+void PASCAL AddValueToList(PCHAR FName, PCHAR Host, PCHAR section,
PCHAR key, int MaxList)
{
HANDLE MemH;
@@ -3587,12 +3587,12 @@
}
/* copy hostlist from source IniFile to dest IniFile */
-void FAR PASCAL CopyHostList(PCHAR IniSrc, PCHAR IniDest)
+void PASCAL CopyHostList(PCHAR IniSrc, PCHAR IniDest)
{
CopySerialList(IniSrc, IniDest, "Hosts", "Host", MAXHOSTLIST);
}
-void FAR PASCAL AddHostToList(PCHAR FName, PCHAR Host)
+void PASCAL AddHostToList(PCHAR FName, PCHAR Host)
{
AddValueToList(FName, Host, "Hosts", "Host", MAXHOSTLIST);
}
@@ -3718,7 +3718,7 @@
}
-void FAR PASCAL ParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic)
+void PASCAL ParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic)
{
int i, pos, c;
//int param_top;
Modified: trunk/teraterm/ttptek/tekesc.h
===================================================================
--- trunk/teraterm/ttptek/tekesc.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttptek/tekesc.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -4,7 +4,7 @@
/* TTTEK.DLL, TEK escape sequences */
-void FAR PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts);
+void PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts);
void ParseFirst(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
void TEKEscape(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
void SelectCode(PTEKVar tk, PTTSet ts, BYTE b);
Modified: trunk/teraterm/ttptek/tttek.c
===================================================================
--- trunk/teraterm/ttptek/tttek.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttptek/tttek.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
static HANDLE hInst;
-void FAR PASCAL TEKInit(PTEKVar tk, PTTSet ts)
+void PASCAL TEKInit(PTEKVar tk, PTTSet ts)
{
int i;
@@ -151,7 +151,7 @@
tk->RubberBand = OnFlag;
}
-void FAR PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts)
+void PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts)
{
UINT T;
@@ -175,7 +175,7 @@
}
}
-void FAR PASCAL TEKDestroyCaret(PTEKVar tk, PTTSet ts)
+void PASCAL TEKDestroyCaret(PTEKVar tk, PTTSet ts)
{
DestroyCaret();
if (ts->NonblinkingCursor!=0)
@@ -182,7 +182,7 @@
KillTimer(tk->HWin,IdCaretTimer);
}
-void FAR PASCAL TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H)
+void PASCAL TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H)
{
int i, Height, Width;
TEXTMETRIC Metrics;
@@ -377,7 +377,7 @@
tk->ScaleFont = FALSE;
}
-int FAR PASCAL TEKParse(PTEKVar tk, PTTSet ts, PComVar cv)
+int PASCAL TEKParse(PTEKVar tk, PTTSet ts, PComVar cv)
{
BOOL f;
int c;
@@ -443,7 +443,7 @@
return (tk->ChangeEmu);
}
-void FAR PASCAL TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode)
+void PASCAL TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode)
{
BYTE Code[11];
int X, Y;
@@ -465,7 +465,7 @@
tk->IgnoreCount = 6;
}
-void FAR PASCAL TEKPaint
+void PASCAL TEKPaint
(PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo)
{
int X,Y,W,H;
@@ -486,7 +486,7 @@
if (tk->GIN) ToggleCrossHair(tk,ts,TRUE);
}
-void FAR PASCAL TEKWMLButtonDown
+void PASCAL TEKWMLButtonDown
(PTEKVar tk, PTTSet ts, PComVar cv, POINT pos)
{
BYTE b;
@@ -517,7 +517,7 @@
}
}
-void FAR PASCAL TEKWMLButtonUp(PTEKVar tk, PTTSet ts)
+void PASCAL TEKWMLButtonUp(PTEKVar tk, PTTSet ts)
{
int X;
@@ -546,7 +546,7 @@
}
}
-void FAR PASCAL TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p)
+void PASCAL TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p)
{
int X, Y;
@@ -578,7 +578,7 @@
if (tk->GIN) SetCapture(tk->HWin);
}
-void FAR PASCAL TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy)
+void PASCAL TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy)
{
int Width, Height;
@@ -636,7 +636,7 @@
SwitchRubberBand(tk,ts,tk->Select);
}
-void FAR PASCAL TEKCMCopy(PTEKVar tk, PTTSet ts)
+void PASCAL TEKCMCopy(PTEKVar tk, PTTSet ts)
{
int x, y;
@@ -654,13 +654,13 @@
abs(tk->SelectEnd.y - tk->SelectStart.y));
}
-void FAR PASCAL TEKCMCopyScreen(PTEKVar tk, PTTSet ts)
+void PASCAL TEKCMCopyScreen(PTEKVar tk, PTTSet ts)
{
/* copy fullscreen to clipboard */
CopyToClipboard(tk, ts, 0, 0, tk->ScreenWidth, tk->ScreenHeight);
}
-void FAR PASCAL TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag)
+void PASCAL TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag)
{
POINT PPI;
RECT Margin;
@@ -739,7 +739,7 @@
SwitchRubberBand(tk,ts,tk->Select);
}
-void FAR PASCAL TEKClearScreen(PTEKVar tk, PTTSet ts)
+void PASCAL TEKClearScreen(PTEKVar tk, PTTSet ts)
{
RECT R;
@@ -753,7 +753,7 @@
TEKCaretOn(tk,ts);
}
-void FAR PASCAL TEKSetupFont(PTEKVar tk, PTTSet ts)
+void PASCAL TEKSetupFont(PTEKVar tk, PTTSet ts)
{
int W, H;
// BOOL Ok;
@@ -776,7 +776,7 @@
TEKResizeWindow(tk,ts,W,H);
}
-void FAR PASCAL TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld)
+void PASCAL TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld)
{
HDC TmpDC;
RECT R;
@@ -844,7 +844,7 @@
InvalidateRect(tk->HWin,NULL,TRUE);
}
-/* BOOL FAR PASCAL TEKSetupWinDlg(PTEKVar tk, PTTSet ts)
+/* BOOL PASCAL TEKSetupWinDlg(PTEKVar tk, PTTSet ts)
{
BOOL Ok;
WORD OldEmu;
@@ -861,7 +861,7 @@
return Ok;
} */
-void FAR PASCAL TEKRestoreSetup(PTEKVar tk, PTTSet ts)
+void PASCAL TEKRestoreSetup(PTEKVar tk, PTTSet ts)
{
int W, H;
RECT R;
@@ -879,7 +879,7 @@
TEKResizeWindow(tk,ts,W,H);
}
-void FAR PASCAL TEKEnd(PTEKVar tk)
+void PASCAL TEKEnd(PTEKVar tk)
{
int i;
Modified: trunk/ttpmenu/winmisc.cpp
===================================================================
--- trunk/ttpmenu/winmisc.cpp 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttpmenu/winmisc.cpp 2017-06-13 10:30:12 UTC (rev 6801)
@@ -452,7 +452,7 @@
char chars[] = { (char) wParam, 0 };
SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
- (LPARAM) (char FAR *) chars);
+ (LPARAM) (char *) chars);
return 0;
}
}
Modified: trunk/ttssh2/matcher/matcher.c
===================================================================
--- trunk/ttssh2/matcher/matcher.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/matcher/matcher.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -40,8 +40,8 @@
in the length of the string (as opposed to exponential).
Since it's also best-case quadratic, it should only be used for unusual
cases (2 or more *'s in the pattern). */
-static BOOL wildcard_match_pattern(char const FAR * pattern, int patternLen,
- char const FAR * str, int strLen) {
+static BOOL wildcard_match_pattern(char const *pattern, int patternLen,
+ char const *str, int strLen) {
char * canBeAt = (char *)malloc(sizeof(char)*(strLen + 1));
int i, result;
@@ -79,7 +79,7 @@
Before entry, ensure that str does not contain any invalid characters
(at least including '*', '?', ',', ' ' and '\n').
*/
-BOOL match_pattern(char const FAR * pattern, char const FAR * str) {
+BOOL match_pattern(char const *pattern, char const *str) {
char patternCh = *pattern;
char strCh = *str;
Modified: trunk/ttssh2/matcher/matcher.h
===================================================================
--- trunk/ttssh2/matcher/matcher.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/matcher/matcher.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -48,6 +48,6 @@
This function is optimized for matching many patterns against one string,
such as occurs when searching an ssh_known_hosts file for a host key.
*/
-BOOL match_pattern(char const FAR * pattern, char const FAR * str);
+BOOL match_pattern(char const *pattern, char const *str);
#endif
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/auth.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -48,7 +48,7 @@
static HFONT DlgTisFont;
static HFONT DlgAuthSetupFont;
-void destroy_malloced_string(char FAR * FAR * str)
+void destroy_malloced_string(char **str)
{
if (*str != NULL) {
SecureZeroMemory(*str, strlen(*str));
@@ -72,7 +72,7 @@
char chars[] = { (char) wParam, 0 };
SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
- (LPARAM) (char FAR *) chars);
+ (LPARAM) (char *) chars);
return 0;
}
}
@@ -352,10 +352,10 @@
}
}
-static char FAR *alloc_control_text(HWND ctl)
+static char *alloc_control_text(HWND ctl)
{
int len = GetWindowTextLength(ctl);
- char FAR *result = malloc(len + 1);
+ char *result = malloc(len + 1);
if (result != NULL) {
GetWindowText(ctl, result, len + 1);
@@ -365,7 +365,7 @@
return result;
}
-static int get_key_file_name(HWND parent, char FAR * buf, int bufsize, PTInstVar pvar)
+static int get_key_file_name(HWND parent, char *buf, int bufsize, PTInstVar pvar)
{
OPENFILENAME params;
char fullname_buf[2048] = "identity";
@@ -423,7 +423,7 @@
static BOOL end_auth_dlg(PTInstVar pvar, HWND dlg)
{
int method = SSH_AUTH_PASSWORD;
- char FAR *password =
+ char *password =
alloc_control_text(GetDlgItem(dlg, IDC_SSHPASSWORD));
Key *key_pair = NULL;
@@ -936,7 +936,7 @@
}
}
-char FAR *AUTH_get_user_name(PTInstVar pvar)
+char *AUTH_get_user_name(PTInstVar pvar)
{
return pvar->auth_state.user;
}
@@ -1121,7 +1121,7 @@
static BOOL end_TIS_dlg(PTInstVar pvar, HWND dlg)
{
- char FAR *password =
+ char *password =
alloc_control_text(GetDlgItem(dlg, IDC_SSHPASSWORD));
pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
@@ -1462,7 +1462,7 @@
destroy_malloced_string(&pvar->auth_state.TIS_prompt);
}
-void AUTH_set_TIS_mode(PTInstVar pvar, char FAR * prompt, int len)
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len)
{
if (pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
pvar->auth_state.mode = TIS_AUTH_MODE;
@@ -1520,7 +1520,7 @@
}
}
-void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len)
+void AUTH_get_auth_info(PTInstVar pvar, char *dest, int len)
{
const char *method = "unknown";
char buf[256];
Modified: trunk/ttssh2/ttxssh/auth.h
===================================================================
--- trunk/ttssh2/ttxssh/auth.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/auth.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -38,15 +38,15 @@
typedef struct {
SSHAuthMethod method;
- char FAR * password;
- char FAR * rhosts_client_user;
- struct Key FAR * key_pair;
+ char *password;
+ char *rhosts_client_user;
+ struct Key *key_pair;
} AUTHCred;
typedef enum { GENERIC_AUTH_MODE, TIS_AUTH_MODE } AuthMode;
typedef struct {
- char FAR * user;
+ char *user;
AUTHCred cur_cred;
SSHAuthMethod failed_method;
int flags;
@@ -54,23 +54,23 @@
HWND auth_dialog;
AuthMode mode;
- char FAR * TIS_prompt;
+ char *TIS_prompt;
} AUTHState;
void AUTH_init(PTInstVar pvar);
-char FAR * AUTH_get_user_name(PTInstVar pvar);
+char *AUTH_get_user_name(PTInstVar pvar);
int AUTH_set_supported_auth_types(PTInstVar pvar, int types);
void AUTH_set_generic_mode(PTInstVar pvar);
-void AUTH_set_TIS_mode(PTInstVar pvar, char FAR * prompt, int len);
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len);
void AUTH_advance_to_next_cred(PTInstVar pvar);
void AUTH_do_cred_dialog(PTInstVar pvar);
void AUTH_do_default_cred_dialog(PTInstVar pvar);
void AUTH_destroy_cur_cred(PTInstVar pvar);
-void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len);
+void AUTH_get_auth_info(PTInstVar pvar, char *dest, int len);
void AUTH_notify_disconnecting(PTInstVar pvar);
void AUTH_notify_end_error(PTInstVar pvar);
void AUTH_end(PTInstVar pvar);
-void destroy_malloced_string(char FAR * FAR * str);
+void destroy_malloced_string(char **str);
LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
WPARAM wParam, LPARAM lParam);
Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/crypt.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -72,12 +72,12 @@
#define CMP(a,b) memcmp(a, b, SSH_BLOCKSIZE)
-static char FAR *get_cipher_name(int cipher);
+static char *get_cipher_name(int cipher);
-static void crc_update(uint32 FAR * a, uint32 b)
+static void crc_update(uint32 *a, uint32 b)
{
b ^= *a;
- *a = do_crc((unsigned char FAR *) &b, sizeof(b));
+ *a = do_crc((unsigned char *) &b, sizeof(b));
}
/* check_crc
@@ -84,11 +84,11 @@
detects if a block is used in a particular pattern
*/
-static int check_crc(unsigned char FAR * S, unsigned char FAR * buf,
- uint32 len, unsigned char FAR * IV)
+static int check_crc(unsigned char *S, unsigned char *buf,
+ uint32 len, unsigned char *IV)
{
uint32 crc;
- unsigned char FAR *c;
+ unsigned char *c;
crc = 0;
if (IV && !CMP(S, IV)) {
@@ -113,16 +113,16 @@
detect_attack
Detects a crc32 compensation attack on a packet
*/
-static int detect_attack(CRYPTDetectAttack FAR * statics,
- unsigned char FAR * buf, uint32 len,
- unsigned char *FAR IV)
+static int detect_attack(CRYPTDetectAttack *statics,
+ unsigned char *buf, uint32 len,
+ unsigned char *IV)
{
- uint32 FAR *h = statics->h;
+ uint32 *h = statics->h;
uint32 n = statics->n;
uint32 i, j;
uint32 l;
- unsigned char FAR *c;
- unsigned char FAR *d;
+ unsigned char *c;
+ unsigned char *d;
for (l = n; l < HASH_FACTOR(len / SSH_BLOCKSIZE); l = l << 2) {
}
@@ -129,11 +129,11 @@
if (h == NULL) {
n = l;
- h = (uint32 FAR *) malloc(n * HASH_ENTRYSIZE);
+ h = (uint32 *) malloc(n * HASH_ENTRYSIZE);
} else {
if (l > n) {
n = l;
- h = (uint32 FAR *) realloc(h, n * HASH_ENTRYSIZE);
+ h = (uint32 *) realloc(h, n * HASH_ENTRYSIZE);
}
}
@@ -188,7 +188,7 @@
return DEATTACK_OK;
}
-BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char FAR * buf,
+BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char *buf,
int bytes)
{
if (SSHv1(pvar)) {
@@ -204,11 +204,11 @@
}
}
-static void no_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void no_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
}
-static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
unsigned char *newbuf;
int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
@@ -242,7 +242,7 @@
free(newbuf);
}
-static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
unsigned char *newbuf;
int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
@@ -276,9 +276,9 @@
free(newbuf);
}
-static void c3DES_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void c3DES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- Cipher3DESState FAR *encryptstate = &pvar->crypt_state.enc.c3DES;
+ Cipher3DESState *encryptstate = &pvar->crypt_state.enc.c3DES;
DES_ncbc_encrypt(buf, buf, bytes,
&encryptstate->k1, &encryptstate->ivec1, DES_ENCRYPT);
@@ -288,9 +288,9 @@
&encryptstate->k3, &encryptstate->ivec3, DES_ENCRYPT);
}
-static void c3DES_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void c3DES_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- Cipher3DESState FAR *decryptstate = &pvar->crypt_state.dec.c3DES;
+ Cipher3DESState *decryptstate = &pvar->crypt_state.dec.c3DES;
DES_ncbc_encrypt(buf, buf, bytes,
&decryptstate->k3, &decryptstate->ivec3, DES_DECRYPT);
@@ -300,25 +300,25 @@
&decryptstate->k1, &decryptstate->ivec1, DES_DECRYPT);
}
-static void cDES_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cDES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- CipherDESState FAR *encryptstate = &pvar->crypt_state.enc.cDES;
+ CipherDESState *encryptstate = &pvar->crypt_state.enc.cDES;
DES_ncbc_encrypt(buf, buf, bytes,
&encryptstate->k, &encryptstate->ivec, DES_ENCRYPT);
}
-static void cDES_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cDES_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- CipherDESState FAR *decryptstate = &pvar->crypt_state.dec.cDES;
+ CipherDESState *decryptstate = &pvar->crypt_state.dec.cDES;
DES_ncbc_encrypt(buf, buf, bytes,
&decryptstate->k, &decryptstate->ivec, DES_DECRYPT);
}
-static void flip_endianness(unsigned char FAR * cbuf, int bytes)
+static void flip_endianness(unsigned char *cbuf, int bytes)
{
- uint32 FAR *buf = (uint32 FAR *) cbuf;
+ uint32 *buf = (uint32 *) cbuf;
int count = bytes / 4;
while (count > 0) {
@@ -331,9 +331,9 @@
}
}
-static void cBlowfish_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cBlowfish_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- CipherBlowfishState FAR *encryptstate =
+ CipherBlowfishState *encryptstate =
&pvar->crypt_state.enc.cBlowfish;
flip_endianness(buf, bytes);
@@ -342,9 +342,9 @@
flip_endianness(buf, bytes);
}
-static void cBlowfish_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cBlowfish_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
{
- CipherBlowfishState FAR *decryptstate =
+ CipherBlowfishState *decryptstate =
&pvar->crypt_state.dec.cBlowfish;
flip_endianness(buf, bytes);
@@ -353,7 +353,7 @@
flip_endianness(buf, bytes);
}
-void CRYPT_set_random_data(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+void CRYPT_set_random_data(PTInstVar pvar, unsigned char *buf, int bytes)
{
RAND_bytes(buf, bytes);
}
@@ -365,7 +365,7 @@
//RAND_screen();
}
-static BIGNUM FAR *get_bignum(unsigned char FAR * bytes)
+static BIGNUM *get_bignum(unsigned char *bytes)
{
int bits = get_ushort16_MSBfirst(bytes);
@@ -373,11 +373,11 @@
}
// make_key()\x82\xF0 fingerprint \x90\xB6\x90\xAC\x82ł\xE0\x97\x98\x97p\x82\xB7\x82\xE9\x82̂ŁAstatic\x82\xF0\x8D폜\x81B(2006.3.27 yutaka)
-RSA FAR *make_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp,
- unsigned char FAR * mod)
+RSA *make_key(PTInstVar pvar,
+ int bits, unsigned char *exp,
+ unsigned char *mod)
{
- RSA FAR *key = RSA_new();
+ RSA *key = RSA_new();
if (key != NULL) {
key->e = get_bignum(exp);
@@ -405,7 +405,7 @@
}
}
-void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char FAR * cookie)
+void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char *cookie)
{
if (SSHv1(pvar)) {
memcpy(pvar->crypt_state.server_cookie, cookie, SSH_COOKIE_LENGTH);
@@ -415,7 +415,7 @@
}
}
-void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char FAR * cookie)
+void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char *cookie)
{
if (SSHv2(pvar)) {
memcpy(pvar->crypt_state.client_cookie, cookie,
@@ -424,8 +424,8 @@
}
BOOL CRYPT_set_server_RSA_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp,
- unsigned char FAR * mod)
+ int bits, unsigned char *exp,
+ unsigned char *mod)
{
pvar->crypt_state.server_key.RSA_key = make_key(pvar, bits, exp, mod);
@@ -433,8 +433,8 @@
}
BOOL CRYPT_set_host_RSA_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp,
- unsigned char FAR * mod)
+ int bits, unsigned char *exp,
+ unsigned char *mod)
{
pvar->crypt_state.host_key.RSA_key = make_key(pvar, bits, exp, mod);
@@ -544,7 +544,7 @@
// \x81\xA6\x96{\x8A\x94\x82\xCD SSH2 \x82ł̂ݎg\x97p\x82\xB3\x82\xEA\x82\xE9\x81B
// (2004.12.17 yutaka)
BOOL CRYPT_verify_receiver_MAC(PTInstVar pvar, uint32 sequence_number,
- char FAR * data, int len, char FAR * MAC)
+ char *data, int len, char *MAC)
{
HMAC_CTX c;
unsigned char m[EVP_MAX_MD_SIZE];
@@ -605,7 +605,7 @@
// for SSH2
BOOL CRYPT_build_sender_MAC(PTInstVar pvar, uint32 sequence_number,
- char FAR * data, int len, char FAR * MAC)
+ char *data, int len, char *MAC)
{
HMAC_CTX c;
static u_char m[EVP_MAX_MD_SIZE];
@@ -697,7 +697,7 @@
}
int CRYPT_choose_session_key(PTInstVar pvar,
- unsigned char FAR * encrypted_key_buf)
+ unsigned char *encrypted_key_buf)
{
int server_key_bits =
BN_num_bits(pvar->crypt_state.server_key.RSA_key->n);
@@ -724,7 +724,7 @@
/* following Goldberg's code, I'm using MD5(servkey->n || hostkey->n || cookie)
for the session ID, rather than the one specified in the RFC */
int session_buf_len = server_key_bytes + host_key_bytes + 8;
- char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+ char *session_buf = (char *) malloc(session_buf_len);
char session_id[16];
int i;
@@ -795,9 +795,9 @@
}
int CRYPT_generate_RSA_challenge_response(PTInstVar pvar,
- unsigned char FAR * challenge,
+ unsigned char *challenge,
int challenge_len,
- unsigned char FAR * response)
+ unsigned char *response)
{
int server_key_bits =
BN_num_bits(pvar->crypt_state.server_key.RSA_key->n);
@@ -805,7 +805,7 @@
int server_key_bytes = (server_key_bits + 7) / 8;
int host_key_bytes = (host_key_bits + 7) / 8;
int session_buf_len = server_key_bytes + host_key_bytes + 8;
- char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+ char *session_buf = (char *) malloc(session_buf_len);
char decrypted_challenge[48];
int decrypted_challenge_len;
@@ -843,24 +843,24 @@
return 1;
}
-static void c3DES_init(char FAR * session_key, Cipher3DESState FAR * state)
+static void c3DES_init(char *session_key, Cipher3DESState *state)
{
- DES_set_key((const_DES_cblock FAR *) session_key, &state->k1);
- DES_set_key((const_DES_cblock FAR *) (session_key + 8), &state->k2);
- DES_set_key((const_DES_cblock FAR *) (session_key + 16), &state->k3);
+ DES_set_key((const_DES_cblock *) session_key, &state->k1);
+ DES_set_key((const_DES_cblock *) (session_key + 8), &state->k2);
+ DES_set_key((const_DES_cblock *) (session_key + 16), &state->k3);
memset(state->ivec1, 0, 8);
memset(state->ivec2, 0, 8);
memset(state->ivec3, 0, 8);
}
-static void cDES_init(char FAR * session_key, CipherDESState FAR * state)
+static void cDES_init(char *session_key, CipherDESState *state)
{
- DES_set_key((const_DES_cblock FAR *) session_key, &state->k);
+ DES_set_key((const_DES_cblock *) session_key, &state->k);
memset(state->ivec, 0, 8);
}
-static void cBlowfish_init(char FAR * session_key,
- CipherBlowfishState FAR * state)
+static void cBlowfish_init(char *session_key,
+ CipherBlowfishState *state)
{
BF_set_key(&state->k, 32, session_key);
memset(state->ivec, 0, 8);
@@ -940,8 +940,8 @@
BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag)
{
struct Enc *enc;
- char FAR *encryption_key = pvar->crypt_state.sender_cipher_key;
- char FAR *decryption_key = pvar->crypt_state.receiver_cipher_key;
+ char *encryption_key = pvar->crypt_state.sender_cipher_key;
+ char *decryption_key = pvar->crypt_state.receiver_cipher_key;
int cipher;
BOOL isOK = TRUE;
@@ -1061,7 +1061,7 @@
HASH_MINSIZE / HASH_ENTRYSIZE;
}
-static char FAR *get_cipher_name(int cipher)
+static char *get_cipher_name(int cipher)
{
switch (cipher) {
case SSH_CIPHER_NONE:
@@ -1122,7 +1122,7 @@
}
}
-void CRYPT_get_cipher_info(PTInstVar pvar, char FAR * dest, int len)
+void CRYPT_get_cipher_info(PTInstVar pvar, char *dest, int len)
{
UTIL_get_lang_msg("DLG_ABOUT_CIPHER_INFO", pvar,
"%s to server, %s from server");
@@ -1131,7 +1131,7 @@
get_cipher_name(pvar->crypt_state.receiver_cipher));
}
-void CRYPT_get_server_key_info(PTInstVar pvar, char FAR * dest, int len)
+void CRYPT_get_server_key_info(PTInstVar pvar, char *dest, int len)
{
if (SSHv1(pvar)) {
if (pvar->crypt_state.server_key.RSA_key == NULL
@@ -1191,8 +1191,8 @@
SecureZeroMemory(&pvar->crypt_state.dec, sizeof(pvar->crypt_state.dec));
}
-int CRYPT_passphrase_decrypt(int cipher, char FAR * passphrase,
- char FAR * buf, int bytes)
+int CRYPT_passphrase_decrypt(int cipher, char *passphrase,
+ char *buf, int bytes)
{
unsigned char passphrase_key[16];
@@ -1202,11 +1202,11 @@
case SSH_CIPHER_3DES:{
Cipher3DESState state;
- DES_set_key((const_DES_cblock FAR *) passphrase_key,
+ DES_set_key((const_DES_cblock *) passphrase_key,
&state.k1);
- DES_set_key((const_DES_cblock FAR *) (passphrase_key + 8),
+ DES_set_key((const_DES_cblock *) (passphrase_key + 8),
&state.k2);
- DES_set_key((const_DES_cblock FAR *) passphrase_key,
+ DES_set_key((const_DES_cblock *) passphrase_key,
&state.k3);
memset(state.ivec1, 0, 8);
memset(state.ivec2, 0, 8);
Modified: trunk/ttssh2/ttxssh/crypt.h
===================================================================
--- trunk/ttssh2/ttxssh/crypt.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/crypt.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -66,7 +66,7 @@
} CipherBlowfishState;
typedef struct {
- uint32 FAR * h;
+ uint32 *h;
uint32 n;
} CRYPTDetectAttack;
@@ -80,7 +80,7 @@
CipherBlowfishState cBlowfish;
} CRYPTCipherState;
-typedef void (* CRYPTCryptFun)(PTInstVar pvar, unsigned char FAR * buf, int bytes);
+typedef void (* CRYPTCryptFun)(PTInstVar pvar, unsigned char *buf, int bytes);
typedef struct {
CRYPTDetectAttack detect_attack_statics;
@@ -108,35 +108,35 @@
from the server. Therefore we have some time available to do some
moderately expensive computations. */
void CRYPT_initialize_random_numbers(PTInstVar pvar);
-void CRYPT_set_random_data(PTInstVar pvar, unsigned char FAR * buf, int bytes);
+void CRYPT_set_random_data(PTInstVar pvar, unsigned char *buf, int bytes);
void CRYPT_end(PTInstVar pvar);
-void CRYPT_get_cipher_info(PTInstVar pvar, char FAR * dest, int len);
-void CRYPT_get_server_key_info(PTInstVar pvar, char FAR * dest, int len);
+void CRYPT_get_cipher_info(PTInstVar pvar, char *dest, int len);
+void CRYPT_get_server_key_info(PTInstVar pvar, char *dest, int len);
-void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char FAR * cookie);
-void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char FAR * cookie);
+void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char *cookie);
+void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char *cookie);
#define CRYPT_get_server_cookie(pvar) ((pvar)->crypt_state.server_cookie)
-void CRYPT_free_public_key(CRYPTPublicKey FAR * key);
+void CRYPT_free_public_key(CRYPTPublicKey *key);
BOOL CRYPT_set_server_RSA_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+ int bits, unsigned char *exp, unsigned char *mod);
BOOL CRYPT_set_host_RSA_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+ int bits, unsigned char *exp, unsigned char *mod);
int CRYPT_get_encrypted_session_key_len(PTInstVar pvar);
-int CRYPT_choose_session_key(PTInstVar pvar, unsigned char FAR * encrypted_key_buf);
+int CRYPT_choose_session_key(PTInstVar pvar, unsigned char *encrypted_key_buf);
BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag);
-int CRYPT_generate_RSA_challenge_response(PTInstVar pvar, unsigned char FAR * challenge,
- int challenge_len, unsigned char FAR * response);
+int CRYPT_generate_RSA_challenge_response(PTInstVar pvar, unsigned char *challenge,
+ int challenge_len, unsigned char *response);
int CRYPT_get_receiver_MAC_size(PTInstVar pvar);
BOOL CRYPT_verify_receiver_MAC(PTInstVar pvar, uint32 sequence_number,
- char FAR * data, int len, char FAR * MAC);
+ char *data, int len, char *MAC);
int CRYPT_get_sender_MAC_size(PTInstVar pvar);
BOOL CRYPT_build_sender_MAC(PTInstVar pvar, uint32 sequence_number,
- char FAR * data, int len, char FAR * MAC);
+ char *data, int len, char *MAC);
BOOL CRYPT_set_supported_ciphers(PTInstVar pvar, int sender_ciphers, int receiver_ciphers);
BOOL CRYPT_choose_ciphers(PTInstVar pvar);
@@ -149,10 +149,10 @@
#define CRYPT_decrypt(pvar, buf, bytes) \
((pvar)->crypt_state.decrypt((pvar), (buf), (bytes)))
-BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char FAR * buf, int bytes);
-int CRYPT_passphrase_decrypt(int cipher, char FAR * passphrase, char FAR * buf, int len);
-RSA FAR *make_key(PTInstVar pvar,
- int bits, unsigned char FAR * exp,
- unsigned char FAR * mod);
+BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char *buf, int bytes);
+int CRYPT_passphrase_decrypt(int cipher, char *passphrase, char *buf, int len);
+RSA *make_key(PTInstVar pvar,
+ int bits, unsigned char *exp,
+ unsigned char *mod);
#endif
Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/dns.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,7 +51,7 @@
return 0;
}
-int verify_hostkey_dns(PTInstVar pvar, char FAR *hostname, Key *key)
+int verify_hostkey_dns(PTInstVar pvar, char *hostname, Key *key)
{
DNS_STATUS status;
PDNS_RECORD rec, p;
Modified: trunk/ttssh2/ttxssh/dns.h
===================================================================
--- trunk/ttssh2/ttxssh/dns.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/dns.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -63,6 +63,6 @@
} DNS_SSHFP_DATA, *PDNS_SSHFP_DATA;
int is_numeric_hostname(const char *hostname);
-int verify_hostkey_dns(PTInstVar pvar, char FAR *hostname, Key *key);
+int verify_hostkey_dns(PTInstVar pvar, char *hostname, Key *key);
#endif // __TTSSH_DNS_H
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwd.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -109,7 +109,7 @@
static int find_listening_socket_num(PTInstVar pvar, int request_num,
SOCKET s)
{
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
int i;
for (i = 0; i < request->num_listening_sockets; ++i)
@@ -123,7 +123,7 @@
static void drain_matching_messages(HWND wnd, UINT msg, WPARAM wParam)
{
MSG m;
- MSG FAR *buf;
+ MSG *buf;
int buf_len;
int buf_size;
int i;
@@ -136,12 +136,12 @@
/* suck out all the messages */
buf_size = 1;
buf_len = 0;
- buf = (MSG FAR *) malloc(sizeof(MSG) * buf_size);
+ buf = (MSG *) malloc(sizeof(MSG) * buf_size);
while (PeekMessage(&m, wnd, msg, msg, PM_REMOVE)) {
if (buf_len == buf_size) {
buf_size *= 2;
- buf = (MSG FAR *) realloc(buf, sizeof(MSG) * buf_size);
+ buf = (MSG *) realloc(buf, sizeof(MSG) * buf_size);
}
buf[buf_len] = m;
@@ -207,7 +207,7 @@
static void request_error(PTInstVar pvar, int request_num, int err)
{
- SOCKET FAR *s =
+ SOCKET *s =
pvar->fwd_state.requests[request_num].listening_sockets;
int i;
@@ -229,7 +229,7 @@
static void send_local_connection_closure(PTInstVar pvar, int channel_num)
{
- FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+ FWDChannel *channel = pvar->fwd_state.channels + channel_num;
if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
== (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -241,7 +241,7 @@
static void closed_local_connection(PTInstVar pvar, int channel_num)
{
- FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+ FWDChannel *channel = pvar->fwd_state.channels + channel_num;
if (channel->local_socket != INVALID_SOCKET) {
safe_closesocket(pvar, channel->local_socket);
@@ -255,7 +255,7 @@
active channels. */
static void really_delete_request(PTInstVar pvar, int request_num)
{
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
if (request->to_host_lookup_handle != 0) {
safe_WSACancelAsyncRequest(pvar, request->to_host_lookup_handle);
@@ -268,7 +268,7 @@
void FWD_free_channel(PTInstVar pvar, uint32 local_channel_num)
{
- FWDChannel FAR *channel = &pvar->fwd_state.channels[local_channel_num];
+ FWDChannel *channel = &pvar->fwd_state.channels[local_channel_num];
if (channel->type == TYPE_AGENT) { // TYPE_AGENT \x82ł\xB1\x82\xB1\x82ɗ\x88\x82\xE9\x82̂\xCD SSH1 \x82̂\xDD
buffer_free(channel->agent_msg);
@@ -291,7 +291,7 @@
}
if (channel->request_num >= 0) {
- FWDRequest FAR *request =
+ FWDRequest *request =
&pvar->fwd_state.requests[channel->request_num];
request->num_channels--;
@@ -305,7 +305,7 @@
void FWD_channel_input_eof(PTInstVar pvar, uint32 local_channel_num)
{
- FWDChannel FAR *channel;
+ FWDChannel *channel;
if (!FWD_check_local_channel_num(pvar, local_channel_num))
return;
@@ -324,7 +324,7 @@
void FWD_channel_output_eof(PTInstVar pvar, uint32 local_channel_num)
{
- FWDChannel FAR *channel;
+ FWDChannel *channel;
if (!FWD_check_local_channel_num(pvar, local_channel_num))
return;
@@ -341,7 +341,7 @@
}
}
-static char FAR *describe_socket_error(PTInstVar pvar, int code)
+static char *describe_socket_error(PTInstVar pvar, int code)
{
switch (code) {
case WSAECONNREFUSED:
@@ -373,10 +373,10 @@
}
}
-static void channel_error(PTInstVar pvar, char FAR * action,
+static void channel_error(PTInstVar pvar, char *action,
int channel_num, int err)
{
- char FAR *err_msg;
+ char *err_msg;
char uimsg[MAX_UIMSG];
closed_local_connection(pvar, channel_num);
@@ -410,8 +410,8 @@
static void channel_opening_error(PTInstVar pvar, int channel_num, int err)
{
char buf[1024];
- FWDChannel FAR *channel = &pvar->fwd_state.channels[channel_num];
- FWDRequest FAR *request =
+ FWDChannel *channel = &pvar->fwd_state.channels[channel_num];
+ FWDRequest *request =
&pvar->fwd_state.requests[channel->request_num];
char uimsg[MAX_UIMSG];
@@ -446,7 +446,7 @@
int i;
int new_num_channels;
int new_channel = -1;
- FWDChannel FAR *channel;
+ FWDChannel *channel;
for (i = 0; i < pvar->fwd_state.num_channels && new_channel < 0; i++) {
if (pvar->fwd_state.channels[i].status == 0) {
@@ -457,7 +457,7 @@
if (new_channel < 0) {
new_num_channels = pvar->fwd_state.num_channels + 1;
pvar->fwd_state.channels =
- (FWDChannel FAR *) realloc(pvar->fwd_state.channels,
+ (FWDChannel *) realloc(pvar->fwd_state.channels,
sizeof(FWDChannel) *
new_num_channels);
@@ -491,7 +491,7 @@
int i;
int new_num_channels;
int new_channel = -1;
- FWDChannel FAR *channel;
+ FWDChannel *channel;
for (i = 0; i < pvar->fwd_state.num_channels && new_channel < 0; i++) {
if (pvar->fwd_state.channels[i].status == 0) {
@@ -502,7 +502,7 @@
if (new_channel < 0) {
new_num_channels = pvar->fwd_state.num_channels + 1;
pvar->fwd_state.channels =
- (FWDChannel FAR *) realloc(pvar->fwd_state.channels,
+ (FWDChannel *) realloc(pvar->fwd_state.channels,
sizeof(FWDChannel) *
new_num_channels);
@@ -552,8 +552,8 @@
static void make_local_connection(PTInstVar pvar, int channel_num)
{
- FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
- FWDRequest FAR *request =
+ FWDChannel *channel = pvar->fwd_state.channels + channel_num;
+ FWDRequest *request =
pvar->fwd_state.requests + channel->request_num;
for (channel->to_host_addrs = request->to_host_addrs;
@@ -600,21 +600,21 @@
char strport[NI_MAXSERV]; // ws2tcpip.h
int addrlen = sizeof(addr);
char buf[1024];
- BYTE FAR *IP;
- FWDChannel FAR *channel;
- FWDRequest FAR *request = &pvar->fwd_state.requests[request_num];
+ BYTE *IP;
+ FWDChannel *channel;
+ FWDRequest *request = &pvar->fwd_state.requests[request_num];
BOOL is_localhost = FALSE;
s = accept(request->listening_sockets[listening_socket_num],
- (struct sockaddr FAR *) &addr, &addrlen);
+ (struct sockaddr *) &addr, &addrlen);
if (s == INVALID_SOCKET)
return;
- IP = (BYTE FAR *) & ((struct sockaddr_in *) (&addr))->sin_addr.s_addr;
+ IP = (BYTE *) & ((struct sockaddr_in *) (&addr))->sin_addr.s_addr;
// SSH2 port-forwarding\x82ɐڑ\xB1\x8C\xB3\x82̃\x8A\x83\x82\x81[\x83g\x83|\x81[\x83g\x82\xAA\x95K\x97v\x81B(2005.2.27 yutaka)
if (getnameinfo
- ((struct sockaddr FAR *) &addr, addrlen, hname, sizeof(hname),
+ ((struct sockaddr *) &addr, addrlen, hname, sizeof(hname),
strport, sizeof(strport), NI_NUMERICHOST | NI_NUMERICSERV)) {
/* NOT REACHED */
}
@@ -640,7 +640,7 @@
static void write_local_connection_buffer(PTInstVar pvar, int channel_num)
{
- FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+ FWDChannel *channel = pvar->fwd_state.channels + channel_num;
if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
== (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -653,7 +653,7 @@
static void read_local_connection(PTInstVar pvar, int channel_num)
{
- FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+ FWDChannel *channel = pvar->fwd_state.channels + channel_num;
if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
!= (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -670,7 +670,7 @@
//OutputDebugPrintf("%s: recv %d\n", __FUNCTION__, amount);
if (amount > 0) {
- char FAR *new_buf = buf;
+ char *new_buf = buf;
int action = FWD_FILTER_RETAIN;
if (channel->filter != NULL) {
@@ -784,7 +784,7 @@
case WM_SOCK_IO:{
int channel_num = find_channel_num(pvar, (SOCKET) wParam);
- FWDChannel FAR *channel =
+ FWDChannel *channel =
pvar->fwd_state.channels + channel_num;
if (channel_num < 0)
@@ -867,11 +867,11 @@
wParam, lParam);
}
-int FWD_compare_specs(void const FAR * void_spec1,
- void const FAR * void_spec2)
+int FWD_compare_specs(void const *void_spec1,
+ void const *void_spec2)
{
- FWDRequestSpec FAR *spec1 = (FWDRequestSpec FAR *) void_spec1;
- FWDRequestSpec FAR *spec2 = (FWDRequestSpec FAR *) void_spec2;
+ FWDRequestSpec *spec1 = (FWDRequestSpec *) void_spec1;
+ FWDRequestSpec *spec2 = (FWDRequestSpec *) void_spec2;
int delta = spec1->from_port - spec2->from_port;
if (delta == 0) {
@@ -890,8 +890,8 @@
so that we never lie to the server about where its forwarded connection is
ending up. Maybe some SSH implementation depends on this information being
reliable, for security? */
-static BOOL can_server_listen_using(FWDRequestSpec FAR * listener,
- FWDRequestSpec FAR * spec)
+static BOOL can_server_listen_using(FWDRequestSpec *listener,
+ FWDRequestSpec *spec)
{
return listener->type == spec->type
&& listener->from_port == spec->from_port
@@ -902,7 +902,7 @@
|| strcmp(listener->bind_address, spec->bind_address) == 0);
}
-BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec FAR * spec)
+BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec *spec)
{
int num_server_listening_requests =
pvar->fwd_state.num_server_listening_specs;
@@ -910,7 +910,7 @@
if (num_server_listening_requests < 0) {
return TRUE;
} else {
- FWDRequestSpec FAR *listener =
+ FWDRequestSpec *listener =
bsearch(spec, pvar->fwd_state.server_listening_specs,
num_server_listening_requests,
sizeof(FWDRequestSpec), FWD_compare_specs);
@@ -937,7 +937,7 @@
return num_request_specs;
}
-void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs,
+void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec *specs,
int num_specs)
{
int i;
@@ -956,11 +956,11 @@
It returns the listening socket for the request, if there is one.
The caller must close this socket if it is not INVALID_SOCKET.
*/
-static SOCKET FAR *delete_request(PTInstVar pvar, int request_num,
+static SOCKET *delete_request(PTInstVar pvar, int request_num,
int *p_num_listening_sockets)
{
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
- SOCKET FAR *lp_listening_sockets;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
+ SOCKET *lp_listening_sockets;
/* safe to shut down the listening socket here. Any pending connections
that haven't yet been turned into channels will be broken, but that's
@@ -981,8 +981,8 @@
return lp_listening_sockets;
}
-static BOOL are_specs_identical(FWDRequestSpec FAR * spec1,
- FWDRequestSpec FAR * spec2)
+static BOOL are_specs_identical(FWDRequestSpec *spec1,
+ FWDRequestSpec *spec2)
{
return spec1->type == spec2->type
&& spec1->from_port == spec2->from_port
@@ -994,12 +994,12 @@
static BOOL interactive_init_request(PTInstVar pvar, int request_num,
BOOL report_error)
{
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
if (request->spec.type == FWD_LOCAL_TO_REMOTE) {
struct addrinfo hints;
- struct addrinfo FAR *res;
- struct addrinfo FAR *res0;
+ struct addrinfo *res;
+ struct addrinfo *res0;
SOCKET s;
char pname[NI_MAXSERV];
char bname[NI_MAXHOST];
@@ -1020,7 +1020,7 @@
res = res->ai_next)
request->num_listening_sockets++;
request->listening_sockets =
- (SOCKET FAR *) malloc(sizeof(SOCKET) *
+ (SOCKET *) malloc(sizeof(SOCKET) *
request->num_listening_sockets);
if (request->listening_sockets == NULL) {
freeaddrinfo(res0);
@@ -1073,10 +1073,10 @@
/* This function will only be called on a request when all its channels are
closed. */
static BOOL init_request(PTInstVar pvar, int request_num,
- BOOL report_error, SOCKET FAR * listening_sockets,
+ BOOL report_error, SOCKET *listening_sockets,
int num_listening_sockets)
{
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
request->num_listening_sockets = 0;
request->listening_sockets = NULL;
@@ -1099,17 +1099,17 @@
}
}
-void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs,
+void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec *specs,
int num_specs)
{
- FWDRequestSpec FAR *new_specs =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
- char FAR *specs_accounted_for;
+ FWDRequestSpec *new_specs =
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
+ char *specs_accounted_for;
typedef struct _saved_sockets {
- SOCKET FAR *listening_sockets;
+ SOCKET *listening_sockets;
int num_listening_sockets;
} saved_sockets_t;
- saved_sockets_t FAR *ptr_to_saved_sockets;
+ saved_sockets_t *ptr_to_saved_sockets;
int i;
int num_new_requests = num_specs;
int num_free_requests = 0;
@@ -1129,9 +1129,9 @@
}
}
- specs_accounted_for = (char FAR *) malloc(sizeof(char) * num_specs);
+ specs_accounted_for = (char *) malloc(sizeof(char) * num_specs);
ptr_to_saved_sockets =
- (saved_sockets_t FAR *) malloc(sizeof(saved_sockets_t) *
+ (saved_sockets_t *) malloc(sizeof(saved_sockets_t) *
num_specs);
memset(specs_accounted_for, 0, num_specs);
@@ -1142,9 +1142,9 @@
for (i = pvar->fwd_state.num_requests - 1; i >= 0; i--) {
if ((pvar->fwd_state.requests[i].status & FWD_DELETED) == 0) {
- FWDRequestSpec FAR *cur_spec =
+ FWDRequestSpec *cur_spec =
&pvar->fwd_state.requests[i].spec;
- FWDRequestSpec FAR *new_spec =
+ FWDRequestSpec *new_spec =
bsearch(cur_spec, new_specs, num_specs,
sizeof(FWDRequestSpec), FWD_compare_specs);
@@ -1154,7 +1154,7 @@
num_new_requests--;
} else {
int num_listening_sockets;
- SOCKET FAR *listening_sockets;
+ SOCKET *listening_sockets;
listening_sockets =
delete_request(pvar, i, &num_listening_sockets);
@@ -1186,7 +1186,7 @@
pvar->fwd_state.num_requests + num_new_requests - num_free_requests;
pvar->fwd_state.requests =
- (FWDRequest FAR *) realloc(pvar->fwd_state.requests,
+ (FWDRequest *) realloc(pvar->fwd_state.requests,
sizeof(FWDRequest) *
total_requests);
for (i = pvar->fwd_state.num_requests; i < total_requests; i++) {
@@ -1227,7 +1227,7 @@
int num_server_listening_requests = 0;
for (i = 0; i < pvar->fwd_state.num_requests; i++) {
- FWDRequest FAR *request = pvar->fwd_state.requests + i;
+ FWDRequest *request = pvar->fwd_state.requests + i;
if ((request->status & FWD_DELETED) == 0) {
switch (request->spec.type) {
@@ -1263,8 +1263,8 @@
num_server_listening_requests;
if (num_server_listening_requests > 0) {
- FWDRequestSpec FAR *server_listening_requests =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) *
+ FWDRequestSpec *server_listening_requests =
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) *
num_server_listening_requests);
pvar->fwd_state.server_listening_specs = server_listening_requests;
@@ -1309,8 +1309,8 @@
{
char buf[1024];
int channel_num;
- FWDChannel FAR *channel;
- FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+ FWDChannel *channel;
+ FWDRequest *request = pvar->fwd_state.requests + request_num;
struct addrinfo hints;
char pname[NI_MAXSERV];
@@ -1365,8 +1365,8 @@
}
void FWD_open(PTInstVar pvar, uint32 remote_channel_num,
- char FAR * local_hostname, int local_port,
- char FAR * originator, int originator_len,
+ char *local_hostname, int local_port,
+ char *originator, int originator_len,
int *chan_num)
{
int i;
@@ -1373,7 +1373,7 @@
char buf[1024];
for (i = 0; i < pvar->fwd_state.num_requests; i++) {
- FWDRequest FAR *request = pvar->fwd_state.requests + i;
+ FWDRequest *request = pvar->fwd_state.requests + i;
if (SSHv1(pvar)) {
if ((request->status & FWD_DELETED) == 0
@@ -1401,7 +1401,7 @@
/* now, before we panic, maybe we TOLD the server we could forward this port
and then the user changed the settings. */
for (i = 0; i < pvar->fwd_state.num_server_listening_specs; i++) {
- FWDRequestSpec FAR *spec =
+ FWDRequestSpec *spec =
pvar->fwd_state.server_listening_specs + i;
if (spec->type == FWD_REMOTE_TO_LOCAL
@@ -1423,13 +1423,13 @@
}
void FWD_X11_open(PTInstVar pvar, uint32 remote_channel_num,
- char FAR * originator, int originator_len,
+ char *originator, int originator_len,
int *chan_num)
{
int i;
for (i = 0; i < pvar->fwd_state.num_requests; i++) {
- FWDRequest FAR *request = pvar->fwd_state.requests + i;
+ FWDRequest *request = pvar->fwd_state.requests + i;
if ((request->status & FWD_DELETED) == 0
&& request->spec.type == FWD_REMOTE_X11_TO_LOCAL) {
@@ -1448,7 +1448,7 @@
/* now, before we panic, maybe we TOLD the server we could forward this port
and then the user changed the settings. */
for (i = 0; i < pvar->fwd_state.num_server_listening_specs; i++) {
- FWDRequestSpec FAR *spec =
+ FWDRequestSpec *spec =
pvar->fwd_state.server_listening_specs + i;
if (spec->type == FWD_REMOTE_X11_TO_LOCAL) {
@@ -1479,7 +1479,7 @@
uint32 remote_channel_num)
{
SOCKET s;
- FWDChannel FAR *channel;
+ FWDChannel *channel;
if (!FWD_check_local_channel_num(pvar, local_channel_num))
return;
@@ -1510,7 +1510,7 @@
FWD_free_channel(pvar, local_channel_num);
}
-static BOOL blocking_write(PTInstVar pvar, SOCKET s, const char FAR * data,
+static BOOL blocking_write(PTInstVar pvar, SOCKET s, const char *data,
int length)
{
u_long do_block = 0;
@@ -1550,10 +1550,10 @@
}
void FWD_received_data(PTInstVar pvar, uint32 local_channel_num,
- unsigned char FAR * data, int length)
+ unsigned char *data, int length)
{
SOCKET s;
- FWDChannel FAR *channel;
+ FWDChannel *channel;
int action = FWD_FILTER_RETAIN;
if (!FWD_check_local_channel_num(pvar, local_channel_num))
@@ -1630,7 +1630,7 @@
for (i = 0; i < pvar->fwd_state.num_requests; i++) {
int j;
int num_listening_sockets;
- SOCKET FAR *s =
+ SOCKET *s =
delete_request(pvar, i, &num_listening_sockets);
for (j = 0; j < num_listening_sockets; ++j) {
Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwd.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,8 +51,8 @@
/* a length == 0 means that we're killing the channel and the filter
should deallocate */
-typedef int (* FWDFilter)(void FAR * closure, int direction,
- int FAR * length, unsigned char FAR * FAR * buf);
+typedef int (* FWDFilter)(void *closure, int direction,
+ int *length, unsigned char **buf);
typedef struct {
int status;
@@ -61,9 +61,9 @@
int request_num;
UTILSockWriteBuf writebuf;
- void FAR * filter_closure;
+ void *filter_closure;
FWDFilter filter;
- struct addrinfo FAR * to_host_addrs;
+ struct addrinfo *to_host_addrs;
// for agent forwarding
buffer_t *agent_msg;
@@ -99,8 +99,8 @@
#define MAX_LISTENING_SOCKETS 4096
typedef struct {
int num_listening_sockets;
- SOCKET FAR * listening_sockets;
- struct addrinfo FAR * to_host_addrs;
+ SOCKET *listening_sockets;
+ struct addrinfo *to_host_addrs;
HANDLE to_host_lookup_handle;
int num_channels;
@@ -114,13 +114,13 @@
WNDPROC old_accept_wnd_proc;
int num_server_listening_specs;
/* stored in sorted order */
- FWDRequestSpec FAR * server_listening_specs;
+ FWDRequestSpec *server_listening_specs;
int num_requests;
- FWDRequest FAR * requests;
+ FWDRequest *requests;
int num_channels;
- FWDChannel FAR * channels;
- struct sockaddr_storage FAR * local_host_IP_numbers;
- struct _X11AuthData FAR * X11_auth_data;
+ FWDChannel *channels;
+ struct sockaddr_storage *local_host_IP_numbers;
+ struct _X11AuthData *X11_auth_data;
BOOL in_interactive_mode;
} FWDState;
@@ -129,25 +129,25 @@
given request. Before the SSH session's prep phase, this returns true for
all requests. After the SSH session's prep phase, this returns true only
for requests that the server actually was told about during the prep phase. */
-BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec FAR * spec);
+BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec *spec);
int FWD_get_num_request_specs(PTInstVar pvar);
-void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs, int num_specs);
-void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs, int num_specs);
-int FWD_compare_specs(void const FAR * void_spec1, void const FAR * void_spec2);
+void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec *specs, int num_specs);
+void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec *specs, int num_specs);
+int FWD_compare_specs(void const *void_spec1, void const *void_spec2);
void FWD_prep_forwarding(PTInstVar pvar);
void FWD_enter_interactive_mode(PTInstVar pvar);
void FWD_open(PTInstVar pvar, uint32 remote_channel_num,
- char FAR * local_hostname, int local_port,
- char FAR * originator, int originator_len,
+ char *local_hostname, int local_port,
+ char *originator, int originator_len,
int *chan_num);
void FWD_X11_open(PTInstVar pvar, uint32 remote_channel_num,
- char FAR * originator, int originator_len,
+ char *originator, int originator_len,
int *chan_num);
void FWD_confirmed_open(PTInstVar pvar, uint32 local_channel_num,
uint32 remote_channel_num);
void FWD_failed_open(PTInstVar pvar, uint32 local_channel_num);
void FWD_received_data(PTInstVar pvar, uint32 local_channel_num,
- unsigned char FAR * data, int length);
+ unsigned char *data, int length);
void FWD_channel_input_eof(PTInstVar pvar, uint32 local_channel_num);
void FWD_channel_output_eof(PTInstVar pvar, uint32 local_channel_num);
void FWD_end(PTInstVar pvar);
Modified: trunk/ttssh2/ttxssh/fwdui.c
===================================================================
--- trunk/ttssh2/ttxssh/fwdui.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwdui.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -42,11 +42,11 @@
typedef struct {
int port;
- char FAR *name;
+ char *name;
} TCP_service_name;
typedef struct {
- FWDRequestSpec FAR *spec;
+ FWDRequestSpec *spec;
PTInstVar pvar;
} FWDEditClosure;
@@ -370,15 +370,15 @@
{210, "z3950"}
};
-static int compare_services(void const FAR * elem1, void const FAR * elem2)
+static int compare_services(void const *elem1, void const *elem2)
{
- TCP_service_name FAR *s1 = (TCP_service_name FAR *) elem1;
- TCP_service_name FAR *s2 = (TCP_service_name FAR *) elem2;
+ TCP_service_name *s1 = (TCP_service_name *) elem1;
+ TCP_service_name *s2 = (TCP_service_name *) elem2;
return strcmp(s1->name, s2->name);
}
-static void make_X_forwarding_spec(FWDRequestSpec FAR * spec, PTInstVar pvar)
+static void make_X_forwarding_spec(FWDRequestSpec *spec, PTInstVar pvar)
{
spec->type = FWD_REMOTE_X11_TO_LOCAL;
spec->from_port = -1;
@@ -412,7 +412,7 @@
}
} else {
char lower_buf[32];
- TCP_service_name FAR *result;
+ TCP_service_name *result;
TCP_service_name key;
for (i = 0; buf[i] != 0 && i < sizeof(lower_buf) - 1; i++) {
@@ -421,7 +421,7 @@
lower_buf[i] = 0;
key.name = lower_buf;
- result = (TCP_service_name FAR *)
+ result = (TCP_service_name *)
bsearch(&key, service_DB, NUM_ELEM(service_DB),
sizeof(service_DB[0]), compare_services);
@@ -561,10 +561,10 @@
static void FWDUI_save_settings(PTInstVar pvar)
{
int num_specs = FWD_get_num_request_specs(pvar);
- FWDRequestSpec FAR *requests =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
+ FWDRequestSpec *requests =
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
int i;
- char FAR *str = pvar->settings.DefaultForwarding;
+ char *str = pvar->settings.DefaultForwarding;
int str_remaining = sizeof(pvar->settings.DefaultForwarding) - 1;
char format[20];
@@ -582,7 +582,7 @@
}
if (str_remaining > 0) {
- FWDRequestSpec FAR *spec = requests + i;
+ FWDRequestSpec *spec = requests + i;
int chars;
// IPv6 \x83A\x83h\x83\x8C\x83X\x82Ȃ\xE7 "[", "]" \x82\xF0\x95t\x89\xC1\x82\xB5\x82ĕ\xB6\x8E\x9A\x97\xF1\x89\xBB
@@ -671,11 +671,11 @@
void FWDUI_load_settings(PTInstVar pvar)
{
- char FAR *str = pvar->settings.DefaultForwarding;
+ char *str = pvar->settings.DefaultForwarding;
if (str[0] != 0) {
int i, ch, j;
- FWDRequestSpec FAR *requests;
+ FWDRequestSpec *requests;
j = 1;
for (i = 0; (ch = str[i]) != 0; i++) {
@@ -685,7 +685,7 @@
}
requests =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * j);
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * j);
j = 0;
if (parse_request(requests, str, pvar)) {
@@ -729,8 +729,8 @@
{
}
-static void set_verbose_port(char FAR * buf, int bufsize, int port,
- char FAR * name)
+static void set_verbose_port(char *buf, int bufsize, int port,
+ char *name)
{
if (*name >= '0' && *name <= '9') {
strncpy_s(buf, bufsize, name, _TRUNCATE);
@@ -741,7 +741,7 @@
buf[bufsize - 1] = 0;
}
-static void get_spec_string(FWDRequestSpec FAR * spec, char FAR * buf,
+static void get_spec_string(FWDRequestSpec *spec, char *buf,
int bufsize, PTInstVar pvar)
{
char verbose_from_port[64];
@@ -790,7 +790,7 @@
update_listbox_selection(dlg);
}
-static int add_spec_to_listbox(HWND dlg, FWDRequestSpec FAR * spec, PTInstVar pvar)
+static int add_spec_to_listbox(HWND dlg, FWDRequestSpec *spec, PTInstVar pvar)
{
char buf[1024];
HWND listbox = GetDlgItem(dlg, IDC_SSHFWDLIST);
@@ -801,7 +801,7 @@
index = SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM) buf);
if (index >= 0) {
- FWDRequestSpec FAR *listbox_spec = malloc(sizeof(FWDRequestSpec));
+ FWDRequestSpec *listbox_spec = malloc(sizeof(FWDRequestSpec));
*listbox_spec = *spec;
if (SendMessage
@@ -817,8 +817,8 @@
static void init_fwd_dlg(PTInstVar pvar, HWND dlg)
{
int num_specs = FWD_get_num_request_specs(pvar);
- FWDRequestSpec FAR *requests =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
+ FWDRequestSpec *requests =
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
int i;
char uimsg[MAX_UIMSG];
@@ -867,7 +867,7 @@
static void free_listbox_spec(HWND listbox, int selection)
{
- FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+ FWDRequestSpec *spec = (FWDRequestSpec *)
SendMessage(listbox, LB_GETITEMDATA, selection, 0);
if (spec != NULL) {
@@ -892,14 +892,14 @@
int num_items = SendMessage(listbox, LB_GETCOUNT, 0, 0);
BOOL X_enabled = IsDlgButtonChecked(dlg, IDC_SSHFWDX11);
int num_specs = X_enabled ? 1 : 0;
- FWDRequestSpec FAR *specs =
- (FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) *
+ FWDRequestSpec *specs =
+ (FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) *
(num_specs + num_items));
int i;
int num_unspecified_forwardings = 0;
for (i = 0; i < num_items; i++) {
- FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+ FWDRequestSpec *spec = (FWDRequestSpec *)
SendMessage(listbox, LB_GETITEMDATA, i, 0);
if (spec != NULL) {
@@ -1027,7 +1027,7 @@
shift_over_input(dlg, type, IDC_SSHRTLTOPORT, IDC_SSHLTRTOPORT);
}
-static void setup_edit_controls(HWND dlg, FWDRequestSpec FAR * spec,
+static void setup_edit_controls(HWND dlg, FWDRequestSpec *spec,
WORD radio_item,
WORD from_port_item, WORD listen_address_item,
WORD to_host_item, WORD to_port_item)
@@ -1046,7 +1046,7 @@
set_dir_options_status(dlg);
}
-static void init_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec FAR * spec, HWND dlg)
+static void init_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec *spec, HWND dlg)
{
char uimsg[MAX_UIMSG];
@@ -1107,7 +1107,7 @@
}
static void grab_control_text(HWND dlg, int type, WORD rtl_item,
- WORD ltr_item, char FAR * buf, int bufsize)
+ WORD ltr_item, char *buf, int bufsize)
{
GetDlgItemText(dlg, type == FWD_REMOTE_TO_LOCAL ? rtl_item : ltr_item,
buf, bufsize);
@@ -1114,7 +1114,7 @@
buf[bufsize - 1] = 0;
}
-static BOOL end_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec FAR * spec,
+static BOOL end_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec *spec,
HWND dlg)
{
FWDRequestSpec new_spec;
@@ -1192,7 +1192,7 @@
static BOOL CALLBACK fwd_edit_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
LPARAM lParam)
{
- FWDEditClosure FAR *closure;
+ FWDEditClosure *closure;
PTInstVar pvar;
LOGFONT logfont;
HFONT font;
@@ -1200,7 +1200,7 @@
switch (msg) {
case WM_INITDIALOG:
- closure = (FWDEditClosure FAR *) lParam;
+ closure = (FWDEditClosure *) lParam;
SetWindowLong(dlg, DWL_USER, lParam);
pvar = closure->pvar;
@@ -1233,7 +1233,7 @@
return FALSE; /* because we set the focus */
case WM_COMMAND:
- closure = (FWDEditClosure FAR *) GetWindowLong(dlg, DWL_USER);
+ closure = (FWDEditClosure *) GetWindowLong(dlg, DWL_USER);
switch (LOWORD(wParam)) {
case IDOK:
@@ -1307,7 +1307,7 @@
int cursel = SendMessage(listbox, LB_GETCURSEL, 0, 0);
if (cursel >= 0) {
- FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+ FWDRequestSpec *spec = (FWDRequestSpec *)
SendMessage(listbox, LB_GETITEMDATA, cursel, 0);
if (spec != NULL) {
Modified: trunk/ttssh2/ttxssh/hosts.c
===================================================================
--- trunk/ttssh2/ttxssh/hosts.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/hosts.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -59,12 +59,12 @@
static char base64[] ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static char FAR *FAR * parse_multi_path(char FAR * buf)
+static char **parse_multi_path(char *buf)
{
int i;
int ch;
int num_paths = 1;
- char FAR *FAR * result;
+ char ** result;
int last_path_index;
for (i = 0; (ch = buf[i]) != 0; i++) {
@@ -74,7 +74,7 @@
}
result =
- (char FAR * FAR *) malloc(sizeof(char FAR *) * (num_paths + 1));
+ (char **) malloc(sizeof(char *) * (num_paths + 1));
last_path_index = 0;
num_paths = 0;
@@ -112,7 +112,7 @@
//
// known_hosts\x83t\x83@\x83C\x83\x8B\x82̓\xE0\x97e\x82\xF0\x82\xB7\x82ׂ\xC4 pvar->hosts_state.file_data \x82֓ǂݍ\x9E\x82\xDE
//
-static int begin_read_file(PTInstVar pvar, char FAR * name,
+static int begin_read_file(PTInstVar pvar, char *name,
int suppress_errors)
{
int fd;
@@ -196,7 +196,7 @@
}
// MIME64\x82̕\xB6\x8E\x9A\x97\xF1\x82\xF0\x83X\x83L\x83b\x83v\x82\xB7\x82\xE9
-static int eat_base64(char FAR * data)
+static int eat_base64(char *data)
{
int index = 0;
int ch;
@@ -214,7 +214,7 @@
return index;
}
-static int eat_spaces(char FAR * data)
+static int eat_spaces(char *data)
{
int index = 0;
int ch;
@@ -225,7 +225,7 @@
return index;
}
-static int eat_digits(char FAR * data)
+static int eat_digits(char *data)
{
int index = 0;
int ch;
@@ -236,7 +236,7 @@
return index;
}
-static int eat_to_end_of_line(char FAR * data)
+static int eat_to_end_of_line(char *data)
{
int index = 0;
int ch;
@@ -252,7 +252,7 @@
return index;
}
-static int eat_to_end_of_pattern(char FAR * data)
+static int eat_to_end_of_pattern(char *data)
{
int index = 0;
int ch;
@@ -301,7 +301,7 @@
}
-static char FAR *parse_bignum(char FAR * data)
+static char *parse_bignum(char *data)
{
uint32 digits = 0;
BIGNUM *num = BN_new();
@@ -308,7 +308,7 @@
BIGNUM *billion = BN_new();
BIGNUM *digits_num = BN_new();
BN_CTX *ctx = BN_CTX_new();
- char FAR *result;
+ char *result;
int ch;
int leftover_digits = 1;
@@ -335,7 +335,7 @@
BN_mul(num, num, billion, ctx);
BN_add(num, num, digits_num);
- result = (char FAR *) malloc(2 + BN_num_bytes(num));
+ result = (char *) malloc(2 + BN_num_bytes(num));
set_ushort16_MSBfirst(result, BN_num_bits(num));
BN_bn2bin(num, result + 2);
@@ -350,8 +350,8 @@
//
// known_hosts\x83t\x83@\x83C\x83\x8B\x82̓\xE0\x97e\x82\xF0\x89\xF0\x90͂\xB5\x81A\x8Ew\x92肵\x82\xBD\x83z\x83X\x83g\x82̌\xF6\x8AJ\x8C\xAE\x82\xF0\x92T\x82\xB7\x81B
//
-static int check_host_key(PTInstVar pvar, char FAR * hostname,
- unsigned short tcpport, char FAR * data,
+static int check_host_key(PTInstVar pvar, char *hostname,
+ unsigned short tcpport, char *data,
Key *key)
{
int index = eat_spaces(data);
@@ -504,7 +504,7 @@
// 1: 1\x8Ds\x82\xBE\x82\xAF\x92T\x82\xB5\x82Ė߂\xE9
//
static int read_host_key(PTInstVar pvar,
- char FAR * hostname, unsigned short tcpport,
+ char *hostname, unsigned short tcpport,
int suppress_errors, int return_always,
Key *key)
{
@@ -541,7 +541,7 @@
do {
if (pvar->hosts_state.file_data == NULL
|| pvar->hosts_state.file_data[pvar->hosts_state.file_data_index] == 0) {
- char FAR *filename;
+ char *filename;
int keep_going = 1;
if (pvar->hosts_state.file_data != NULL) {
@@ -593,7 +593,7 @@
}
// \x83T\x81[\x83o\x82ڑ\xB1\x82\xB7\x82\xE9\x91O\x82ɁAknown_hosts\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82\xF0\x90\xE6\x93ǂ݂\xB5\x82Ă\xA8\x82\xAD\x81B
-void HOSTS_prefetch_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport)
+void HOSTS_prefetch_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport)
{
Key key; // known_hosts\x82ɓo\x98^\x82\xB3\x82\xEA\x82Ă\xA2\x82錮
@@ -621,8 +621,8 @@
// return:
// *keyptr != NULL \x8E擾\x90\xAC\x8C\xF7
//
-static int parse_hostkey_file(PTInstVar pvar, char FAR * hostname,
- unsigned short tcpport, char FAR * data, Key **keyptr)
+static int parse_hostkey_file(PTInstVar pvar, char *hostname,
+ unsigned short tcpport, char *data, Key **keyptr)
{
int index = eat_spaces(data);
int matched = 0;
@@ -778,7 +778,7 @@
int success = 0;
int suppress_errors = 1;
unsigned short tcpport;
- char FAR *filename;
+ char *filename;
char *hostname;
Key *key;
@@ -831,8 +831,8 @@
}
-static BOOL equal_mp_ints(unsigned char FAR * num1,
- unsigned char FAR * num2)
+static BOOL equal_mp_ints(unsigned char *num1,
+ unsigned char *num2)
{
if (num1 == NULL || num2 == NULL) {
return FALSE;
@@ -857,8 +857,8 @@
int HOSTS_compare_public_key(Key *src, Key *key)
{
int bits;
- unsigned char FAR * exp;
- unsigned char FAR * mod;
+ unsigned char *exp;
+ unsigned char *mod;
const EC_GROUP *group;
const EC_POINT *pa, *pb;
Key *a, *b;
@@ -984,7 +984,7 @@
hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
}
-static int print_mp_int(char FAR * buf, unsigned char FAR * mp)
+static int print_mp_int(char *buf, unsigned char *mp)
{
int i = 0, j, k;
BIGNUM *num = BN_new();
@@ -1011,7 +1011,7 @@
//
// known_hosts \x83t\x83@\x83C\x83\x8B\x82֕ۑ\xB6\x82\xB7\x82\xE9\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B
//
-static char FAR *format_host_key(PTInstVar pvar)
+static char *format_host_key(PTInstVar pvar)
{
int host_len = strlen(pvar->hosts_state.prefetched_hostname);
char *result = NULL;
@@ -1024,7 +1024,7 @@
int result_len = host_len + 50 + 8 +
get_ushort16_MSBfirst(pvar->hosts_state.hostkey.exp) / 3 +
get_ushort16_MSBfirst(pvar->hosts_state.hostkey.mod) / 3;
- result = (char FAR *) malloc(result_len);
+ result = (char *) malloc(result_len);
if (pvar->ssh_state.tcpport == 22) {
strncpy_s(result, result_len, pvar->hosts_state.prefetched_hostname, _TRUNCATE);
@@ -1107,7 +1107,7 @@
return result;
}
-static char FAR *format_specified_host_key(Key *key, char *hostname, unsigned short tcpport)
+static char *format_specified_host_key(Key *key, char *hostname, unsigned short tcpport)
{
int host_len = strlen(hostname);
char *result = NULL;
@@ -1120,7 +1120,7 @@
int result_len = host_len + 50 + 8 +
get_ushort16_MSBfirst(key->exp) / 3 +
get_ushort16_MSBfirst(key->mod) / 3;
- result = (char FAR *) malloc(result_len);
+ result = (char *) malloc(result_len);
if (tcpport == 22) {
strncpy_s(result, result_len, hostname, _TRUNCATE);
@@ -1206,7 +1206,7 @@
static void add_host_key(PTInstVar pvar)
{
- char FAR *name = NULL;
+ char *name = NULL;
if ( pvar->hosts_state.file_names != NULL)
name = pvar->hosts_state.file_names[0];
@@ -1217,7 +1217,7 @@
"Restart Tera Term and specify a read/write known-hosts file in the TTSSH Setup dialog box.");
notify_nonfatal_error(pvar, pvar->ts->UIMsg);
} else {
- char FAR *keydata = format_host_key(pvar);
+ char *keydata = format_host_key(pvar);
int length = strlen(keydata);
int fd;
int amount_written;
@@ -1259,7 +1259,7 @@
// \x8Ew\x92肵\x82\xBD\x83L\x81[\x82\xF0 known_hosts \x82ɒlj\xC1\x82\xB7\x82\xE9\x81B
void HOSTS_add_host_key(PTInstVar pvar, Key *key)
{
- char FAR *name = NULL;
+ char *name = NULL;
char *hostname;
unsigned short tcpport;
@@ -1276,7 +1276,7 @@
notify_nonfatal_error(pvar, pvar->ts->UIMsg);
}
else {
- char FAR *keydata = format_specified_host_key(key, hostname, tcpport);
+ char *keydata = format_specified_host_key(key, hostname, tcpport);
int length = strlen(keydata);
int fd;
int amount_written;
@@ -1322,7 +1322,7 @@
//
static void delete_different_key(PTInstVar pvar)
{
- char FAR *name = pvar->hosts_state.file_names[0];
+ char *name = pvar->hosts_state.file_names[0];
if (name == NULL || name[0] == 0) {
UTIL_get_lang_msg("MSG_HOSTS_FILE_UNSPECIFY_ERROR", pvar,
@@ -1371,7 +1371,7 @@
int host_index = 0;
int matched = 0;
int keybits = 0;
- char FAR *data;
+ char *data;
int do_write = 0;
length = amount_written = 0;
@@ -1506,7 +1506,7 @@
void HOSTS_delete_all_hostkeys(PTInstVar pvar)
{
- char FAR *name = pvar->hosts_state.file_names[0];
+ char *name = pvar->hosts_state.file_names[0];
char *hostname;
unsigned short tcpport;
@@ -1561,7 +1561,7 @@
int host_index = 0;
int matched = 0;
int keybits = 0;
- char FAR *data;
+ char *data;
int do_write = 0;
length = amount_written = 0;
@@ -2229,7 +2229,7 @@
//
// SSH2\x91Ή\x9E\x82\xF0\x92lj\xC1 (2006.3.24 yutaka)
//
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport, Key *key)
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport, Key *key)
{
int found_different_key = 0, found_different_type_key = 0;
Key key2; // known_hosts\x82ɓo\x98^\x82\xB3\x82\xEA\x82Ă\xA2\x82錮
Modified: trunk/ttssh2/ttxssh/hosts.h
===================================================================
--- trunk/ttssh2/ttxssh/hosts.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/hosts.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -35,13 +35,13 @@
#define __HOSTS_H
typedef struct {
- char FAR * prefetched_hostname;
+ char *prefetched_hostname;
#if 0
int key_bits;
/* The key exponent and modulus, in SSH mp_int format */
- unsigned char FAR * key_exp;
- unsigned char FAR * key_mod;
+ unsigned char *key_exp;
+ unsigned char *key_mod;
#else
// \x83z\x83X\x83g\x83L\x81[(SSH1,SSH2)\x82\xCD Key \x8D\\x91\xA2\x91̂ɏW\x96\xE9
Key hostkey;
@@ -48,9 +48,9 @@
#endif
int file_num;
- char FAR * FAR * file_names;
+ char **file_names;
int file_data_index;
- char FAR * file_data; // known_hosts\x83t\x83@\x83C\x83\x8B\x82̓\xE0\x97e\x82\xAA\x82\xB7\x82ׂĊi\x94[\x82\xB3\x82\xEA\x82\xE9
+ char *file_data; // known_hosts\x83t\x83@\x83C\x83\x8B\x82̓\xE0\x97e\x82\xAA\x82\xB7\x82ׂĊi\x94[\x82\xB3\x82\xEA\x82\xE9
HWND hosts_dialog;
} HOSTSState;
@@ -59,12 +59,12 @@
void HOSTS_init(PTInstVar pvar);
void HOSTS_open(PTInstVar pvar);
-void HOSTS_prefetch_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport);
+void HOSTS_prefetch_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport);
#if 0
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname,
- int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname,
+ int bits, unsigned char *exp, unsigned char *mod);
#else
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport, Key *key);
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport, Key *key);
#endif
void HOSTS_do_unknown_host_dialog(HWND wnd, PTInstVar pvar);
void HOSTS_do_different_key_dialog(HWND wnd, PTInstVar pvar);
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/key.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -478,10 +478,10 @@
return (ret); // success
}
-static char FAR *copy_mp_int(char FAR * num)
+static char *copy_mp_int(char *num)
{
int len = (get_ushort16_MSBfirst(num) + 7) / 8 + 2;
- char FAR *result = (char FAR *) malloc(len);
+ char *result = (char *) malloc(len);
if (result != NULL) {
memcpy(result, num, len);
@@ -2081,7 +2081,7 @@
strncat_s(buf, buf_len, "\r\n", _TRUNCATE);
}
}
- SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf);
+ SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)buf);
free(buf);
}
@@ -2088,7 +2088,7 @@
if (ctx->nold > 0) {
buf_len = 100 * ctx->nold;
buf = calloc(100, ctx->nold);
- SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)"");
+ SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)"");
for (i = 0; i < ctx->nold; i++) {
switch (dgst_alg) {
case SSH_DIGEST_MD5:
@@ -2109,7 +2109,7 @@
strncat_s(buf, buf_len, "\r\n", _TRUNCATE);
}
}
- SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf);
+ SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)buf);
free(buf);
}
}
Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/keyfiles.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,7 +51,7 @@
static char ID_string[] = "SSH PRIVATE KEY FILE FORMAT 1.1\n";
-static BIGNUM FAR *get_bignum(unsigned char FAR * bytes)
+static BIGNUM *get_bignum(unsigned char *bytes)
{
int bits = get_ushort16_MSBfirst(bytes);
@@ -63,7 +63,7 @@
It's needed to work around "issues" with LIBEAY/RSAREF.
If this function returns 0, then something went wrong and the
key must be discarded. */
-static BOOL normalize_key(RSA FAR * key)
+static BOOL normalize_key(RSA *key)
{
BOOL OK = FALSE;
BIGNUM *r = BN_new();
@@ -107,7 +107,7 @@
unsigned char *keyfile_data;
unsigned int index;
int cipher;
- RSA FAR *key;
+ RSA *key;
unsigned int E_index, N_index, D_index, U_index, P_index, Q_index = 0;
*invalid_passphrase = FALSE;
Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/pkt.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -144,7 +144,7 @@
-- reads data from the sshd and feeds the SSH protocol packets to ssh.c
-- copies any available decrypted session data into the application buffer
*/
-int PKT_recv(PTInstVar pvar, char FAR * buf, int buflen)
+int PKT_recv(PTInstVar pvar, char *buf, int buflen)
{
int amount_in_buf = 0;
BOOL connection_closed = FALSE;
@@ -197,7 +197,7 @@
} else if (pvar->pkt_state.seen_server_ID
&& pvar->pkt_state.datalen >=
(unsigned int) SSH_get_min_packet_size(pvar)) {
- char FAR *data =
+ char *data =
pvar->pkt_state.buf + pvar->pkt_state.datastart;
uint32 padding;
uint32 pktsize;
Modified: trunk/ttssh2/ttxssh/pkt.h
===================================================================
--- trunk/ttssh2/ttxssh/pkt.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/pkt.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -39,7 +39,7 @@
#define PACKET_MAX_SIZE (4 * 1024 * 1024)
typedef struct {
- char FAR * buf;
+ char *buf;
unsigned long buflen;
unsigned long datastart;
unsigned long datalen;
@@ -49,7 +49,7 @@
} PKTState;
void PKT_init(PTInstVar pvar);
-int PKT_recv(PTInstVar pvar, char FAR * buf, int buflen);
+int PKT_recv(PTInstVar pvar, char *buf, int buflen);
void PKT_end(PTInstVar pvar);
#endif
Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/sftp.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -832,7 +832,7 @@
if (buf[0] != '\0') {
SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) buf);
SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
- (LPARAM) (char FAR *) "\r\n");
+ (LPARAM) (char *) "\r\n");
goto cmd_parsed;
}
}
@@ -1117,7 +1117,7 @@
case WM_USER_CONSOLE:
SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) lp);
SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
- (LPARAM) (char FAR *) "\r\n");
+ (LPARAM) (char *) "\r\n");
return TRUE;
#if 0
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ssh.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -739,7 +739,7 @@
'len' is the length of the
payload + padding (+ length of CRC for SSHv1). 'padding' is the length
of the padding alone. */
-static int prep_packet(PTInstVar pvar, char FAR * data, int len,
+static int prep_packet(PTInstVar pvar, char *data, int len,
int padding)
{
pvar->ssh_state.payload = data + 4;
@@ -857,9 +857,9 @@
or for the packet type byte).
Returns a pointer to the payload data area, a region of length 'len',
to be filled by the caller. */
-unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len)
+unsigned char *begin_send_packet(PTInstVar pvar, int type, int len)
{
- unsigned char FAR *buf;
+ unsigned char *buf;
pvar->ssh_state.outgoing_packet_len = len + 1;
@@ -890,7 +890,7 @@
// \x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂ŁA\x82\xBB\x82̏ꍇ\x82̓G\x83\x89\x81[\x82Ƃ\xB5\x82Ȃ\xA2\x81B
// \x82\xB1\x82\xEA\x82ɂ\xE6\x82\xE8\x81ATCP\x83R\x83l\x83N\x83V\x83\x87\x83\x93\x90ؒf\x82̌댟\x8Fo\x82\xF0\x96h\x82\xAE\x81B
// (2006.12.9 yutaka)
-static int retry_send_packet(PTInstVar pvar, char FAR * data, int len)
+static int retry_send_packet(PTInstVar pvar, char *data, int len)
{
int n;
int err;
@@ -917,7 +917,7 @@
return 0; // success
}
-static BOOL send_packet_blocking(PTInstVar pvar, char FAR * data, int len)
+static BOOL send_packet_blocking(PTInstVar pvar, char *data, int len)
{
// \x83p\x83P\x83b\x83g\x91\x97\x90M\x8C\xE3\x82Ƀo\x83b\x83t\x83@\x82\xF0\x8Eg\x82\xA2\x82܂킷\x82\xBD\x82߁A\x83u\x83\x8D\x83b\x83L\x83\x93\x83O\x82ő\x97\x90M\x82\xB5\x82Ă\xB5\x82܂\xA4\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
// \x83m\x83\x93\x83u\x83\x8D\x83b\x83L\x83\x93\x83O\x82ő\x97\x90M\x82\xB5\x82\xC4WSAEWOULDBLOCK\x82\xAA\x95Ԃ\xC1\x82Ă\xAB\x82\xBD\x8Fꍇ\x81A\x82\xBB\x82̃o\x83b\x83t\x83@\x82͑\x97\x90M\x8A\xAE\x97\xB9\x82\xB7\x82\xE9
@@ -986,7 +986,7 @@
void finish_send_packet_special(PTInstVar pvar, int skip_compress)
{
unsigned int len = pvar->ssh_state.outgoing_packet_len;
- unsigned char FAR *data;
+ unsigned char *data;
unsigned int data_length;
buffer_t *msg = NULL; // for SSH2 packet compression
@@ -1151,18 +1151,18 @@
handlers fires, if it returns FALSE, then all handlers in the set are
removed from their queues. */
static void enque_handlers(PTInstVar pvar, int num_msgs,
- const int FAR * messages,
- const SSHPacketHandler FAR * handlers)
+ const int *messages,
+ const SSHPacketHandler *handlers)
{
- SSHPacketHandlerItem FAR *first_item;
- SSHPacketHandlerItem FAR *last_item = NULL;
+ SSHPacketHandlerItem *first_item;
+ SSHPacketHandlerItem *last_item = NULL;
int i;
for (i = 0; i < num_msgs; i++) {
- SSHPacketHandlerItem FAR *item =
- (SSHPacketHandlerItem FAR *)
+ SSHPacketHandlerItem *item =
+ (SSHPacketHandlerItem *)
malloc(sizeof(SSHPacketHandlerItem));
- SSHPacketHandlerItem FAR *cur_item =
+ SSHPacketHandlerItem *cur_item =
pvar->ssh_state.packet_handlers[messages[i]];
item->handler = handlers[i];
@@ -1195,7 +1195,7 @@
static SSHPacketHandler get_handler(PTInstVar pvar, int message)
{
- SSHPacketHandlerItem FAR *cur_item =
+ SSHPacketHandlerItem *cur_item =
pvar->ssh_state.packet_handlers[message];
if (cur_item == NULL) {
@@ -1208,18 +1208,18 @@
/* Called only by SSH_handle_packet */
static void deque_handlers(PTInstVar pvar, int message)
{
- SSHPacketHandlerItem FAR *cur_item =
+ SSHPacketHandlerItem *cur_item =
pvar->ssh_state.packet_handlers[message];
- SSHPacketHandlerItem FAR *first_item_in_set = cur_item;
+ SSHPacketHandlerItem *first_item_in_set = cur_item;
if (cur_item == NULL)
return;
do {
- SSHPacketHandlerItem FAR *next_in_set = cur_item->next_in_set;
+ SSHPacketHandlerItem *next_in_set = cur_item->next_in_set;
if (cur_item->active_for_message >= 0) {
- SSHPacketHandlerItem FAR *replacement =
+ SSHPacketHandlerItem *replacement =
cur_item->next_for_message;
if (replacement == cur_item) {
@@ -1247,7 +1247,7 @@
enque_handlers(pvar, 1, &message, &handler);
}
-static void chop_newlines(char FAR * buf)
+static void chop_newlines(char *buf)
{
int len = strlen(buf);
@@ -1365,7 +1365,7 @@
static BOOL handle_debug(PTInstVar pvar)
{
BOOL always_display;
- char FAR *description;
+ char *description;
int description_len;
char buf[2048];
@@ -1411,10 +1411,10 @@
static BOOL handle_disconnect(PTInstVar pvar)
{
int reason_code;
- char FAR *description;
+ char *description;
int description_len;
char buf[2048];
- char FAR *explanation = "";
+ char *explanation = "";
char uimsg[MAX_UIMSG];
if (SSHv1(pvar)) {
@@ -1527,7 +1527,7 @@
int host_key_public_modulus_len;
int protocol_flags_pos;
int supported_ciphers;
- char FAR *inmsg;
+ char *inmsg;
Key hostkey;
int supported_types;
@@ -1609,9 +1609,9 @@
The ID must have already been found to start with "SSH-". It must
be null-terminated.
*/
-static BOOL parse_protocol_ID(PTInstVar pvar, char FAR * ID)
+static BOOL parse_protocol_ID(PTInstVar pvar, char *ID)
{
- char FAR *str;
+ char *str;
for (str = ID + 4; *str >= '0' && *str <= '9'; str++) {
}
@@ -1743,7 +1743,7 @@
}
}
-BOOL SSH_handle_server_ID(PTInstVar pvar, char FAR * ID, int ID_len)
+BOOL SSH_handle_server_ID(PTInstVar pvar, char *ID, int ID_len)
{
static char prefix[64];
int negotiate;
@@ -1757,11 +1757,11 @@
return FALSE;
} else {
int buf_len;
- char FAR *buf;
+ char *buf;
strncpy_s(prefix, sizeof(prefix), "Received server identification string: ", _TRUNCATE);
buf_len = strlen(prefix) + ID_len + 1;
- buf = (char FAR *) malloc(buf_len);
+ buf = (char *) malloc(buf_len);
strncpy_s(buf, buf_len, prefix, _TRUNCATE);
strncat_s(buf, buf_len, ID, _TRUNCATE);
chop_newlines(buf);
@@ -1845,7 +1845,7 @@
strncpy_s(prefix, sizeof(prefix), "Sent client identification string: ", _TRUNCATE);
buf_len = strlen(prefix) + strlen(pvar->client_version_string) + 1;
- buf = (char FAR *) malloc(buf_len);
+ buf = (char *) malloc(buf_len);
strncpy_s(buf, buf_len, prefix, _TRUNCATE);
strncat_s(buf, buf_len, pvar->client_version_string, _TRUNCATE);
notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
@@ -2109,7 +2109,7 @@
}
-void SSH_handle_packet(PTInstVar pvar, char FAR * data, int len,
+void SSH_handle_packet(PTInstVar pvar, char *data, int len,
int padding)
{
unsigned char message = prep_packet(pvar, data, len, padding);
@@ -2144,7 +2144,7 @@
pvar->ts->UIMsg, message, handle_message_stage);
notify_fatal_error(pvar, buf, TRUE);
} else {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH2_MSG_UNIMPLEMENTED, 4);
set_uint32(outmsg,
@@ -2191,7 +2191,7 @@
static void prep_pty(PTInstVar pvar)
{
int len = strlen(pvar->ts->TermType);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_REQUEST_PTY,
4 + len + 16 + sizeof(ssh_ttymodes));
static const int msgs[] = { SSH_SMSG_SUCCESS, SSH_SMSG_FAILURE };
@@ -2354,7 +2354,7 @@
static const SSHPacketHandler handlers[]
= { handle_enable_compression, handle_disable_compression };
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_REQUEST_COMPRESSION, 4);
set_uint32(outmsg, pvar->session_settings.CompressionLevel);
@@ -2394,7 +2394,7 @@
challenge_bytes = get_mpint_len(pvar, 0);
if (grab_payload(pvar, challenge_bytes)) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RSA_RESPONSE, 16);
if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA) {
@@ -2423,7 +2423,7 @@
int server_key_bytes = (server_key_bits + 7) / 8;
int host_key_bytes = (host_key_bits + 7) / 8;
int session_buf_len = server_key_bytes + host_key_bytes + 8;
- char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+ char *session_buf = (char *) malloc(session_buf_len);
unsigned char session_id[16];
unsigned char *hash;
@@ -2464,7 +2464,7 @@
static void try_send_credentials(PTInstVar pvar)
{
if ((pvar->ssh_state.status_flags & STATUS_DONT_SEND_CREDENTIALS) == 0) {
- AUTHCred FAR *cred = AUTH_get_cur_cred(pvar);
+ AUTHCred *cred = AUTH_get_cur_cred(pvar);
static const int RSA_msgs[] =
{ SSH_SMSG_AUTH_RSA_CHALLENGE, SSH_SMSG_FAILURE };
static const SSHPacketHandler RSA_handlers[]
@@ -2483,7 +2483,7 @@
return;
case SSH_AUTH_PASSWORD:{
int len = strlen(cred->password);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_PASSWORD,
4 + len);
@@ -2505,7 +2505,7 @@
}
case SSH_AUTH_RHOSTS:{
int len = strlen(cred->rhosts_client_user);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS, 4 + len);
notify_verbose_message(pvar,
@@ -2520,7 +2520,7 @@
}
case SSH_AUTH_RSA:{
int len = BN_num_bytes(cred->key_pair->rsa->n);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + len);
notify_verbose_message(pvar,
@@ -2538,7 +2538,7 @@
int name_len = strlen(cred->rhosts_client_user);
int exp_len = BN_num_bytes(cred->key_pair->rsa->e);
int index;
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS_RSA,
12 + mod_len + name_len + exp_len);
@@ -2562,7 +2562,7 @@
break;
}
case SSH_AUTH_PAGEANT:{
- unsigned char FAR *outmsg;
+ unsigned char *outmsg;
unsigned char *pubkey;
int len, bn_bytes;
@@ -2604,7 +2604,7 @@
}
case SSH_AUTH_TIS:{
if (cred->password == NULL) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_TIS, 0);
notify_verbose_message(pvar,
@@ -2613,7 +2613,7 @@
enque_handlers(pvar, 2, TIS_msgs, TIS_handlers);
} else {
int len = strlen(cred->password);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_AUTH_TIS_RESPONSE,
4 + len);
@@ -2648,11 +2648,11 @@
static void try_send_user_name(PTInstVar pvar)
{
if ((pvar->ssh_state.status_flags & STATUS_DONT_SEND_USER_NAME) == 0) {
- char FAR *username = AUTH_get_user_name(pvar);
+ char *username = AUTH_get_user_name(pvar);
if (username != NULL) {
int len = strlen(username);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_USER, 4 + len);
char buf[1024] = "Sending user name: ";
static const int msgs[] =
@@ -2677,7 +2677,7 @@
static void send_session_key(PTInstVar pvar)
{
int encrypted_session_key_len;
- unsigned char FAR *outmsg;
+ unsigned char *outmsg;
if (SSHv1(pvar)) {
encrypted_session_key_len =
@@ -2770,11 +2770,11 @@
pvar->ssh_state.win_rows = pvar->ts->TerminalHeight;
}
-void SSH_notify_disconnecting(PTInstVar pvar, char FAR * reason)
+void SSH_notify_disconnecting(PTInstVar pvar, char *reason)
{
if (SSHv1(pvar)) {
int len = reason == NULL ? 0 : strlen(reason);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_DISCONNECT, len + 4);
set_uint32(outmsg, len);
@@ -2845,7 +2845,7 @@
if (SSHv1(pvar)) {
if (get_handler(pvar, SSH_SMSG_STDOUT_DATA) == handle_data) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_WINDOW_SIZE, 16);
set_uint32(outmsg, rows); // window height (characters)
@@ -2953,7 +2953,7 @@
/* data is guaranteed to be at least SSH_get_min_packet_size bytes long
at least 5 bytes must be decrypted */
-void SSH_predecrpyt_packet(PTInstVar pvar, char FAR * data)
+void SSH_predecrpyt_packet(PTInstVar pvar, char *data)
{
if (SSHv2(pvar)) {
CRYPT_decrypt(pvar, data, get_predecryption_amount(pvar));
@@ -2979,7 +2979,7 @@
try_send_credentials(pvar);
}
-void SSH_send(PTInstVar pvar, unsigned char const FAR * buf, unsigned int buflen)
+void SSH_send(PTInstVar pvar, unsigned char const *buf, unsigned int buflen)
{
// RAW\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x92lj\xC1 (2008.8.15 yutaka)
if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -2996,7 +2996,7 @@
int len =
buflen >
SSH_MAX_SEND_PACKET_SIZE ? SSH_MAX_SEND_PACKET_SIZE : buflen;
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_STDIN_DATA, 4 + len);
set_uint32(outmsg, len);
@@ -3021,7 +3021,7 @@
}
pvar->ssh_state.compress_stream.next_in =
- (unsigned char FAR *) buf;
+ (unsigned char *) buf;
pvar->ssh_state.compress_stream.avail_in = len;
if (deflate(&pvar->ssh_state.compress_stream, Z_SYNC_FLUSH) != Z_OK) {
@@ -3047,7 +3047,7 @@
}
-int SSH_extract_payload(PTInstVar pvar, unsigned char FAR * dest, int len)
+int SSH_extract_payload(PTInstVar pvar, unsigned char *dest, int len)
{
int num_bytes = pvar->ssh_state.payload_datalen;
@@ -3077,7 +3077,7 @@
return num_bytes;
}
-void SSH_get_compression_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_compression_info(PTInstVar pvar, char *dest, int len)
{
char buf[1024];
char buf2[1024];
@@ -3139,7 +3139,7 @@
_snprintf_s(dest, len, _TRUNCATE, pvar->ts->UIMsg, buf, buf2);
}
-void SSH_get_server_ID_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_server_ID_info(PTInstVar pvar, char *dest, int len)
{
strncpy_s(dest, len,
pvar->ssh_state.server_ID == NULL ? "Unknown"
@@ -3147,7 +3147,7 @@
_TRUNCATE);
}
-void SSH_get_protocol_version_info(PTInstVar pvar, char FAR * dest,
+void SSH_get_protocol_version_info(PTInstVar pvar, char *dest,
int len)
{
if (pvar->protocol_major == 0) {
@@ -3158,7 +3158,7 @@
}
}
-void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_mac_info(PTInstVar pvar, char *dest, int len)
{
UTIL_get_lang_msg("DLG_ABOUT_MAC_INFO", pvar,
"%s to server, %s from server");
@@ -3173,14 +3173,14 @@
int mode;
for (i = 0; i < 256; i++) {
- SSHPacketHandlerItem FAR *first_item =
+ SSHPacketHandlerItem *first_item =
pvar->ssh_state.packet_handlers[i];
if (first_item != NULL) {
- SSHPacketHandlerItem FAR *item = first_item;
+ SSHPacketHandlerItem *item = first_item;
do {
- SSHPacketHandlerItem FAR *cur_item = item;
+ SSHPacketHandlerItem *cur_item = item;
item = item->next_for_message;
free(cur_item);
@@ -3287,7 +3287,7 @@
}
-void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen, int retry)
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char *buf, unsigned int buflen, int retry)
{
buffer_t *msg;
unsigned char *outmsg;
@@ -3355,10 +3355,10 @@
/* support for port forwarding */
void SSH_channel_send(PTInstVar pvar, int channel_num,
uint32 remote_channel_num,
- unsigned char FAR * buf, int len, int retry)
+ unsigned char *buf, int len, int retry)
{
if (SSHv1(pvar)) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_CHANNEL_DATA, 8 + len);
set_uint32(outmsg, remote_channel_num);
@@ -3383,7 +3383,7 @@
}
pvar->ssh_state.compress_stream.next_in =
- (unsigned char FAR *) buf;
+ (unsigned char *) buf;
pvar->ssh_state.compress_stream.avail_in = len;
if (deflate(&pvar->ssh_state.compress_stream, Z_SYNC_FLUSH) !=
@@ -3410,7 +3410,7 @@
void SSH_fail_channel_open(PTInstVar pvar, uint32 remote_channel_num)
{
if (SSHv1(pvar)) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_CHANNEL_OPEN_FAILURE, 4);
set_uint32(outmsg, remote_channel_num);
@@ -3476,7 +3476,7 @@
uint32 local_channel_num)
{
if (SSHv1(pvar)) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_CHANNEL_OPEN_CONFIRMATION, 8);
set_uint32(outmsg, remote_channel_num);
@@ -3499,7 +3499,7 @@
void SSH_channel_output_eof(PTInstVar pvar, uint32 remote_channel_num)
{
if (SSHv1(pvar)){
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_CHANNEL_OUTPUT_CLOSED, 4);
set_uint32(outmsg, remote_channel_num);
@@ -3550,7 +3550,7 @@
void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num)
{
if (SSHv1(pvar)){
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_CHANNEL_INPUT_EOF, 4);
set_uint32(outmsg, remote_channel_num);
@@ -3568,12 +3568,12 @@
}
}
-void SSH_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port,
- char FAR * to_local_host, int to_local_port)
+void SSH_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port,
+ char *to_local_host, int to_local_port)
{
if (SSHv1(pvar)) {
int host_len = strlen(to_local_host);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_PORT_FORWARD_REQUEST,
12 + host_len);
@@ -3614,7 +3614,7 @@
}
}
-void SSH_cancel_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port, int reply)
+void SSH_cancel_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port, int reply)
{
if (SSHv2(pvar)) {
buffer_t *msg;
@@ -3645,8 +3645,8 @@
}
void SSH_request_X11_forwarding(PTInstVar pvar,
- char FAR * auth_protocol,
- unsigned char FAR * auth_data,
+ char *auth_protocol,
+ unsigned char *auth_data,
int auth_data_len, int screen_num)
{
if (SSHv1(pvar)) {
@@ -3653,10 +3653,10 @@
int protocol_len = strlen(auth_protocol);
int data_len = auth_data_len * 2;
int outmsg_len = 12 + protocol_len + data_len;
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_CMSG_X11_REQUEST_FORWARDING, outmsg_len);
int i;
- char FAR *auth_data_ptr;
+ char *auth_data_ptr;
set_uint32(outmsg, protocol_len);
memcpy(outmsg + 4, auth_protocol, protocol_len);
@@ -3730,8 +3730,8 @@
}
void SSH_open_channel(PTInstVar pvar, uint32 local_channel_num,
- char FAR * to_remote_host, int to_remote_port,
- char FAR * originator, unsigned short originator_port)
+ char *to_remote_host, int to_remote_port,
+ char *originator, unsigned short originator_port)
{
static const int msgs[]
= { SSH_MSG_CHANNEL_OPEN_CONFIRMATION, SSH_MSG_CHANNEL_OPEN_FAILURE };
@@ -3743,7 +3743,7 @@
if ((pvar->ssh_state.
server_protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0) {
int originator_len = strlen(originator);
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_PORT_OPEN,
16 + host_len + originator_len);
@@ -3756,7 +3756,7 @@
} else {
if (SSHv1(pvar)) {
- unsigned char FAR *outmsg =
+ unsigned char *outmsg =
begin_send_packet(pvar, SSH_MSG_PORT_OPEN,
12 + host_len);
@@ -6693,7 +6693,7 @@
}
-static unsigned __stdcall ssh_heartbeat_thread(void FAR * p)
+static unsigned __stdcall ssh_heartbeat_thread(void *p)
{
static int instance = 0;
PTInstVar pvar = (PTInstVar)p;
@@ -8047,7 +8047,7 @@
return;
}
-static unsigned __stdcall ssh_scp_thread(void FAR * p)
+static unsigned __stdcall ssh_scp_thread(void *p)
{
Channel_t *c = (Channel_t *)p;
PTInstVar pvar = c->scp.pvar;
@@ -8229,7 +8229,7 @@
#define WM_RECEIVING_FILE (WM_USER + 2)
-static unsigned __stdcall ssh_scp_receive_thread(void FAR * p)
+static unsigned __stdcall ssh_scp_receive_thread(void *p)
{
Channel_t *c = (Channel_t *)p;
PTInstVar pvar = c->scp.pvar;
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ssh.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -587,27 +587,27 @@
struct _SSHPacketHandlerItem {
SSHPacketHandler handler;
/* Circular list of handlers for given message */
- SSHPacketHandlerItem FAR * next_for_message;
- SSHPacketHandlerItem FAR * last_for_message;
+ SSHPacketHandlerItem *next_for_message;
+ SSHPacketHandlerItem *last_for_message;
/* Circular list of handlers in set */
- SSHPacketHandlerItem FAR * next_in_set;
+ SSHPacketHandlerItem *next_in_set;
int active_for_message;
};
typedef struct {
- char FAR * hostname;
+ char *hostname;
int server_protocol_flags;
- char FAR * server_ID;
+ char *server_ID;
/* This buffer is used to hold the outgoing data, and encrypted in-place
here if necessary. */
- unsigned char FAR * outbuf;
+ unsigned char *outbuf;
long outbuflen;
/* This buffer is used by the SSH protocol processing to store uncompressed
packet data for compression. User data is never streamed through here;
it is compressed directly from the user's buffer. */
- unsigned char FAR * precompress_outbuf;
+ unsigned char *precompress_outbuf;
long precompress_outbuflen;
/* this is the length of the packet data, including the type header */
long outgoing_packet_len;
@@ -615,10 +615,10 @@
/* This buffer is used by the SSH protocol processing to store decompressed
packet data. User data is never streamed through here; it is decompressed
directly to the user's buffer. */
- unsigned char FAR * postdecompress_inbuf;
+ unsigned char *postdecompress_inbuf;
long postdecompress_inbuflen;
- unsigned char FAR * payload;
+ unsigned char *payload;
long payload_grabbed;
long payloadlen;
long payload_datastart;
@@ -633,7 +633,7 @@
BOOL decompressing;
int compression_level;
- SSHPacketHandlerItem FAR * packet_handlers[256];
+ SSHPacketHandlerItem *packet_handlers[256];
int status_flags;
int win_cols;
@@ -651,47 +651,47 @@
void SSH_init(PTInstVar pvar);
void SSH_open(PTInstVar pvar);
-void SSH_notify_disconnecting(PTInstVar pvar, char FAR * reason);
+void SSH_notify_disconnecting(PTInstVar pvar, char *reason);
/* SSH_handle_server_ID returns TRUE iff a valid ID string has been
received. If it returns FALSE, we need to keep looking for another
ID string. */
-BOOL SSH_handle_server_ID(PTInstVar pvar, char FAR * ID, int ID_len);
+BOOL SSH_handle_server_ID(PTInstVar pvar, char *ID, int ID_len);
/* SSH_handle_packet requires NO PAYLOAD on entry.
'len' is the size of the packet: payload + padding (+ CRC for SSHv1)
'padding' is the size of the padding.
'data' points to the start of the packet data (the length field)
*/
-void SSH_handle_packet(PTInstVar pvar, char FAR * data, int len, int padding);
+void SSH_handle_packet(PTInstVar pvar, char *data, int len, int padding);
void SSH_notify_win_size(PTInstVar pvar, int cols, int rows);
void SSH_notify_user_name(PTInstVar pvar);
void SSH_notify_cred(PTInstVar pvar);
void SSH_notify_host_OK(PTInstVar pvar);
-void SSH_send(PTInstVar pvar, unsigned char const FAR * buf, unsigned int buflen);
+void SSH_send(PTInstVar pvar, unsigned char const *buf, unsigned int buflen);
/* SSH_extract_payload returns number of bytes extracted */
-int SSH_extract_payload(PTInstVar pvar, unsigned char FAR * dest, int len);
+int SSH_extract_payload(PTInstVar pvar, unsigned char *dest, int len);
void SSH_end(PTInstVar pvar);
-void SSH_get_server_ID_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_protocol_version_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_compression_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len);
+void SSH_get_server_ID_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_protocol_version_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_compression_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_mac_info(PTInstVar pvar, char *dest, int len);
/* len must be <= SSH_MAX_SEND_PACKET_SIZE */
void SSH_channel_send(PTInstVar pvar, int channel_num,
uint32 remote_channel_num,
- unsigned char FAR * buf, int len, int retry);
+ unsigned char *buf, int len, int retry);
void SSH_fail_channel_open(PTInstVar pvar, uint32 remote_channel_num);
void SSH_confirm_channel_open(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num);
void SSH_channel_output_eof(PTInstVar pvar, uint32 remote_channel_num);
void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num);
-void SSH_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port,
- char FAR * to_local_host, int to_local_port);
-void SSH_cancel_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port, int reply);
+void SSH_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port,
+ char *to_local_host, int to_local_port);
+void SSH_cancel_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port, int reply);
void SSH_request_X11_forwarding(PTInstVar pvar,
- char FAR * auth_protocol, unsigned char FAR * auth_data, int auth_data_len, int screen_num);
+ char *auth_protocol, unsigned char *auth_data, int auth_data_len, int screen_num);
void SSH_open_channel(PTInstVar pvar, uint32 local_channel_num,
- char FAR * to_remote_host, int to_remote_port,
- char FAR * originator, unsigned short originator_port);
+ char *to_remote_host, int to_remote_port,
+ char *originator, unsigned short originator_port);
int SSH_start_scp(PTInstVar pvar, char *sendfile, char *dstfile);
int SSH_start_scp_receive(PTInstVar pvar, char *filename);
@@ -702,7 +702,7 @@
int SSH_get_min_packet_size(PTInstVar pvar);
/* data is guaranteed to be at least SSH_get_min_packet_size bytes long
at least 5 bytes must be decrypted */
-void SSH_predecrpyt_packet(PTInstVar pvar, char FAR * data);
+void SSH_predecrpyt_packet(PTInstVar pvar, char *data);
int SSH_get_clear_MAC_size(PTInstVar pvar);
#define SSH_is_any_payload(pvar) ((pvar)->ssh_state.payload_datalen > 0)
@@ -822,9 +822,9 @@
unsigned int state;
} Channel_t;
-unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len);
+unsigned char *begin_send_packet(PTInstVar pvar, int type, int len);
void finish_send_packet_special(PTInstVar pvar, int skip_compress);
-void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen, int retry);
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char *buf, unsigned int buflen, int retry);
#define finish_send_packet(pvar) finish_send_packet_special((pvar), 0)
#define get_payload_uint32(pvar, offset) get_uint32_MSBfirst((pvar)->ssh_state.payload + (offset))
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -54,7 +54,7 @@
#include <commctrl.h>
#include <commdlg.h>
#include <winsock2.h>
-static char FAR *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
+static char *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
#include <Lmcons.h>
@@ -99,7 +99,7 @@
static HFONT DlgSetupFont;
static HFONT DlgKeygenFont;
-static TInstVar FAR *pvar;
+static TInstVar *pvar;
typedef struct {
int cnt;
@@ -171,7 +171,7 @@
ssh_heartbeat_lock_finalize();
}
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv)
+static void PASCAL TTXInit(PTTSet ts, PComVar cv)
{
pvar->settings = *pvar->ts_SSH;
pvar->ts = ts;
@@ -274,7 +274,7 @@
* Remove unsupported cipher or duplicated cipher.
* Add unspecified ciphers at the end of list.
*/
-static void normalize_cipher_order(char FAR * buf)
+static void normalize_cipher_order(char *buf)
{
/* SSH_CIPHER_NONE means that all ciphers below that one are disabled.
We *never* allow no encryption. */
@@ -310,7 +310,7 @@
normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
}
-static void normalize_kex_order(char FAR * buf)
+static void normalize_kex_order(char *buf)
{
static char default_strings[] = {
KEX_ECDH_SHA2_256,
@@ -329,7 +329,7 @@
normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
}
-static void normalize_host_key_order(char FAR * buf)
+static void normalize_host_key_order(char *buf)
{
static char default_strings[] = {
KEY_ECDSA256,
@@ -344,7 +344,7 @@
normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
}
-static void normalize_mac_order(char FAR * buf)
+static void normalize_mac_order(char *buf)
{
static char default_strings[] = {
HMAC_SHA2_512,
@@ -362,7 +362,7 @@
normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
}
-static void normalize_comp_order(char FAR * buf)
+static void normalize_comp_order(char *buf)
{
static char default_strings[] = {
COMP_DELAYED,
@@ -381,7 +381,7 @@
pvar->ts_SSH->TryDefaultAuth = FALSE;
}
-static BOOL read_BOOL_option(PCHAR fileName, char FAR * keyName, BOOL def)
+static BOOL read_BOOL_option(PCHAR fileName, char *keyName, BOOL def)
{
char buf[1024];
@@ -397,8 +397,8 @@
}
}
-static void read_string_option(PCHAR fileName, char FAR * keyName,
- char FAR * def, char FAR * buf, int bufSize)
+static void read_string_option(PCHAR fileName, char *keyName,
+ char *def, char *buf, int bufSize)
{
buf[0] = 0;
@@ -408,7 +408,7 @@
static void read_ssh_options(PTInstVar pvar, PCHAR fileName)
{
char buf[1024];
- TS_SSH FAR *settings = pvar->ts_SSH;
+ TS_SSH *settings = pvar->ts_SSH;
#define READ_STD_STRING_OPTION(name) \
read_string_option(fileName, #name, "", settings->name, sizeof(settings->name))
@@ -536,7 +536,7 @@
}
static void write_ssh_options(PTInstVar pvar, PCHAR fileName,
- TS_SSH FAR * settings, BOOL copy_forward)
+ TS_SSH *settings, BOOL copy_forward)
{
char buf[1024];
@@ -664,8 +664,8 @@
int tries;
SOCKET connecter;
struct addrinfo hints;
- struct addrinfo FAR *res;
- struct addrinfo FAR *res0;
+ struct addrinfo *res;
+ struct addrinfo *res0;
unsigned short port;
char pname[NI_MAXHOST];
@@ -722,8 +722,8 @@
return 0;
}
-static int PASCAL FAR TTXconnect(SOCKET s,
- const struct sockaddr FAR * name,
+static int PASCAL TTXconnect(SOCKET s,
+ const struct sockaddr *name,
int namelen)
{
if (pvar->socket == INVALID_SOCKET || pvar->socket != s) {
@@ -736,17 +736,17 @@
switch (pvar->ts->ProtocolFamily) {
case AF_INET:
len = sizeof(struct sockaddr_in);
- ((struct sockaddr_in FAR *) &ss)->sin_family = AF_INET;
- ((struct sockaddr_in FAR *) &ss)->sin_addr.s_addr = INADDR_ANY;
- ((struct sockaddr_in FAR *) &ss)->sin_port =
+ ((struct sockaddr_in *) &ss)->sin_family = AF_INET;
+ ((struct sockaddr_in *) &ss)->sin_addr.s_addr = INADDR_ANY;
+ ((struct sockaddr_in *) &ss)->sin_port =
htons(find_local_port(pvar));
break;
case AF_INET6:
len = sizeof(struct sockaddr_in6);
- ((struct sockaddr_in6 FAR *) &ss)->sin6_family = AF_INET6;
- memset(&((struct sockaddr_in6 FAR *) &ss)->sin6_addr, 0,
+ ((struct sockaddr_in6 *) &ss)->sin6_family = AF_INET6;
+ memset(&((struct sockaddr_in6 *) &ss)->sin6_addr, 0,
sizeof(struct in_addr6));
- ((struct sockaddr_in6 FAR *) &ss)->sin6_port =
+ ((struct sockaddr_in6 *) &ss)->sin6_port =
htons(find_local_port(pvar));
break;
default:
@@ -754,13 +754,13 @@
break;
}
- bind(s, (struct sockaddr FAR *) &ss, len);
+ bind(s, (struct sockaddr *) &ss, len);
}
return (pvar->Pconnect) (s, name, namelen);
}
-static int PASCAL FAR TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
+static int PASCAL TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
long lEvent)
{
if (s == pvar->socket) {
@@ -776,7 +776,7 @@
return (pvar->PWSAAsyncSelect) (s, hWnd, wMsg, lEvent);
}
-static int PASCAL FAR TTXrecv(SOCKET s, char FAR * buf, int len, int flags)
+static int PASCAL TTXrecv(SOCKET s, char *buf, int len, int flags)
{
if (s == pvar->socket) {
int ret;
@@ -791,7 +791,7 @@
}
}
-static int PASCAL FAR TTXsend(SOCKET s, char const FAR * buf, int len,
+static int PASCAL TTXsend(SOCKET s, char const *buf, int len,
int flags)
{
if (s == pvar->socket) {
@@ -850,7 +850,7 @@
LOG_LEVEL_VERBOSE);
}
-void notify_closed_connection(PTInstVar pvar, char FAR * send_msg)
+void notify_closed_connection(PTInstVar pvar, char *send_msg)
{
SSH_notify_disconnecting(pvar, send_msg);
AUTH_notify_disconnecting(pvar);
@@ -860,11 +860,11 @@
pvar->socket, MAKELPARAM(FD_CLOSE, 0));
}
-static void add_err_msg(PTInstVar pvar, char FAR * msg)
+static void add_err_msg(PTInstVar pvar, char *msg)
{
if (pvar->err_msg != NULL) {
int buf_len = strlen(pvar->err_msg) + 3 + strlen(msg);
- char FAR *buf = (char FAR *) malloc(buf_len);
+ char *buf = (char *) malloc(buf_len);
strncpy_s(buf, buf_len, pvar->err_msg, _TRUNCATE);
strncat_s(buf, buf_len, "\n\n", _TRUNCATE);
@@ -876,7 +876,7 @@
}
}
-void notify_nonfatal_error(PTInstVar pvar, char FAR * msg)
+void notify_nonfatal_error(PTInstVar pvar, char *msg)
{
if (!pvar->showing_err) {
// \x96\xA2\x90ڑ\xB1\x82̏\xF3\x91Ԃł͒ʒm\x90\xE6\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x82Ȃ\xA2\x82̂ŁA\x83f\x83X\x83N\x83g\x83b\x83v\x82\xF0\x83I\x81[\x83i\x81[\x82Ƃ\xB5\x82\xC4
@@ -898,7 +898,7 @@
}
}
-void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect)
+void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)
{
if (msg[0] != 0) {
notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
@@ -920,7 +920,7 @@
}
}
-void notify_verbose_message(PTInstVar pvar, char FAR * msg, int level)
+void notify_verbose_message(PTInstVar pvar, char *msg, int level)
{
if (level <= pvar->session_settings.LogLevel) {
char buf[1024];
@@ -1045,7 +1045,7 @@
}
}
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks)
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks)
{
if (pvar->settings.Enabled) {
// TCPLocalEcho/TCPCRSend \x82\xF8\x82ɂ\xB7\x82\xE9 (maya 2007.4.25)
@@ -1090,7 +1090,7 @@
}
}
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks)
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks)
{
if (pvar->session_settings.Enabled) {
pvar->socket = INVALID_SOCKET;
@@ -1644,18 +1644,18 @@
return FALSE;
}
-static BOOL FAR PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
+static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
{
return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG),
parent, TTXHostDlg, (LONG) rec);
}
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks)
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks)
{
*hooks->GetHostName = TTXGetHostName;
}
-static void FAR PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)
+static void PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)
{
(pvar->ReadIniFile) (fileName, ts);
read_ssh_options(pvar, fileName);
@@ -1664,7 +1664,7 @@
FWDUI_load_settings(pvar);
}
-static void FAR PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)
+static void PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)
{
(pvar->WriteIniFile) (fileName, ts);
*pvar->ts_SSH = pvar->settings;
@@ -1674,7 +1674,7 @@
}
static void read_ssh_options_from_user_file(PTInstVar pvar,
- char FAR * user_file_name)
+ char *user_file_name)
{
if (user_file_name[0] == '.') {
read_ssh_options(pvar, user_file_name);
@@ -1727,7 +1727,7 @@
}
}
-static void FAR PASCAL TTXParseParam(PCHAR param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR param, PTTSet ts, PCHAR DDETopic) {
int param_len=strlen(param);
int opt_len = param_len+1;
char *option = (char *)calloc(opt_len, sizeof(char));
@@ -2098,7 +2098,7 @@
(pvar->ParseParam) (param, ts, DDETopic);
}
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks)
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks)
{
pvar->ReadIniFile = *hooks->ReadIniFile;
pvar->WriteIniFile = *hooks->WriteIniFile;
@@ -2109,13 +2109,13 @@
*hooks->ParseParam = TTXParseParam;
}
-static void PASCAL FAR TTXSetWinSize(int rows, int cols)
+static void PASCAL TTXSetWinSize(int rows, int cols)
{
SSH_notify_win_size(pvar, cols, rows);
}
static void insertMenuBeforeItem(HMENU menu, WORD beforeItemID, WORD flags,
- WORD newItemID, char FAR * text)
+ WORD newItemID, char *text)
{
int i, j;
@@ -2157,7 +2157,7 @@
return NULL;
}
-static void PASCAL FAR TTXModifyMenu(HMENU menu)
+static void PASCAL TTXModifyMenu(HMENU menu)
{
pvar->FileMenu = GetFileMenu(menu);
@@ -2182,7 +2182,7 @@
insertMenuBeforeItem(menu, 50170, MF_GRAYED, ID_SSHSCPMENU, pvar->ts->UIMsg);
}
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
if (menu == pvar->FileMenu) {
if (pvar->cv->Ready && pvar->settings.Enabled)
EnableMenuItem(menu, ID_SSHSCPMENU, MF_BYCOMMAND | MF_ENABLED);
@@ -2405,7 +2405,7 @@
strncat_s(buf2, sizeof(buf2), fp, _TRUNCATE);
free(fp);
- SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf2);
+ SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETTEXT, 0, (LPARAM)(char *)buf2);
}
}
@@ -2605,7 +2605,7 @@
return FALSE;
}
-static char FAR *get_cipher_name(int cipher)
+static char *get_cipher_name(int cipher)
{
switch (cipher) {
case SSH_CIPHER_NONE:
@@ -2823,7 +2823,7 @@
for (i = 0; pvar->settings.CipherOrder[i] != 0; i++) {
int cipher = pvar->settings.CipherOrder[i] - '0';
- char FAR *name = get_cipher_name(cipher);
+ char *name = get_cipher_name(cipher);
if (name != NULL) {
SendMessage(cipherControl, LB_ADDSTRING, 0, (LPARAM) name);
@@ -2837,7 +2837,7 @@
normalize_kex_order(pvar->settings.KexOrder);
for (i = 0; pvar->settings.KexOrder[i] != 0; i++) {
int index = pvar->settings.KexOrder[i] - '0';
- char FAR *name = NULL;
+ char *name = NULL;
if (index == 0) {
UTIL_get_lang_msg("DLG_SSHSETUP_KEX_BORDER", pvar,
@@ -2858,7 +2858,7 @@
normalize_host_key_order(pvar->settings.HostKeyOrder);
for (i = 0; pvar->settings.HostKeyOrder[i] != 0; i++) {
int index = pvar->settings.HostKeyOrder[i] - '0';
- char FAR *name = NULL;
+ char *name = NULL;
if (index == 0) {
UTIL_get_lang_msg("DLG_SSHSETUP_HOST_KEY_BORDER", pvar,
@@ -2879,7 +2879,7 @@
normalize_mac_order(pvar->settings.MacOrder);
for (i = 0; pvar->settings.MacOrder[i] != 0; i++) {
int index = pvar->settings.MacOrder[i] - '0';
- char FAR *name = NULL;
+ char *name = NULL;
if (index == 0) {
UTIL_get_lang_msg("DLG_SSHSETUP_MAC_BORDER", pvar,
@@ -2900,7 +2900,7 @@
normalize_comp_order(pvar->settings.CompOrder);
for (i = 0; pvar->settings.CompOrder[i] != 0; i++) {
int index = pvar->settings.CompOrder[i] - '0';
- char FAR *name = NULL;
+ char *name = NULL;
if (index == 0) {
UTIL_get_lang_msg("DLG_SSHSETUP_COMP_BORDER", pvar,
@@ -2977,8 +2977,8 @@
}
-void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
- char FAR * basename)
+void get_teraterm_dir_relative_name(char *buf, int bufsize,
+ char *basename)
{
int filename_start = 0;
int i;
@@ -3002,8 +3002,8 @@
}
}
-int copy_teraterm_dir_relative_path(char FAR * dest, int destsize,
- char FAR * basename)
+int copy_teraterm_dir_relative_path(char *dest, int destsize,
+ char *basename)
{
char buf[1024];
int filename_start = 0;
@@ -3254,13 +3254,13 @@
SendMessage(listbox, LB_GETTEXT, curPos, (LPARAM) buf);
SendMessage(listbox, LB_DELETESTRING, curPos, 0);
SendMessage(listbox, LB_INSERTSTRING, newPos,
- (LPARAM) (char FAR *) buf);
+ (LPARAM) (char *) buf);
SendMessage(listbox, LB_SETCURSEL, newPos, 0);
}
}
}
-static int get_keys_file_name(HWND parent, char FAR * buf, int bufsize,
+static int get_keys_file_name(HWND parent, char *buf, int bufsize,
int readonly)
{
OPENFILENAME params;
@@ -5149,7 +5149,7 @@
}
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd)
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd)
{
char uimsg[MAX_UIMSG];
@@ -5223,7 +5223,7 @@
return 1;
case ID_SSHASYNCMESSAGEBOX:
if (pvar->err_msg != NULL) {
- char FAR *msg = pvar->err_msg;
+ char *msg = pvar->err_msg;
/* Could there be a buffer overrun bug anywhere in Win32
MessageBox? Who knows? I'm paranoid. */
@@ -5323,7 +5323,7 @@
strncpy_s(dst, dst_len, str, _TRUNCATE);
}
-static void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen,
+static void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen,
PGetHNRec rec)
{
char tmpFile[MAX_PATH];
@@ -5442,7 +5442,7 @@
This function is called for each extension, in reverse load order (see
below).
*/
-static void PASCAL FAR TTXEnd(void)
+static void PASCAL TTXEnd(void)
{
uninit_TTSSH(pvar);
@@ -5487,7 +5487,7 @@
};
BOOL __declspec(dllexport)
-PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports)
+PASCAL TTXBind(WORD Version, TTXExports *exports)
{
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
@@ -5496,8 +5496,8 @@
if (size > exports->size) {
size = exports->size;
}
- memcpy((char FAR *) exports + sizeof(exports->size),
- (char FAR *) &Exports + sizeof(exports->size), size);
+ memcpy((char *) exports + sizeof(exports->size),
+ (char *) &Exports + sizeof(exports->size), size);
return TRUE;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -64,7 +64,7 @@
#include "i18n.h"
#include "ttlib.h"
-typedef struct _TInstVar FAR * PTInstVar;
+typedef struct _TInstVar *PTInstVar;
#include "util.h"
#include "pkt.h"
@@ -198,11 +198,11 @@
/* shared memory for settings across instances. Basically it's
a cache for the INI file.*/
- TS_SSH FAR * ts_SSH;
+ TS_SSH *ts_SSH;
int fatal_error;
int showing_err;
- char FAR * err_msg;
+ char *err_msg;
Tconnect Pconnect;
Trecv Precv;
@@ -339,16 +339,16 @@
#define SSHv2(pvar) ((pvar)->protocol_major == 2)
void notify_established_secure_connection(PTInstVar pvar);
-void notify_closed_connection(PTInstVar pvar, char FAR * send_msg);
-void notify_nonfatal_error(PTInstVar pvar, char FAR * msg);
-void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect);
-void notify_verbose_message(PTInstVar pvar, char FAR * msg, int level);
+void notify_closed_connection(PTInstVar pvar, char *send_msg);
+void notify_nonfatal_error(PTInstVar pvar, char *msg);
+void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
+void notify_verbose_message(PTInstVar pvar, char *msg, int level);
void logprintf(PTInstVar pvar, int level, char *fmt, ...);
void logprintf_hexdump(PTInstVar pvar, int level, char *data, int len, char *fmt, ...);
-void get_teraterm_dir_relative_name(char FAR * buf, int bufsize, char FAR * basename);
-int copy_teraterm_dir_relative_path(char FAR * dest, int destsize, char FAR * basename);
+void get_teraterm_dir_relative_name(char *buf, int bufsize, char *basename);
+int copy_teraterm_dir_relative_path(char *dest, int destsize, char *basename);
void get_file_version(char *exefile, int *major, int *minor, int *release, int *build);
int uuencode(unsigned char *src, int srclen, unsigned char *target, int targsize);
Modified: trunk/ttssh2/ttxssh/util.c
===================================================================
--- trunk/ttssh2/ttxssh/util.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/util.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -33,7 +33,7 @@
#include "ttxssh.h"
-void UTIL_init_sock_write_buf(UTILSockWriteBuf FAR * buf)
+void UTIL_init_sock_write_buf(UTILSockWriteBuf *buf)
{
buf_create(&buf->bufdata, &buf->buflen);
buf->datastart = 0;
@@ -41,7 +41,7 @@
}
static int send_until_block(PTInstVar pvar, SOCKET s,
- const char FAR * data, int len)
+ const char *data, int len)
{
int total_sent = 0;
@@ -91,9 +91,9 @@
* return TRUE: \x91\x97\x90M\x90\xAC\x8C\xF7
* FALSE: \x91\x97\x90M\x83G\x83\x89\x81[
*/
-BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
+BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf *buf,
UTILBlockingWriteCallback blocking_write,
- SOCKET socket, const char FAR * data,
+ SOCKET socket, const char *data,
int len)
{
int curlen;
@@ -269,7 +269,7 @@
}
}
-BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
+BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf *buf,
SOCKET socket)
{
int first_amount = min(buf->buflen - buf->datastart, buf->datalen);
@@ -302,13 +302,13 @@
return TRUE;
}
-void UTIL_destroy_sock_write_buf(UTILSockWriteBuf FAR * buf)
+void UTIL_destroy_sock_write_buf(UTILSockWriteBuf *buf)
{
SecureZeroMemory(buf->bufdata, buf->buflen);
buf_destroy(&buf->bufdata, &buf->buflen);
}
-BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf FAR * buf)
+BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf *buf)
{
return buf->buflen / 2 < buf->datalen;
}
Modified: trunk/ttssh2/ttxssh/util.h
===================================================================
--- trunk/ttssh2/ttxssh/util.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/util.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -67,7 +67,7 @@
(buf)[3] = (unsigned char)(uint32)(v))
typedef struct _UTILSockWriteBuf {
- char FAR * bufdata;
+ char *bufdata;
int buflen;
int datastart;
int datalen;
@@ -74,14 +74,14 @@
} UTILSockWriteBuf;
typedef BOOL (* UTILBlockingWriteCallback)(PTInstVar pvar,
- SOCKET socket, const char FAR * data, int len);
+ SOCKET socket, const char *data, int len);
-void UTIL_init_sock_write_buf(UTILSockWriteBuf FAR * buf);
-BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
- UTILBlockingWriteCallback blocking_write, SOCKET socket, const char FAR * data, int len);
-BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf FAR * buf, SOCKET socket);
-void UTIL_destroy_sock_write_buf(UTILSockWriteBuf FAR * buf);
-BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf FAR * buf);
+void UTIL_init_sock_write_buf(UTILSockWriteBuf *buf);
+BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf *buf,
+ UTILBlockingWriteCallback blocking_write, SOCKET socket, const char *data, int len);
+BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf *buf, SOCKET socket);
+void UTIL_destroy_sock_write_buf(UTILSockWriteBuf *buf);
+BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf *buf);
void UTIL_get_lang_msg(PCHAR key, PTInstVar pvar, PCHAR def);
int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, PTInstVar pvar);
Modified: trunk/ttssh2/ttxssh/x11util.c
===================================================================
--- trunk/ttssh2/ttxssh/x11util.c 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/x11util.c 2017-06-13 10:30:12 UTC (rev 6801)
@@ -34,15 +34,15 @@
typedef struct {
PTInstVar pvar;
- X11AuthData FAR *auth_data;
+ X11AuthData *auth_data;
- unsigned char FAR *init_buf;
+ unsigned char *init_buf;
int init_buf_len;
int init_data_len;
} X11UnspoofingFilterClosure;
-void parse_DISPLAY_str(char FAR * name_buf, int name_buf_len,
- int FAR * port, int FAR * screen, char *DISPLAY)
+void parse_DISPLAY_str(char *name_buf, int name_buf_len,
+ int *port, int *screen, char *DISPLAY)
{
strncpy_s(name_buf, name_buf_len, "localhost", _TRUNCATE);
*port = 6000;
@@ -73,10 +73,10 @@
}
}
-void X11_get_DISPLAY_info(PTInstVar pvar, char FAR * name_buf, int name_buf_len,
- int FAR * port, int FAR * screen)
+void X11_get_DISPLAY_info(PTInstVar pvar, char *name_buf, int name_buf_len,
+ int *port, int *screen)
{
- char FAR *DISPLAY = getenv("DISPLAY");
+ char *DISPLAY = getenv("DISPLAY");
if (pvar->settings.X11Display[0] != 0) {
parse_DISPLAY_str(name_buf, name_buf_len, port, screen, pvar->settings.X11Display);
@@ -87,11 +87,11 @@
}
-X11AuthData FAR *X11_load_local_auth_data(int screen_num)
+X11AuthData *X11_load_local_auth_data(int screen_num)
{
- X11AuthData FAR *auth_data =
- (X11AuthData FAR *) malloc(sizeof(X11AuthData));
- char FAR *local_auth_data_str;
+ X11AuthData *auth_data =
+ (X11AuthData *) malloc(sizeof(X11AuthData));
+ char *local_auth_data_str;
auth_data->local_protocol = getenv("TTSSH_XAUTH_PROTOCOL_NAME");
@@ -133,7 +133,7 @@
return auth_data;
}
-void X11_dispose_auth_data(X11AuthData FAR * auth_data)
+void X11_dispose_auth_data(X11AuthData *auth_data)
{
SecureZeroMemory(auth_data->local_data, auth_data->local_data_len);
free(auth_data->local_data);
@@ -144,9 +144,9 @@
}
void *X11_init_unspoofing_filter(PTInstVar pvar,
- X11AuthData FAR * auth_data)
+ X11AuthData *auth_data)
{
- X11UnspoofingFilterClosure FAR *closure =
+ X11UnspoofingFilterClosure *closure =
malloc(sizeof(X11UnspoofingFilterClosure));
closure->pvar = pvar;
@@ -162,9 +162,9 @@
#define MERGE_GOT_GOOD_DATA 1
#define MERGE_GOT_BAD_DATA 2
-static int merge_into_X11_init_packet(X11UnspoofingFilterClosure FAR *
+static int merge_into_X11_init_packet(X11UnspoofingFilterClosure *
closure, int length,
- unsigned char FAR * buf)
+ unsigned char *buf)
{
buf_ensure_size_growing(&closure->init_buf, &closure->init_buf_len,
closure->init_data_len + length);
@@ -214,9 +214,9 @@
}
}
-static void insert_real_X11_auth_data(X11UnspoofingFilterClosure FAR *
- closure, int FAR * length,
- unsigned char FAR * FAR * buf)
+static void insert_real_X11_auth_data(X11UnspoofingFilterClosure *
+ closure, int *length,
+ unsigned char **buf)
{
int name_len = closure->auth_data->local_protocol == NULL
? 0 : strlen(closure->auth_data->local_protocol);
@@ -248,11 +248,11 @@
data_len);
}
-int X11_unspoofing_filter(void FAR * void_closure, int direction,
- int FAR * length, unsigned char FAR * FAR * buf)
+int X11_unspoofing_filter(void *void_closure, int direction,
+ int *length, unsigned char **buf)
{
- X11UnspoofingFilterClosure FAR *closure =
- (X11UnspoofingFilterClosure FAR *) void_closure;
+ X11UnspoofingFilterClosure *closure =
+ (X11UnspoofingFilterClosure *) void_closure;
if (length == NULL) {
buf_destroy(&closure->init_buf, &closure->init_buf_len);
Modified: trunk/ttssh2/ttxssh/x11util.h
===================================================================
--- trunk/ttssh2/ttxssh/x11util.h 2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/x11util.h 2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,11 +37,11 @@
#include "ttxssh.h"
typedef struct _X11AuthData {
- char FAR * local_protocol;
- unsigned char FAR * local_data;
+ char *local_protocol;
+ unsigned char *local_data;
int local_data_len;
- char FAR * spoofed_protocol;
- unsigned char FAR * spoofed_data;
+ char *spoofed_protocol;
+ unsigned char *spoofed_data;
int spoofed_data_len;
} X11AuthData;
@@ -49,12 +49,12 @@
#define X11_get_spoofed_protocol_data(d) ((d)->spoofed_data)
#define X11_get_spoofed_protocol_data_len(d) ((d)->spoofed_data_len)
-void X11_get_DISPLAY_info(PTInstVar pvar, char FAR * name_buf, int name_buf_len, int FAR * port, int FAR * screen);
-X11AuthData FAR * X11_load_local_auth_data(int screen_num);
-void FAR * X11_init_unspoofing_filter(struct _TInstVar FAR * pvar,
- X11AuthData FAR * auth_data);
-int X11_unspoofing_filter(void FAR * closure, int direction,
- int FAR * length, unsigned char FAR * FAR * buf);
-void X11_dispose_auth_data(X11AuthData FAR * auth_data);
+void X11_get_DISPLAY_info(PTInstVar pvar, char *name_buf, int name_buf_len, int *port, int *screen);
+X11AuthData *X11_load_local_auth_data(int screen_num);
+void *X11_init_unspoofing_filter(struct _TInstVar *pvar,
+ X11AuthData *auth_data);
+int X11_unspoofing_filter(void *closure, int direction,
+ int *length, unsigned char **buf);
+void X11_dispose_auth_data(X11AuthData *auth_data);
#endif