diff options
| -rw-r--r-- | Sessions/Src/Main.cpp | 53 | ||||
| -rw-r--r-- | Sessions/Src/Utils.cpp | 19 | ||||
| -rw-r--r-- | Sessions/Src/Utils.h | 2 |
3 files changed, 27 insertions, 47 deletions
diff --git a/Sessions/Src/Main.cpp b/Sessions/Src/Main.cpp index 0a4a173..ec13338 100644 --- a/Sessions/Src/Main.cpp +++ b/Sessions/Src/Main.cpp @@ -476,15 +476,14 @@ INT_PTR CloseCurrentSession(WPARAM wparam,LPARAM lparam) int SaveSessionHandles(WPARAM wparam,LPARAM lparam)
{
int k=0;
- HANDLE hContact;
if(session_list[0]!=0)
{
- for (hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact;
+ for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact;
hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
{
if ((k=CheckForDuplicate(session_list,(DWORD)hContact))!=-1
- &&!(g_bExclHidden&&!CheckContactVisibility((DWORD)hContact)))
+ &&!(g_bExclHidden&&!CheckContactVisibility(hContact)))
{
AddSessionMark((HANDLE)hContact,lparam,'1');
AddInSessionOrder((HANDLE)hContact,lparam,k,1);
@@ -538,45 +537,39 @@ INT_PTR OpenSessionsManagerWindow(WPARAM wparam,LPARAM lparam) int SaveSessionDate()
{
- DBVARIANT dbv={0};
- int i=0;
- char szSessionDate[256]={0};
- TCHAR *szSessionDateBuf_1=NULL;
- TCHAR *szTimeBuf=NULL;
- TCHAR *szDateBuf=NULL;
- TCHAR *szSessionTime=NULL;
- TCHAR *ptr=NULL;
- int TimeSize;
- int DateSize;
- size_t lenn;
if(session_list[0]!=0)
{
- TimeSize=GetTimeFormat(LOCALE_USER_DEFAULT,0/*TIME_NOSECONDS*/,NULL,NULL,NULL,0);
- szTimeBuf = (TCHAR*)mir_alloc((TimeSize+1)*sizeof(TCHAR));
+ int TimeSize = GetTimeFormat(LOCALE_USER_DEFAULT, 0/*TIME_NOSECONDS*/, NULL, NULL, NULL, 0);
+ TCHAR *szTimeBuf = (TCHAR*)mir_alloc((TimeSize+1)*sizeof(TCHAR));
- GetTimeFormat(LOCALE_USER_DEFAULT, 0/*TIME_NOSECONDS*/,NULL,NULL,szTimeBuf,TimeSize);
+ GetTimeFormat(LOCALE_USER_DEFAULT, 0/*TIME_NOSECONDS*/, NULL, NULL, szTimeBuf, TimeSize);
- DateSize=GetDateFormat(LOCALE_USER_DEFAULT,DATE_SHORTDATE,NULL,NULL,NULL,0);
- szDateBuf = (TCHAR*)mir_alloc((DateSize+1)*sizeof(TCHAR));
+ int DateSize = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, NULL, 0);
+ TCHAR *szDateBuf = (TCHAR*)mir_alloc((DateSize+1)*sizeof(TCHAR));
- GetDateFormat(LOCALE_USER_DEFAULT,DATE_SHORTDATE,NULL,NULL,szDateBuf,DateSize );
- szSessionTime = (TCHAR*)mir_alloc((DateSize+TimeSize+4)*sizeof(TCHAR));
- lenn=_tcslen(szSessionTime);
- mir_sntprintf(szSessionTime, ((DateSize+TimeSize+4)*sizeof(TCHAR)), _T("%s - %s")/*TCHAR_STR_PARAM _T(" - ") TCHAR_STR_PARAM*/, szTimeBuf,szDateBuf);
+ GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDateBuf, DateSize );
+ TCHAR *szSessionTime = (TCHAR*)mir_alloc((DateSize+TimeSize+5)*sizeof(TCHAR));
+ int lenn = _tcslen(szSessionTime);
+ mir_sntprintf(szSessionTime, lenn, _T("%s - %s"), szTimeBuf, szDateBuf);
- mir_snprintf(szSessionDate, SIZEOF(szSessionDate), "%s_%u", "SessionDate", 0);
+ char szSessionDate[256];
+ DBVARIANT dbv = {0};
+ mir_snprintf(szSessionDate, SIZEOF(szSessionDate), "%s_%d", "SessionDate", 0);
DBGetContactSettingTString(NULL, __INTERNAL_NAME, szSessionDate, &dbv);
- szSessionDateBuf_1 = mir_tstrdup(dbv.ptszVal);
+ TCHAR *szSessionDateBuf_1 = mir_tstrdup(dbv.ptszVal);
DBFreeVariant(&dbv);
DBWriteContactSettingTString(NULL, __INTERNAL_NAME, szSessionDate, szSessionTime);
mir_free(szSessionTime);
- ResaveSettings("SessionDate",1,ses_limit,szSessionDateBuf_1);
+ ResaveSettings("SessionDate", 1, ses_limit, szSessionDateBuf_1);
- if(szTimeBuf) mir_free(szTimeBuf);
- if(szDateBuf) mir_free(szDateBuf);
+ if(szTimeBuf)
+ mir_free(szTimeBuf);
+ if(szDateBuf)
+ mir_free(szDateBuf);
}
- if(g_bCrashRecovery) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 1);
+ if(g_bCrashRecovery)
+ DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 1);
return 0;
}
@@ -653,7 +646,7 @@ int LoadSession(WPARAM wparam,LPARAM lparam) CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)session_list_t[i], 0);
else if(g_bWarnOnHidden)
{
- if(!CheckContactVisibility(session_list_t[i]))
+ if(!CheckContactVisibility((HANDLE)session_list_t[i]))
{
hidden[j]=i+1;
j++;
diff --git a/Sessions/Src/Utils.cpp b/Sessions/Src/Utils.cpp index c25b6e8..4b5ba06 100644 --- a/Sessions/Src/Utils.cpp +++ b/Sessions/Src/Utils.cpp @@ -346,11 +346,10 @@ void SetInSessionOrder(HANDLE hContact,int mode,int count,unsigned int ordernum) BOOL ResaveSettings(char* szName,int iFirst,int iLimit,TCHAR* szBuffer)
{
- int i=0;
BYTE marked,marked_t;
char szNameBuf[256]={0};
- for (i=iFirst;i<iLimit;i++)
+ for (int i = iFirst; i < iLimit; i++)
{
if (szBuffer)
{
@@ -507,21 +506,9 @@ void OffsetWindow(HWND parent, HWND hwnd, int dx, int dy) SetWindowPos(hwnd, NULL, rc.left, rc.top,0, 0, SWP_NOZORDER |SWP_NOSIZE);
}
-int CheckContactVisibility(DWORD hContact)
+int CheckContactVisibility(HANDLE hContact)
{
- MessageWindowInputData mwid;
- MessageWindowData mwd;
-
- mwid.cbSize = sizeof(MessageWindowInputData);
- mwid.hContact=(HANDLE)hContact;
- mwid.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH;
-
- mwd.cbSize = sizeof(MessageWindowData);
- mwd.hContact = mwid.hContact;
- mwd.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH;
- CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid,(LPARAM)&mwd);
-
- if(!IsWindowVisible(mwd.hwndWindow))
+ if (DBGetContactSettingByte(hContact, "CList", "Hidden", 0))
return 0;
return 1;
}
diff --git a/Sessions/Src/Utils.h b/Sessions/Src/Utils.h index bfcdd38..ce4fe75 100644 --- a/Sessions/Src/Utils.h +++ b/Sessions/Src/Utils.h @@ -38,7 +38,7 @@ int MarkUserDefSession(int ses_count,BYTE bCheck); BYTE IsMarkedUserDefSession(int ses_count);
void SavePosition(HWND hWnd, char *wndName);
void LoadPosition(HWND hWnd, char *wndName);
-int CheckContactVisibility(DWORD hContact);
+int CheckContactVisibility(HANDLE hContact);
void RenameUserDefSession(int ses_count,TCHAR* ptszNewName);
int FillFavoritesMenu (HMENU hMenu,int iLimit);
|