[Ttssh2-commit] [7305] PASCAL->WINAPI

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2018年 12月 3日 (月) 00:51:50 JST


Revision: 7305
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7305
Author:   zmatsuo
Date:     2018-12-03 00:51:49 +0900 (Mon, 03 Dec 2018)
Log Message:
-----------
PASCAL->WINAPI

Modified Paths:
--------------
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpfile/ttfile.c

-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2018-12-02 15:51:37 UTC (rev 7304)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2018-12-02 15:51:49 UTC (rev 7305)
@@ -73,13 +73,13 @@
 };
 
 
-void PASCAL CopyShmemToTTSet(PTTSet ts)
+void WINAPI CopyShmemToTTSet(PTTSet ts)
 {
 	// \x8C\xBB\x8D݂̐ݒ\xE8\x82\xF0\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82\xA9\x82\xE7\x83R\x83s\x81[\x82\xB7\x82\xE9
 	memcpy(ts, &pm->ts, sizeof(TTTSet));
 }
 
-void PASCAL CopyTTSetToShmem(PTTSet ts)
+void WINAPI CopyTTSetToShmem(PTTSet ts)
 {
 	// \x8C\xBB\x8D݂̐ݒ\xE8\x82\xF0\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82փR\x83s\x81[\x82\xB7\x82\xE9
 	memcpy(&pm->ts, ts, sizeof(TTTSet));
@@ -86,7 +86,7 @@
 }
 
 
-BOOL PASCAL StartTeraTerm(PTTSet ts)
+BOOL WINAPI StartTeraTerm(PTTSet ts)
 {
 	char Temp[MAX_PATH];
 
@@ -129,7 +129,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 RestartTeraTerm(HWND hwnd, PTTSet ts)
+void WINAPI RestartTeraTerm(HWND hwnd, PTTSet ts)
 {
 	char path[1024];
 	STARTUPINFO si;
@@ -162,7 +162,7 @@
 	}
 }
 
-void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km)
+void WINAPI ChangeDefaultSet(PTTSet ts, PKeyMap km)
 {
 	if ((ts!=NULL) &&
 		(_stricmp(ts->SetupFName, pm->ts.SetupFName) == 0)) {
@@ -173,7 +173,7 @@
 	}
 }
 
-void PASCAL GetDefaultSet(PTTSet ts)
+void WINAPI GetDefaultSet(PTTSet ts)
 {
 	memcpy(ts,&(pm->ts),sizeof(TTTSet));
 }
@@ -180,7 +180,7 @@
 
 
 /* Key scan code -> Tera Term key code */
-WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan)
+WORD WINAPI GetKeyCode(PKeyMap KeyMap, WORD Scan)
 {
 	WORD Key;
 
@@ -194,7 +194,7 @@
 	return Key;
 }
 
-void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+void WINAPI GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
                           BOOL AppliKeyMode, BOOL AppliCursorMode,
                           BOOL Send8BitMode, PCHAR KeyStr, int destlen,
                           LPINT Len, LPWORD Type)
@@ -848,22 +848,22 @@
 	PeekMessage(&Msg,HWin, WM_CHAR, WM_CHAR,PM_REMOVE);
 }
 
-void PASCAL SetCOMFlag(int Com)
+void WINAPI SetCOMFlag(int Com)
 {
 	pm->ComFlag[(Com-1)/CHAR_BIT] |= 1 << ((Com-1)%CHAR_BIT);
 }
 
-void PASCAL ClearCOMFlag(int Com)
+void WINAPI ClearCOMFlag(int Com)
 {
 	pm->ComFlag[(Com-1)/CHAR_BIT] &= ~(1 << ((Com-1)%CHAR_BIT));
 }
 
-int PASCAL CheckCOMFlag(int Com)
+int WINAPI CheckCOMFlag(int Com)
 {
 	return ((pm->ComFlag[(Com-1)/CHAR_BIT] & 1 << (Com-1)%CHAR_BIT) > 0);
 }
 
-int PASCAL RegWin(HWND HWinVT, HWND HWinTEK)
+int WINAPI RegWin(HWND HWinVT, HWND HWinTEK)
 {
 	int i, j;
 
@@ -894,7 +894,7 @@
 	}
 }
 
-void PASCAL UnregWin(HWND HWin)
+void WINAPI UnregWin(HWND HWin)
 {
 	int i, j;
 
@@ -932,7 +932,7 @@
 		return '+';
 }
 
-void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
+void WINAPI SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
 {
 	int i;
 	char Temp[MAXPATHLEN];
@@ -1004,7 +1004,7 @@
 	}
 }
 
-void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList)
+void WINAPI SetWinList(HWND HWin, HWND HDlg, int IList)
 {
 	int i;
 	char Temp[MAXPATHLEN];
@@ -1030,7 +1030,7 @@
 	}
 }
 
-void PASCAL SelectWin(int WinId)
+void WINAPI 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
@@ -1049,7 +1049,7 @@
 	}
 }
 
-void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
+void WINAPI SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
 {
 	int i;
 
@@ -1078,7 +1078,7 @@
 	SelectWin(i);
 }
 
-void PASCAL ShowAllWin(int stat) {
+void WINAPI ShowAllWin(int stat) {
 	int i;
 
 	for (i=0; i < pm->NWin; i++) {
@@ -1086,7 +1086,7 @@
 	}
 }
 
-void PASCAL UndoAllWin(void) {
+void WINAPI UndoAllWin(void) {
 	int i;
 	WINDOWPLACEMENT rc0;
 	RECT rc;
@@ -1153,7 +1153,7 @@
 	}
 }
 
-void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
+void WINAPI OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
 {
 	char HomeDir[MAX_PATH];
 	char Temp[MAX_PATH];
@@ -1182,7 +1182,7 @@
 	}
 }
 
-HWND PASCAL GetNthWin(int n)
+HWND WINAPI GetNthWin(int n)
 {
 	if (n<pm->NWin) {
 		return pm->WinList[n];
@@ -1192,7 +1192,7 @@
 	}
 }
 
-int PASCAL GetRegisteredWindowCount()
+int WINAPI GetRegisteredWindowCount()
 {
 	return (pm->NWin);
 }
@@ -1236,7 +1236,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 PASCAL ShowAllWinSidebySide(HWND myhwnd)
+void WINAPI ShowAllWinSidebySide(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1246,7 +1246,7 @@
 }
 
 // \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F㉺\x82ɕ\xC0\x82ׂĕ\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
-void PASCAL ShowAllWinStacked(HWND myhwnd)
+void WINAPI ShowAllWinStacked(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1256,7 +1256,7 @@
 }
 
 // \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82˂ĕ\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
-void PASCAL ShowAllWinCascade(HWND myhwnd)
+void WINAPI ShowAllWinCascade(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1266,7 +1266,7 @@
 }
 
 // \x91STera Term\x82ɏI\x97\xB9\x8Ew\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
-void PASCAL BroadcastClosingMessage(HWND myhwnd)
+void WINAPI BroadcastClosingMessage(HWND myhwnd)
 {
 	int i, max;
 	HWND hwnd[MAXNWIN];
@@ -1289,7 +1289,7 @@
 }
 
 
-int PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
+int WINAPI CommReadRawByte(PComVar cv, LPBYTE b)
 {
 	if ( ! cv->Ready ) {
 		return 0;
@@ -1310,7 +1310,7 @@
 	}
 }
 
-void PASCAL CommInsert1Byte(PComVar cv, BYTE b)
+void WINAPI CommInsert1Byte(PComVar cv, BYTE b)
 {
 	if ( ! cv->Ready ) {
 		return;
@@ -1353,7 +1353,7 @@
 	}
 }
 
-int PASCAL CommRead1Byte(PComVar cv, LPBYTE b)
+int WINAPI CommRead1Byte(PComVar cv, LPBYTE b)
 {
 	int c;
 
@@ -1423,7 +1423,7 @@
 	return c;
 }
 
-int PASCAL CommRawOut(PComVar cv, PCHAR B, int C)
+int WINAPI CommRawOut(PComVar cv, PCHAR B, int C)
 {
 	int a;
 
@@ -1446,7 +1446,7 @@
 	return a;
 }
 
-int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C)
+int WINAPI CommBinaryOut(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;
 	char d[3];
@@ -1483,7 +1483,7 @@
 	return i;
 }
 
-int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
+int WINAPI CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len, OutLen;
 	char d[3];
@@ -1785,7 +1785,7 @@
 	return i;
 }
 
-int PASCAL CommTextOut(PComVar cv, PCHAR B, int C)
+int WINAPI CommTextOut(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen, OutLen;
 	char TempStr[12];
@@ -1888,7 +1888,7 @@
 	return i;
 }
 
-int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C)
+int WINAPI CommBinaryEcho(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;
 	char d[3];
@@ -1932,7 +1932,7 @@
 	return i;
 }
 
-int PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
+int WINAPI TextEchoMBCS(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen;
 	WORD K;
@@ -2107,7 +2107,7 @@
 	return i;
 }
 
-int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
+int WINAPI CommTextEcho(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen;
 	char TempStr[11];
@@ -2289,7 +2289,7 @@
 }
 
 
-int PASCAL DetectComPorts(LPWORD ComPortTable, int ComPortMax, char **ComPortDesc)
+int WINAPI DetectComPorts(LPWORD ComPortTable, int ComPortMax, char **ComPortDesc)
 {
 	HMODULE h;
 	TCHAR   devicesBuff[65535];
@@ -2346,7 +2346,7 @@
 	return comports;
 }
 
-int PASCAL CheckComPort(WORD ComPort)
+int WINAPI CheckComPort(WORD ComPort)
 {
 	HMODULE h;
 	TCHAR   devicesBuff[65535];
@@ -2420,17 +2420,17 @@
 static int NotifyIconShowCount = 0;
 static HICON CustomIcon = NULL;
 
-void PASCAL SetCustomNotifyIcon(HICON icon)
+void WINAPI SetCustomNotifyIcon(HICON icon)
 {
 	CustomIcon = icon;
 }
 
-HICON PASCAL GetCustomNotifyIcon()
+HICON WINAPI GetCustomNotifyIcon()
 {
 	return CustomIcon;
 }
 
-void PASCAL CreateNotifyIcon(PComVar cv)
+void WINAPI CreateNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon == NULL) {
 		notify_icon.cbSize = sizeof(notify_icon);
@@ -2462,7 +2462,7 @@
 	return;
 }
 
-void PASCAL DeleteNotifyIcon(PComVar cv)
+void WINAPI DeleteNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon) {
 		Shell_NotifyIcon(NIM_DELETE, cv->NotifyIcon);
@@ -2473,7 +2473,7 @@
 	return;
 }
 
-void PASCAL ShowNotifyIcon(PComVar cv)
+void WINAPI ShowNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon == NULL) {
 		CreateNotifyIcon(cv);
@@ -2488,7 +2488,7 @@
 	return;
 }
 
-void PASCAL HideNotifyIcon(PComVar cv)
+void WINAPI HideNotifyIcon(PComVar cv)
 {
 	if (NotifyIconShowCount > 1) {
 		NotifyIconShowCount -= 1;
@@ -2506,7 +2506,7 @@
 	return;
 }
 
-void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver)
+void WINAPI SetVerNotifyIcon(PComVar cv, unsigned int ver)
 {
 	if (cv->NotifyIcon) {
 		cv->NotifyIcon->uVersion = ver;
@@ -2515,7 +2515,7 @@
 	return;
 }
 
-void PASCAL NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
+void WINAPI NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
 {
 	if (msg == NULL) {
 		return;

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2018-12-02 15:51:37 UTC (rev 7304)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2018-12-02 15:51:49 UTC (rev 7305)
@@ -3280,7 +3280,7 @@
 	return FALSE;
 }
 
-BOOL PASCAL SetupTerminal(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupTerminal(HWND WndParent, PTTSet ts)
 {
 	int i;
 
@@ -3305,7 +3305,7 @@
 		                     WndParent, TermDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL SetupWin(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupWin(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3313,7 +3313,7 @@
 		                     WndParent, WinDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL SetupKeyboard(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupKeyboard(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3321,7 +3321,7 @@
 		                     WndParent, KeybDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL SetupSerialPort(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupSerialPort(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3329,7 +3329,7 @@
 		                     WndParent, SerialDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL SetupTCPIP(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupTCPIP(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3337,7 +3337,7 @@
 		                     WndParent, TCPIPDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL GetHostName(HWND WndParent, PGetHNRec GetHNRec)
+BOOL WINAPI GetHostName(HWND WndParent, PGetHNRec GetHNRec)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3345,7 +3345,7 @@
 		                     WndParent, HostDlg, (LPARAM)GetHNRec);
 }
 
-BOOL PASCAL ChangeDirectory(HWND WndParent, PCHAR CurDir)
+BOOL WINAPI ChangeDirectory(HWND WndParent, PCHAR CurDir)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3353,7 +3353,7 @@
 		                     WndParent, DirDlg, (LPARAM)CurDir);
 }
 
-BOOL PASCAL AboutDialog(HWND WndParent)
+BOOL WINAPI AboutDialog(HWND WndParent)
 {
 	return
 		(BOOL)DialogBox(hInst,
@@ -3406,7 +3406,7 @@
 #ifndef CF_INACTIVEFONTS
 #define CF_INACTIVEFONTS 0x02000000L
 #endif
-BOOL PASCAL ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
+BOOL WINAPI ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
 {
 	CHOOSEFONT cf;
 	BOOL Ok;
@@ -3429,7 +3429,7 @@
 	return Ok;
 }
 
-BOOL PASCAL SetupGeneral(HWND WndParent, PTTSet ts)
+BOOL WINAPI SetupGeneral(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3437,7 +3437,7 @@
 		                     WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
 }
 
-BOOL PASCAL WindowWindow(HWND WndParent, PBOOL Close)
+BOOL WINAPI WindowWindow(HWND WndParent, PBOOL Close)
 {
 	*Close = FALSE;
 	return
@@ -3447,7 +3447,7 @@
 		                     (DLGPROC)&WinListDlg, (LPARAM)Close);
 }
 
-void PASCAL TTDLGSetUILanguageFile(char *file)
+void WINAPI TTDLGSetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
 }

Modified: trunk/teraterm/ttpfile/ttfile.c
===================================================================
--- trunk/teraterm/ttpfile/ttfile.c	2018-12-02 15:51:37 UTC (rev 7304)
+++ trunk/teraterm/ttpfile/ttfile.c	2018-12-02 15:51:49 UTC (rev 7305)
@@ -176,7 +176,7 @@
 	return Ok;
 }
 
-void SetLogFlags(HWND Dialog)
+static void SetLogFlags(HWND Dialog)
 {
 	LPLONG pl;
 	WORD BinFlag, val;
@@ -239,7 +239,7 @@
 }
 
 /* Hook function for file name dialog box */
-BOOL CALLBACK LogFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK LogFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	LPOPENFILENAME ofn;
 	WORD BinFlag, TsFlag;
@@ -338,6 +338,7 @@
 		}
 
 		// timestamp\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X (2006.7.23 maya)
+		TsFlag = FALSE;
 		ShowDlgItem(Dialog, IDC_TIMESTAMP, IDC_TIMESTAMP);
 		if (BinFlag) {
 			// Binary\x83t\x83\x89\x83O\x82\xAA\x97L\x8C\xF8\x82ȂƂ\xAB\x82̓`\x83F\x83b\x83N\x82ł\xAB\x82Ȃ\xA2
@@ -427,10 +428,9 @@
 	return FALSE;
 }
 
-BOOL CALLBACK TransFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam);
+static BOOL CALLBACK TransFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam);
 
-BOOL PASCAL GetTransFname
-  (PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option)
+BOOL WINAPI GetTransFname(PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option)
 {
 	char uimsg[MAX_UIMSG];
 	char FNFilter[sizeof(FileSendFilter)*3], *pf;
@@ -575,7 +575,7 @@
 	return Ok;
 }
 
-BOOL CALLBACK TransFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK TransFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	LPOPENFILENAME ofn;
 	LPWORD pw;
@@ -646,8 +646,7 @@
 	return FALSE;
 }
 
-BOOL PASCAL GetMultiFname
-  (PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option)
+BOOL WINAPI GetMultiFname(PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option)
 {
 	int i, len;
 	char uimsg[MAX_UIMSG];
@@ -797,8 +796,7 @@
 	return Ok;
 }
 
-BOOL CALLBACK GetFnDlg
-  (HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK GetFnDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	PFileVar fv;
 	char TempFull[MAX_PATH];
@@ -875,7 +873,7 @@
 	return FALSE;
 }
 
-BOOL PASCAL GetGetFname(HWND HWin, PFileVar fv)
+BOOL WINAPI GetGetFname(HWND HWin, PFileVar fv)
 {
 	return (BOOL)DialogBoxParam(hInst,
 	                            MAKEINTRESOURCE(IDD_GETFNDLG),
@@ -882,7 +880,7 @@
 	                            HWin, GetFnDlg, (LONG)fv);
 }
 
-void PASCAL SetFileVar(PFileVar fv)
+void WINAPI SetFileVar(PFileVar fv)
 {
 	int i;
 	char uimsg[MAX_UIMSG];
@@ -959,7 +957,7 @@
 }
 
 /* Hook function for XMODEM file name dialog box */
-BOOL CALLBACK XFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK XFnHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	LPOPENFILENAME ofn;
 	WORD Hi, Lo;
@@ -1094,8 +1092,7 @@
 	return FALSE;
 }
 
-BOOL PASCAL GetXFname
-  (HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir)
+BOOL WINAPI GetXFname(HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir)
 {
 	char uimsg[MAX_UIMSG];
 	char FNFilter[sizeof(FileSendFilter)*2+128], *pf;
@@ -1190,7 +1187,7 @@
 	return Ok;
 }
 
-void PASCAL ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
+void WINAPI ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
 {
 	switch (Proto) {
 	case PROTO_KMT:
@@ -1214,8 +1211,7 @@
 	}
 }
 
-BOOL PASCAL ProtoParse
-  (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
+BOOL WINAPI ProtoParse(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	BOOL Ok;
 
@@ -1264,8 +1260,7 @@
 	return Ok;
 }
 
-void PASCAL ProtoTimeOutProc
-  (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
+void WINAPI ProtoTimeOutProc(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	switch (Proto) {
 	case PROTO_KMT:
@@ -1289,8 +1284,7 @@
 	}
 }
 
-BOOL PASCAL ProtoCancel
-  (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
+BOOL WINAPI ProtoCancel(int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	switch (Proto) {
 	case PROTO_KMT:
@@ -1318,12 +1312,12 @@
 	return TRUE;
 }
 
-void PASCAL TTFILESetUILanguageFile(char *file)
+void WINAPI TTFILESetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
 }
 
-void PASCAL TTFILESetFileSendFilter(char *file)
+void WINAPI TTFILESetFileSendFilter(char *file)
 {
 	strncpy_s(FileSendFilter, sizeof(FileSendFilter), file, _TRUNCATE);
 }


Ttssh2-commit メーリングリストの案内
Back to archive index