コミット: 66d898a778e94021d12df50eb2f6778748d31503 - ffftp (git)

Loweynet

コミットメタ情報

• リビジョン: 66d898a778e94021d12df50eb2f6778748d31503 (tree)
• 日時: 2013-02-23 00:08:05
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Fix tools for encoding literal messages into UTF-8.

変更サマリ

• modified: utf8msg.bat
• modified: utf8msg.exe
• modified: utf8msg/utf8msg.cpp
• modified: utf8msg/utf8msg.vcproj

差分

--- a/utf8msg.bat
+++ b/utf8msg.bat
@@ -1,2 +1,2 @@
-utf8msg mesg-jpn.h mesg-jpn.h
-utf8msg mesg-eng.h mesg-eng.h
+utf8msg.exe mesg-jpn.h mesg-jpn.h
+utf8msg.exe mesg-eng.h mesg-eng.h

Binary files a/utf8msg.exe and b/utf8msg.exe differ

--- a/utf8msg/utf8msg.cpp
+++ b/utf8msg/utf8msg.cpp
@@ -139,48 +139,48 @@ int _tmain(int argc, _TCHAR* argv[])
 	_tsetlocale(LC_ALL, _T(""));
 	if(argc != 3)
 	{
-		_tprintf(_T("UTF-8‚ŏ‘‚©‚ꂽCŒ¾Œêƒ\[ƒXƒtƒ@ƒCƒ‹“à‚Ì•¶Žš—ñƒŠƒeƒ‰ƒ‹‚ðƒGƒ“ƒR[ƒh‚µ‚Ü‚·B\n"));
-		_tprintf(_T("s’†‚ōŏ‰‚ɏoŒ»‚·‚镶Žš—ñƒŠƒeƒ‰ƒ‹‚Í‚»‚Ì‚Ü‚Ü•ÛŽ‚³‚ê‚Ü‚·B\n"));
-		_tprintf(_T("s’†‚Å2”Ԗڈȍ~‚ɏoŒ»‚·‚镶Žš—ñƒŠƒeƒ‰ƒ‹‚͍ŏ‰‚Ì‚à‚̂ŃGƒ“ƒR[ƒh‚³‚ê‚Ü‚·B\n"));
-		_tprintf(_T("ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“\n"));
-		_tprintf(_T("mbtoutf8 [in] [out]\n"));
-		_tprintf(_T("[in]    Œ³‚̃\[ƒXƒtƒ@ƒCƒ‹‚̃tƒ@ƒCƒ‹–¼\n"));
-		_tprintf(_T("[out]   •Û‘¶æ‚̃tƒ@ƒCƒ‹–¼\n"));
+		_tprintf(_T("Encode string literals in C language source files written in UTF-8.\n"));
+		_tprintf(_T("The first string literal in each line will be retained.\n"));
+		_tprintf(_T("The other string literals in each line will be encoded from the first one.\n"));
+		_tprintf(_T("Command line\n"));
+		_tprintf(_T("utf8msg.exe [in] [out]\n"));
+		_tprintf(_T("[in]    Original source file name.\n"));
+		_tprintf(_T("[out]   File name to save.\n"));
 		return 0;
 	}
 	fpIn = _tfopen(argv[1], _T("rb"));
 	if(!fpIn)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	if(fseek(fpIn, 0, SEEK_END) != 0)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	InLength = ftell(fpIn);
 	if(fseek(fpIn, 0, SEEK_SET) != 0)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	pInBuffer = (char*)malloc(InLength);
 	if(!pInBuffer)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	if((long)fread(pInBuffer, 1, InLength, fpIn) != InLength)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	OutLength = InLength * 4;
 	pOutBuffer = (char*)malloc(OutLength);
 	if(!pOutBuffer)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[1]);
+		_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[1]);
 		return 0;
 	}
 	pIn = pInBuffer;
@@ -233,44 +233,44 @@ int _tmain(int argc, _TCHAR* argv[])
 	{
 		if(fseek(fpIn, 0, SEEK_END) != 0)
 		{
-			_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[2]);
+			_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[2]);
 			return 0;
 		}
 		InLength = ftell(fpIn);
 		if(fseek(fpIn, 0, SEEK_SET) != 0)
 		{
-			_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[2]);
+			_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[2]);
 			return 0;
 		}
 		pInBuffer = (char*)malloc(InLength);
 		if(!pInBuffer)
 		{
-			_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[2]);
+			_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[2]);
 			return 0;
 		}
 		if((long)fread(pInBuffer, 1, InLength, fpIn) != InLength)
 		{
-			_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªŠJ‚¯‚Ü‚¹‚ñB\n"), argv[2]);
+			_tprintf(_T("File \"%s\" cannot be opened.\n"), argv[2]);
 			return 0;
 		}
 		if(InLength == OutLength && memcmp(pInBuffer, pOutBuffer, InLength) == 0)
 		{
-			_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚Í•ÏŠ·‚Ì•K—v‚ª‚ ‚è‚Ü‚¹‚ñB\n"), argv[2]);
+			_tprintf(_T("There is no need to convert file \"%s\".\n"), argv[2]);
 			return 0;
 		}
 	}
 	fpOut = _tfopen(argv[2], _T("wb"));
 	if(!fpOut)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªì¬‚Å‚«‚Ü‚¹‚ñB\n"), argv[2]);
+		_tprintf(_T("File \"%s\" cannot be created.\n"), argv[2]);
 		return 0;
 	}
 	if((long)fwrite(pOutBuffer, 1, OutLength, fpOut) != OutLength)
 	{
-		_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚ªì¬‚Å‚«‚Ü‚¹‚ñB\n"), argv[2]);
+		_tprintf(_T("File \"%s\" cannot be created.\n"), argv[2]);
 		return 0;
 	}
-	_tprintf(_T("ƒtƒ@ƒCƒ‹\"%s\"‚͐³í‚É•ÏŠ·‚³‚ê‚Ü‚µ‚½B\n"), argv[2]);
+	_tprintf(_T("File \"%s\" was successfully converted.\n"), argv[2]);
 	return 0;
 }
 

--- a/utf8msg/utf8msg.vcproj
+++ b/utf8msg/utf8msg.vcproj
@@ -44,7 +44,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -115,7 +115,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -171,10 +171,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\utf8msg.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\stdafx.cpp"
 				>
 				<FileConfiguration
@@ -194,6 +190,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\utf8msg.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="ƒwƒbƒ_[ ƒtƒ@ƒCƒ‹"