From: qwerty2501 <qwerty2501users.sourceforge.jp>
Date: Tue, 6 Mar 2012 22:09:50 +0000 (+0900)
Subject: プロパティファイル読み取り時のバグ修正
X-Git-Tag: v0.101~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2498b60eab51949de31bfb4658ac46213c45c5b;p=nlite%2Fnlite.git

プロパティファイル読み取り時のバグ修正
---

diff --git a/nlite.suo b/nlite.suo
index 8e26c31..6749ae0 100644
Binary files a/nlite.suo and b/nlite.suo differ
diff --git a/nlite/nlite_chatData.cpp b/nlite/nlite_chatData.cpp
index 3d1015f..f2ad284 100644
--- a/nlite/nlite_chatData.cpp
+++ b/nlite/nlite_chatData.cpp
@@ -443,13 +443,14 @@ BOOL CListenerList::ReadProperty(LPCTSTR fileName){
 	BOOL rslt = FALSE;
 	CAtlFile	userSettingFile;
 	ULONGLONG userSettingFileSize;
+	std::vector<char> userSettingBuf;
 	
-	
-	if(SUCCEEDED(userSettingFile.Create(fileName,GENERIC_READ,FILE_SHARE_READ,OPEN_ALWAYS)) == FALSE || SUCCEEDED(userSettingFile.GetSize(userSettingFileSize)) == FALSE){
+	if(SUCCEEDED(userSettingFile.Create(fileName,GENERIC_READ,FILE_SHARE_READ,OPEN_ALWAYS)) == FALSE || userSettingFile.m_h == NULL || SUCCEEDED(userSettingFile.GetSize(userSettingFileSize)) == FALSE){
 
 		throw Exception(TEXT("ƒŠƒXƒi[Ý’èƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ‚Å‚µ‚½B‚±‚̃Gƒ‰[‚ª‘±‚­‚悤‚Å‚ ‚ê‚΁Aˆê“xÝ’èƒtƒ@ƒCƒ‹‚ðíœ‚µ‚čēxŽŽ‚µ‚Ä‚Ý‚Ä‚­‚¾‚³‚¢"),__LINE__,TEXT(__FILE__),TEXT(__FUNCTION__));
+		
 	}
-	std::vector<char> userSettingBuf(static_cast<UINT_PTR>(userSettingFileSize / sizeof(char) + (1 * sizeof(char))));
+	userSettingBuf.resize(static_cast<UINT_PTR>(userSettingFileSize / sizeof(char) + (1 * sizeof(char))));
 	userSettingFile.Read(&userSettingBuf[0],userSettingBuf.size());
 	LPSTR userSettingStart = strstr(&userSettingBuf[0],"<");
 	if(userSettingStart != NULL){
diff --git a/nlite/nlite_property.cpp b/nlite/nlite_property.cpp
index 07c919c..2c499d6 100644
--- a/nlite/nlite_property.cpp
+++ b/nlite/nlite_property.cpp
@@ -218,7 +218,7 @@ UINT_PTR CCommentViewProperty::GetHeaderOrderArrayLength()const{
 	}
 
 
-	const CNLiteString CProperty::iniFileName(TEXT("nlite.init"));
+	const CNLiteString CProperty::iniFileName(TEXT("nlite.ini"));
 	CProperty::CProperty()
 	{
 		TCHAR localAppPath[_MAX_PATH];
@@ -379,7 +379,7 @@ UINT_PTR CCommentViewProperty::GetHeaderOrderArrayLength()const{
 		TCHAR propertyBuf[_MAX_PATH];
 		LPCTSTR sectionName = TEXT("property");
 		LPCTSTR keyName = TEXT("dir");
-		::WritePrivateProfileString(sectionName,keyName,this->propertyPath,iniFile);
+		::WritePrivateProfileString(sectionName,keyName,this->propertySaveFolderPath,iniFile);
 
 	}