コミット: 7ce4d240fce9d30c503b308bf306201f1cc0755f - ffftp (git)

FFFTPのソースコードです。

コミットメタ情報

• リビジョン: 7ce4d240fce9d30c503b308bf306201f1cc0755f (tree)
• 日時: 2012-02-23 10:05:13
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Fix bugs of UTF-8 to UTF-16 API bridge.

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: filelist.c
• modified: mbswrapper.c

差分

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/filelist.c
+++ b/filelist.c
@@ -1525,20 +1525,36 @@ static void AddDispFileList(FLISTANCHOR *Anchor, char *Name, FILETIME *Time, LON
 
 			if((Sort & SORT_GET_ORD) == SORT_ASCENT)
 			{
-				if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&
-					((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0)) ||
+				// 読みにくいのでリファクタリング
+//				if((((Sort & SORT_MASK_ORD) == SORT_EXT) &&
+//					((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0)) ||
+//#if defined(HAVE_TANDEM)
+//				   ((AskHostType() == HTYPE_TANDEM) &&
+//				    ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
+//					((Cmp = Attr - Pos->Attr) < 0)) ||
+//#endif
+//				   (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&
+//					((Cmp = Size - Pos->Size) < 0)) ||
+//				   (((Sort & SORT_MASK_ORD) == SORT_DATE) &&
+//					((Cmp = CompareFileTime(Time, &Pos->Time)) < 0)))
+//				{
+//					break;
+//				}
+				if(((Sort & SORT_MASK_ORD) == SORT_EXT) &&
+					((Cmp = _mbsicmp(GetFileExt(Name), GetFileExt(Pos->File))) < 0))
+					break;
 #if defined(HAVE_TANDEM)
-				   ((AskHostType() == HTYPE_TANDEM) &&
-				    ((Sort & SORT_MASK_ORD) == SORT_EXT) &&
-					((Cmp = Attr - Pos->Attr) < 0)) ||
+				if((AskHostType() == HTYPE_TANDEM) &&
+					((Sort & SORT_MASK_ORD) == SORT_EXT) &&
+					((Cmp = Attr - Pos->Attr) < 0))
+					break;
 #endif
-				   (((Sort & SORT_MASK_ORD) == SORT_SIZE) &&
-					((Cmp = Size - Pos->Size) < 0)) ||
-				   (((Sort & SORT_MASK_ORD) == SORT_DATE) &&
-					((Cmp = CompareFileTime(Time, &Pos->Time)) < 0)))
-				{
+				if(((Sort & SORT_MASK_ORD) == SORT_SIZE) &&
+					((Cmp = Size - Pos->Size) < 0))
+					break;
+				if(((Sort & SORT_MASK_ORD) == SORT_DATE) &&
+					((Cmp = CompareFileTime(Time, &Pos->Time)) < 0))
 					break;
-				}
 
 				if(((Sort & SORT_MASK_ORD) == SORT_NAME) || (Cmp == 0))
 				{

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -427,14 +427,19 @@ DWORD GetNextCharM(LPCSTR lpString, LPCSTR* ppNext)
 	}
 	else
 		i = -1;
-	lpString++;
-	while((*lpString & 0xc0) == 0x80)
+	if(*lpString != 0x00)
 	{
-		i--;
-		Code = Code << 6;
-		Code |= (DWORD)*lpString & 0x3f;
 		lpString++;
+		while((*lpString & 0xc0) == 0x80)
+		{
+			i--;
+			Code = Code << 6;
+			Code |= (DWORD)*lpString & 0x3f;
+			lpString++;
+		}
 	}
+	else
+		lpString++;
 	if(i != 0)
 		Code = 0x80000000;
 	if(ppNext)