OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

ppregnessem: Commit


Commit MetaInfo

Revision91 (tree)
Time2009-08-03 01:15:08
Authorkamoya

Log Message

--remove

Common::TThreadList::AutoLock::List() overload

Change Summary

Incremental Difference

--- trunk/StrRsc/src/StrRscConsts.h (revision 90)
+++ trunk/StrRsc/src/StrRscConsts.h (revision 91)
@@ -20,6 +20,6 @@
2020 #define NMS_ADDIN_STRRSC_SHOWOPTIONDIALOG NMD_ADDIN_STRRSC TEXT("/ShowOptionDialog")
2121
2222 // 言語変更通知用イベント
23-#define STRRSC_EVENT_CHANGELANGUAGE NMM_ADDIN TEXT("/") NMP_ADDIN_NAME TEXT("/OnChangeLanguage")
23+#define NME_ADDIN_STRRSC_CHANGELANGUAGE NMD_ADDIN_STRRSC TEXT("/OnChangeLanguage")
2424
2525 #endif
--- trunk/StrRsc/src/StrRsc.cpp (revision 90)
+++ trunk/StrRsc/src/StrRsc.cpp (revision 91)
@@ -43,11 +43,11 @@
4343 CreateNsmService(NMS_ADDIN_STRRSC_GETLOCALSTR, StrRscService::DoGetLocalStr);
4444 CreateNsmService(NMS_ADDIN_STRRSC_SHOWOPTIONDIALOG, StrRscService::DoShowOptionDialog);
4545
46- ChangeLangEvent = CreateNsmEvent(STRRSC_EVENT_CHANGELANGUAGE);
46+ ChangeLangEvent = CreateNsmEvent(NME_ADDIN_STRRSC_CHANGELANGUAGE);
4747 }
4848
4949 // オプションダイアログ表示
50- INT_PTR StrRscMain::DoShowOptionDialog(const HWND parent)
50+ INT_PTR StrRscMain::DoShowOptionDialog(HWND parent)
5151 {
5252 OptionDlg dlg;
5353 dlg.Locale = Config.Locale;
@@ -76,14 +76,20 @@
7676 + pluginName + TEXT(".txt");
7777
7878 if(GetFileAttributes(filePath.c_str()) != INVALID_FILE_ATTRIBUTES)
79- IniFiles.insert(std::make_pair(pluginName,filePath));
79+ IniFiles.insert(std::make_pair(pluginName, filePath));
8080 }
8181
8282 // 言語ファイルから文字列取得
83- int StrRscMain::DoGetLocalStr(const PNsmStrRsc strRsc)
83+ int StrRscMain::DoGetLocalStr(const NsmStrRsc &strRsc)
8484 {
85- const std::tstring pluginName = c2t(strRsc->lpPluginName);
85+ if(!strRsc.lpDefaultStr || !strRsc.lpMessageTag || !strRsc.lpPluginName || !strRsc.lpSectionName)
86+ return 0;
8687
88+ if(strRsc.nBufferSize < 1)
89+ return 0;
90+
91+ const std::tstring pluginName = c2t(strRsc.lpPluginName);
92+
8793 IniFilesTable::const_iterator it = IniFiles.find(pluginName);
8894
8995 if(it == IniFiles.end())
@@ -93,36 +99,41 @@
9399
94100 if(it == IniFiles.end())
95101 {
96- strRsc->nBufferSize = StrToStrRsc(strRsc,c2t(strRsc->lpDefaultStr));
102+ StrToStrRsc(strRsc, c2t(strRsc.lpDefaultStr));
103+
97104 return 0;
98105 }
99106 }
100107
101- std::vector<TCHAR> buff(strRsc->nBufferSize);
108+ std::vector<TCHAR> buff(strRsc.nBufferSize);
102109 GetPrivateProfileString(
103- c2t(strRsc->lpSectionName).c_str(),
104- c2t(strRsc->lpMessageTag).c_str(),
105- c2t(strRsc->lpDefaultStr).c_str(),
106- &buff[0],static_cast<DWORD>(buff.size()),(*it).second.c_str());
110+ c2t(strRsc.lpSectionName).c_str(),
111+ c2t(strRsc.lpMessageTag).c_str(),
112+ c2t(strRsc.lpDefaultStr).c_str(),
113+ &buff[0], static_cast<DWORD>(buff.size()), (*it).second.c_str());
107114
108- StrToStrRsc(strRsc, &buff[0]);
115+ if(!StrToStrRsc(strRsc, &buff[0]))
116+ return 0;
109117
110118 return 1;
111119 }
112120
113121 // String->StrRsc 変換関数
114- int StrRscMain::StrToStrRsc(const PNsmStrRsc strRsc,const std::tstring &source)
122+ int StrRscMain::StrToStrRsc(const NsmStrRsc &strRsc, const std::tstring &source)
115123 {
116- if(strRsc->nBufferSize < 1)
124+ if(!strRsc.lpBuffer)
117125 return 0;
118126
127+ if(strRsc.nBufferSize < 1)
128+ return 0;
129+
119130 std::string tmp = t2c(source);
120131
121- std::string::size_type len = std::min<std::string::size_type>(strRsc->nBufferSize-1,tmp.size());
132+ std::string::size_type len = std::min<std::string::size_type>(strRsc.nBufferSize - 1, tmp.size());
122133
123134 tmp.resize(len);
124135
125- strcpy_s(strRsc->lpBuffer,strRsc->nBufferSize,tmp.c_str());
136+ strcpy_s(strRsc.lpBuffer, strRsc.nBufferSize, tmp.c_str());
126137
127138 return static_cast<int>(len);
128139 }
@@ -138,13 +149,16 @@
138149
139150 LONG_PTR __stdcall StrRscService::DoGetLocalStr(const WPARAM wParam, const LPARAM /* lParam */)
140151 {
141- return g_strRscMain.DoGetLocalStr(reinterpret_cast<PNsmStrRsc>(wParam));
152+ if(!wParam)
153+ return 0;
154+
155+ return g_strRscMain.DoGetLocalStr(*reinterpret_cast<NsmStrRsc*>(wParam));
142156 }
143157 }
144158 }
145159 }
146160
147-BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID /*lpvReserved*/)
161+BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID /*lpvReserved*/)
148162 {
149163 g_hInstance = hinstDLL;
150164
@@ -173,7 +187,7 @@
173187 //
174188 // Return : 実際に書き込んだ情報のサイズ
175189 // nInfoNo が無効なら 0
176- int WINAPI GetPluginInfo(const int nInfNo, LPSTR lpBuffer,const int nSize)
190+ int WINAPI GetPluginInfo(const int nInfNo, LPSTR lpBuffer, const int nSize)
177191 {
178192 if(!lpBuffer)
179193 return 0;
@@ -186,10 +200,10 @@
186200 if(result.empty())
187201 return 0;
188202
189- std::string::size_type len = std::min<std::string::size_type>(nSize-1,result.size());
203+ std::string::size_type len = std::min<std::string::size_type>(nSize-1, result.size());
190204
191205 result.resize(len);
192- strcpy_s(lpBuffer,nSize,result.c_str());
206+ strcpy_s(lpBuffer, nSize, result.c_str());
193207
194208 return static_cast<int>(len);
195209 }
--- trunk/StrRsc/src/OptionDlg.h (revision 90)
+++ trunk/StrRsc/src/OptionDlg.h (revision 91)
@@ -1,7 +1,6 @@
11 #ifndef OPTIONDLG_H
22 #define OPTIONDLG_H
33
4-#include <list>
54 #include <windows.h>
65
76 #include "../../Common/tstring.h"
--- trunk/StrRsc/src/StrRsc.h (revision 90)
+++ trunk/StrRsc/src/StrRsc.h (revision 91)
@@ -17,7 +17,7 @@
1717 class StrRscMain : public Common::NsmPluginMain
1818 {
1919 private:
20- typedef std::tr1::unordered_map<std::tstring,std::tstring> IniFilesTable;
20+ typedef std::tr1::unordered_map<std::tstring, std::tstring> IniFilesTable;
2121
2222 IniFilesTable IniFiles;
2323 HNsmEvent ChangeLangEvent;
@@ -24,15 +24,15 @@
2424
2525 StrRscConfig Config;
2626 //--
27- static int StrToStrRsc(const PNsmStrRsc,const std::tstring &source);
28- void DoInitialize();
27+ static int StrToStrRsc(const NsmStrRsc &strRsc, const std::tstring &source);
28+ void DoInitialize();
2929 void RegisterIniFile(const std::tstring &pluginName);
3030 public:
3131 StrRscMain();
32- int DoGetLocalStr(const PNsmStrRsc strRsc);
33- INT_PTR DoShowOptionDialog(const HWND parent);
32+ int DoGetLocalStr(const NsmStrRsc &strRsc);
33+ INT_PTR DoShowOptionDialog(HWND parent);
3434 };
35-
35+
3636 // サービス関数
3737 class StrRscService
3838 {
@@ -47,7 +47,7 @@
4747
4848 extern "C"
4949 {
50- int WINAPI GetPluginInfo(const int nInfNo, LPSTR lpBuffer,const int nSize);
50+ int WINAPI GetPluginInfo(const int nInfNo, LPSTR lpBuffer, const int nSize);
5151 int WINAPI Initialize(const Regnessem::PNsmPluginInitInfo lpNsmInitInfo);
5252 int WINAPI Terminate();
5353 }
--- trunk/ClientSocket/src/ClientSocket.cpp (revision 90)
+++ trunk/ClientSocket/src/ClientSocket.cpp (revision 91)
@@ -43,7 +43,7 @@
4343 StrRsc::g_StrResource.reset(new StrRsc::StrResource(InitInfo));
4444 {
4545 NsmThreadClientSocketList::AutoLock lock(SocketList);
46- lock.List()->clear();
46+ lock.List().clear();
4747 }
4848 Config.LoadFromFile(GetIniFileName());
4949
@@ -65,7 +65,7 @@
6565 void ClientSocketMain::DoTerminate()
6666 {
6767 NsmThreadClientSocketList::AutoLock lock(SocketList);
68- lock.List()->clear();
68+ lock.List().clear();
6969 }
7070
7171 // ソケットを作成
@@ -80,7 +80,7 @@
8080
8181 {
8282 NsmThreadClientSocketList::AutoLock lock(SocketList);
83- lock.List()->push_back(NsmClientSocketListSub(soc));
83+ lock.List().push_back(NsmClientSocketListSub(soc));
8484 }
8585
8686 return reinterpret_cast<LONG_PTR>(soc);
@@ -93,7 +93,7 @@
9393
9494 {
9595 NsmThreadClientSocketList::AutoLock lock(SocketList);
96- NsmClientSocketList &p = *lock.List();
96+ NsmClientSocketList &p = lock.List();
9797
9898 NsmClientSocketList::const_iterator it =
9999 std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle));
@@ -109,13 +109,13 @@
109109 }
110110
111111 // ソケットを開く
112- LONG_PTR ClientSocketMain::DoOpen(NsmClientSocket *const handle)
112+ LONG_PTR ClientSocketMain::DoOpen(NsmClientSocket *const handle) const
113113 {
114114 RgnOutputDebugString(TEXT("CClientSocketMain::DoOpen()\n"));
115115
116116 {
117- NsmThreadClientSocketList::AutoLock lock(SocketList);
118- const NsmClientSocketList &p = *lock.List();
117+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
118+ const NsmClientSocketList &p = lock.List();
119119
120120 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
121121 return 0;
@@ -132,13 +132,13 @@
132132 }
133133
134134 // ソケットを閉じる
135- LONG_PTR ClientSocketMain::DoClose(NsmClientSocket *const handle)
135+ LONG_PTR ClientSocketMain::DoClose(NsmClientSocket *const handle) const
136136 {
137137 RgnOutputDebugString(TEXT("CClientSocketMain::DoClose()\n"));
138138
139139 {
140- NsmThreadClientSocketList::AutoLock lock(SocketList);
141- const NsmClientSocketList &p = *lock.List();
140+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
141+ const NsmClientSocketList &p = lock.List();
142142
143143 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
144144 return 0;
@@ -148,7 +148,7 @@
148148 }
149149
150150 // ソケットの情報を取得
151- LONG_PTR ClientSocketMain::DoGetInfo(const NsmClientSocket *const handle, const PNsmClientSocketInfo sockInfo)
151+ LONG_PTR ClientSocketMain::DoGetInfo(const NsmClientSocket *const handle, const PNsmClientSocketInfo sockInfo) const
152152 {
153153 RgnOutputDebugString(TEXT("CClientSocketMain::DoGetInfo()\n"));
154154
@@ -156,8 +156,8 @@
156156 return 0;
157157
158158 {
159- NsmThreadClientSocketList::AutoLock lock(SocketList);
160- const NsmClientSocketList &p = *lock.List();
159+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
160+ const NsmClientSocketList &p = lock.List();
161161
162162 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
163163 return 0;
@@ -206,7 +206,7 @@
206206 }
207207
208208 // ソケットの情報を設定
209- LONG_PTR ClientSocketMain::DoSetInfo(NsmClientSocket *const handle, const NsmClientSocketInfo &sockInfo)
209+ LONG_PTR ClientSocketMain::DoSetInfo(NsmClientSocket *const handle, const NsmClientSocketInfo &sockInfo) const
210210 {
211211 RgnOutputDebugString(TEXT("CClientSocketMain::DoSetInfo()\n"));
212212
@@ -214,8 +214,8 @@
214214 return 0;
215215
216216 {
217- NsmThreadClientSocketList::AutoLock lock(SocketList);
218- const NsmClientSocketList &p = *lock.List();
217+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
218+ const NsmClientSocketList &p = lock.List();
219219
220220 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
221221 return 0;
@@ -236,7 +236,7 @@
236236 return 0;
237237 }
238238
239- LONG_PTR ClientSocketMain::DoReceive(const NsmClientSocket *const handle, const NsmClientSocketData &data)
239+ LONG_PTR ClientSocketMain::DoReceive(const NsmClientSocket *const handle, const NsmClientSocketData &data) const
240240 {
241241 RgnOutputDebugString(TEXT("CClientSocketMain::DoReceive()\n"));
242242
@@ -244,8 +244,8 @@
244244 return 0;
245245
246246 {
247- NsmThreadClientSocketList::AutoLock lock(SocketList);
248- const NsmClientSocketList &p = *lock.List();
247+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
248+ const NsmClientSocketList &p = lock.List();
249249
250250 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
251251 return 0;
@@ -254,7 +254,7 @@
254254 }
255255 }
256256
257- LONG_PTR ClientSocketMain::DoSend(const NsmClientSocket *const handle, const NsmClientSocketData &data)
257+ LONG_PTR ClientSocketMain::DoSend(const NsmClientSocket *const handle, const NsmClientSocketData &data) const
258258 {
259259 RgnOutputDebugString(TEXT("CClientSocketMain::DoSend()\n"));
260260
@@ -262,8 +262,8 @@
262262 return 0;
263263
264264 {
265- NsmThreadClientSocketList::AutoLock lock(SocketList);
266- const NsmClientSocketList &p = *lock.List();
265+ NsmThreadClientSocketList::ConstAutoLock lock(SocketList);
266+ const NsmClientSocketList &p = lock.List();
267267
268268 if(std::find_if(p.begin(),p.end(),NsmClientSocket::FindByHandle(handle)) == p.end())
269269 return 0;
--- trunk/ClientSocket/src/ClientSocket.h (revision 90)
+++ trunk/ClientSocket/src/ClientSocket.h (revision 91)
@@ -26,12 +26,12 @@
2626 // サービス処理関数
2727 LONG_PTR DoCreate(const NsmClientSocketInitInfo &initInfo);
2828 LONG_PTR DoDelete(const NsmClientSocket *const handle);
29- LONG_PTR DoOpen(NsmClientSocket *const handle);
30- LONG_PTR DoClose(NsmClientSocket *const handle);
31- LONG_PTR DoGetInfo(const NsmClientSocket *const handle, const PNsmClientSocketInfo sockInfo);
32- LONG_PTR DoSetInfo(NsmClientSocket *const handle, const NsmClientSocketInfo &sockInfo);
33- LONG_PTR DoReceive(const NsmClientSocket *const handle, const NsmClientSocketData &data);
34- LONG_PTR DoSend(const NsmClientSocket *const handle, const NsmClientSocketData &data);
29+ LONG_PTR DoOpen(NsmClientSocket *const handle) const;
30+ LONG_PTR DoClose(NsmClientSocket *const handle) const;
31+ LONG_PTR DoGetInfo(const NsmClientSocket *const handle, const PNsmClientSocketInfo sockInfo) const;
32+ LONG_PTR DoSetInfo(NsmClientSocket *const handle, const NsmClientSocketInfo &sockInfo) const;
33+ LONG_PTR DoReceive(const NsmClientSocket *const handle, const NsmClientSocketData &data) const;
34+ LONG_PTR DoSend(const NsmClientSocket *const handle, const NsmClientSocketData &data) const;
3535
3636 LONG_PTR DoShowOptionDialog(const HWND parent);
3737
--- trunk/FileIO/src/FileIO.cpp (revision 90)
+++ trunk/FileIO/src/FileIO.cpp (revision 91)
@@ -194,7 +194,7 @@
194194 return 0;
195195
196196 NsmThreadFileIOList::AutoLock lock(Files);
197- NsmFileIOList &p = *lock.List();
197+ NsmFileIOList &p = lock.List();
198198
199199 NsmFileIO* newIO = new NsmFileIO();
200200
@@ -213,7 +213,7 @@
213213 + ((*Config.FileDir.rbegin() == TEXT('\\'))?(filename):(TEXT("\\") + filename));
214214
215215 NsmThreadFileIOList::AutoLock lock(Files);
216- NsmFileIOList &p = *lock.List();
216+ NsmFileIOList &p = lock.List();
217217
218218 NsmFileIO* newIO = new NsmFileIO();
219219
@@ -222,10 +222,10 @@
222222 return newIO->OpenNew(newPath) ? reinterpret_cast<LONG_PTR>(newIO) : 0;
223223 }
224224
225- LONG_PTR FileIOMain::DoReadFile(const NsmFileIO *const fileIO, const PNsmFileIOData data)
225+ LONG_PTR FileIOMain::DoReadFile(const NsmFileIO *const fileIO, const PNsmFileIOData data) const
226226 {
227- NsmThreadFileIOList::AutoLock lock(Files);
228- const NsmFileIOList &p = *lock.List();
227+ NsmThreadFileIOList::ConstAutoLock lock(Files);
228+ const NsmFileIOList &p = lock.List();
229229
230230 if(std::find_if(p.begin(),p.end(),NsmFileIO::FindByHandle(fileIO)) == p.end())
231231 return 0;
@@ -233,10 +233,10 @@
233233 return fileIO->ReadData(data);
234234 }
235235
236- LONG_PTR FileIOMain::DoAppendFile(const NsmFileIO *const fileIO, const NsmFileIOData &data)
236+ LONG_PTR FileIOMain::DoAppendFile(const NsmFileIO *const fileIO, const NsmFileIOData &data) const
237237 {
238- NsmThreadFileIOList::AutoLock lock(Files);
239- const NsmFileIOList &p = *lock.List();
238+ NsmThreadFileIOList::ConstAutoLock lock(Files);
239+ const NsmFileIOList &p = lock.List();
240240
241241 if(std::find_if(p.begin(),p.end(),NsmFileIO::FindByHandle(fileIO)) == p.end())
242242 return 0;
@@ -247,7 +247,7 @@
247247 LONG_PTR FileIOMain::DoCloseFile(NsmFileIO *const fileIO)
248248 {
249249 NsmThreadFileIOList::AutoLock lock(Files);
250- NsmFileIOList &p = *lock.List();
250+ NsmFileIOList &p = lock.List();
251251
252252 NsmFileIOList::iterator it = std::find_if(p.begin(),p.end(),NsmFileIO::FindByHandle(fileIO));
253253
@@ -261,10 +261,10 @@
261261 return result;
262262 }
263263
264- LONG_PTR FileIOMain::DoFileGetInfo(const NsmFileIO *const fileIO, const PNsmFileIOInfo fInfo)
264+ LONG_PTR FileIOMain::DoFileGetInfo(const NsmFileIO *const fileIO, const PNsmFileIOInfo fInfo) const
265265 {
266- NsmThreadFileIOList::AutoLock lock(Files);
267- const NsmFileIOList &p = *lock.List();
266+ NsmThreadFileIOList::ConstAutoLock lock(Files);
267+ const NsmFileIOList &p = lock.List();
268268
269269 if(std::find_if(p.begin(),p.end(),NsmFileIO::FindByHandle(fileIO)) == p.end())
270270 return 0;
--- trunk/FileIO/src/FileIO.h (revision 90)
+++ trunk/FileIO/src/FileIO.h (revision 91)
@@ -64,10 +64,10 @@
6464 FileIOMain();
6565 LONG_PTR DoOpenFile(const std::tstring &filePath);
6666 LONG_PTR DoCreateFile(const std::tstring &filename);
67- LONG_PTR DoReadFile(const NsmFileIO *const fileIO, const PNsmFileIOData data);
68- LONG_PTR DoAppendFile(const NsmFileIO *const fileIO, const NsmFileIOData &data);
67+ LONG_PTR DoReadFile(const NsmFileIO *const fileIO, const PNsmFileIOData data) const;
68+ LONG_PTR DoAppendFile(const NsmFileIO *const fileIO, const NsmFileIOData &data) const;
6969 LONG_PTR DoCloseFile(NsmFileIO *const fileIO);
70- LONG_PTR DoFileGetInfo(const NsmFileIO *const fileIO, const PNsmFileIOInfo fInfo);
70+ LONG_PTR DoFileGetInfo(const NsmFileIO *const fileIO, const PNsmFileIOInfo fInfo) const;
7171
7272 LONG_PTR UIOpenFileDir(const PNsmUIServiceInfo uiInfo) const;
7373 LONG_PTR DoShowOptionDialog(const HWND parent);
--- trunk/Common/NsmPluginMain.cpp (revision 90)
+++ trunk/Common/NsmPluginMain.cpp (revision 91)
@@ -48,7 +48,7 @@
4848
4949 std::tstring NsmPluginMain::GetPluginInfo(const int index) const
5050 {
51- if(NMPI_APIVER <= index && index <= NMPI_PLUGINVER)
51+ if(0 <= index && index < ARRAYSIZE(PluginInfo))
5252 return PluginInfo[index];
5353
5454 return TEXT("");
@@ -56,7 +56,7 @@
5656
5757 void NsmPluginMain::SetPluginInfo(const int index,const std::tstring &value)
5858 {
59- if(NMPI_APIVER <= index && index <= NMPI_PLUGINVER)
59+ if(0 <= index && index < ARRAYSIZE(PluginInfo))
6060 PluginInfo[index] = value;
6161 }
6262
--- trunk/Common/LockList.h (revision 90)
+++ trunk/Common/LockList.h (revision 91)
@@ -47,10 +47,6 @@
4747 explicit AutoLock(TThreadList &self)
4848 :Self(self), Lock(self.CS)
4949 {}
50- ListType* List()
51- {
52- return &Self.List;
53- }
5450 ListType& List() const
5551 {
5652 return Self.List;
--- trunk/nsmsgs/src/UNsmCom.cpp (revision 90)
+++ trunk/nsmsgs/src/UNsmCom.cpp (revision 91)
@@ -57,11 +57,11 @@
5757 NsmServiceListSub result;
5858 {
5959 NsmThreadServiceList::AutoLock lock(ServiceList);
60- NsmServiceList *const p = lock.List();
60+ NsmServiceList &p = lock.List();
6161
62- result.reset(new NsmService(p,procAddr));
62+ result.reset(new NsmService(&p,procAddr));
6363
64- if(!p->insert(NsmServiceList::value_type(serviceName,result)).second)
64+ if(!p.insert(NsmServiceList::value_type(serviceName,result)).second)
6565 return 0;
6666 }
6767
@@ -69,14 +69,14 @@
6969 return reinterpret_cast<HNsmService>(result.get());
7070 }
7171
72- HNsmService TNsmCom::GetService(const std::tstring &serviceName)
72+ HNsmService TNsmCom::GetService(const std::tstring &serviceName) const
7373 {
7474 if (DebugMode){
7575 DoLog(format(TEXT("GetService\t\"%s\""), serviceName.c_str()));
7676 }
7777
78- NsmThreadServiceList::AutoLock lock(ServiceList);
79- const NsmServiceList &p = *lock.List();
78+ NsmThreadServiceList::ConstAutoLock lock(ServiceList);
79+ const NsmServiceList &p = lock.List();
8080
8181 NsmServiceList::const_iterator svc = p.find(serviceName);
8282
@@ -107,11 +107,11 @@
107107 NsmEventListSub result;
108108 {
109109 NsmThreadEventList::AutoLock lock(EventList);
110- NsmEventList* p = lock.List();
110+ NsmEventList &p = lock.List();
111111
112- result.reset(new NsmEvent(p));
112+ result.reset(new NsmEvent(&p));
113113
114- if(!p->insert(NsmEventList::value_type(eventName,result)).second)
114+ if(!p.insert(NsmEventList::value_type(eventName,result)).second)
115115 return 0;
116116 }
117117
@@ -119,14 +119,14 @@
119119 return reinterpret_cast<HNsmEvent>(result.get());
120120 }
121121
122- HNsmEvent TNsmCom::GetEvent(const std::tstring &eventName)
122+ HNsmEvent TNsmCom::GetEvent(const std::tstring &eventName) const
123123 {
124124 if (DebugMode){
125125 DoLog(format(TEXT("GetEvent\t\"%s\""), eventName.c_str()));
126126 }
127127
128- NsmThreadEventList::AutoLock lock(EventList);
129- const NsmEventList &p = *lock.List();
128+ NsmThreadEventList::ConstAutoLock lock(EventList);
129+ const NsmEventList &p = lock.List();
130130
131131 NsmEventList::const_iterator evt = p.find(eventName);
132132
@@ -163,7 +163,7 @@
163163 return 0;
164164 }
165165
166- int TNsmCom::HookEvent(const std::tstring &eventName, TNsmEventProc procAddr)
166+ int TNsmCom::HookEvent(const std::tstring &eventName, TNsmEventProc procAddr) const
167167 {
168168 if(!procAddr)
169169 return 0;
@@ -173,8 +173,8 @@
173173 }
174174
175175 {
176- NsmThreadEventList::AutoLock lock(EventList);
177- const NsmEventList &p = *lock.List();
176+ NsmThreadEventList::ConstAutoLock lock(EventList);
177+ const NsmEventList &p = lock.List();
178178
179179 NsmEventList::const_iterator evt = p.find(eventName);
180180 if(evt == p.end())
@@ -188,7 +188,7 @@
188188 return 1;
189189 }
190190
191- int TNsmCom::UnhookEvent(const std::tstring &eventName, TNsmEventProc procAddr)
191+ int TNsmCom::UnhookEvent(const std::tstring &eventName, TNsmEventProc procAddr) const
192192 {
193193 if(!procAddr)
194194 return 0;
@@ -198,8 +198,8 @@
198198 }
199199
200200 {
201- NsmThreadEventList::AutoLock lock(EventList);
202- const NsmEventList &p = *lock.List();
201+ NsmThreadEventList::ConstAutoLock lock(EventList);
202+ const NsmEventList &p = lock.List();
203203
204204 NsmEventList::const_iterator evt = p.find(eventName);
205205 if(evt == p.end())
--- trunk/nsmsgs/src/UNsmSystem.cpp (revision 90)
+++ trunk/nsmsgs/src/UNsmSystem.cpp (revision 91)
@@ -156,7 +156,7 @@
156156 void NsmSystem::CloseRelatedSessions(const NsmConnection *const connection)
157157 {
158158 NsmThreadSessionList::AutoLock lock(Sessions);
159- const NsmSessionList &sesList = *lock.List();
159+ NsmSessionList &sesList = lock.List();
160160
161161 for(NsmSessionList::size_type i = sesList.size() ; i ; --i)
162162 {
@@ -174,7 +174,7 @@
174174 void NsmSystem::CloseAllSession()
175175 {
176176 NsmThreadSessionList::AutoLock lock(Sessions);
177- const NsmSessionList &sesList = *lock.List();
177+ NsmSessionList &sesList = lock.List();
178178
179179 for(NsmSessionList::size_type i = sesList.size() ; i ; --i)
180180 {
@@ -189,7 +189,7 @@
189189 void NsmSystem::CloseRelatedFileSessions(const NsmSession *const session)
190190 {
191191 NsmThreadFileSessionList::AutoLock lock(FileSessions);
192- const NsmFileSessionList &fileSesList = *lock.List();
192+ NsmFileSessionList &fileSesList = lock.List();
193193
194194 for(NsmFileSessionList::size_type i = fileSesList.size(); i ; --i)
195195 {
@@ -207,7 +207,7 @@
207207 void NsmSystem::CloseAllFileSession()
208208 {
209209 NsmThreadFileSessionList::AutoLock lock(FileSessions);
210- const NsmFileSessionList &fileSesList = *lock.List();
210+ NsmFileSessionList &fileSesList = lock.List();
211211
212212 for(NsmFileSessionList::size_type i = fileSesList.size(); i ; --i)
213213 {
@@ -222,7 +222,7 @@
222222 void NsmSystem::DisconnectAll()
223223 {
224224 NsmThreadConnectionList::AutoLock lock(Connections);
225- const NsmConnectionList &conList = *lock.List();
225+ NsmConnectionList &conList = lock.List();
226226
227227 for(NsmConnectionList::size_type i = conList.size(); i ; --i)
228228 {
@@ -438,11 +438,11 @@
438438 NsmConnection *result = NULL;
439439 {
440440 NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
441- NsmConnectionList *const p = lock.List();
441+ NsmConnectionList &p = lock.List();
442442
443443 result = new NsmConnection(c2t(reinterpret_cast<char *>(wParam)),c2t(reinterpret_cast<char *>(lParam == 0?wParam:lParam)));
444444
445- p->push_back(NsmConnectionListSub(result));
445+ p.push_back(NsmConnectionListSub(result));
446446 }
447447
448448 NsmCom.NotifyEvent(g_NsmSystem.HConnectionConnect,reinterpret_cast<WPARAM>(result), 0);
@@ -455,15 +455,15 @@
455455 {
456456 {
457457 NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
458- NsmConnectionList *const p = lock.List();
458+ NsmConnectionList &p = lock.List();
459459
460460 NsmConnectionList::iterator it =
461- std::find_if(p->begin(), p->end(),NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
462- if(it == p->end())
461+ std::find_if(p.begin(), p.end(),NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
462+ if(it == p.end())
463463 return -1;
464464
465465 g_NsmSystem.CloseRelatedSessions(reinterpret_cast<NsmConnection *>(wParam));
466- p->erase(it);
466+ p.erase(it);
467467 }
468468
469469 NsmCom.NotifyEvent(g_NsmSystem.HConnectionDisconnect, wParam, 0);
@@ -477,8 +477,8 @@
477477 const NsmConnection *const connection = reinterpret_cast<NsmConnection *>(wParam);
478478 const PNsmConnectionInfo pin = reinterpret_cast<PNsmConnectionInfo>(lParam);
479479
480- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
481- const NsmConnectionList &p = *lock.List();
480+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
481+ const NsmConnectionList &p = lock.List();
482482
483483 if (std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(connection)) == p.end())
484484 return 0;
@@ -524,8 +524,8 @@
524524 {
525525 NsmConnection *const connection = reinterpret_cast<NsmConnection *>(wParam);
526526
527- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
528- const NsmConnectionList &p = *lock.List();
527+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
528+ const NsmConnectionList &p = lock.List();
529529
530530 if (std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(connection)) == p.end())
531531 return 0;
@@ -586,8 +586,8 @@
586586
587587 LONG_PTR Service::DoEnumConnections(const WPARAM wParam,const LPARAM lParam)
588588 {
589- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
590- const NsmConnectionList &p = *lock.List();
589+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
590+ const NsmConnectionList &p = lock.List();
591591
592592 for (NsmConnectionList::const_iterator it = p.begin(); it != p.end(); ++it)
593593 reinterpret_cast<TEnumConnectionCallback>(wParam) (reinterpret_cast<HNsmConnection>(it->get()), lParam);
@@ -600,8 +600,8 @@
600600 LONG_PTR Service::DoAddMember(const WPARAM wParam,const LPARAM lParam)
601601 {
602602 {
603- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
604- const NsmConnectionList &p = *lock.List();
603+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
604+ const NsmConnectionList &p = lock.List();
605605 NsmConnectionList::const_iterator it =
606606 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
607607 if (it == p.end())
@@ -624,8 +624,8 @@
624624 LONG_PTR Service::DoRemoveMember(const WPARAM wParam,const LPARAM lParam)
625625 {
626626 {
627- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
628- const NsmConnectionList &p = *lock.List();
627+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
628+ const NsmConnectionList &p = lock.List();
629629 NsmConnectionList::const_iterator it =
630630 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
631631 if (it == p.end())
@@ -646,8 +646,8 @@
646646 {
647647 const TNsmMemberInfo &MemberInfo = *reinterpret_cast<PNsmMemberInfo>(lParam);
648648 {
649- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
650- const NsmConnectionList &p = *lock.List();
649+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
650+ const NsmConnectionList &p = lock.List();
651651 NsmConnectionList::const_iterator it =
652652 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
653653 if (it == p.end())
@@ -704,8 +704,8 @@
704704
705705 LONG_PTR Service::DoGetMemberInfo(const WPARAM wParam,const LPARAM lParam)
706706 {
707- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
708- const NsmConnectionList &p = *lock.List();
707+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
708+ const NsmConnectionList &p = lock.List();
709709 NsmConnectionList::const_iterator it =
710710 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
711711 if (it == p.end())
@@ -749,8 +749,8 @@
749749
750750 LONG_PTR Service::DoEnumMembers(const WPARAM wParam,const LPARAM lParam)
751751 {
752- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
753- const NsmConnectionList &p = *lock.List();
752+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
753+ const NsmConnectionList &p = lock.List();
754754 NsmConnectionList::const_iterator it =
755755 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
756756 if (it == p.end())
@@ -782,8 +782,8 @@
782782 LONG_PTR Service::DoAddGroup(const WPARAM wParam,const LPARAM lParam)
783783 {
784784 {
785- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
786- const NsmConnectionList &p = *lock.List();
785+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
786+ const NsmConnectionList &p = lock.List();
787787 NsmConnectionList::const_iterator it =
788788 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
789789 if (it == p.end())
@@ -807,8 +807,8 @@
807807 LONG_PTR Service::DoRemoveGroup(const WPARAM wParam,const LPARAM lParam)
808808 {
809809 {
810- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
811- const NsmConnectionList &p = *lock.List();
810+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
811+ const NsmConnectionList &p = lock.List();
812812 NsmConnectionList::const_iterator it =
813813 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
814814 if (it == p.end())
@@ -830,8 +830,8 @@
830830 {
831831 TNsmGroupInfo & GroupInfo = *reinterpret_cast<PNsmGroupInfo>(lParam);
832832 {
833- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
834- const NsmConnectionList &p = *lock.List();
833+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
834+ const NsmConnectionList &p = lock.List();
835835 NsmConnectionList::const_iterator it =
836836 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
837837 if (it == p.end())
@@ -865,8 +865,8 @@
865865
866866 LONG_PTR Service::DoGetGroupInfo(const WPARAM wParam,const LPARAM lParam)
867867 {
868- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
869- const NsmConnectionList &p = *lock.List();
868+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
869+ const NsmConnectionList &p = lock.List();
870870 NsmConnectionList::const_iterator it =
871871 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
872872 if (it == p.end())
@@ -896,8 +896,8 @@
896896
897897 LONG_PTR Service::DoEnumGroups(const WPARAM wParam,const LPARAM lParam)
898898 {
899- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
900- const NsmConnectionList &p = *lock.List();
899+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
900+ const NsmConnectionList &p = lock.List();
901901 NsmConnectionList::const_iterator it =
902902 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
903903 if (it == p.end())
@@ -929,8 +929,8 @@
929929 {
930930 NsmSession *result = NULL;
931931 {
932- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
933- const NsmConnectionList &p = *lock.List();
932+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
933+ const NsmConnectionList &p = lock.List();
934934 NsmConnectionList::const_iterator it =
935935 std::find_if(p.begin(), p.end(), NsmConnection::FindByHandle(reinterpret_cast<NsmConnection *>(wParam)));
936936 if (it == p.end())
@@ -937,7 +937,7 @@
937937 return 0;
938938
939939 NsmThreadSessionList::AutoLock lock2(g_NsmSystem.Sessions);
940- NsmSessionList &p2 = *lock2.List();
940+ NsmSessionList &p2 = lock2.List();
941941
942942 result = new NsmSession();
943943
@@ -958,7 +958,7 @@
958958 {
959959 {
960960 NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
961- NsmSessionList &p = *lock.List();
961+ NsmSessionList &p = lock.List();
962962
963963 NsmSessionList::iterator it =
964964 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -976,8 +976,8 @@
976976
977977 LONG_PTR Service::DoGetSessionInfo(const WPARAM wParam,const LPARAM lParam)
978978 {
979- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
980- const NsmSessionList &p = *lock.List();
979+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
980+ const NsmSessionList &p = lock.List();
981981
982982 NsmSessionList::const_iterator it =
983983 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1008,8 +1008,8 @@
10081008 LONG_PTR Service::DoSetSessionInfo(const WPARAM wParam,const LPARAM lParam)
10091009 {
10101010 {
1011- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1012- const NsmSessionList &p = *lock.List();
1011+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1012+ const NsmSessionList &p = lock.List();
10131013
10141014 NsmSessionList::const_iterator it =
10151015 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1047,8 +1047,8 @@
10471047
10481048 LONG_PTR Service::DoEnumSessions(const WPARAM wParam,const LPARAM lParam)
10491049 {
1050- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1051- const NsmSessionList &p = *lock.List();
1050+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1051+ const NsmSessionList &p = lock.List();
10521052
10531053 for(NsmSessionList::const_iterator it = p.begin();it!=p.end();++it)
10541054 reinterpret_cast<TEnumSessionCallback>(wParam)(reinterpret_cast<HNsmSession>(it->get()), lParam);
@@ -1059,8 +1059,8 @@
10591059 LONG_PTR Service::DoAddSessionMember(const WPARAM wParam,const LPARAM lParam)
10601060 {
10611061 {
1062- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1063- const NsmSessionList &p = *lock.List();
1062+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1063+ const NsmSessionList &p = lock.List();
10641064
10651065 NsmSessionList::const_iterator it =
10661066 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1083,8 +1083,8 @@
10831083 LONG_PTR Service::DoRemoveSessionMember(const WPARAM wParam,const LPARAM lParam)
10841084 {
10851085 {
1086- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1087- const NsmSessionList &p = *lock.List();
1086+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1087+ const NsmSessionList &p = lock.List();
10881088
10891089 NsmSessionList::const_iterator it =
10901090 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1105,8 +1105,8 @@
11051105 LONG_PTR Service::DoSetSessionMemberInfo(const WPARAM wParam,const LPARAM lParam)
11061106 {
11071107 {
1108- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1109- const NsmSessionList &p = *lock.List();
1108+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1109+ const NsmSessionList &p = lock.List();
11101110
11111111 NsmSessionList::const_iterator it =
11121112 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1149,8 +1149,8 @@
11491149
11501150 LONG_PTR Service::DoGetSessionMemberInfo(const WPARAM wParam,const LPARAM lParam)
11511151 {
1152- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1153- const NsmSessionList &p = *lock.List();
1152+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1153+ const NsmSessionList &p = lock.List();
11541154
11551155 NsmSessionList::const_iterator it =
11561156 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1198,8 +1198,8 @@
11981198
11991199 LONG_PTR Service::DoEnumSessionMembers(const WPARAM wParam,const LPARAM lParam)
12001200 {
1201- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1202- const NsmSessionList &p = *lock.List();
1201+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1202+ const NsmSessionList &p = lock.List();
12031203
12041204 NsmSessionList::const_iterator it =
12051205 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1218,8 +1218,8 @@
12181218 LONG_PTR Service::DoSendMessage(const WPARAM wParam,const LPARAM lParam)
12191219 {
12201220 {
1221- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1222- const NsmSessionList &p = *lock.List();
1221+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1222+ const NsmSessionList &p = lock.List();
12231223
12241224 NsmSessionList::const_iterator it =
12251225 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1236,8 +1236,8 @@
12361236 LONG_PTR Service::DoReceiveMessage(const WPARAM wParam,const LPARAM lParam)
12371237 {
12381238 {
1239- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1240- const NsmSessionList &p = *lock.List();
1239+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1240+ const NsmSessionList &p = lock.List();
12411241
12421242 NsmSessionList::const_iterator it =
12431243 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1255,8 +1255,8 @@
12551255 {
12561256 NsmFileSession *result = NULL;
12571257 {
1258- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
1259- const NsmSessionList &p = *lock.List();
1258+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
1259+ const NsmSessionList &p = lock.List();
12601260
12611261 NsmSessionList::const_iterator it =
12621262 std::find_if(p.begin(), p.end(), NsmSession::FindByHandle(reinterpret_cast<NsmSession *>(wParam)));
@@ -1264,7 +1264,7 @@
12641264 return 0;
12651265
12661266 NsmThreadFileSessionList::AutoLock lock2(g_NsmSystem.FileSessions);
1267- NsmFileSessionList &p2 = *lock2.List();
1267+ NsmFileSessionList &p2 = lock2.List();
12681268
12691269 result = new NsmFileSession();
12701270
@@ -1285,7 +1285,7 @@
12851285 {
12861286 {
12871287 NsmThreadFileSessionList::AutoLock lock(g_NsmSystem.FileSessions);
1288- NsmFileSessionList &p = *lock.List();
1288+ NsmFileSessionList &p = lock.List();
12891289 NsmFileSessionList::iterator it
12901290 = std::find_if(p.begin(), p.end(), NsmFileSession::FindByHandle(reinterpret_cast<NsmFileSession *>(wParam)));
12911291 if (it == p.end())
@@ -1301,8 +1301,8 @@
13011301
13021302 LONG_PTR Service::DoGetFileSessionInfo(const WPARAM wParam,const LPARAM lParam)
13031303 {
1304- NsmThreadFileSessionList::AutoLock lock(g_NsmSystem.FileSessions);
1305- const NsmFileSessionList &p = *lock.List();
1304+ NsmThreadFileSessionList::ConstAutoLock lock(g_NsmSystem.FileSessions);
1305+ const NsmFileSessionList &p = lock.List();
13061306 NsmFileSessionList::const_iterator it =
13071307 std::find_if(p.begin(), p.end(), NsmFileSession::FindByHandle(reinterpret_cast<NsmFileSession *>(wParam)));
13081308 if (it == p.end())
@@ -1338,8 +1338,8 @@
13381338 LONG_PTR Service::DoSetFileSessionInfo(const WPARAM wParam,const LPARAM lParam)
13391339 {
13401340 {
1341- NsmThreadFileSessionList::AutoLock lock(g_NsmSystem.FileSessions);
1342- const NsmFileSessionList &p = *lock.List();
1341+ NsmThreadFileSessionList::ConstAutoLock lock(g_NsmSystem.FileSessions);
1342+ const NsmFileSessionList &p = lock.List();
13431343
13441344 NsmFileSessionList::const_iterator it =
13451345 std::find_if(p.begin(), p.end(), NsmFileSession::FindByHandle(reinterpret_cast<NsmFileSession *>(wParam)));
@@ -1382,10 +1382,10 @@
13821382
13831383 LONG_PTR Service::DoEnumFileSessions(const WPARAM wParam,const LPARAM lParam)
13841384 {
1385- NsmThreadFileSessionList::AutoLock lock(g_NsmSystem.FileSessions);
1386- const NsmFileSessionList &ls = *lock.List();
1385+ NsmThreadFileSessionList::ConstAutoLock lock(g_NsmSystem.FileSessions);
1386+ const NsmFileSessionList &p = lock.List();
13871387
1388- for(NsmFileSessionList::const_iterator it = ls.begin();it != ls.end();++it)
1388+ for(NsmFileSessionList::const_iterator it = p.begin();it != p.end();++it)
13891389 reinterpret_cast<TEnumFileSessionCallback>(wParam)(reinterpret_cast<HNsmFileSession>(it->get()), lParam);
13901390
13911391 return 0;
@@ -1395,8 +1395,8 @@
13951395
13961396 void Service::DoEnumService(const std::tstring &requiredService,const TEnumUIServiceInfo *const pin)
13971397 {
1398- NsmThreadServiceList::AutoLock lock(NsmCom.ServiceList);
1399- const NsmServiceList &p = *lock.List();
1398+ NsmThreadServiceList::ConstAutoLock lock(NsmCom.ServiceList);
1399+ const NsmServiceList &p = lock.List();
14001400
14011401 for (NsmServiceList::const_iterator it = p.begin(); it != p.end(); ++it)
14021402 {
--- trunk/nsmsgs/src/UFrmNsmMainDebug.cpp (revision 90)
+++ trunk/nsmsgs/src/UFrmNsmMainDebug.cpp (revision 91)
@@ -384,8 +384,8 @@
384384 item.mask = LVIF_TEXT;
385385 item.iItem = 0;
386386
387- NsmThreadServiceList::AutoLock lock(NsmCom.ServiceList);
388- const NsmServiceList &p = *lock.List();
387+ NsmThreadServiceList::ConstAutoLock lock(NsmCom.ServiceList);
388+ const NsmServiceList &p = lock.List();
389389
390390 for(NsmServiceList::const_iterator it = p.begin();it!=p.end();++item.iItem,++it)
391391 {
@@ -410,8 +410,8 @@
410410 item.mask = LVIF_TEXT;
411411 item.iItem = 0;
412412
413- NsmThreadEventList::AutoLock lock(NsmCom.EventList);
414- const NsmEventList &p = *lock.List();
413+ NsmThreadEventList::ConstAutoLock lock(NsmCom.EventList);
414+ const NsmEventList &p = lock.List();
415415
416416 for(NsmEventList::const_iterator it = p.begin();it != p.end();++item.iItem,++it)
417417 {
@@ -436,8 +436,8 @@
436436 item.mask = LVIF_TEXT;
437437 item.iItem = 0;
438438
439- NsmThreadConnectionList::AutoLock lock(g_NsmSystem.Connections);
440- const NsmConnectionList &p = *lock.List();
439+ NsmThreadConnectionList::ConstAutoLock lock(g_NsmSystem.Connections);
440+ const NsmConnectionList &p = lock.List();
441441
442442 for(NsmConnectionList::const_iterator it = p.begin();it != p.end();++item.iItem,++it)
443443 {
@@ -471,8 +471,8 @@
471471 item.mask = LVIF_TEXT;
472472 item.iItem = 0;
473473
474- NsmThreadSessionList::AutoLock lock(g_NsmSystem.Sessions);
475- const NsmSessionList &p = *lock.List();
474+ NsmThreadSessionList::ConstAutoLock lock(g_NsmSystem.Sessions);
475+ const NsmSessionList &p = lock.List();
476476
477477 for(NsmSessionList::const_iterator it=p.begin();it!=p.end();++item.iItem,++it)
478478 {
--- trunk/nsmsgs/src/UNsmCom.h (revision 90)
+++ trunk/nsmsgs/src/UNsmCom.h (revision 91)
@@ -39,14 +39,14 @@
3939 ~TNsmCom();
4040
4141 HNsmService CreateNsmService(const std::tstring &serviceName, TNsmServiceProc procAddr);
42- HNsmService GetService(const std::tstring &serviceName);
42+ HNsmService GetService(const std::tstring &serviceName) const;
4343 LONG_PTR CallService(const HNsmService serviceHandle, const WPARAM wParam, const LPARAM lParam) const;
4444
4545 HNsmEvent CreateNsmEvent(const std::tstring &eventName);
46- HNsmEvent GetEvent(const std::tstring &eventName);
46+ HNsmEvent GetEvent(const std::tstring &eventName) const;
4747 int NotifyEvent(const HNsmEvent eventHandle, const WPARAM wParam, const LPARAM lParam) const;
48- int HookEvent(const std::tstring &eventName, TNsmEventProc procAddr);
49- int UnhookEvent(const std::tstring &eventName, TNsmEventProc procAddr);
48+ int HookEvent(const std::tstring &eventName, TNsmEventProc procAddr) const;
49+ int UnhookEvent(const std::tstring &eventName, TNsmEventProc procAddr) const;
5050 };
5151 extern TNsmCom NsmCom;
5252
--- trunk/MSNP10/src/MSNP10.cpp (revision 90)
+++ trunk/MSNP10/src/MSNP10.cpp (revision 91)
@@ -96,9 +96,9 @@
9696 GetSetInfo->SetConnectionInfo(cHandle, NMCI_USER_MAILSTATUS, 0);
9797
9898 MsnThreadConnectionList::AutoLock lock(m_Connections);
99- lock.List()->push_back(MsnConnectionListSub());
99+ lock.List().push_back(MsnConnectionListSub());
100100
101- MsnConnectionListSub Connection = lock.List()->back();
101+ MsnConnectionListSub Connection = lock.List().back();
102102 Connection;
103103
104104 // SignIn();
Show on old repository browser