コミット: 8bfa3a094bc6f38ae9b19100c1b8603effc84610 - TTXEject (git)

Tera TermにCD-ROM取り出し機能を追加します。

コミットメタ情報

• リビジョン: 8bfa3a094bc6f38ae9b19100c1b8603effc84610 (tree)
• 日時: 2019-08-26 16:00:59
• 作者: IWAMOTO Kouichi <sue@iwmt...>
• コミッター: IWAMOTO Kouichi

ログメッセージ

Eliminate FAR keyword.

変更サマリ

• modified: TTXEject.c

差分

--- a/TTXEject.c
+++ b/TTXEject.c
@@ -68,7 +68,7 @@ typedef struct {
   int Pin;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 #define GetFileMenu(menu)	GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -97,7 +97,7 @@ HMENU GetSubMenuByChildID(HMENU menu, UINT id) {
   return NULL;
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   pvar->ts = ts;
   pvar->cv = cv;
   pvar->origPrecv = NULL;
@@ -106,12 +106,12 @@ static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
   pvar->origPWriteFile = NULL;
 }
 
-static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts) {
   (pvar->origReadIniFile)(fn, ts);
   pvar->Pin = GetPrivateProfileInt(INISECTION, "Pin", 0, fn);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
 }
@@ -207,7 +207,7 @@ void ParseInputStr(unsigned char *rstr, int rcount) {
   }
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -216,7 +216,7 @@ int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
   return rlen;
 }
 
-BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
+BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, LPOVERLAPPED rol) {
   BOOL result;
 
   if ((result = pvar->origPReadFile(fh, buff, len, rbytes, rol)) != FALSE)
@@ -224,35 +224,35 @@ BOOL PASCAL FAR TTXReadFile(HANDLE fh, LPVOID buff, DWORD len, LPDWORD rbytes, L
   return result;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks) {
   if (pvar->Pin > 0) {
     pvar->origPrecv = *hooks->Precv;
     *hooks->Precv = TTXrecv;
   }
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
     pvar->origPrecv = NULL;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL TTXOpenFile(TTXFileHooks *hooks) {
   if (pvar->Pin > 0) {
     pvar->origPReadFile = *hooks->PReadFile;
     *hooks->PReadFile = TTXReadFile;
   }
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
     pvar->origPReadFile = NULL;
   }
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
   HMENU ControlMenu;
 //  uint flag = MF_BYCOMMAND | MF_STRING | MF_ENABLED;
 
@@ -262,7 +262,7 @@ static void PASCAL FAR TTXModifyMenu(HMENU menu) {
   InsertMenu(ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 }
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   if (cmd == MENUID) {
     EjectTray();
     return 1;
@@ -289,14 +289,14 @@ static TTXExports Exports = {
   TTXCloseFile
 };
 
-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);
 
   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;
 }