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

diff --git a/nlite.suo b/nlite.suo
index 8e26c31..6749ae0 100644 (file)
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 (file)
--- 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("\83\8a\83X\83i\81[\90Ý\92è\83t\83@\83C\83\8b\82ª\8aJ\82¯\82Ü\82¹\82ñ\82Å\82µ\82½\81B\82±\82Ì\83G\83\89\81[\82ª\91±\82­\82æ\82¤\82Å\82 \82ê\82Î\81A\88ê\93x\90Ý\92è\83t\83@\83C\83\8b\82ð\8dí\8f\9c\82µ\82Ä\8dÄ\93x\8e\8e\82µ\82Ä\82Ý\82Ä\82­\82¾\82³\82¢"),__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 (file)
--- 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);
 
        }