From a2498b60eab51949de31bfb4658ac46213c45c5b Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Wed, 7 Mar 2012 07:09:50 +0900 Subject: [PATCH] =?utf8?q?=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3?= =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=AA=AD=E3=81=BF=E5=8F=96?= =?utf8?q?=E3=82=8A=E6=99=82=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 200192 -> 200704 bytes nlite/nlite_chatData.cpp | 7 ++++--- nlite/nlite_property.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nlite.suo b/nlite.suo index 8e26c31c7f391e446cda166b74fc13511c3e7b05..6749ae05d760b9b35bf2e6fc4e188f6457398a0d 100644 GIT binary patch delta 1167 zcmY*Ye@v8h82>(>_q|_o2`A$8U>ZVg84V7aD@;3;Ehi~Q>&HsQXwx=KN!vkT!Okt2 zC4Z=wJSv{y7RS;S=e-wSX9-udRa*;CW2`kLONmjfwre?O*!R5yc0Aj6@ALh<&+~bn z&+|TS;FL4a<&5moErH_JuWuTA^$F51=|UJa);tH*8O@m)AT4;nRh*G0glG`EM7{7E z1Fi#B`yvIn)CsO=%@3C7wxECMRXsNiux=zFZk8MSmfgvt7Nc=>V}r}6Km6a_$iEFW zn`$>SZCiBh(cu2t93!jyF}J=iE!FT3_!iioQ^?kIH1X|_)gfvW^wKq%&+rfK=lv$(I!cD-DPd~u1_kK-s;_o9fmp2i{Wy#YJlJ&sj8(2W5T zYv-0j@bKgb#LVl{;dVIrOeehj<7s#(#z#VUmusUalKlr!242^rc*Z-S^V;Kz_Q4Yv zl%bP2ugQ!L5VP{V4^!`*Tseh@qzc#cj<--K3qQtB#Ou%D0;Tmu56H+T*hc*Kd-M8> zN3dkch?+sl3gQ#W$yTRgCfO6ihMameh*@iy@heQK_GJ5nFV_?OCuimWh9`R~ZX5$IY<#068t`v$HrES*azh(ATVKZZXjni|)5pPFA+ z6i$n|=?mE-F~q(BQRa;Ksuhht?6Zu>+0vmg$V3lVt;xhGJ zhL=|C5I*s`cunjPJJi!J%%w@Q;1{L&9Jqo2cb!71sb!^9RZ57nLfFDvhEd!xipA6> zU89(yjxl_rXQ}+z|4$~y;I#2x18(jZMh*u@u$%9HfwFmBFKp6%6}O1%3_P4vlvE(S z<0vE!Tr)rGujWKXPNJIkoL8NH_A@@B@NWQDcVi>>{DK$xSO{&h?G`GCKaI|;hg9n^ zX>({vDQm=9etA$)cqb8;UYquc9_)Y8Ed#d^umq#!<^0!9dg546!} JW`%YqckQcmtaa;{+f*=v1c$6LDKK!>hznwLl}Is@nCO50n31GIm_Rx+ zjAJHFp7ww&rt+hUjEL}>T?5uFnMNg%O~Iv!M#n;!$RGx*F=njZ*JfI7a`Nu`zH{FD z&Uep^#@*3g_a`rjqEO4>)(LBim?SZi&1S95j%pVLt?eaqKrnZE>*i?xFKf`d+hJ5G zz^lT%bJqgXFPvti;=J$_0FH-9)9P1Q?YI3?O*^c%K-=Hg=prR5r>O5E9lXi;L(r}8*OCBy~K+A5Fqc3 zhqVtn9Q_XzB?I%;ty|H)TK%WgIy=@zMcVrRGSkh~F6~A2y6vXVWkR~qu8?RU8u@#q z#6`-R?A8L9BL+2_!{T1f7!)#IRn)EmT1H$n;?41qDr$C7t0K1-CS&c5aG&y%>&lBPr9pIHBk3{T7zVt~ino?(D*#yuS~_f@`m%pZh;Xu`@|)8~hFa z*lVbfHOKH1@rBdq=b^P+o&3vU5y&Q@*R43=$aCg z)6#PS<^1Jo`1r_4)j{wO3~uSd-E0%Sso6sHoK!Ja#adf+jxMh#pxtUe&!z`*0=O}S zro7Nkl~D7k(lY++65h6LSedJqZKLQWo__^S={%2}H1IhlgnZ7>@1VpN%DRp{c#Okw zc-JJ@I8XGHyq^XIYi9`(NcMQ99JnehB8`YewZqio*twr zmd4lOR;6$DLdZ-SZYN(DzzVZY81lynEF|{4k4n}~UjGf1 z9R1mL|6%kJ^6np4Eg$>~3k8=A!6O6HI75kPHEc68@Jm1R iQ8G_9H1O{)(3g&zD%fmeS2+GW(;jx6!-TwmBscByT 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 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 userSettingBuf(static_cast(userSettingFileSize / sizeof(char) + (1 * sizeof(char)))); + userSettingBuf.resize(static_cast(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); } -- 2.11.0