Commit: f875ec4e76ad4a1dc913d1972f2c92a0ec46bed4 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: f875ec4e76ad4a1dc913d1972f2c92a0ec46bed4 (tree)
• Tiempo: 2011-09-16 19:53:00
• Autor: hylom <hylom@user...>
• Commiter: hylom

Log Message

replace 'SUCCESS' and 'FAIL' macro to 'FFFTP_SUCCESS' and 'FFFTP_FAIL' to suppress warning

Cambiar Resumen

• add: .gitignore
• modified: OLDregistory.c
• modified: bookmark.c
• modified: cache.c
• modified: clipboard.c
• modified: common.h
• modified: connect.c
• modified: filelist.c
• modified: ftpproc.c
• modified: getput.c
• modified: history.c
• modified: hostman.c
• modified: local.c
• modified: lvtips.c
• modified: main.c
• modified: misc.c
• modified: ras.c
• modified: registory.c
• modified: remote.c
• modified: sha.c
• modified: skey.c
• modified: socket.c
• modified: statuswin.c
• modified: taskwin.c
• modified: tool.c
• modified: toolmenu.c
• modified: wildcard.c

Diferencia incremental

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*~
+Release
+Debug
+FFFTP_Eng_Release
+FFFTP_Eng_Debug
+*.ncb
+*.suo
+*.user

--- a/OLDregistory.c
+++ b/OLDregistory.c
@@ -220,7 +220,7 @@ int ValidateMasterPassword(void)
 	int i;
 
 	SetRegType(REGTYPE_INI);
-	if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)
+	if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)
 	{
 		if(AskForceIni() == NO)
 		{
@@ -228,14 +228,14 @@ int ValidateMasterPassword(void)
 			i = OpenReg("FFFTP", &hKey3);
 		}
 	}
-	if(i == SUCCESS){
+	if(i == FFFTP_SUCCESS){
 		char checkbuf[48];
 		int salt = 0;
 
 		if( ReadIntValueFromReg(hKey3, "CredentialSalt", &salt)){
 			SetHashSalt( salt );
 		}
-		if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == SUCCESS ){
+		if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == FFFTP_SUCCESS ){
 			switch( CheckPasswordValidity( SecretKey, SecretKeyLength, checkbuf ) ){
 			case 0: /* not match */
 				IsMasterPasswordError = PASSWORD_UNMATCH;
@@ -283,7 +283,7 @@ void SaveRegistory(void)
 	}
 
 	SetRegType(RegType);
-	if(CreateReg("FFFTP", &hKey3) == SUCCESS)
+	if(CreateReg("FFFTP", &hKey3) == FFFTP_SUCCESS)
 	{
 		char buf[48];
 		int salt = GetTickCount();
@@ -296,7 +296,7 @@ void SaveRegistory(void)
 		CreatePasswordHash( SecretKey, SecretKeyLength, buf );
 		WriteStringToReg(hKey3, "CredentialCheck", buf);
 
-		if(CreateSubKey(hKey3, "Options", &hKey4) == SUCCESS)
+		if(CreateSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)
 		{
 			WriteIntValueToReg(hKey4, "NoSave", SuppressSave);
 
@@ -412,10 +412,10 @@ void SaveRegistory(void)
 				n = 0;
 				for(i = AskHistoryNum(); i > 0; i--)
 				{
-					if(GetHistoryByNum(i-1, &Hist) == SUCCESS)
+					if(GetHistoryByNum(i-1, &Hist) == FFFTP_SUCCESS)
 					{
 						sprintf(Str, "History%d", n);
-						if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)
+						if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 						{
 							SaveStr(hKey5, "HostAdrs", Hist.HostAdrs, DefaultHist.HostAdrs);
 							SaveStr(hKey5, "UserName", Hist.UserName, DefaultHist.UserName);
@@ -459,17 +459,17 @@ void SaveRegistory(void)
 				for(; n < 999; n++)
 				{
 					sprintf(Str, "History%d", n);
-					if(DeleteSubKey(hKey4, Str) != SUCCESS)
+					if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)
 						break;
 				}
 
 				/* ホストの設定を保存 */
 				CopyDefaultHost(&DefaultHost);
 				i = 0;
-				while(CopyHostFromList(i, &Host) == SUCCESS)
+				while(CopyHostFromList(i, &Host) == FFFTP_SUCCESS)
 				{
 					sprintf(Str, "Host%d", i);
-					if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)
+					if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 					{
 //						SaveIntNum(hKey5, "Set", Host.Level, DefaultHost.Level);
 						WriteIntValueToReg(hKey5, "Set", Host.Level);
@@ -526,7 +526,7 @@ void SaveRegistory(void)
 				for(; i < 998; i++)
 				{
 					sprintf(Str, "Host%d", i);
-					if(DeleteSubKey(hKey4, Str) != SUCCESS)
+					if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)
 						break;
 				}
 
@@ -571,7 +571,7 @@ int LoadRegistory(void)
 	Sts = NO;
 
 	SetRegType(REGTYPE_INI);
-	if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)
+	if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)
 	{
 		if(AskForceIni() == NO)
 		{
@@ -580,7 +580,7 @@ int LoadRegistory(void)
 		}
 	}
 
-	if(i == SUCCESS)
+	if(i == FFFTP_SUCCESS)
 	{
 		char checkbuf[48];
 		int salt = 0;
@@ -588,7 +588,7 @@ int LoadRegistory(void)
 
 		ReadIntValueFromReg(hKey3, "Version", &Version);
 
-		if(OpenSubKey(hKey3, "Options", &hKey4) == SUCCESS)
+		if(OpenSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)
 		{
 			ReadIntValueFromReg(hKey4, "WinPosX", &WinPosX);
 			ReadIntValueFromReg(hKey4, "WinPosY", &WinPosY);
@@ -647,7 +647,7 @@ int LoadRegistory(void)
 			ReadIntValueFromReg(hKey4, "RegExp", &FindMode);
 			ReadIntValueFromReg(hKey4, "Reg", &RegType);
 
-			if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FAIL)
+			if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FFFTP_FAIL)
 			{
 				/* 旧ASCIIモードの拡張子の設定を新しいものに変換 */
 				ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);
@@ -679,9 +679,9 @@ int LoadRegistory(void)
 			ReadIntValueFromReg(hKey4, "MirUNot", &MirUpDelNotify);
 			ReadIntValueFromReg(hKey4, "MirDNot", &MirDownDelNotify);
 
-			if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == SUCCESS)
+			if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == FFFTP_SUCCESS)
 			{
-				if(RestoreFontData(Str, &ListLogFont) == SUCCESS)
+				if(RestoreFontData(Str, &ListLogFont) == FFFTP_SUCCESS)
 					ListFont = CreateFontIndirect(&ListLogFont);
 			}
 			ReadIntValueFromReg(hKey4, "ListHide", &DispIgnoreHide);
@@ -730,7 +730,7 @@ int LoadRegistory(void)
 			for(i = 0; i < Sets; i++)
 			{
 				sprintf(Str, "History%d", i);
-				if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)
+				if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 				{
 					CopyDefaultHistory(&Hist);
 
@@ -778,7 +778,7 @@ int LoadRegistory(void)
 			for(i = 0; i < Sets; i++)
 			{
 				sprintf(Str, "Host%d", i);
-				if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)
+				if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 				{
 					CopyDefaultHost(&Host);
 					/* 下位互換性のため */
@@ -893,17 +893,17 @@ DWORD LoadHideDriveListRegistory(void)
 	DWORD Ret;
 
 	Ret = 0;
-	if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hKey1) == ERROR_SUCCESS)
+	if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hKey1) == ERROR_FFFTP_SUCCESS)
 	{
-		if(RegOpenKeyEx(hKey1, "Microsoft", 0, KEY_READ, &hKey2) == ERROR_SUCCESS)
+		if(RegOpenKeyEx(hKey1, "Microsoft", 0, KEY_READ, &hKey2) == ERROR_FFFTP_SUCCESS)
 		{
-			if(RegOpenKeyEx(hKey2, "Windows", 0, KEY_READ, &hKey3) == ERROR_SUCCESS)
+			if(RegOpenKeyEx(hKey2, "Windows", 0, KEY_READ, &hKey3) == ERROR_FFFTP_SUCCESS)
 			{
-				if(RegOpenKeyEx(hKey3, "CurrentVersion", 0, KEY_READ, &hKey4) == ERROR_SUCCESS)
+				if(RegOpenKeyEx(hKey3, "CurrentVersion", 0, KEY_READ, &hKey4) == ERROR_FFFTP_SUCCESS)
 				{
-					if(RegOpenKeyEx(hKey4, "Policies", 0, KEY_READ, &hKey5) == ERROR_SUCCESS)
+					if(RegOpenKeyEx(hKey4, "Policies", 0, KEY_READ, &hKey5) == ERROR_FFFTP_SUCCESS)
 					{
-						if(RegOpenKeyEx(hKey5, "Explorer", 0, KEY_READ, &hKey6) == ERROR_SUCCESS)
+						if(RegOpenKeyEx(hKey5, "Explorer", 0, KEY_READ, &hKey6) == ERROR_FFFTP_SUCCESS)
 						{
 							Size = sizeof(DWORD);
 							RegQueryValueEx(hKey6, "NoDrives", NULL, &Type, (BYTE *)&Ret, &Size);
@@ -941,22 +941,22 @@ void ClearRegistory(void)
 	char Str[20];
 	int i;
 
-	if(RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Sota", 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey2, &Dispos) == ERROR_SUCCESS)
+	if(RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Sota", 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey2, &Dispos) == ERROR_FFFTP_SUCCESS)
 	{
-		if(RegCreateKeyEx(hKey2, "FFFTP", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey3, &Dispos) == ERROR_SUCCESS)
+		if(RegCreateKeyEx(hKey2, "FFFTP", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey3, &Dispos) == ERROR_FFFTP_SUCCESS)
 		{
-			if(RegCreateKeyEx(hKey3, "Options", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey4, &Dispos) == ERROR_SUCCESS)
+			if(RegCreateKeyEx(hKey3, "Options", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey4, &Dispos) == ERROR_FFFTP_SUCCESS)
 			{
 				for(i = 0; ; i++)
 				{
 					sprintf(Str, "Host%d", i);
-					if(RegDeleteKey(hKey4, Str) != ERROR_SUCCESS)
+					if(RegDeleteKey(hKey4, Str) != ERROR_FFFTP_SUCCESS)
 						break;
 				}
 				for(i = 0; ; i++)
 				{
 					sprintf(Str, "History%d", i);
-					if(RegDeleteKey(hKey4, Str) != ERROR_SUCCESS)
+					if(RegDeleteKey(hKey4, Str) != ERROR_FFFTP_SUCCESS)
 						break;
 				}
 				RegCloseKey(hKey4);
@@ -1141,7 +1141,7 @@ static void MakeFontData(LOGFONT Font, HFONT hFont, char *Buf)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL=変換できない
+*			FFFTP_SUCCESS/FFFTP_FAIL=変換できない
 *----------------------------------------------------------------------------*/
 
 static int RestoreFontData(char *Str, LOGFONT *Font)
@@ -1149,7 +1149,7 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
 	int i;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(sscanf(Str, "%d %d %d %d %d %d %d %d %d %d %d %d %d",
 			&(Font->lfHeight), &(Font->lfWidth), &(Font->lfEscapement), &(Font->lfOrientation),
 			&(Font->lfWeight), &(Font->lfItalic), &(Font->lfUnderline), &(Font->lfStrikeOut),
@@ -1165,11 +1165,11 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
 		if(i == 0)
 		{
 			strcpy(Font->lfFaceName, Str);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 
-	if(Sts == FAIL)
+	if(Sts == FFFTP_FAIL)
 		memset(Font, NUL, sizeof(LOGFONT));
 
 	return(Sts);
@@ -1445,7 +1445,7 @@ static int TmpRegType;
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static void SetRegType(int Type)
@@ -1463,7 +1463,7 @@ static void SetRegType(int Type)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int OpenReg(char *Name, void **Handle)
@@ -1471,17 +1471,17 @@ static int OpenReg(char *Name, void **Handle)
 	int Sts;
 	char Tmp[FMAX_PATH+1];
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		strcpy(Tmp, "Software\\Sota\\");
 		strcat(Tmp, Name);
-		if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == SUCCESS)
+		if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == FFFTP_SUCCESS)
 			((REGDATATBL *)(*Handle))->Mode = 0;
 	}
 	return(Sts);
@@ -1496,7 +1496,7 @@ static int OpenReg(char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CreateReg(char *Name, void **Handle)
@@ -1505,13 +1505,13 @@ static int CreateReg(char *Name, void **Handle)
 	char Tmp[FMAX_PATH+1];
 	DWORD Dispos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		strcpy(Tmp, "Software\\Sota\\");
 		strcat(Tmp, Name);
-		if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -1521,7 +1521,7 @@ static int CreateReg(char *Name, void **Handle)
 			((REGDATATBL *)(*Handle))->ValLen = 0;
 			((REGDATATBL *)(*Handle))->Next = NULL;
 			((REGDATATBL *)(*Handle))->Mode = 1;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -1535,7 +1535,7 @@ static int CreateReg(char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CloseReg(void *Handle)
@@ -1574,7 +1574,7 @@ static int CloseReg(void *Handle)
 			Pos = Next;
 		}
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -1627,7 +1627,7 @@ static BOOL WriteOutRegToFile(REGDATATBL *Pos)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadInReg(char *Name, REGDATATBL **Handle)
@@ -1640,7 +1640,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 	REGDATATBL *Pos;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	*Handle = NULL;
 
 	if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)
@@ -1683,7 +1683,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 					}
 				}
 			}
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 			free(Buf);
 		}
 		fclose(Strm);
@@ -1701,7 +1701,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int OpenSubKey(void *Parent, char *Name, void **Handle)
@@ -1710,11 +1710,11 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 	char Key[80];
 	REGDATATBL *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -1727,7 +1727,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 			if(strcmp(Pos->KeyName, Key) == 0)
 			{
 				*Handle = Pos;
-				Sts = SUCCESS;
+				Sts = FFFTP_SUCCESS;
 				break;
 			}
 			Pos = Pos->Next;
@@ -1746,7 +1746,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CreateSubKey(void *Parent, char *Name, void **Handle)
@@ -1755,11 +1755,11 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 	DWORD Dispos;
 	REGDATATBL *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -1776,7 +1776,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 			while(Pos->Next != NULL)
 				Pos = Pos->Next;
 			Pos->Next = *Handle;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -1790,7 +1790,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CloseSubKey(void *Handle)
@@ -1801,7 +1801,7 @@ static int CloseSubKey(void *Handle)
 	{
 		/* Nothing */
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -1813,22 +1813,22 @@ static int CloseSubKey(void *Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int DeleteSubKey(void *Handle, char *Name)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegDeleteKey(Handle, Name) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegDeleteKey(Handle, Name) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -1842,22 +1842,22 @@ static int DeleteSubKey(void *Handle, char *Name)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int DeleteValue(void *Handle, char *Name)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegDeleteValue(Handle, Name) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegDeleteValue(Handle, Name) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -1872,7 +1872,7 @@ static int DeleteValue(void *Handle, char *Name)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
@@ -1881,19 +1881,19 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 	DWORD Size;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		Size = sizeof(int);
-		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
 		if((Pos = ScanValue(Handle, Name)) != NULL)
 		{
 			*Value = atoi(Pos);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -1909,7 +1909,7 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteIntValueToReg(void *Handle, char *Name, int Value)
@@ -1930,7 +1930,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 		strcat(Data, Tmp);
 		Pos->ValLen += strlen(Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -1944,7 +1944,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
@@ -1952,14 +1952,14 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)
+		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_FFFTP_SUCCESS)
 		{
 			if(*(Str + Size - 1) != NUL)
 				*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	else
@@ -1969,7 +1969,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 			Size = min1(Size-1, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Str);
 			*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -1985,7 +1985,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteStringToReg(void *Handle, char *Name, char *Str)
@@ -2005,7 +2005,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Str, strlen(Str), Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2019,7 +2019,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
@@ -2027,14 +2027,14 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)
+		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_FFFTP_SUCCESS)
 		{
 			if(*(Str + Size - 1) != NUL)
 				*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	else
@@ -2044,7 +2044,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 			Size = min1(Size-1, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Str);
 			*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2060,7 +2060,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
@@ -2080,7 +2080,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Str, StrMultiLen(Str), Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2094,7 +2094,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
@@ -2102,11 +2102,11 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
-		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_FFFTP_SUCCESS)
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -2114,7 +2114,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 		{
 			Size = min1(Size, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Bin);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2131,7 +2131,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
@@ -2151,7 +2151,7 @@ static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Bin, Len, Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 

--- a/bookmark.c
+++ b/bookmark.c
@@ -125,7 +125,7 @@ void AddCurDirToBookMark(int Win)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int AddBookMark(char *Path)
@@ -134,11 +134,11 @@ static int AddBookMark(char *Path)
 	int MarkID;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	hMenu = GetSubMenu(GetMenu(GetMainHwnd()), BMARK_SUB_MENU);
 	MarkID = (GetMenuItemCount(hMenu) - DEFAULT_BMARK_ITEM) + MENU_BMARK_TOP;
 	if(AppendMenu(hMenu, MF_STRING, MarkID, Path) == TRUE)
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	return(Sts);
 }
 

--- a/cache.c
+++ b/cache.c
@@ -74,7 +74,7 @@ static int ProgNum;						/* FFFTPの起動番号 */
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeCacheBuf(int Num)
@@ -82,16 +82,16 @@ int MakeCacheBuf(int Num)
 	int Sts;
 	int i;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(Num > 0)
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 		if((RemoteCache = malloc(sizeof(CACHELIST) * Num)) != NULL)
 		{
 			TmpCacheEntry = Num;
 			for(i = 0; i < TmpCacheEntry; i++)
 				ClearCache(i);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);

--- a/clipboard.c
+++ b/clipboard.c
@@ -54,7 +54,7 @@ int CopyStrToClipBoard(char *Str)
 	void *gBuf;
 	HGLOBAL hGlobal;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(OpenClipboard(GetMainHwnd()))
 	{
 		if(EmptyClipboard())
@@ -67,7 +67,7 @@ int CopyStrToClipBoard(char *Str)
 
 					GlobalUnlock(hGlobal);
 					SetClipboardData(CF_TEXT, hGlobal);
-					Sts = SUCCESS;
+					Sts = FFFTP_SUCCESS;
 				}
 			}
 		}

--- a/common.h
+++ b/common.h
@@ -52,8 +52,9 @@
 #define ushort			unsigned short
 #define ulong			unsigned long
 
-#define FAIL			0
-#define SUCCESS			1
+#define FFFTP_FAIL			0
+#define FFFTP_SUCCESS			1
+#undef SUCCESS
 
 #define NO				0
 #define YES				1

--- a/connect.c
+++ b/connect.c
@@ -137,7 +137,7 @@ void ConnectProc(int Type, int Num)
 		InitPWDcommand();
 		CopyHostFromList(AskCurrentHost(), &CurHost);
 
-		if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == SUCCESS)
+		if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)
 		{
 			SetHostKanaCnvImm(CurHost.KanaCnv);
 			SetHostKanjiCodeImm(CurHost.KanjiCode);
@@ -216,7 +216,7 @@ void QuickConnectProc(void)
 
 		InitPWDcommand();
 		CopyDefaultHost(&CurHost);
-		if(SplitUNCpath(Tmp, CurHost.HostAdrs, CurHost.RemoteInitDir, File, CurHost.UserName, CurHost.PassWord, &CurHost.Port) == SUCCESS)
+		if(SplitUNCpath(Tmp, CurHost.HostAdrs, CurHost.RemoteInitDir, File, CurHost.UserName, CurHost.PassWord, &CurHost.Port) == FFFTP_SUCCESS)
 		{
 			if(strlen(CurHost.UserName) == 0)
 			{
@@ -304,7 +304,7 @@ static BOOL CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 			SendDlgItemMessage(hDlg, QHOST_PASV, BM_SETCHECK, PasvDefault, 0);
 			for(i = 0; i < HISTORY_MAX; i++)
 			{
-				if(GetHistoryByNum(i, &Tmp) == SUCCESS)
+				if(GetHistoryByNum(i, &Tmp) == FFFTP_SUCCESS)
 				{
 //sprintf(Str, "%s (%s) %s", Tmp.HostAdrs, Tmp.UserName, Tmp.RemoteInitDir);
 //SendDlgItemMessage(hDlg, QHOST_HOST, CB_ADDSTRING, 0, (LPARAM)Str);
@@ -373,7 +373,7 @@ void DirectConnectProc(char *unc, int Kanji, int Kana, int Fkanji, int TrMode)
 	SetTaskMsg("----------------------------");
 
 	InitPWDcommand();
-	if(SplitUNCpath(unc, Host, Path, File, User, Pass, &Port) == SUCCESS)
+	if(SplitUNCpath(unc, Host, Path, File, User, Pass, &Port) == FFFTP_SUCCESS)
 	{
 		if(strlen(User) == 0)
 		{
@@ -453,7 +453,7 @@ void HistoryConnectProc(int MenuCmd)
 	int RFSort;
 	int RDSort;
 
-	if(GetHistoryByCmd(MenuCmd, &Hist) == SUCCESS)
+	if(GetHistoryByCmd(MenuCmd, &Hist) == FFFTP_SUCCESS)
 	{
 		SaveBookMark();
 		SaveCurrentSetToHost();
@@ -467,7 +467,7 @@ void HistoryConnectProc(int MenuCmd)
 		InitPWDcommand();
 		CopyHistoryToHost(&Hist, &CurHost);
 
-		if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == SUCCESS)
+		if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)
 		{
 			SetCurrentHost(HOSTNUM_NOENTRY);
 			SetHostKanaCnvImm(CurHost.KanaCnv);
@@ -574,7 +574,7 @@ static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List)
 	*List = NO;
 
 	i = 0;
-	while(CopyHostFromList(i, &Tmp) == SUCCESS)
+	while(CopyHostFromList(i, &Tmp) == FFFTP_SUCCESS)
 	{
 		if(strcmp(Host, Tmp.HostAdrs) == 0)
 		{
@@ -905,7 +905,7 @@ static void SaveCurrentSetToHistory(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int ReConnectCmdSkt(void)
@@ -931,7 +931,7 @@ int ReConnectCmdSkt(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 //int ReConnectTrnSkt(void)
@@ -947,7 +947,7 @@ int ReConnectCmdSkt(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReConnectSkt(SOCKET *Skt)
@@ -955,7 +955,7 @@ static int ReConnectSkt(SOCKET *Skt)
 	char Path[FMAX_PATH+1];
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 
 	SetTaskMsg(MSGJPN003);
 
@@ -968,7 +968,7 @@ static int ReConnectSkt(SOCKET *Skt)
 	{
 		AskRemoteCurDir(Path, FMAX_PATH);
 		DoCWD(Path, YES, YES, YES);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	else
 		SoundPlay(SND_ERROR);
@@ -1221,7 +1221,7 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 				Flg = 1;
 				if(setsockopt(ContSock, SOL_SOCKET, SO_OOBINLINE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
 					ReportWSError("setsockopt", WSAGetLastError());
-#pragma aaa
+/* #pragma aaa */
 				Flg = 1;
 				if(setsockopt(ContSock, SOL_SOCKET, SO_KEEPALIVE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
 					ReportWSError("setsockopt", WSAGetLastError());
@@ -1402,7 +1402,7 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	Note
 *		ワンタイムパスワードでない時はPassをそのままReplyにコピー
@@ -1416,7 +1416,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 	char Seed[MAX_SEED_LEN+1];
 	int i;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	Pos = NULL;
 
 	if(Type == SECURITY_AUTO)
@@ -1445,7 +1445,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 		/* シーケンス番号を見つけるループ */
 		DoPrintf("Analize OTP");
 		DoPrintf("%s", Pos);
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 		while((Pos = GetNextField(Pos)) != NULL)
 		{
 			if(IsDigit(*Pos))
@@ -1456,7 +1456,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 				/* Seed */
 				if((Pos = GetNextField(Pos)) != NULL)
 				{
-					if(GetOneField(Pos, Seed, MAX_SEED_LEN) == SUCCESS)
+					if(GetOneField(Pos, Seed, MAX_SEED_LEN) == FFFTP_SUCCESS)
 					{
 						/* Seedは英数字のみ有効とする */
 						for(i = strlen(Seed)-1; i >= 0; i--)
@@ -1474,7 +1474,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 							if(Seq <= 10)
 								DialogBox(GetFtpInst(), MAKEINTRESOURCE(otp_notify_dlg), GetMainHwnd(), ExeEscDialogProc);
 
-							Sts = SUCCESS;
+							Sts = FFFTP_SUCCESS;
 						}
 					}
 				}
@@ -1482,7 +1482,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 			}
 		}
 
-		if(Sts == FAIL)
+		if(Sts == FFFTP_FAIL)
 			SetTaskMsg(MSGJPN015);
 	}
 	else
@@ -1636,8 +1636,8 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 			if(Fwall == FWALL_SOCKS4)
 			{
 				Socks4Reply.Result = -1;
-				if((SocksSendCmd(sSocket, &Socks4Cmd, Len, CancelCheckWork) != SUCCESS) ||
-				   (Socks4GetCmdReply(sSocket, &Socks4Reply) != SUCCESS) || 
+				if((SocksSendCmd(sSocket, &Socks4Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks4GetCmdReply(sSocket, &Socks4Reply) != FFFTP_SUCCESS) || 
 				   (Socks4Reply.Result != SOCKS4_RES_OK))
 				{
 					SetTaskMsg(MSGJPN023, Socks4Reply.Result);
@@ -1647,15 +1647,15 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 			}
 			else if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 			{
-				if(Socks5SelMethod(sSocket, CancelCheckWork) == FAIL)
+				if(Socks5SelMethod(sSocket, CancelCheckWork) == FFFTP_FAIL)
 				{
 					DoClose(sSocket);
 					sSocket = INVALID_SOCKET;
 				}
 
 				Socks5Reply.Result = -1;
-				if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != SUCCESS) ||
-				   (Socks5GetCmdReply(sSocket, &Socks5Reply) != SUCCESS) || 
+				if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks5GetCmdReply(sSocket, &Socks5Reply) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
 					SetTaskMsg(MSGJPN024, Socks5Reply.Result);
@@ -1727,8 +1727,8 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 				Len = offsetof(SOCKS4CMD, UserID) + strlen(FwallUser) + 1;
 
 				Socks4Reply.Result = -1;
-				if((SocksSendCmd(listen_skt, &Socks4Cmd, Len, CancelCheckWork) != SUCCESS) ||
-				   (Socks4GetCmdReply(listen_skt, &Socks4Reply) != SUCCESS) || 
+				if((SocksSendCmd(listen_skt, &Socks4Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks4GetCmdReply(listen_skt, &Socks4Reply) != FFFTP_SUCCESS) || 
 				   (Socks4Reply.Result != SOCKS4_RES_OK))
 				{
 					SetTaskMsg(MSGJPN028, Socks4Reply.Result);
@@ -1749,7 +1749,7 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 			DoPrintf("Use SOCKS5 BIND");
 			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)
 			{
-				if(Socks5SelMethod(listen_skt, CancelCheckWork) == FAIL)
+				if(Socks5SelMethod(listen_skt, CancelCheckWork) == FFFTP_FAIL)
 				{
 					DoClose(listen_skt);
 					listen_skt = INVALID_SOCKET;
@@ -1759,8 +1759,8 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 				Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);
 
 				Socks5Reply.Result = -1;
-				if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != SUCCESS) ||
-				   (Socks5GetCmdReply(listen_skt, &Socks5Reply) != SUCCESS) || 
+				if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks5GetCmdReply(listen_skt, &Socks5Reply) != FFFTP_SUCCESS) || 
 				   (Socks5Reply.Result != SOCKS5_RES_OK))
 				{
 					SetTaskMsg(MSGJPN029, Socks5Reply.Result);
@@ -1945,7 +1945,7 @@ static int Socks5MakeCmdPacket(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, ulo
 *		int Size : サイズ
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWork)
@@ -1954,7 +1954,7 @@ static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWor
 
 	Ret = SendData(Socket, (char *)Data, Size, 0, CancelCheckWork);
 
-	if(Ret != SUCCESS)
+	if(Ret != FFFTP_SUCCESS)
 		SetTaskMsg(MSGJPN033, *((short *)Data));
 
 	return(Ret);
@@ -1968,7 +1968,7 @@ static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWor
 *		SOCKS5REPLY *Packet : パケット
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
@@ -1980,7 +1980,7 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
 	Pos = (uchar *)Packet;
 	Pos += SOCKS5REPLY_SIZE;
 
-	if((Ret = ReadNchar(Socket, (char *)Packet, SOCKS5REPLY_SIZE, &CancelFlg)) == SUCCESS)
+	if((Ret = ReadNchar(Socket, (char *)Packet, SOCKS5REPLY_SIZE, &CancelFlg)) == FFFTP_SUCCESS)
 	{
 		if(Packet->Type == SOCKS5_ADRS_IPV4)
 			Len = 4 + 2;
@@ -1988,18 +1988,18 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
 			Len = 6 + 2;
 		else
 		{
-			if((Ret = ReadNchar(Socket, (char *)Pos, 1, &CancelFlg)) == SUCCESS)
+			if((Ret = ReadNchar(Socket, (char *)Pos, 1, &CancelFlg)) == FFFTP_SUCCESS)
 			{
 				Len = *Pos + 2;
 				Pos++;
 			}
 		}
 
-		if(Ret == SUCCESS)
+		if(Ret == FFFTP_SUCCESS)
 			Ret = ReadNchar(Socket, (char *)Pos, Len, &CancelFlg);
 	}
 
-	if(Ret != SUCCESS)
+	if(Ret != FFFTP_SUCCESS)
 		SetTaskMsg(MSGJPN034);
 
 	return(Ret);
@@ -2013,7 +2013,7 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
 *		SOCKS5REPLY *Packet : パケット
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)
@@ -2022,7 +2022,7 @@ static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)
 
 	Ret = ReadNchar(Socket, (char *)Packet, SOCKS4REPLY_SIZE, &CancelFlg);
 
-	if(Ret != SUCCESS)
+	if(Ret != FFFTP_SUCCESS)
 		DoPrintf(MSGJPN035);
 
 	return(Ret);
@@ -2035,7 +2035,7 @@ static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)
 *		SOCKET Socket : ソケット
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
@@ -2048,7 +2048,7 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
 	int Len;
 	int Len2;
 
-	Ret = SUCCESS;
+	Ret = FFFTP_SUCCESS;
 	Socks5Method.Ver = SOCKS5_VER;
 	Socks5Method.Num = 1;
 	if(FwallType == FWALL_SOCKS5_NOAUTH)
@@ -2056,12 +2056,12 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
 	else
 		Socks5Method.Methods[0] = SOCKS5_AUTH_USER;
 
-	if((SocksSendCmd(Socket, &Socks5Method, SOCKS5METHODREQUEST_SIZE, CancelCheckWork) != SUCCESS) ||
-	   (ReadNchar(Socket, (char *)&Socks5MethodReply, SOCKS5METHODREPLY_SIZE, &CancelFlg) != SUCCESS) ||
+	if((SocksSendCmd(Socket, &Socks5Method, SOCKS5METHODREQUEST_SIZE, CancelCheckWork) != FFFTP_SUCCESS) ||
+	   (ReadNchar(Socket, (char *)&Socks5MethodReply, SOCKS5METHODREPLY_SIZE, &CancelFlg) != FFFTP_SUCCESS) ||
 	   (Socks5MethodReply.Method == (uchar)0xFF))
 	{
 		SetTaskMsg(MSGJPN036);
-		Ret = FAIL;
+		Ret = FFFTP_FAIL;
 	}
 	else if(Socks5MethodReply.Method == SOCKS5_AUTH_USER)
 	{
@@ -2074,12 +2074,12 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
 		Buf[2 + Len] = Len2;
 		strcpy(Buf+3+Len, FwallPass);
 
-		if((SocksSendCmd(Socket, &Buf, Len+Len2+3, CancelCheckWork) != SUCCESS) ||
-		   (ReadNchar(Socket, (char *)&Socks5Status, SOCKS5USERPASSSTATUS_SIZE, &CancelFlg) != SUCCESS) ||
+		if((SocksSendCmd(Socket, &Buf, Len+Len2+3, CancelCheckWork) != FFFTP_SUCCESS) ||
+		   (ReadNchar(Socket, (char *)&Socks5Status, SOCKS5USERPASSSTATUS_SIZE, &CancelFlg) != FFFTP_SUCCESS) ||
 		   (Socks5Status.Status != 0))
 		{
 			SetTaskMsg(MSGJPN037);
-			Ret = FAIL;
+			Ret = FFFTP_FAIL;
 		}
 	}
 	else
@@ -2096,7 +2096,7 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
 *		SOCKET *Data : データソケットを返すワーク
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data)
@@ -2104,19 +2104,19 @@ int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data)
 	int Ret;
 	char Buf[300];
 
-	Ret = FAIL;
+	Ret = FFFTP_FAIL;
 	if((AskHostFireWall() == YES) && (FwallType == FWALL_SOCKS4))
 	{
 		Socks4GetCmdReply(Socket, (SOCKS4REPLY *)Buf);
 		*Data = Socket;
-		Ret = SUCCESS;
+		Ret = FFFTP_SUCCESS;
 	}
 	else if((AskHostFireWall() == YES) &&
 			((FwallType == FWALL_SOCKS5_NOAUTH) || (FwallType == FWALL_SOCKS5_USER)))
 	{
 		Socks5GetCmdReply(Socket, (SOCKS5REPLY *)Buf);
 		*Data = Socket;
-		Ret = SUCCESS;
+		Ret = FFFTP_SUCCESS;
 	}
 	return(Ret);
 }

--- a/filelist.c
+++ b/filelist.c
@@ -157,7 +157,7 @@ static char remoteFileDir[FMAX_PATH + 1];
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeListWin(HWND hWnd, HINSTANCE hInst)
@@ -275,11 +275,11 @@ int MakeListWin(HWND hWnd, HINSTANCE hInst)
 		SendMessage(hWndListRemote, LVM_INSERTCOLUMN, 5, (LPARAM)&LvCol);
 	}
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if((hWndListLocal == NULL) ||
 	   (hWndListRemote == NULL))
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -1198,7 +1198,7 @@ void GetRemoteDirForWnd(int Mode, int *CancelCheckWork)
 			{
 				ListType = LIST_UNKNOWN;
 
-				while(GetListOneLine(Str, FMAX_PATH, fd) == SUCCESS)
+				while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)
 				{
 					if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)
 					{
@@ -1705,7 +1705,7 @@ void SelectFileInList(HWND hWnd, int Type)
 						LvItem.state = 0;
 						if(GetNodeType(Win, i) != NODE_DRIVE)
 						{
-							if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||
+							if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||
 							   ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))
 							{
 								LvItem.state = LVIS_SELECTED;
@@ -1859,7 +1859,7 @@ void FindFileInList(HWND hWnd, int Type)
 						_mbslwr(Name);
 
 						LvItem.state = 0;
-						if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||
+						if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||
 						   ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))
 						{
 							LvItem.mask = LVIF_STATE;
@@ -1883,7 +1883,7 @@ void FindFileInList(HWND hWnd, int Type)
 				_mbslwr(Name);
 
 				LvItem.state = 0;
-				if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||
+				if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||
 				   ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))
 				{
 					LvItem.mask = LVIF_STATE;
@@ -2775,11 +2775,11 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
 
 		ListType = LIST_UNKNOWN;
 
-		while(GetListOneLine(Str, FMAX_PATH, fd) == SUCCESS)
+		while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)
 		{
 			if((ListType = AnalizeFileInfo(Str)) == LIST_UNKNOWN)
 			{
-				if(MakeDirPath(Str, ListType, Path, Dir) == SUCCESS)
+				if(MakeDirPath(Str, ListType, Path, Dir) == FFFTP_SUCCESS)
 				{
 					if(IncDir == RDIR_NLST)
 					{
@@ -2830,7 +2830,7 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
 *		FILE *Fd : ストリーム
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *
 *	Note
 *		VAX VMS以外の時は fgets(Buf, Max, Fd) と同じ
@@ -2842,10 +2842,10 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
 	char Tmp[FMAX_PATH+1];
 	int Sts;
 
-	Sts = FAIL;
-	while((Sts == FAIL) && (fgets(Buf, Max, Fd) != NULL))
+	Sts = FFFTP_FAIL;
+	while((Sts == FFFTP_FAIL) && (fgets(Buf, Max, Fd) != NULL))
 	{
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 		RemoveReturnCode(Buf);
 		ReplaceAll(Buf, '\x08', ' ');
 
@@ -2854,7 +2854,7 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
 		if(AskHostType() == HTYPE_VMS)
 		{
 			if(strchr(Buf, ';') == NULL)	/* ファイル名以外の行 */
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 			else
 			{
 				Max -= strlen(Buf);
@@ -2892,14 +2892,14 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL=ディレクトリ情報でない
+*			FFFTP_SUCCESS/FFFTP_FAIL=ディレクトリ情報でない
 *----------------------------------------------------------------------------*/
 
 static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	switch(ListType)
 	{
 		case LIST_ACOS :
@@ -2929,7 +2929,7 @@ static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir)
 						ReplaceAll(Dir, '\\', '/');
 					}
 				}
-				Sts = SUCCESS;
+				Sts = FFFTP_SUCCESS;
 			}
 			break;
 	}
@@ -3177,13 +3177,13 @@ static int AnalizeFileInfo(char *Str)
 		/* LIST_UNIX_10, LIST_UNIX_20, LIST_UNIX_12, LIST_UNIX_22, LIST_UNIX_50, LIST_UNIX_60 */
 		/* MELCOM80 */
 
-		if(FindField(Str, Tmp, 0, NO) == SUCCESS)
+		if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)
 		{
 			/* MELCOM80は "d rwxrwxrwx" のようにスペースが空いている */
 			Flag1 = NO;
 			if((strlen(Tmp) == 1) && (strchr("-dDlL", Tmp[0]) != NULL))
 			{
-				if(FindField(Str, Tmp, 1, NO) == SUCCESS)
+				if(FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS)
 				{
 					if((strlen(Tmp) == 9) ||
 					   ((strlen(Tmp) > 9) && (IsDigit(Tmp[9]) != 0)))
@@ -3207,7 +3207,7 @@ static int AnalizeFileInfo(char *Str)
 
 ////////////
 // LIST_UNIX_60 support
-				if(FindField(Str, Tmp, 7+Add1, NO) == SUCCESS)
+				if(FindField(Str, Tmp, 7+Add1, NO) == FFFTP_SUCCESS)
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3220,7 +3220,7 @@ static int AnalizeFileInfo(char *Str)
 ////////////
 // LIST_UNIX_12 support
 				if((Ret == LIST_UNKNOWN) &&
-				   (FindField(Str, Tmp, 6+Add1, NO) == SUCCESS))
+				   (FindField(Str, Tmp, 6+Add1, NO) == FFFTP_SUCCESS))
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3233,7 +3233,7 @@ static int AnalizeFileInfo(char *Str)
 ////////////
 // LIST_UNIX_70 support
 				if((Ret == LIST_UNKNOWN) &&
-				   (FindField(Str, Tmp, 6+Add1, NO) == SUCCESS))
+				   (FindField(Str, Tmp, 6+Add1, NO) == FFFTP_SUCCESS))
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3244,7 +3244,7 @@ static int AnalizeFileInfo(char *Str)
 ///////////
 
 				if((Ret == LIST_UNKNOWN) &&
-				   (FindField(Str, Tmp, 5+Add1, NO) == SUCCESS))
+				   (FindField(Str, Tmp, 5+Add1, NO) == FFFTP_SUCCESS))
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3254,7 +3254,7 @@ static int AnalizeFileInfo(char *Str)
 				}
 
 				if((Ret == LIST_UNKNOWN) &&
-				   (FindField(Str, Tmp, 4+Add1, NO) == SUCCESS))
+				   (FindField(Str, Tmp, 4+Add1, NO) == FFFTP_SUCCESS))
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3264,7 +3264,7 @@ static int AnalizeFileInfo(char *Str)
 				}
 
 				if((Ret == LIST_UNKNOWN) &&
-				   (FindField(Str, Tmp, 3+Add1, NO) == SUCCESS))
+				   (FindField(Str, Tmp, 3+Add1, NO) == FFFTP_SUCCESS))
 				{
 					GetMonth(Tmp, &Month, &Day);
 					if(Month != 0)
@@ -3283,16 +3283,16 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 			{
-				if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&
 				   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 				{
-					if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 					   (IsDigit(Tmp[0]) != 0))
 					{
-						if(FindField(Str, Tmp, 5, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_AS400;
 						}
@@ -3306,19 +3306,19 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYMMDDformat(Tmp, '*', NO) != 0))
 			{
-				if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 				   ((IsDigit(Tmp[0]) != 0) || (StrAllSameChar(Tmp, '*') == YES)))
 				{
-					if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&
 					   ((IsDigit(Tmp[0]) != 0) || (StrAllSameChar(Tmp, '*') == YES)))
 					{
-						if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+						if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 						   (strlen(Tmp) == 4))
 						{
-							if(FindField(Str, Tmp, 6, NO) == SUCCESS)
+							if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)
 							{
 								Ret = LIST_M1800;
 							}
@@ -3333,16 +3333,16 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 			{
-				if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 				   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 				{
-					if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&
 					   (IsDigit(Tmp[0]) != 0))
 					{
-						if(FindField(Str, Tmp, 6, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_GP6000;
 						}
@@ -3356,15 +3356,15 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 			   (CheckHHMMformat(Tmp) == YES))
 			{
-				if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 				   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))
 				{
-					if(FindField(Str, Tmp, 3, NO) == SUCCESS)
+					if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)
 					{
-						if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+						if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 						   (CheckYYMMDDformat(Tmp, NUL, YES) != 0))
 						{
 							TmpInt = atoi(Tmp);
@@ -3383,13 +3383,13 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&
 			   (CheckHHMMformat(Tmp) == YES))
 			{
-				if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 				   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))
 				{
-					if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 					   (CheckYYMMDDformat(Tmp, NUL, YES) != 0))
 					{
 						Ret = LIST_DOS_3;
@@ -3403,16 +3403,16 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYYYMMDDformat(Tmp, NUL) == YES))
 			{
-				if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 				   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 				{
-					if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 					   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))
 					{
-						if(FindField(Str, Tmp, 3, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_DOS_4;
 						}
@@ -3426,15 +3426,15 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if(FindField(Str, Tmp, 2, NO) == SUCCESS)
+			if(FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS)
 			{
 				GetMonth(Tmp, &Month, &Day);
 				if((Month != 0) && (Day == 0))
 				{
-					if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 					   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))
 					{
-						if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&
+						if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&
 						   (CheckHHMMformat(Tmp) == YES))
 						{
 							Ret = LIST_CHAMELEON;
@@ -3449,16 +3449,16 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&
 			   (CheckHHMMformat(Tmp) == YES))
 			{
-				if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 				   (IsDigit(Tmp[0]) != 0))
 				{
-					if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 					   (CheckYYMMDDformat(Tmp, NUL, YES) != 0))
 					{
-						if(FindField(Str, Tmp, 4, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 4, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_OS2;
 						}
@@ -3472,32 +3472,32 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 			   (strlen(Tmp) == 10))
 			{
-				if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&
 				   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 				{
-					if((FindField(Str, Tmp, 4, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 4, NO) == FFFTP_SUCCESS) &&
 					   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 					{
-						if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+						if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 						   (IsDigit(Tmp[0]) != 0))
 						{
-							if(FindField(Str, Tmp, 5, NO) == SUCCESS)
+							if(FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS)
 							{
 								Ret = LIST_OS7_2;
 							}
 						}
 					}
 				}
-				else if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+				else if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 						(CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 				{
-					if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 					   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 					{
-						if(FindField(Str, Tmp, 3, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_OS7_1;
 						}
@@ -3511,18 +3511,18 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&
 			   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))
 			{
-				if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&
 				   (CheckHHMMformat(Tmp) == YES))
 				{
-					if(FindField(Str, Tmp, 3, NO) == SUCCESS)
+					if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)
 					{
 						GetMonth(Tmp, &Month, &Day);
 						if(Month != 0)
 						{
-							if((FindField(Str, Tmp, 6, NO) == SUCCESS) &&
+							if((FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS) &&
 							   (IsDigit(Tmp[0]) != 0))
 							{
 								Ret = LIST_ALLIED;
@@ -3538,16 +3538,16 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))
 			{
-				if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 				   (IsDigit(Tmp[0]) != 0) && (strlen(Tmp) == 4))
 				{
-					if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&
+					if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&
 					   (IsDigit(Tmp[0]) != 0))
 					{
-						if(FindField(Str, Tmp, 6, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_OS9;
 						}
@@ -3561,14 +3561,14 @@ static int AnalizeFileInfo(char *Str)
 
 		if(Ret == LIST_UNKNOWN)
 		{
-			if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&
 			   (CheckYYYYMMDDformat(Tmp, NUL) == YES))
 			{
-				if((FindField(Str, Tmp, 1, NO) == SUCCESS) && IsDigit(Tmp[0]))
+				if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) && IsDigit(Tmp[0]))
 				{
-					if((FindField(Str, Tmp, 7, NO) == SUCCESS) && IsDigit(Tmp[0]))
+					if((FindField(Str, Tmp, 7, NO) == FFFTP_SUCCESS) && IsDigit(Tmp[0]))
 					{
-						if(FindField(Str, Tmp, 9, NO) == SUCCESS)
+						if(FindField(Str, Tmp, 9, NO) == FFFTP_SUCCESS)
 						{
 							Ret = LIST_IBM;
 						}
@@ -3617,13 +3617,13 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
 
 	// unix系チェック
 	if((Day != 0) ||
-	   ((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == SUCCESS) &&
+	   ((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&
 		((atoi(Tmp) >= 1) && (atoi(Tmp) <= 31))))
 	{
-		if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == SUCCESS) &&
-		   ((atoi(Tmp) >= 1900) || (GetHourAndMinute(Tmp, &Hour, &Minute) == SUCCESS)))
+		if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&
+		   ((atoi(Tmp) >= 1900) || (GetHourAndMinute(Tmp, &Hour, &Minute) == FFFTP_SUCCESS)))
 		{
-			if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == SUCCESS)
+			if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == FFFTP_SUCCESS)
 			{
 				Flag = 1;
 			}
@@ -3633,13 +3633,13 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
 	// 中国語Solaris専用
 	if(Flag == 0)
 	{
-	   if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == SUCCESS) &&
+	   if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&
 		  ((atoi(Tmp) >= 1) && (atoi(Tmp) <= 31)))
 		{
-			if((FindField(Str, Tmp, 5+Add1+Add2+Add3, NO) == SUCCESS) &&
+			if((FindField(Str, Tmp, 5+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&
 			   (atoi(Tmp) >= 1900))
 			{
-				if((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == SUCCESS) &&
+				if((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&
 				   (((atoi(Tmp) >= 1) && (atoi(Tmp) <= 9) && 
 					 ((unsigned char)Tmp[1] == 0xD4) &&
 					 ((unsigned char)Tmp[2] == 0xC2)) ||
@@ -3647,7 +3647,7 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
 					 ((unsigned char)Tmp[2] == 0xD4) && 
 					 ((unsigned char)Tmp[3] == 0xC2))))
 				{
-					if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == SUCCESS)
+					if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == FFFTP_SUCCESS)
 					{
 						Flag = 2;
 					}
@@ -3967,7 +3967,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, DosPos[offs][3], DosLongFname[offs]) == SUCCESS)
+			if(FindField(Str, Fname, DosPos[offs][3], DosLongFname[offs]) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(Buf[0] == '<')
@@ -3999,7 +3999,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 3, YES) == SUCCESS)
+			if(FindField(Str, Fname, 3, YES) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(Buf[0] == '<')
@@ -4034,7 +4034,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 4, YES) == SUCCESS)
+			if(FindField(Str, Fname, 4, YES) == FFFTP_SUCCESS)
 			{
 				FindField(Str, Buf, 1, NO);
 				Ret = NODE_FILE;
@@ -4073,7 +4073,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 0, NO) == SUCCESS)
+			if(FindField(Str, Fname, 0, NO) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(Buf[0] == '<')
@@ -4108,7 +4108,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 5, YES) == SUCCESS)
+			if(FindField(Str, Fname, 5, YES) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if((Pos = strchr(Fname, '/')) != NULL)
@@ -4147,7 +4147,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			}
 
 			/* 名前 */
-			if(FindField(Str, Fname, 6, YES) == SUCCESS)
+			if(FindField(Str, Fname, 6, YES) == FFFTP_SUCCESS)
 			{
 				RemoveTailingSpaces(Fname);
 				Ret = NODE_FILE;
@@ -4190,7 +4190,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Attr = AttrString2Value(Buf+1);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 6, YES) == SUCCESS)
+			if(FindField(Str, Fname, 6, YES) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(strchr("dl", Buf[0]) != NULL)
@@ -4274,7 +4274,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Attr = AttrString2Value(Buf+1);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 3+offs, YES) == SUCCESS)
+			if(FindField(Str, Fname, 3+offs, YES) == FFFTP_SUCCESS)
 			{
 				RemoveTailingSpaces(Fname);
 				Ret = NODE_FILE;
@@ -4284,7 +4284,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			break;
 
 		case LIST_STRATUS :
-			if(FindField(Str, Buf, 0, NO) != SUCCESS)
+			if(FindField(Str, Buf, 0, NO) != FFFTP_SUCCESS)
 				break;
 			if(_strnicmp(Buf, "Files:", 6) == 0)
 				StratusMode = 0;
@@ -4304,14 +4304,14 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 				*InfoExist |= (FINFO_TIME | FINFO_DATE);
 
 				/* 日付 */
-				if(FindField(Str, Buf, 2+offs, NO) != SUCCESS)
+				if(FindField(Str, Buf, 2+offs, NO) != FFFTP_SUCCESS)
 					break;
 				sTime.wYear = Assume1900or2000(atoi(Buf));
 				sTime.wMonth = atoi(Buf + 3);
 				sTime.wDay = atoi(Buf + 6);
 
 				/* 時刻 */
-				if(FindField(Str, Buf, 3+offs, NO) != SUCCESS)
+				if(FindField(Str, Buf, 3+offs, NO) != FFFTP_SUCCESS)
 					break;
 				sTime.wHour = atoi(Buf);
 				sTime.wMinute = atoi(Buf+3);
@@ -4321,7 +4321,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 				SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());
 
 				/* 名前 */
-				if(FindField(Str, Fname, 4+offs, YES) != SUCCESS)
+				if(FindField(Str, Fname, 4+offs, YES) != FFFTP_SUCCESS)
 					break;
 
 				if(StratusMode == 0)
@@ -4329,12 +4329,12 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 					*InfoExist |= FINFO_SIZE;
 
 					/* サイズ */
-					if(FindField(Str, Buf, 1, NO) != SUCCESS)
+					if(FindField(Str, Buf, 1, NO) != FFFTP_SUCCESS)
 						break;
 					*Size = _atoi64(Buf) * 4096;
 
 					/* 種類（オーナ名のフィールドにいれる） */
-					if(FindField(Str, Buf, 2, NO) != SUCCESS)
+					if(FindField(Str, Buf, 2, NO) != FFFTP_SUCCESS)
 						break;
 					strncpy(Owner, Buf, OWNER_NAME_LEN);
 
@@ -4351,18 +4351,18 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			/* 日付 */
 			for(offs = 11; offs > 7; offs--)
 			{
-				if((err = FindField(Str, Buf, offs, NO)) == SUCCESS)
+				if((err = FindField(Str, Buf, offs, NO)) == FFFTP_SUCCESS)
 					break;
 			}
-			if(err != SUCCESS)
+			if(err != FFFTP_SUCCESS)
 				break;
 			if(IsDigit(*Buf) == 0)
 				break;
 			sTime.wYear = Assume1900or2000(atoi(Buf));
-			if(FindField(Str, Buf, --offs, NO) != SUCCESS)
+			if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)
 				break;
 			GetMonth(Buf, &sTime.wMonth, &sTime.wDay);
-			if(FindField(Str, Buf, --offs, NO) != SUCCESS)
+			if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)
 				break;
 			if(IsDigit(*Buf) == 0)
 				break;
@@ -4375,35 +4375,35 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());
 
 			/* オーナ名 */
-			if(FindField(Str, Buf, --offs, NO) != SUCCESS)
+			if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)
 				break;
 			strncpy(Owner, Buf, OWNER_NAME_LEN);
 
 			/* サイズ */
 			do
 			{
-				if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)
+				if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)
 					break;
 			}
 			while(IsDigit(*Buf) == 0);
 			--offs;
-			if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)
+			if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)
 				break;
 			RemoveComma(Buf);
 			*Size = _atoi64(Buf);
-			if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)
+			if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)
 				break;
 			if(IsDigit(*Buf) == 0)
 				break;
 			/* 名前 */
-			if(FindField(Str, Fname, 0, NO) != SUCCESS)
+			if(FindField(Str, Fname, 0, NO) != FFFTP_SUCCESS)
 				break;
 			/* 種類 */
 			if(offs == 0)
 				Ret = NODE_FILE;
 			else
 			{
-				if((FindField(Str, Buf, 1, NO) == SUCCESS) &&
+				if((FindField(Str, Buf, 1, NO) == FFFTP_SUCCESS) &&
 				   (strcmp(Buf, "DR") == 0))
 					Ret = NODE_DIR;
 				else
@@ -4436,7 +4436,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Size = _atoi64(Buf);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 1, NO) == SUCCESS)
+			if(FindField(Str, Fname, 1, NO) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(Buf[0] == '<')
@@ -4476,7 +4476,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			FindField(Str, Buf, 3, NO);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 6, NO) == SUCCESS)
+			if(FindField(Str, Fname, 6, NO) == FFFTP_SUCCESS)
 			{
 				if((Buf[0] == 'd') || (Buf[0] == 'D'))
 					Ret = NODE_DIR;
@@ -4503,7 +4503,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 
 			/* 名前 */
 			FindField(Str, Buf, 8, NO);
-			if(FindField(Str, Fname, 9, NO) == SUCCESS)
+			if(FindField(Str, Fname, 9, NO) == FFFTP_SUCCESS)
 			{
 				if(strcmp(Buf, "PO") == 0)
 					Ret = NODE_DIR;
@@ -4528,7 +4528,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			*Attr = AttrString2Value(Buf+1);
 
 			/* 名前 */
-			if(FindField(Str, Fname, 5, YES) == SUCCESS)
+			if(FindField(Str, Fname, 5, YES) == FFFTP_SUCCESS)
 			{
 				Ret = NODE_FILE;
 				if(strchr("dl", Buf[0]) != NULL)
@@ -4566,7 +4566,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 
 				/* 種類 */
 				Ret = NODE_FILE;
-				if(FindField(Str, Buf, 4, NO) == SUCCESS)
+				if(FindField(Str, Buf, 4, NO) == FFFTP_SUCCESS)
 				{
 					if(strcmp(Buf, "<DIR>") == 0)
 						Ret = NODE_DIR;
@@ -4715,12 +4715,12 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 
 				FindField(Str, Buf, 5+offs, NO);
 				/* 日付が yy/mm/dd の場合に対応 */
-				if(GetYearMonthDay(Buf, &sTime.wYear, &sTime.wMonth, &sTime.wDay) == SUCCESS)
+				if(GetYearMonthDay(Buf, &sTime.wYear, &sTime.wMonth, &sTime.wDay) == FFFTP_SUCCESS)
 				{
 					sTime.wYear = Assume1900or2000(sTime.wYear);
 
 					FindField(Str, Buf, 7+offs+offs2, NO);
-					if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == SUCCESS)
+					if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FFFTP_SUCCESS)
 						*InfoExist |= FINFO_TIME;
 				}
 				else
@@ -4733,7 +4733,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 					}
 
 					FindField(Str, Buf, 7+offs+offs2, NO);
-					if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FAIL)
+					if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FFFTP_FAIL)
 					{
 						sTime.wYear = atoi(Buf);
 					}
@@ -4780,7 +4780,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());
 
 			/* 名前 */
-			if(FindField(Str, Fname, 8+offs+offs2, YES) == SUCCESS)
+			if(FindField(Str, Fname, 8+offs+offs2, YES) == FFFTP_SUCCESS)
 			{
 				Flag = 'B';
 				if(OrgListType & LIST_MELCOM)
@@ -4836,7 +4836,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int FindField(char *Str, char *Buf, int Num, int ToLast)
@@ -4844,7 +4844,7 @@ static int FindField(char *Str, char *Buf, int Num, int ToLast)
 	char *Pos;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	*Buf = NUL;
 	if(Num >= 0)
 	{
@@ -4879,7 +4879,7 @@ static int FindField(char *Str, char *Buf, int Num, int ToLast)
 			strncpy(Buf, Str, Pos - Str);
 			*(Buf + (Pos - Str)) = NUL;
 		}
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -4977,18 +4977,18 @@ static void GetMonth(char *Str, WORD *Month, WORD *Day)
 *		WORD *Day : 日
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL=日付を表す文字ではない)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=日付を表す文字ではない)
 *
 *	Note
 *		以下の形式をサポート
 *			01/07/25
-*		FAILを返す時は *Year = 0; *Month = 0; *Day = 0
+*		FFFTP_FAILを返す時は *Year = 0; *Month = 0; *Day = 0
 *----------------------------------------------------------------------------*/
 static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(strlen(Str) == 8)
 	{
 		if(IsDigit(Str[0]) && IsDigit(Str[1]) && !IsDigit(Str[2]) &&
@@ -4998,7 +4998,7 @@ static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)
 			*Year = atoi(&Str[0]);
 			*Month = atoi(&Str[3]);
 			*Day = atoi(&Str[6]);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -5013,13 +5013,13 @@ static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)
 *		WORD *Minute : 分
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL=時刻を表す文字ではない)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=時刻を表す文字ではない)
 *
 *	Note
 *		以下の形式をサポート
 *			HH:MM
 *			HH時MM分
-*		FAILを返す時は *Hour = 0; *Minute = 0
+*		FFFTP_FAILを返す時は *Hour = 0; *Minute = 0
 *----------------------------------------------------------------------------*/
 
 static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
@@ -5027,7 +5027,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 	int Ret;
 	char *Pos;
 
-	Ret = FAIL;
+	Ret = FFFTP_FAIL;
 	if((_mbslen(Str) >= 3) && (isdigit(Str[0]) != 0))
 	{
 		*Hour = atoi(Str);
@@ -5040,7 +5040,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 				{
 					*Minute = atoi(Pos);
 					if(*Minute < 60)
-						Ret = SUCCESS;
+						Ret = FFFTP_SUCCESS;
 				}
 			}
 			else
@@ -5061,7 +5061,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 							{
 								*Minute = atoi(Pos);
 								if(*Minute < 60)
-									Ret = SUCCESS;
+									Ret = FFFTP_SUCCESS;
 							}
 						}
 						break;
@@ -5075,10 +5075,10 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 	{
 		*Hour = 0;
 		*Minute = 0;
-		Ret = SUCCESS;
+		Ret = FFFTP_SUCCESS;
 	}
 
-	if(Ret == FAIL)
+	if(Ret == FFFTP_FAIL)
 	{
 		*Hour = 0;
 		*Minute = 0;
@@ -5096,12 +5096,12 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 *		WORD *Day : 日
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL=日付を表す文字ではない)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=日付を表す文字ではない)
 *
 *	Note
 *		以下の形式をサポート
 *			18-SEP-1998
-*		FAILを返す時は *Year = 0; *Month = 0; *Day = 0
+*		FFFTP_FAILを返す時は *Year = 0; *Month = 0; *Day = 0
 *----------------------------------------------------------------------------*/
 
 static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)
@@ -5111,7 +5111,7 @@ static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)
 	WORD Tmp;
 	char Buf[4];
 
-	Ret = FAIL;
+	Ret = FFFTP_FAIL;
 	*Day = atoi(Str);
 	if((Pos = strchr(Str, '-')) != NULL)
 	{
@@ -5123,11 +5123,11 @@ static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)
 		{
 			Pos++;
 			*Year = atoi(Pos);
-			Ret = SUCCESS;
+			Ret = FFFTP_SUCCESS;
 		}
 	}
 
-	if(Ret == FAIL)
+	if(Ret == FFFTP_FAIL)
 	{
 		*Year = 0;
 		*Month = 0;
@@ -5216,7 +5216,7 @@ static int AskFilterStr(char *Fname, int Type)
 			if((Pos = strchr(Tmp, ';')) != NULL)
 				*Pos = NUL;
 
-			if(CheckFname(Fname, Tmp) == SUCCESS)
+			if(CheckFname(Fname, Tmp) == FFFTP_SUCCESS)
 			{
 				Ret = YES;
 				break;

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -118,7 +118,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 	FILELIST *Pos;
 	TRANSPACKET Pkt;
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -148,7 +148,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				else if(FnameCnv == FNAME_UPPER)
 					_mbsupr(TmpString);
 				RemoveAfterSemicolon(TmpString);
-				if(RenameUnuseableName(TmpString) == FAIL)
+				if(RenameUnuseableName(TmpString) == FFFTP_FAIL)
 					break;
 			}
 			else
@@ -156,7 +156,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 				CurWin = WIN_REMOTE;
 				if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(updown_as_dlg), GetMainHwnd(), UpDownAsDialogCallBack) == YES)
 				{
-					if(RenameUnuseableName(TmpString) == FAIL)
+					if(RenameUnuseableName(TmpString) == FFFTP_FAIL)
 						break;
 				}
 				else
@@ -244,7 +244,7 @@ void DirectDownLoadProc(char *Fname)
 {
 	TRANSPACKET Pkt;
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -269,7 +269,7 @@ void DirectDownLoadProc(char *Fname)
 				_mbsupr(TmpString);
 			RemoveAfterSemicolon(TmpString);
 
-			if(RenameUnuseableName(TmpString) == SUCCESS)
+			if(RenameUnuseableName(TmpString) == FFFTP_SUCCESS)
 			{
 				strcat(Pkt.LocalFile, TmpString);
 				ReplaceAll(Pkt.LocalFile, '/', '\\');
@@ -378,7 +378,7 @@ void MirrorDownloadProc(int Notify)
 	int Level;
 	int Mode;
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -844,7 +844,7 @@ void UpLoadListProc(int ChName, int All)
 	char Tmp[FMAX_PATH+1];
 	int FirstAdd;
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -1007,7 +1007,7 @@ void UpLoadDragProc(WPARAM wParam)
 	int FirstAdd;
 	char Cur[FMAX_PATH+1];
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -1161,7 +1161,7 @@ void MirrorUploadProc(int Notify)
 	FILETIME TmpFtimeL;
 	FILETIME TmpFtimeR;
 
-	if(CheckClosedAndReconnect() == SUCCESS)
+	if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -1570,7 +1570,7 @@ static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 						Num = SendDlgItemMessage(hDlg, MIRROR_LIST, LB_GETSELITEMS, Num, (LPARAM)List);
 						for(Num--; Num >= 0; Num--)
 						{
-							if(RemoveTmpTransFileListItem(Base, List[Num]) == SUCCESS)
+							if(RemoveTmpTransFileListItem(Base, List[Num]) == FFFTP_SUCCESS)
 								SendDlgItemMessage(hDlg, MIRROR_LIST, LB_DELETESTRING, List[Num], 0);
 							else
 								MessageBeep(-1);
@@ -1698,7 +1698,7 @@ static int AskMirrorNoTrn(char *Fname, int Mode)
 		Fname = GetFileName(Fname);
 		while(*Tbl != NUL)
 		{
-			if(CheckFname(Fname, Tbl) == SUCCESS)
+			if(CheckFname(Fname, Tbl) == FFFTP_SUCCESS)
 			{
 				Ret = YES;
 				break;
@@ -1733,7 +1733,7 @@ static int AskUpLoadFileAttr(char *Fname)
 		Sts = CheckFname(Fname, Tbl);
 		Tbl += strlen(Tbl) + 1;
 
-		if((Sts == SUCCESS) && (*Tbl != NUL))
+		if((Sts == FFFTP_SUCCESS) && (*Tbl != NUL))
 		{
 			Ret = xtoi(Tbl);
 			break;
@@ -1937,7 +1937,7 @@ void DeleteProc(void)
 	else
 	{
 		Win = WIN_REMOTE;
-		if(CheckClosedAndReconnect() == SUCCESS)
+		if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 			MakeSelectedFileList(Win, YES, NO, &FileListBase, &CancelFlg);
 		else
 			Sts = NO;
@@ -2075,7 +2075,7 @@ static void DelNotifyAndDo(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDi
 		else
 		{
 			/* フルパスを使わない時のための処理 */
-			if(ProcForNonFullpath(Path, CurDir, GetMainHwnd(), 0) == FAIL)
+			if(ProcForNonFullpath(Path, CurDir, GetMainHwnd(), 0) == FFFTP_FAIL)
 				*Sw = NO_ALL;
 
 			if(*Sw != NO_ALL)
@@ -2159,7 +2159,7 @@ void RenameProc(void)
 	int RenFlg;
 	int Sts;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(GetFocus() == GetLocalHwnd())
 		Win = WIN_LOCAL;
 	else
@@ -2168,7 +2168,7 @@ void RenameProc(void)
 		Sts = CheckClosedAndReconnect();
 	}
 
-	if(Sts == SUCCESS)
+	if(Sts == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -2252,7 +2252,7 @@ void MoveRemoteFileProc(int drop_index)
 		}
 	}
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 #if 0
 	if(GetFocus() == GetLocalHwnd())
 		Win = WIN_LOCAL;
@@ -2266,7 +2266,7 @@ void MoveRemoteFileProc(int drop_index)
 		Sts = CheckClosedAndReconnect();
 #endif
 
-	if(Sts == SUCCESS)
+	if(Sts == FFFTP_SUCCESS)
 	{
 		DisableUserOpe();
 
@@ -2428,7 +2428,7 @@ void MkdirProc(void)
 		}
 		else
 		{
-			if(CheckClosedAndReconnect() == SUCCESS)
+			if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 			{
 				DisableUserOpe();
 				DoMKD(Path);
@@ -2468,7 +2468,7 @@ void ChangeDirComboProc(HWND hWnd)
 		}
 		else
 		{
-			if(CheckClosedAndReconnect() == SUCCESS)
+			if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 			{
 				DisableUserOpe();
 				if(DoCWD(Tmp, YES, NO, YES) < FTP_RETRY)
@@ -2500,14 +2500,14 @@ void ChangeDirBmarkProc(int MarkID)
 	if((Sts == BMARK_TYPE_LOCAL) || (Sts == BMARK_TYPE_BOTH))
 	{
 		DisableUserOpe();
-		if(DoLocalCWD(Local) == SUCCESS)
+		if(DoLocalCWD(Local) == FFFTP_SUCCESS)
 			GetLocalDirForWnd();
 		EnableUserOpe();
 	}
 
 	if((Sts == BMARK_TYPE_REMOTE) || (Sts == BMARK_TYPE_BOTH))
 	{
-		if(CheckClosedAndReconnect() == SUCCESS)
+		if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 		{
 			DisableUserOpe();
 			if(DoCWD(Remote, YES, NO, YES) < FTP_RETRY)
@@ -2557,7 +2557,7 @@ void ChangeDirDirectProc(int Win)
 		}
 		else
 		{
-			if(CheckClosedAndReconnect() == SUCCESS)
+			if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 			{
 				DisableUserOpe();
 				if(DoCWD(Path, YES, NO, YES) < FTP_RETRY)
@@ -2613,7 +2613,7 @@ void ChmodProc(void)
 
 	if(GetFocus() == GetRemoteHwnd())
 	{
-		if(CheckClosedAndReconnect() == SUCCESS)
+		if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 		{
 			DisableUserOpe();
 			FileListBase = NULL;
@@ -2836,7 +2836,7 @@ void SomeCmdProc(void)
 
 	if(GetFocus() == GetRemoteHwnd())
 	{
-		if(CheckClosedAndReconnect() == SUCCESS)
+		if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 		{
 			DisableUserOpe();
 			FileListBase = NULL;
@@ -2880,7 +2880,7 @@ void CalcFileSizeProc(void)
 
 	if((All = DialogBox(GetFtpInst(), MAKEINTRESOURCE(filesize_notify_dlg), GetMainHwnd(), SizeNotifyDlgWndProc)) != NO_ALL)
 	{
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 		if(GetFocus() == GetLocalHwnd())
 			Win = WIN_LOCAL;
 		else
@@ -2889,7 +2889,7 @@ void CalcFileSizeProc(void)
 			Sts = CheckClosedAndReconnect();
 		}
 
-		if(Sts == SUCCESS)
+		if(Sts == FFFTP_SUCCESS)
 		{
 			ListBase = NULL;
 			MakeSelectedFileList(Win, YES, All, &ListBase, &CancelFlg);
@@ -3093,7 +3093,7 @@ void CopyURLtoClipBoard(void)
 *			0=コマンドソケット, 1=転送ソケット
 *
 *	Return Value
-*		int ステータス(SUCCESS/FAIL)
+*		int ステータス(FFFTP_SUCCESS/FFFTP_FAIL)
 *
 *	Note
 *		フルパスを使わない時は、
@@ -3107,7 +3107,7 @@ int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type)
 	int Cmd;
 	char Tmp[FMAX_PATH+1];
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(AskNoFullPathMode() == YES)
 	{
 		strcpy(Tmp, Path);
@@ -3131,7 +3131,7 @@ int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type)
 			if(Cmd/100 != FTP_COMPLETE)
 			{
 				DispCWDerror(hWnd);
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 			}
 			else
 				strcpy(CurDir, Tmp);
@@ -3245,7 +3245,7 @@ void ReformVMSDirName(char *DirName, int Flg)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL=中止する
+*			FFFTP_SUCCESS/FFFTP_FAIL=中止する
 *
 *	Note
 *		Fnameを直接書きかえる
@@ -3256,7 +3256,7 @@ static int RenameUnuseableName(char *Fname)
 	int Tmp;
 	int Ret;
 
-	Ret = SUCCESS;
+	Ret = FFFTP_SUCCESS;
 	while(1)
 	{
 		if((_mbschr(Fname, ':') != NULL) ||
@@ -3270,7 +3270,7 @@ static int RenameUnuseableName(char *Fname)
 		{
 			if(InputDialogBox(forcerename_dlg, GetMainHwnd(), NULL, Fname, FMAX_PATH+1, &Tmp, IDH_HELP_TOPIC_0000001) == NO)
 			{
-				Ret = FAIL;
+				Ret = FFFTP_FAIL;
 				break;
 			}
 		}

--- a/getput.c
+++ b/getput.c
@@ -161,9 +161,9 @@ int MakeTransferThread(void)
 	fTransferThreadExit = FALSE;
 	hTransferThread = (HANDLE)_beginthreadex(NULL, 0, TransferThread, 0, 0, &dwID);
 	if (hTransferThread == NULL)
-		return(FAIL); /* XXX */
+		return(FFFTP_FAIL); /* XXX */
 
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -206,7 +206,7 @@ void CloseTransferThread(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)
@@ -215,7 +215,7 @@ int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)
 	TRANSPACKET *Prev;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Pos = malloc(sizeof(TRANSPACKET))) != NULL)
 	{
 		memcpy(Pos, Pkt, sizeof(TRANSPACKET));
@@ -230,7 +230,7 @@ int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)
 				Prev = Prev->Next;
 			Prev->Next = Pos;
 		}
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -270,7 +270,7 @@ void EraseTmpTransFileList(TRANSPACKET **Base)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)
@@ -279,13 +279,13 @@ int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)
 	TRANSPACKET *Prev;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	Pos = *Base;
 	if(Num == 0)
 	{
 		*Base = Pos->Next;
 		free(Pos);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -297,7 +297,7 @@ int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)
 			{
 				Prev->Next = Pos->Next;
 				free(Pos);
-				Sts = SUCCESS;
+				Sts = FFFTP_SUCCESS;
 				break;
 			}
 		}
@@ -321,7 +321,7 @@ void AddTransFileList(TRANSPACKET *Pkt)
 
 	WaitForSingleObject(hListAccMutex, INFINITE);
 
-	if(AddTmpTransFileList(Pkt, &TransPacketBase) == SUCCESS)
+	if(AddTmpTransFileList(Pkt, &TransPacketBase) == FFFTP_SUCCESS)
 	{
 		if((strncmp(Pkt->Cmd, "RETR", 4) == 0) ||
 		   (strncmp(Pkt->Cmd, "STOR", 4) == 0))
@@ -615,7 +615,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				if(CheckPathViolation(TransPacketBase) == NO)
 				{
 					/* フルパスを使わないための処理 */
-					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)
+					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)
 					{
 						if(strncmp(TransPacketBase->Cmd, "RETR-S", 6) == 0)
 						{
@@ -628,7 +628,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 						Down = YES;
 //						if(DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)
 //						{
-//							if(ReConnectTrnSkt() == SUCCESS)
+//							if(ReConnectTrnSkt() == FFFTP_SUCCESS)
 								DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);
 //						}
 					}
@@ -638,12 +638,12 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			else if(strncmp(TransPacketBase->Cmd, "STOR", 4) == 0)
 			{
 				/* フルパスを使わないための処理 */
-				if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)
+				if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)
 				{
 					Up = YES;
 //					if(DoUpLoad(AskTrnCtrlSkt(), TransPacketBase) == 429)
 //					{
-//						if(ReConnectTrnSkt() == SUCCESS)
+//						if(ReConnectTrnSkt() == FFFTP_SUCCESS)
 							DoUpLoad(AskTrnCtrlSkt(), TransPacketBase);
 //					}
 				}
@@ -659,7 +659,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 					CwdSts = FTP_COMPLETE;
 
 					strcpy(Tmp, TransPacketBase->RemoteFile);
-					if(ProcForNonFullpath(Tmp, CurDir, hWndTrans, 1) == FAIL)
+					if(ProcForNonFullpath(Tmp, CurDir, hWndTrans, 1) == FFFTP_FAIL)
 					{
 						ClearAll = YES;
 						CwdSts = FTP_ERROR;
@@ -688,7 +688,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				DispTransFileInfo(TransPacketBase, MSGJPN079, FALSE, YES);
 
 				/* フルパスを使わないための処理 */
-				if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)
+				if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)
 				{
 					Up = YES;
 					CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);
@@ -706,7 +706,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				if((DelNotify == YES) || (DelNotify == YES_ALL))
 				{
 					/* フルパスを使わないための処理 */
-					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)
+					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)
 					{
 						Up = YES;
 						CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);
@@ -722,7 +722,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				if((DelNotify == YES) || (DelNotify == YES_ALL))
 				{
 					/* フルパスを使わないための処理 */
-					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)
+					if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)
 					{
 						Up = YES;
 						CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);
@@ -872,7 +872,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 *		char *Tmp : 作業用エリア
 *
 *	Return Value
-*		int ステータス(SUCCESS/FAIL)
+*		int ステータス(FFFTP_SUCCESS/FFFTP_FAIL)
 *
 *	Note
 *		フルパスを使わない時は、
@@ -885,7 +885,7 @@ static int MakeNonFullPath(TRANSPACKET *Pkt, char *Cur, char *Tmp)
 	int Sts;
 
 	Sts = ProcForNonFullpath(Pkt->RemoteFile, Cur, Pkt->hWndTrans, 1);
-	if(Sts == FAIL)
+	if(Sts == FFFTP_FAIL)
 		ClearAll = YES;
 
 	return(Sts);
@@ -990,7 +990,7 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 			iRetCode = command(Pkt->ctrl_skt, Reply, CancelCheckWork, "%s", Buf);
 			if(iRetCode/100 == FTP_PRELIM)
 			{
-				if(SocksGet2ndBindReply(listen_socket, &data_socket) == FAIL)
+				if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 				{
 					iLength = sizeof(saSockAddr1);
 					data_socket = do_accept(listen_socket, (struct sockaddr *)&saSockAddr1, (int *)&iLength);
@@ -1060,7 +1060,7 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 	iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "PASV");
 	if(iRetCode/100 == FTP_COMPLETE)
 	{
-		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == SUCCESS)
+		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
 		{
 			if((data_socket = connectsock(Adrs, Port, MSGJPN091, CancelCheckWork)) != INVALID_SOCKET)
 			{
@@ -1568,7 +1568,7 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 
 	if(Pkt->Mode != EXIST_IGNORE)
 	{
-		if(CheckFileReadable(Pkt->LocalFile) == SUCCESS)
+		if(CheckFileReadable(Pkt->LocalFile) == FFFTP_SUCCESS)
 		{
 			if(Pkt->Type == TYPE_I)
 				Pkt->KanjiCode = KANJI_NOCNV;
@@ -1649,7 +1649,7 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 		iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled, "%s", Buf);
 		if((iRetCode/100) == FTP_PRELIM)
 		{
-			if(SocksGet2ndBindReply(listen_socket, &data_socket) == FAIL)
+			if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 			{
 				iLength=sizeof(saSockAddr1);
 				data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddr1, (int *)&iLength);
@@ -1716,7 +1716,7 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 	iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled, "PASV");
 	if(iRetCode/100 == FTP_COMPLETE)
 	{
-		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == SUCCESS)
+		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
 		{
 			if((data_socket = connectsock(Adrs, Port, MSGJPN109, &Canceled)) != INVALID_SOCKET)
 			{
@@ -1865,7 +1865,7 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 					else
 						Continue = ConvSJIStoEUC(&cInfo);
 
-					if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FAIL)
+					if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FFFTP_FAIL)
 					{
 						Pkt->Abort = ABORT_ERROR;
 							break;
@@ -1875,7 +1875,7 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 			}
 			else
 			{
-				if(TermCodeConvAndSend(&tInfo, dSkt, Buf, iNumBytes, Pkt->Type) == FAIL)
+				if(TermCodeConvAndSend(&tInfo, dSkt, Buf, iNumBytes, Pkt->Type) == FFFTP_FAIL)
 					Pkt->Abort = ABORT_ERROR;
 			}
 
@@ -1899,14 +1899,14 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 				cInfo.BufSize = BUFSIZE+3;
 				FlushRestData(&cInfo);
 
-				if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FAIL)
+				if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FFFTP_FAIL)
 					Pkt->Abort = ABORT_ERROR;
 			}
 
 			tInfo.Buf = Buf2;
 			tInfo.BufSize = BUFSIZE+3;
 			FlushRestTermCodeConvData(&tInfo);
-			if(SendData(dSkt, Buf2, tInfo.OutLen, 0, &Canceled) == FAIL)
+			if(SendData(dSkt, Buf2, tInfo.OutLen, 0, &Canceled) == FFFTP_FAIL)
 				Pkt->Abort = ABORT_ERROR;
 		}
 
@@ -1969,7 +1969,7 @@ static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data,
 	int Continue;
 	int Ret;
 
-	Ret = SUCCESS;
+	Ret = FFFTP_SUCCESS;
 
 // CR-LF以外の改行コードを変換しないモードはここへ追加
 	if(Ascii == TYPE_A)
@@ -1981,7 +1981,7 @@ static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data,
 		do
 		{
 			Continue = ConvTermCodeToCRLF(tInfo);
-			if((Ret = SendData(Skt, Buf3, tInfo->OutLen, 0, &Canceled)) == FAIL)
+			if((Ret = SendData(Skt, Buf3, tInfo->OutLen, 0, &Canceled)) == FFFTP_FAIL)
 				break;
 		}
 		while(Continue == YES);
@@ -2292,7 +2292,7 @@ static void DispTransFileInfo(TRANSPACKET *Pkt, char *Title, int SkipButton, int
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
@@ -2301,7 +2301,7 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
 	char *Btm;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 
 	Pos = strchr(Str, '(');
 	if(Pos != NULL)
@@ -2334,7 +2334,7 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
 							{
 								Btm++;
 								*Port = (atoi(Pos) * 0x100) + atoi(Btm);
-								Sts = SUCCESS;
+								Sts = FFFTP_SUCCESS;
 							}
 						}
 					}

--- a/history.c
+++ b/history.c
@@ -389,7 +389,7 @@ static void RemoveAllHistoryFromMenu(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)
@@ -398,14 +398,14 @@ int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)
 	int i;
 	HISTORYDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	Pos = HistoryBase;
 	for(i = 0; i < HistoryNum; i++)
 	{
 		if(MenuHistId[i] == MenuCmd)
 		{
 			memcpy(Buf, Pos, sizeof(HISTORYDATA));
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 		Pos = Pos->Next;
 	}
@@ -421,7 +421,7 @@ int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int GetHistoryByNum(int Num, HISTORYDATA *Buf)

--- a/hostman.c
+++ b/hostman.c
@@ -757,7 +757,7 @@ static int SetNodeLevelAll(void)
 		Pos->Set.Level |= GetNodeLevelByData(Pos);
 		Pos = GetNextNode(Pos);
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -770,7 +770,7 @@ static int SetNodeLevelAll(void)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int AddHostToList(HOSTDATA *Set, int Pos, int Level)
@@ -780,7 +780,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
 	HOSTLISTDATA *Last;
 	int Cur;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Pos >= -1) && (Pos <= Hosts))
 	{
 		if(Pos == -1)
@@ -838,7 +838,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
 				}
 			}
 			Hosts++;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -853,7 +853,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int UpdateHostToList(int Num, HOSTDATA *Set)
@@ -861,12 +861,12 @@ static int UpdateHostToList(int Num, HOSTDATA *Set)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		memcpy(&Pos->Set, Set, sizeof(HOSTDATA));
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -879,7 +879,7 @@ static int UpdateHostToList(int Num, HOSTDATA *Set)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int DelHostFromList(int Num)
@@ -887,7 +887,7 @@ static int DelHostFromList(int Num)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		if(Num == 0)
@@ -912,7 +912,7 @@ static int DelHostFromList(int Num)
 		}
 		free(Pos);
 		Hosts--;
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -925,7 +925,7 @@ static int DelHostFromList(int Num)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	Note
 *		Pos->Next, Pos->Childの全てのノードを削除する
@@ -945,7 +945,7 @@ static int DeleteChildAndNext(HOSTLISTDATA *Pos)
 		Hosts--;
 		Pos = Next;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -957,7 +957,7 @@ static int DeleteChildAndNext(HOSTLISTDATA *Pos)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	Note
 *		現在ホストに接続中の時は、CopyHostFromListInConnect() を使う事
@@ -968,12 +968,12 @@ int CopyHostFromList(int Num, HOSTDATA *Set)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		memcpy(Set, &Pos->Set, sizeof(HOSTDATA));
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -987,7 +987,7 @@ int CopyHostFromList(int Num, HOSTDATA *Set)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	Note
 *		現在ホストに接続中の時に使う
@@ -998,7 +998,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
@@ -1015,7 +1015,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 		Set->UseNLST_R = Pos->Set.UseNLST_R;
 		Set->LastDir = Pos->Set.LastDir;
 		Set->TimeZone = Pos->Set.TimeZone;
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1030,7 +1030,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SetHostBookMark(int Num, char *Bmask, int Len)
@@ -1038,12 +1038,12 @@ int SetHostBookMark(int Num, char *Bmask, int Len)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		memcpy(Pos->Set.BookMark, Bmask, Len);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1082,7 +1082,7 @@ char *AskHostBookMark(int Num)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SetHostDir(int Num, char *LocDir, char *HostDir)
@@ -1090,13 +1090,13 @@ int SetHostDir(int Num, char *LocDir, char *HostDir)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		strcpy(Pos->Set.LocalInitDir, LocDir);
 		strcpy(Pos->Set.RemoteInitDir, HostDir);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1110,7 +1110,7 @@ int SetHostDir(int Num, char *LocDir, char *HostDir)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SetHostPassword(int Num, char *Pass)
@@ -1118,12 +1118,12 @@ int SetHostPassword(int Num, char *Pass)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		strcpy(Pos->Set.PassWord, Pass);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1171,7 +1171,7 @@ int SearchHostName(char *Name)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SetHostSort(int Num, int LFSort, int LDSort, int RFSort, int RDSort)
@@ -1179,12 +1179,12 @@ int SetHostSort(int Num, int LFSort, int LDSort, int RFSort, int RDSort)
 	int Sts;
 	HOSTLISTDATA *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Num >= 0) && (Num < Hosts))
 	{
 		Pos = GetNodeByNum(Num);
 		Pos->Set.Sort = LFSort * 0x1000000 | LDSort * 0x10000 | RFSort * 0x100 | RDSort;
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }

--- a/local.c
+++ b/local.c
@@ -47,19 +47,19 @@
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int DoLocalCWD(char *Path)
 {
 	int Sts;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	SetTaskMsg(">>CD %s", Path);
 	if(SetCurrentDirectory(Path) != TRUE)
 	{
 		SetTaskMsg(MSGJPN145);
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }

--- a/lvtips.c
+++ b/lvtips.c
@@ -61,7 +61,7 @@ static HWND hWndTips;	/* tipsのウインドウハンドル */
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int InitListViewTips(HWND hWnd, HINSTANCE hInst)
@@ -69,7 +69,7 @@ int InitListViewTips(HWND hWnd, HINSTANCE hInst)
 	WNDCLASSEX wClass;
 	int Ret;
 
-	Ret = FAIL;
+	Ret = FFFTP_FAIL;
 
 	wClass.cbSize = sizeof(WNDCLASSEX);
 	wClass.style         = 0;
@@ -92,7 +92,7 @@ int InitListViewTips(HWND hWnd, HINSTANCE hInst)
 				hWnd, NULL, hInst, NULL);
 
 	if(hWndTips != NULL)
-		Ret = SUCCESS;
+		Ret = FFFTP_SUCCESS;
 
 	return(Ret);
 }

--- a/main.c
+++ b/main.c
@@ -235,7 +235,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 	Ret = FALSE;
 	hWndFtp = NULL;
 	hInstFtp = hInstance;
-	if(InitApp(lpszCmdLine, cmdShow) == SUCCESS)
+	if(InitApp(lpszCmdLine, cmdShow) == FFFTP_SUCCESS)
 	{
 		for(;;)
 		{
@@ -276,7 +276,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int InitApp(LPSTR lpszCmdLine, int cmdShow)
@@ -288,7 +288,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 	int useDefautPassword = 0; /* 警告文表示用 */
 	int masterpass;
 
-	sts = FAIL;
+	sts = FFFTP_FAIL;
 
 	aes_init();
 	srand(GetTickCount());
@@ -381,7 +381,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 
 			CountPrevFfftpWindows();
 
-			if(MakeAllWindows(cmdShow) == SUCCESS)
+			if(MakeAllWindows(cmdShow) == FFFTP_SUCCESS)
 			{
 				hWndCurFocus = GetLocalHwnd();
 
@@ -401,7 +401,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 				if(CacheSave == YES)
 					LoadCache();
 
-				if(MakeTransferThread() == SUCCESS)
+				if(MakeTransferThread() == FFFTP_SUCCESS)
 				{
 					DoPrintf("DEBUG MESSAGE ON ! ##");
 
@@ -430,7 +430,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 					DispTransferFiles();
 
 					StartupProc(lpszCmdLine);
-					sts = SUCCESS;
+					sts = FFFTP_SUCCESS;
 
 					/* セキュリティ警告文の表示 */
 					if( useDefautPassword ){
@@ -453,7 +453,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 		}
 	}
 
-	if(sts == FAIL)
+	if(sts == FFFTP_FAIL)
 		DeleteAllObject();
 
 	return(sts);
@@ -467,7 +467,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int MakeAllWindows(int cmdShow)
@@ -552,19 +552,19 @@ static int MakeAllWindows(int cmdShow)
 		StsLvtips = InitListViewTips(hWndFtp, hInstFtp);
 	}
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if((hWndFtp == NULL) ||
-	   (StsTbar == FAIL) ||
-	   (StsList == FAIL) ||
-	   (StsSbar == FAIL) ||
-	   (StsTask == FAIL) ||
-	   (StsLvtips == FAIL) ||
-	   (StsSocket == FAIL))
+	   (StsTbar == FFFTP_FAIL) ||
+	   (StsList == FFFTP_FAIL) ||
+	   (StsSbar == FFFTP_FAIL) ||
+	   (StsTask == FFFTP_FAIL) ||
+	   (StsLvtips == FFFTP_FAIL) ||
+	   (StsSocket == FFFTP_FAIL))
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 
-	if(Sts == SUCCESS)
+	if(Sts == FFFTP_SUCCESS)
 		SetListViewType();
 
 	return(Sts);
@@ -1034,7 +1034,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_REFRESH :
 					SuppressRefresh = 1;
 					GetLocalDirForWnd();
-					if(CheckClosedAndReconnect() == SUCCESS)
+					if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 						GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
 					SuppressRefresh = 0;
 					break;
@@ -1057,7 +1057,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 				case REFRESH_REMOTE :
 					SuppressRefresh = 1;
-					if(CheckClosedAndReconnect() == SUCCESS)
+					if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 						GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
 					SuppressRefresh = 0;
 					break;
@@ -1842,7 +1842,7 @@ void DoubleClickProc(int Win, int Mode, int App)
 					else
 						ChangeDir(WIN_LOCAL, Tmp);
 				}
-				else if(CheckClosedAndReconnect() == SUCCESS)
+				else if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 				{
 					if((App != -1) || (Type == NODE_FILE))
 					{
@@ -1967,13 +1967,13 @@ static void ChangeDir(int Win, char *Path)
 
 	if((Win == WIN_LOCAL) || (Sync == YES))
 	{
-		if(DoLocalCWD(Path) == SUCCESS)
+		if(DoLocalCWD(Path) == FFFTP_SUCCESS)
 			GetLocalDirForWnd();
 	}
 
 	if((Win == WIN_REMOTE) || (Sync == YES))
 	{
-		if(CheckClosedAndReconnect() == SUCCESS)
+		if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 		{
 #if defined(HAVE_OPENVMS)
 			/* OpenVMSの場合、".DIR;?"を取る */

--- a/misc.c
+++ b/misc.c
@@ -500,7 +500,7 @@ char *GetNextField(char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL=長さが長すぎる
+*			FFFTP_SUCCESS/FFFTP_FAIL=長さが長すぎる
 *----------------------------------------------------------------------------*/
 
 int GetOneField(char *Str, char *Buf, int Max)
@@ -508,13 +508,13 @@ int GetOneField(char *Str, char *Buf, int Max)
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Pos = strchr(Str, ' ')) == NULL)
 	{
 		if((int)strlen(Str) <= Max)
 		{
 			strcpy(Buf, Str);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	else
@@ -523,7 +523,7 @@ int GetOneField(char *Str, char *Buf, int Max)
 		{
 			strncpy(Buf, Str, Pos - Str);
 			*(Buf + (Pos - Str)) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -942,7 +942,7 @@ int hex2bin(char Ch)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	"\"は全て"/"に置き換える
 *----------------------------------------------------------------------------*/
@@ -1011,9 +1011,9 @@ int SplitUNCpath(char *unc, char *Host, char *Path, char *File, char *User, char
 		strncpy(Host, Pos1, HOST_ADRS_LEN);
 	}
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(strlen(Host) > 0)
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 
 	return(Sts);
 }
@@ -1479,7 +1479,7 @@ int xtoi(char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int CheckFileReadable(char *Fname)
@@ -1488,7 +1488,7 @@ int CheckFileReadable(char *Fname)
 	HANDLE iFileHandle;
 	SECURITY_ATTRIBUTES Sec;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 
 	Sec.nLength = sizeof(SECURITY_ATTRIBUTES);
 	Sec.lpSecurityDescriptor = NULL;
@@ -1497,7 +1497,7 @@ int CheckFileReadable(char *Fname)
 	if((iFileHandle = CreateFile(Fname, GENERIC_READ,
 		FILE_SHARE_READ|FILE_SHARE_WRITE, &Sec, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE)
 	{
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 		CloseHandle(iFileHandle);
 	}
 	return(Sts);

--- a/ras.c
+++ b/ras.c
@@ -268,7 +268,7 @@ static DWORD RasHangUpWait(HRASCONN hRasConn)
 *		int Num : 個数
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 static int DoDisconnect(RASCONN *RasConn, int Num)
@@ -276,14 +276,14 @@ static int DoDisconnect(RASCONN *RasConn, int Num)
 	int i;
 	int Sts;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(Num > 0)
 	{
 		SetTaskMsg(MSGJPN220);
 		for(i = 0; i < Num; i++)
 		{
 			if(RasHangUpWait(RasConn[i].hrasconn) != 0)
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 		}
 	}
 	return(Sts);
@@ -383,7 +383,7 @@ int SetRasEntryToComboBox(HWND hDlg, int Item, char *CurName)
 *		char *Name : 接続先
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *----------------------------------------------------------------------------*/
 
 int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
@@ -398,7 +398,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
 	BOOL Flg;
 	OSVERSIONINFO VerInfo;
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(Dialup == YES)
 	{
 		if(m_hDll != NULL)
@@ -438,7 +438,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
 			{
 				/* 接続する */
 				SetTaskMsg(MSGJPN221);
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 
 				Num = 0;
 				VerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@@ -460,7 +460,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
 						DlgParam.reserved = 0;
 						DlgParam.reserved2 = 0;
 						if((*m_RasDialDlg)(NULL, Name, NULL, &DlgParam) != 0)
-							Sts = SUCCESS;
+							Sts = FFFTP_SUCCESS;
 					}
 					else
 						SetTaskMsg(MSGJPN222);
@@ -478,7 +478,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
 					   (DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(dial_password_dlg), GetMainHwnd(), (DLGPROC)DialPassCallBackProc, (LPARAM)&Param) == YES))
 					{
 						if(DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(dial_dlg), GetMainHwnd(), (DLGPROC)DialCallBackProc, (LPARAM)&Param) == YES)
-							Sts = SUCCESS;
+							Sts = FFFTP_SUCCESS;
 					}
 				}
 			}

--- a/registory.c
+++ b/registory.c
@@ -235,7 +235,7 @@ int ValidateMasterPassword(void)
 	int i;
 
 	SetRegType(REGTYPE_INI);
-	if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)
+	if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)
 	{
 		if(AskForceIni() == NO)
 		{
@@ -243,14 +243,14 @@ int ValidateMasterPassword(void)
 			i = OpenReg("FFFTP", &hKey3);
 		}
 	}
-	if(i == SUCCESS){
+	if(i == FFFTP_SUCCESS){
 		char checkbuf[48];
 		int salt = 0;
 
 		if( ReadIntValueFromReg(hKey3, "CredentialSalt", &salt)){
 			SetHashSalt( salt );
 		}
-		if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == SUCCESS ){
+		if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == FFFTP_SUCCESS ){
 			switch( CheckPasswordValidity( SecretKey, SecretKeyLength, checkbuf ) ){
 			case 0: /* not match */
 				IsMasterPasswordError = PASSWORD_UNMATCH;
@@ -298,7 +298,7 @@ void SaveRegistory(void)
 	}
 
 	SetRegType(RegType);
-	if(CreateReg("FFFTP", &hKey3) == SUCCESS)
+	if(CreateReg("FFFTP", &hKey3) == FFFTP_SUCCESS)
 	{
 		char buf[48];
 		int salt = GetTickCount();
@@ -311,7 +311,7 @@ void SaveRegistory(void)
 		CreatePasswordHash( SecretKey, SecretKeyLength, buf );
 		WriteStringToReg(hKey3, "CredentialCheck", buf);
 
-		if(CreateSubKey(hKey3, "Options", &hKey4) == SUCCESS)
+		if(CreateSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)
 		{
 			WriteIntValueToReg(hKey4, "NoSave", SuppressSave);
 
@@ -427,10 +427,10 @@ void SaveRegistory(void)
 				n = 0;
 				for(i = AskHistoryNum(); i > 0; i--)
 				{
-					if(GetHistoryByNum(i-1, &Hist) == SUCCESS)
+					if(GetHistoryByNum(i-1, &Hist) == FFFTP_SUCCESS)
 					{
 						sprintf(Str, "History%d", n);
-						if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)
+						if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 						{
 							SaveStr(hKey5, "HostAdrs", Hist.HostAdrs, DefaultHist.HostAdrs);
 							SaveStr(hKey5, "UserName", Hist.UserName, DefaultHist.UserName);
@@ -474,17 +474,17 @@ void SaveRegistory(void)
 				for(; n < 999; n++)
 				{
 					sprintf(Str, "History%d", n);
-					if(DeleteSubKey(hKey4, Str) != SUCCESS)
+					if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)
 						break;
 				}
 
 				/* ホストの設定を保存 */
 				CopyDefaultHost(&DefaultHost);
 				i = 0;
-				while(CopyHostFromList(i, &Host) == SUCCESS)
+				while(CopyHostFromList(i, &Host) == FFFTP_SUCCESS)
 				{
 					sprintf(Str, "Host%d", i);
-					if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)
+					if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 					{
 //						SaveIntNum(hKey5, "Set", Host.Level, DefaultHost.Level);
 						WriteIntValueToReg(hKey5, "Set", Host.Level);
@@ -541,7 +541,7 @@ void SaveRegistory(void)
 				for(; i < 998; i++)
 				{
 					sprintf(Str, "Host%d", i);
-					if(DeleteSubKey(hKey4, Str) != SUCCESS)
+					if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)
 						break;
 				}
 
@@ -586,7 +586,7 @@ int LoadRegistory(void)
 	Sts = NO;
 
 	SetRegType(REGTYPE_INI);
-	if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)
+	if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)
 	{
 		if(AskForceIni() == NO)
 		{
@@ -595,15 +595,15 @@ int LoadRegistory(void)
 		}
 	}
 
-	if(i == SUCCESS)
+	if(i == FFFTP_SUCCESS)
 	{
-		char checkbuf[48];
+		/* char checkbuf[48]; */
 		int salt = 0;
 		Sts = YES;
 
 		ReadIntValueFromReg(hKey3, "Version", &Version);
 
-		if(OpenSubKey(hKey3, "Options", &hKey4) == SUCCESS)
+		if(OpenSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)
 		{
 			ReadIntValueFromReg(hKey4, "WinPosX", &WinPosX);
 			ReadIntValueFromReg(hKey4, "WinPosY", &WinPosY);
@@ -662,7 +662,7 @@ int LoadRegistory(void)
 			ReadIntValueFromReg(hKey4, "RegExp", &FindMode);
 			ReadIntValueFromReg(hKey4, "Reg", &RegType);
 
-			if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FAIL)
+			if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FFFTP_FAIL)
 			{
 				/* 旧ASCIIモードの拡張子の設定を新しいものに変換 */
 				ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);
@@ -694,9 +694,9 @@ int LoadRegistory(void)
 			ReadIntValueFromReg(hKey4, "MirUNot", &MirUpDelNotify);
 			ReadIntValueFromReg(hKey4, "MirDNot", &MirDownDelNotify);
 
-			if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == SUCCESS)
+			if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == FFFTP_SUCCESS)
 			{
-				if(RestoreFontData(Str, &ListLogFont) == SUCCESS)
+				if(RestoreFontData(Str, &ListLogFont) == FFFTP_SUCCESS)
 					ListFont = CreateFontIndirect(&ListLogFont);
 			}
 			ReadIntValueFromReg(hKey4, "ListHide", &DispIgnoreHide);
@@ -745,7 +745,7 @@ int LoadRegistory(void)
 			for(i = 0; i < Sets; i++)
 			{
 				sprintf(Str, "History%d", i);
-				if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)
+				if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 				{
 					CopyDefaultHistory(&Hist);
 
@@ -793,7 +793,7 @@ int LoadRegistory(void)
 			for(i = 0; i < Sets; i++)
 			{
 				sprintf(Str, "Host%d", i);
-				if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)
+				if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)
 				{
 					CopyDefaultHost(&Host);
 					/* 下位互換性のため */
@@ -1156,7 +1156,7 @@ static void MakeFontData(LOGFONT Font, HFONT hFont, char *Buf)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL=変換できない
+*			FFFTP_SUCCESS/FFFTP_FAIL=変換できない
 *----------------------------------------------------------------------------*/
 
 static int RestoreFontData(char *Str, LOGFONT *Font)
@@ -1164,7 +1164,7 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
 	int i;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(sscanf(Str, "%d %d %d %d %d %d %d %d %d %d %d %d %d",
 			&(Font->lfHeight), &(Font->lfWidth), &(Font->lfEscapement), &(Font->lfOrientation),
 			&(Font->lfWeight), &(Font->lfItalic), &(Font->lfUnderline), &(Font->lfStrikeOut),
@@ -1180,11 +1180,11 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
 		if(i == 0)
 		{
 			strcpy(Font->lfFaceName, Str);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 
-	if(Sts == FAIL)
+	if(Sts == FFFTP_FAIL)
 		memset(Font, NUL, sizeof(LOGFONT));
 
 	return(Sts);
@@ -1390,7 +1390,7 @@ static void EncodePassword3(char *Str, char *Buf, const char *Key)
 			}
 			*Put++ = ':';
 
-			if(CreateAesKey(AesKey, Key) == SUCCESS)
+			if(CreateAesKey(AesKey, Key) == FFFTP_SUCCESS)
 			{
 				aes_encrypt_key(AesKey, 32, &Ctx);
 
@@ -1578,7 +1578,7 @@ static void DecodePassword3(char *Str, char *Buf, const char *Key)
 
 			if(*Get++ == ':')
 			{
-				if(CreateAesKey(AesKey, Key) == SUCCESS)
+				if(CreateAesKey(AesKey, Key) == FFFTP_SUCCESS)
 				{
 					aes_decrypt_key(AesKey, 32, &Ctx);
 
@@ -1606,7 +1606,7 @@ static void DecodePassword3(char *Str, char *Buf, const char *Key)
 *		const char *Key : 暗号化キー
 *
 *	Return Value
-*		int ステータス (SUCCESS/FAIL)
+*		int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)
 *	Note
 *		SHA-1をもちいて32Byte鍵を生成する
 *----------------------------------------------------------------------------*/
@@ -1622,7 +1622,7 @@ static int CreateAesKey(unsigned char *AesKey, const char* Key)
 
 	HashKeyLen = strlen(Key) + 16;
 	if((HashKey = malloc(HashKeyLen + 1)) == NULL){
-		return (FAIL);
+		return (FFFTP_FAIL);
 	}
 
 	strcpy(HashKey, Key);
@@ -1643,7 +1643,7 @@ static int CreateAesKey(unsigned char *AesKey, const char* Key)
 	}
 	free(HashKey);
 
-	return (SUCCESS);
+	return (FFFTP_SUCCESS);
 }
 
 
@@ -1682,7 +1682,7 @@ static int TmpRegType;
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static void SetRegType(int Type)
@@ -1700,7 +1700,7 @@ static void SetRegType(int Type)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int OpenReg(char *Name, void **Handle)
@@ -1708,17 +1708,17 @@ static int OpenReg(char *Name, void **Handle)
 	int Sts;
 	char Tmp[FMAX_PATH+1];
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		strcpy(Tmp, "Software\\Sota\\");
 		strcat(Tmp, Name);
 		if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == SUCCESS)
+		if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == FFFTP_SUCCESS)
 			((REGDATATBL *)(*Handle))->Mode = 0;
 	}
 	return(Sts);
@@ -1733,7 +1733,7 @@ static int OpenReg(char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CreateReg(char *Name, void **Handle)
@@ -1742,13 +1742,13 @@ static int CreateReg(char *Name, void **Handle)
 	char Tmp[FMAX_PATH+1];
 	DWORD Dispos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		strcpy(Tmp, "Software\\Sota\\");
 		strcat(Tmp, Name);
 		if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -1758,7 +1758,7 @@ static int CreateReg(char *Name, void **Handle)
 			((REGDATATBL *)(*Handle))->ValLen = 0;
 			((REGDATATBL *)(*Handle))->Next = NULL;
 			((REGDATATBL *)(*Handle))->Mode = 1;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -1772,7 +1772,7 @@ static int CreateReg(char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CloseReg(void *Handle)
@@ -1811,7 +1811,7 @@ static int CloseReg(void *Handle)
 			Pos = Next;
 		}
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -1864,7 +1864,7 @@ static BOOL WriteOutRegToFile(REGDATATBL *Pos)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadInReg(char *Name, REGDATATBL **Handle)
@@ -1877,7 +1877,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 	REGDATATBL *Pos;
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	*Handle = NULL;
 
 	if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)
@@ -1920,7 +1920,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 					}
 				}
 			}
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 			free(Buf);
 		}
 		fclose(Strm);
@@ -1938,7 +1938,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int OpenSubKey(void *Parent, char *Name, void **Handle)
@@ -1947,11 +1947,11 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 	char Key[80];
 	REGDATATBL *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -1964,7 +1964,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 			if(strcmp(Pos->KeyName, Key) == 0)
 			{
 				*Handle = Pos;
-				Sts = SUCCESS;
+				Sts = FFFTP_SUCCESS;
 				break;
 			}
 			Pos = Pos->Next;
@@ -1983,7 +1983,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CreateSubKey(void *Parent, char *Name, void **Handle)
@@ -1992,11 +1992,11 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 	DWORD Dispos;
 	REGDATATBL *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -2013,7 +2013,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 			while(Pos->Next != NULL)
 				Pos = Pos->Next;
 			Pos->Next = *Handle;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2027,7 +2027,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CloseSubKey(void *Handle)
@@ -2038,7 +2038,7 @@ static int CloseSubKey(void *Handle)
 	{
 		/* Nothing */
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2050,22 +2050,22 @@ static int CloseSubKey(void *Handle)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int DeleteSubKey(void *Handle, char *Name)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegDeleteKey(Handle, Name) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -2079,22 +2079,22 @@ static int DeleteSubKey(void *Handle, char *Name)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int DeleteValue(void *Handle, char *Name)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegDeleteValue(Handle, Name) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -2109,7 +2109,7 @@ static int DeleteValue(void *Handle, char *Name)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
@@ -2118,19 +2118,19 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 	DWORD Size;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		Size = sizeof(int);
 		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
 		if((Pos = ScanValue(Handle, Name)) != NULL)
 		{
 			*Value = atoi(Pos);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2146,7 +2146,7 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteIntValueToReg(void *Handle, char *Name, int Value)
@@ -2167,7 +2167,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 		strcat(Data, Tmp);
 		Pos->ValLen += strlen(Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2181,7 +2181,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
@@ -2189,14 +2189,14 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)
 		{
 			if(*(Str + Size - 1) != NUL)
 				*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	else
@@ -2206,7 +2206,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 			Size = min1(Size-1, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Str);
 			*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2222,7 +2222,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteStringToReg(void *Handle, char *Name, char *Str)
@@ -2242,7 +2242,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Str, strlen(Str), Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2256,7 +2256,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
@@ -2264,14 +2264,14 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)
 		{
 			if(*(Str + Size - 1) != NUL)
 				*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	else
@@ -2281,7 +2281,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 			Size = min1(Size-1, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Str);
 			*(Str + Size) = NUL;
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2297,7 +2297,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
@@ -2317,7 +2317,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Str, StrMultiLen(Str), Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 
@@ -2331,7 +2331,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
@@ -2339,11 +2339,11 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 	int Sts;
 	char *Pos;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(TmpRegType == REGTYPE_REG)
 	{
 		if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_SUCCESS)
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 	}
 	else
 	{
@@ -2351,7 +2351,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 		{
 			Size = min1(Size, strlen(Pos));
 			Size = StrReadIn(Pos, Size, Bin);
-			Sts = SUCCESS;
+			Sts = FFFTP_SUCCESS;
 		}
 	}
 	return(Sts);
@@ -2368,7 +2368,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
@@ -2388,7 +2388,7 @@ static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
 		Data = Pos->ValTbl + Pos->ValLen;
 		Pos->ValLen += StrCatOut(Bin, Len, Data) + 1;
 	}
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 

--- a/remote.c
+++ b/remote.c
@@ -652,7 +652,7 @@ int CommandProcCmd(char *Reply, char *fmt, ...)
 
 //	if((Sts = command(AskCmdCtrlSkt(), Reply, "%s", Cmd)) == 429)
 //	{
-//		if(ReConnectCmdSkt() == SUCCESS)
+//		if(ReConnectCmdSkt() == FFFTP_SUCCESS)
 //		{
 			Sts = command(AskCmdCtrlSkt(), Reply, &CheckCancelFlg, "%s", Cmd);
 //		}
@@ -690,7 +690,7 @@ int CommandProcTrn(char *Reply, char *fmt, ...)
 
 //	if((Sts = command(AskTrnCtrlSkt(), Reply, "%s", Cmd)) == 429)
 //	{
-//		if(ReConnectTrnSkt() == SUCCESS)
+//		if(ReConnectTrnSkt() == FFFTP_SUCCESS)
 			Sts = command(AskTrnCtrlSkt(), Reply, &CheckCancelFlg, "%s", Cmd);
 //	}
 	return(Sts);
@@ -749,7 +749,7 @@ int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...)
 			strcpy(Reply, "");
 
 		Sts = 429;
-		if(SendData(cSkt, Cmd, strlen(Cmd), 0, CancelCheckWork) == SUCCESS)
+		if(SendData(cSkt, Cmd, strlen(Cmd), 0, CancelCheckWork) == FFFTP_SUCCESS)
 		{
 			Sts = ReadReplyMessage(cSkt, Reply, 1024, CancelCheckWork, TmpBuf);
 		}
@@ -779,7 +779,7 @@ int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
@@ -791,10 +791,10 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
 //	struct timeval *ToutPtr;
 	int TimeOutErr;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(Skt != INVALID_SOCKET)
 	{
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 		while(Size > 0)
 		{
 //			FD_ZERO(&SendFds);
@@ -809,13 +809,13 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
 //			Tmp = select(0, NULL, &SendFds, NULL, ToutPtr);
 //			if(Tmp == SOCKET_ERROR)
 //			{
-//				Sts = FAIL;
+//				Sts = FFFTP_FAIL;
 //				ReportWSError("select", WSAGetLastError());
 //				break;
 //			}
 //			else if(Tmp == 0)
 //			{
-//				Sts = FAIL;
+//				Sts = FFFTP_FAIL;
 //				SetTaskMsg(MSGJPN241);
 //				break;
 //			}
@@ -823,13 +823,13 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
 			Tmp = do_send(Skt, Data, Size, Mode, &TimeOutErr, CancelCheckWork);
 			if(TimeOutErr == YES)
 			{
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 				SetTaskMsg(MSGJPN241);
 				break;
 			}
 			else if(Tmp == SOCKET_ERROR)
 			{
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 				ReportWSError("send", WSAGetLastError());
 				break;
 			}
@@ -1056,7 +1056,7 @@ static int ReadOneLine(SOCKET cSkt, char *Buf, int Max, int *CancelCheckWork)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
@@ -1069,10 +1069,10 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
 	int Sts;
 	int TimeOutErr;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if(cSkt != INVALID_SOCKET)
 	{
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 		while(Size > 0)
 		{
 //			FD_ZERO(&ReadFds);
@@ -1088,13 +1088,13 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
 //			if(i == SOCKET_ERROR)
 //			{
 //				ReportWSError("select", WSAGetLastError());
-//				Sts = FAIL;
+//				Sts = FFFTP_FAIL;
 //				break;
 //			}
 //			else if(i == 0)
 //			{
 //				SetTaskMsg(MSGJPN243);
-//				Sts = FAIL;
+//				Sts = FFFTP_FAIL;
 //				break;
 //			}
 
@@ -1102,7 +1102,7 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
 			{
 				if(TimeOutErr == YES)
 					SetTaskMsg(MSGJPN243);
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 				break;
 			}
 
@@ -1111,7 +1111,7 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
 		}
 	}
 
-	if(Sts == FAIL)
+	if(Sts == FFFTP_FAIL)
 		SetTaskMsg(MSGJPN244);
 
 	return(Sts);
@@ -1287,7 +1287,7 @@ void ReportWSError(char *Msg, UINT Error)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int ChangeFnameRemote2Local(char *Fname, int Max)
@@ -1297,7 +1297,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 	char *Pos;
 	CODECONVINFO cInfo;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Buf = malloc(Max)) != NULL)
 	{
 		InitCodeConvInfo(&cInfo);
@@ -1351,7 +1351,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 				break;
 		}
 		free(Buf);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1365,7 +1365,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int ChangeFnameLocal2Remote(char *Fname, int Max)
@@ -1375,7 +1375,7 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 	char *Pos;
 	CODECONVINFO cInfo;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	if((Buf = malloc(Max)) != NULL)
 	{
 		InitCodeConvInfo(&cInfo);
@@ -1438,7 +1438,7 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
 				break;
 		}
 		free(Buf);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }

--- a/sha.c
+++ b/sha.c
@@ -69,8 +69,8 @@
 #define TRUE  1
 #define FALSE 0
 
-#define SUCCESS 0
-#define FAILURE -1
+#define FFFTP_SUCCESS 0
+#define FFFTP_FAILURE -1
 
 int sha_file();                         /* External entries */
 void sha_stream(), sha_memory();
@@ -121,7 +121,7 @@ char **argv;
 	    if (verbose) printf("%s:", *argv);
 	    file_args = TRUE;           /* Whether or not we could read it */
 
-	    if (sha_file(*argv, hbuf) == FAILURE)
+	    if (sha_file(*argv, hbuf) == FFFTP_FAILURE)
 		printf("Can't open file %s.\n", *argv);
 	    else
 		if (terse) printf("%08lx%08lx%08lx%08lx%08lx\n",
@@ -187,11 +187,11 @@ uint32 *buffer;
 
 	for (i = 0; i < 5; i++)
 	    buffer[i] = 0xdeadbeef;
-	return FAILURE;
+	return FFFTP_FAILURE;
     }
     (void) sha_stream(infile, buffer);
     fclose(infile);
-    return SUCCESS;
+    return FFFTP_SUCCESS;
 }
 
 void sha_memory(mem, length, buffer)    /* Hash a memory block */

--- a/skey.c
+++ b/skey.c
@@ -296,7 +296,7 @@ static const char Wp[2048][4] = {
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int Make6WordPass(int seq, char *seed, char *pass, int type, char *buf)
@@ -305,13 +305,13 @@ int Make6WordPass(int seq, char *seed, char *pass, int type, char *buf)
 	int i;
 	int Sts;
 
-	Sts = FAIL;
-	if(keycrunch(key, seed, pass, type) != FAIL)
+	Sts = FFFTP_FAIL;
+	if(keycrunch(key, seed, pass, type) != FFFTP_FAIL)
 	{
 		for(i = 0; i < seq; i++)
 			secure_hash(key, type);
 		btoe(key, buf);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -328,7 +328,7 @@ static int keycrunch(char *result, char *seed, char *passwd, int Type)
 
 	buflen = strlen(seed) + strlen(passwd);
 	if((buf = malloc(buflen + 1)) == NULL)
-		return(FAIL);
+		return(FFFTP_FAIL);
 	strcpy(buf, seed);
 	strcat(buf, passwd);
 
@@ -361,7 +361,7 @@ static int keycrunch(char *result, char *seed, char *passwd, int Type)
 	/* Only works on byte-addressed little-endian machines!! */
 	memcpy(result, (char *)results, 8);
 
-	return(SUCCESS);
+	return(FFFTP_SUCCESS);
 }
 
 

--- a/socket.c
+++ b/socket.c
@@ -115,7 +115,7 @@ static ASYNCSIGNALDATABASE SignalDbase[MAX_SIGNAL_ENTRY_DBASE];
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeSocketWin(HWND hWnd, HINSTANCE hInst)
@@ -138,7 +138,7 @@ int MakeSocketWin(HWND hWnd, HINSTANCE hInst)
 	wClass.hIconSm       = NULL;
 	RegisterClassEx(&wClass);
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	hWndSocket = CreateWindowEx(0, SocketWndClass, NULL,
 			WS_BORDER | WS_POPUP,
 			0, 0, 0, 0,
@@ -152,7 +152,7 @@ int MakeSocketWin(HWND hWnd, HINSTANCE hInst)
 			Signal[i].Socket = INVALID_SOCKET;
 		for(i = 0; i < MAX_SIGNAL_ENTRY_DBASE; i++)
 			SignalDbase[i].Async = 0;
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }
@@ -1015,7 +1015,7 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int CheckClosedAndReconnect(void)
@@ -1025,7 +1025,7 @@ int CheckClosedAndReconnect(void)
 
 //SetTaskMsg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE_BIT) == YES)
 	{
 		Sts = ReConnectCmdSkt();

--- a/statuswin.c
+++ b/statuswin.c
@@ -58,14 +58,14 @@ static int SbarColWidth[5] = { 70, 230, 410, 570, -1 };
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeStatusBarWindow(HWND hWnd, HINSTANCE hInst)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	hWndSbar = CreateWindowEx(0,
 			STATUSCLASSNAME, NULL,
 			WS_CHILD | SBS_SIZEGRIP | WS_CLIPSIBLINGS | SBT_NOBORDERS,
@@ -76,7 +76,7 @@ int MakeStatusBarWindow(HWND hWnd, HINSTANCE hInst)
 	{
 		SendMessage(hWndSbar, SB_SETPARTS, sizeof(SbarColWidth)/sizeof(int), (LPARAM)SbarColWidth);
 		ShowWindow(hWndSbar, SW_SHOW);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
 }

--- a/taskwin.c
+++ b/taskwin.c
@@ -74,14 +74,14 @@ static HANDLE DispLogSemaphore2;
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)
 {
 	int Sts;
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	hWndTask = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,
 			"EDIT", NULL,
 			WS_CHILD | WS_BORDER | ES_AUTOVSCROLL | WS_VSCROLL | ES_MULTILINE | ES_READONLY | WS_CLIPSIBLINGS,
@@ -96,7 +96,7 @@ int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)
 			SendMessage(hWndTask, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));
 
 		ShowWindow(hWndTask, SW_SHOW);
-		Sts = SUCCESS;
+		Sts = FFFTP_SUCCESS;
 
 		DispLogSemaphore = CreateSemaphore(NULL, 1, 1, NULL);
 		DispLogSemaphore2 = CreateSemaphore(NULL, 1, 1, NULL);
@@ -211,7 +211,7 @@ void SetTaskMsg(char *szFormat, ...)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int SaveTaskMsg(char *Fname)
@@ -222,7 +222,7 @@ int SaveTaskMsg(char *Fname)
 	int Sts;
 
 
-	Sts = FAIL;
+	Sts = FFFTP_FAIL;
 	Size = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);
 	if((Buf = malloc(Size)) != NULL)
 	{
@@ -230,10 +230,10 @@ int SaveTaskMsg(char *Fname)
 		{
 			SendMessage(GetTaskWnd(), WM_GETTEXT, Size, (LPARAM)Buf);
 			if(fwrite(Buf, strlen(Buf), 1, Strm) == 1)
-				Sts = SUCCESS;
+				Sts = FFFTP_SUCCESS;
 			fclose(Strm);
 
-			if(Sts == FAIL)
+			if(Sts == FFFTP_FAIL)
 				_unlink(Fname);
 		}
 		free(Buf);
@@ -259,7 +259,7 @@ void DispTaskMsg(void)
 	SetYenTail(Buf);
 	strcat(Buf, "_ffftp.tsk");
 
-	if(SaveTaskMsg(Buf) == SUCCESS)
+	if(SaveTaskMsg(Buf) == FFFTP_SUCCESS)
 	{
 		AddTempFileList(Buf);
 		ExecViewer(Buf, 0);

--- a/tool.c
+++ b/tool.c
@@ -122,7 +122,7 @@ static BOOL CALLBACK OtpCalcWinProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 						/* Seed */
 						if((Pos = GetNextField(Pos)) != NULL)
 						{
-							if(GetOneField(Pos, Seed, MAX_SEED_LEN) == SUCCESS)
+							if(GetOneField(Pos, Seed, MAX_SEED_LEN) == FFFTP_SUCCESS)
 							{
 								Make6WordPass(Seq, Seed, Pass, Type, Tmp);
 							}

--- a/toolmenu.c
+++ b/toolmenu.c
@@ -206,7 +206,7 @@ static const int HideMenus[] = {
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
@@ -351,14 +351,14 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
 		}
 	}
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if((hWndTbarMain == NULL) ||
 	   (hWndTbarLocal == NULL) ||
 	   (hWndTbarRemote == NULL) ||
 	   (hWndDirLocal == NULL) ||
 	   (hWndDirRemote == NULL))
 	{
-		Sts = FAIL;
+		Sts = FFFTP_FAIL;
 	}
 	return(Sts);
 }
@@ -385,7 +385,7 @@ static LRESULT CALLBACK HistEditBoxWndProc(HWND hWnd, UINT message, WPARAM wPara
 				else
 				{
 					SendMessage(hWndDirRemoteEdit, WM_GETTEXT, FMAX_PATH+1, (LPARAM)Tmp);
-					if(CheckClosedAndReconnect() == SUCCESS)
+					if(CheckClosedAndReconnect() == FFFTP_SUCCESS)
 					{
 						if(DoCWD(Tmp, YES, NO, YES) < FTP_RETRY)
 							GetRemoteDirForWnd(CACHE_NORMAL, &CancelFlg);
@@ -925,7 +925,7 @@ int AskTransferTypeAssoc(char *Fname, int Type)
 			Pos = AsciiExt;
 			while(*Pos != NUL)
 			{
-				if(CheckFname(Name, Pos) == SUCCESS)
+				if(CheckFname(Name, Pos) == FFFTP_SUCCESS)
 				{
 					Ret = TYPE_A;
 					break;

--- a/wildcard.c
+++ b/wildcard.c
@@ -51,7 +51,7 @@ static int CheckNameMatch(char *str, char *regexp);
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *
 *	Note
 *		VAX VMSの時は ; 以降は無視する
@@ -84,14 +84,14 @@ int CheckFname(char *str, char *regexp)
 	if((strcmp(p1, "*.*") == 0) || (strcmp(p1, "????????.???") == 0))
 		strcpy(p1, "*");
 
-	Sts = SUCCESS;
+	Sts = FFFTP_SUCCESS;
 	if(strcmp(p1, "*") != 0)
 	{
 		if(strcmp(p1, "*.") == 0)
 		{
 			p = strchr(p2, '.');
 			if((p != NULL) && (*(p+1) != NUL))
-				Sts = FAIL;
+				Sts = FFFTP_FAIL;
 		}
 		else
 			Sts = CheckNameMatch(p2, p1);
@@ -108,7 +108,7 @@ int CheckFname(char *str, char *regexp)
 *
 *	Return Value
 *		int ステータス
-*			SUCCESS/FAIL
+*			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
 static int CheckNameMatch(char *str, char *regexp)
@@ -128,23 +128,23 @@ static int CheckNameMatch(char *str, char *regexp)
 				/* Look for a character matching the one after the '*' */
 				p++;
 				if(*p == NUL)
-					return SUCCESS; /* Automatic match */
+					return FFFTP_SUCCESS; /* Automatic match */
 				while(*str != NUL)
 				{
 					while((*str != NUL) && (toupper(*p)!=toupper(*str)))
 						str++;
 					if(CheckNameMatch(str, p))
-						return SUCCESS;
+						return FFFTP_SUCCESS;
 					if(*str == NUL)
-						return FAIL;
+						return FFFTP_FAIL;
 					else
 						str++;
 				}
-				return FAIL;
+				return FFFTP_FAIL;
 
 			default:
 				if(toupper(*str) != toupper(*p))
-					return FAIL;
+					return FFFTP_FAIL;
 				str++;
 				p++;
 				break;
@@ -152,10 +152,10 @@ static int CheckNameMatch(char *str, char *regexp)
 	}
 
 	if((*p == NUL) && (*str == NUL))
-		return SUCCESS;
+		return FFFTP_SUCCESS;
 
 	if ((*p != NUL) && (str[0] == '.') && (str[1] == 0))
-		return(SUCCESS);
+		return(FFFTP_SUCCESS);
   
 	if ((*str == NUL) && (*p == '?'))
 	{
@@ -165,8 +165,8 @@ static int CheckNameMatch(char *str, char *regexp)
 	}
 
 	if((*str == NUL) && (*p == '*') && (p[1] == '\0'))
-		return SUCCESS;
+		return FFFTP_SUCCESS;
 
-	return FAIL;
+	return FFFTP_FAIL;
 }