From 737f526a855d0fc814c6e5fa0fb3f908c8ad83bb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 Jun 2012 19:22:49 +0000 Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@584 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SRMM/cmdlist.cpp | 2 +- plugins/SRMM/globals.cpp | 6 +- plugins/SRMM/msgdialog.cpp | 134 +++++++++++++++++++++---------------------- plugins/SRMM/msglog.cpp | 36 ++++++------ plugins/SRMM/msgoptions.cpp | 8 +-- plugins/SRMM/msgs.cpp | 18 +++--- plugins/SRMM/msgtimedout.cpp | 2 +- plugins/SRMM/richutil.cpp | 6 +- plugins/SRMM/statusicon.cpp | 4 +- 9 files changed, 108 insertions(+), 108 deletions(-) (limited to 'plugins') diff --git a/plugins/SRMM/cmdlist.cpp b/plugins/SRMM/cmdlist.cpp index 426c26031d..1034b57949 100644 --- a/plugins/SRMM/cmdlist.cpp +++ b/plugins/SRMM/cmdlist.cpp @@ -114,7 +114,7 @@ void msgQueue_processack(HANDLE hContact, HANDLE id, BOOL success, const char* s for (i = 0; i < msgQueue.realCount; ++i) { item = (TMsgQueue*)msgQueue.items[i]; - if (item->hContact == hContact && item->id == id) + if (item->hContact == hContact && item->id == id) { li.List_Remove(&msgQueue, i); diff --git a/plugins/SRMM/globals.cpp b/plugins/SRMM/globals.cpp index 2a5f4d5da6..802bc9fccc 100644 --- a/plugins/SRMM/globals.cpp +++ b/plugins/SRMM/globals.cpp @@ -168,11 +168,11 @@ static int ackevent(WPARAM wParam, LPARAM lParam) ACKDATA *pAck = (ACKDATA *)lParam; if (!pAck) return 0; - if (pAck->type == ACKTYPE_MESSAGE) + if (pAck->type == ACKTYPE_MESSAGE) { - msgQueue_processack(pAck->hContact, pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam); + msgQueue_processack(pAck->hContact, pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam); - if (pAck->result == ACKRESULT_SUCCESS) + if (pAck->result == ACKRESULT_SUCCESS) SkinPlaySound("SendMsg"); } return 0; diff --git a/plugins/SRMM/msgdialog.cpp b/plugins/SRMM/msgdialog.cpp index 3b4261c305..6726dc4258 100644 --- a/plugins/SRMM/msgdialog.cpp +++ b/plugins/SRMM/msgdialog.cpp @@ -61,7 +61,7 @@ static char *MsgServiceName(HANDLE hContact) { char szServiceName[100]; char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); - if (szProto == NULL) + if (szProto == NULL) return PSS_MESSAGE; mir_snprintf(szServiceName, SIZEOF(szServiceName), "%s%sW", szProto, PSS_MESSAGE); @@ -73,7 +73,7 @@ static char *MsgServiceName(HANDLE hContact) static BOOL IsUtfSendAvailable(HANDLE hContact) { char* szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); - if ( szProto == NULL ) + if ( szProto == NULL ) return FALSE; return ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDUTF ) ? TRUE : FALSE; @@ -89,7 +89,7 @@ static int RTL_Detect(const TCHAR *ptszText) GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE2, ptszText, iLen, infoTypeC2); for(i = 0; i < iLen; i++) { - if(infoTypeC2[i] == C2_RIGHTTOLEFT) + if(infoTypeC2[i] == C2_RIGHTTOLEFT) return 1; } return 0; @@ -128,7 +128,7 @@ HANDLE SendMessageDirect(const TCHAR *szMsg, HANDLE hContact, char *szProto) bufSize += (int)bufSizeT; } - if (hContact == NULL) { + if (hContact == NULL) { mir_free(sendBuffer); return NULL; } @@ -268,7 +268,7 @@ static void SetDialogToType(HWND hwndDlg) ShowWindow(GetDlgItem(hwndDlg, IDC_SPLITTER), SW_SHOW); ShowWindow(GetDlgItem(hwndDlg, IDOK), (g_dat->flags & SMF_SENDBTN) ? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLength(GetDlgItem(hwndDlg, IDC_MESSAGE)) != 0); - if (dat->avatarPic == NULL || !(g_dat->flags & SMF_AVATAR)) + if (dat->avatarPic == NULL || !(g_dat->flags & SMF_AVATAR)) ShowWindow(GetDlgItem(hwndDlg, IDC_AVATAR), SW_HIDE); SendMessage(hwndDlg, DM_UPDATETITLE, 0, 0); SendMessage(hwndDlg, WM_SIZE, 0, 0); @@ -309,19 +309,19 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar if (GetWindowLongPtr(hwnd, GWL_STYLE) & ES_READONLY) break; - if (wParam == 1 && GetKeyState(VK_CONTROL) & 0x8000) { //ctrl-a + if (wParam == 1 && GetKeyState(VK_CONTROL) & 0x8000) { //ctrl-a SendMessage(hwnd, EM_SETSEL, 0, -1); return 0; } - if (wParam == 23 && GetKeyState(VK_CONTROL) & 0x8000) { // ctrl-w + if (wParam == 23 && GetKeyState(VK_CONTROL) & 0x8000) { // ctrl-w SendMessage(GetParent(hwnd), WM_CLOSE, 0, 0); return 0; } break; case WM_KEYDOWN: - if (wParam == VK_RETURN) + if (wParam == VK_RETURN) { if (!(GetKeyState(VK_SHIFT) & 0x8000) && ((GetKeyState(VK_CONTROL) & 0x8000) != 0) != ((g_dat->flags & SMF_SENDONENTER) != 0)) @@ -345,15 +345,15 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar else dat->lastEnterTime = 0; - if (((wParam == VK_INSERT && (GetKeyState(VK_SHIFT) & 0x8000)) || (wParam == 'V' && (GetKeyState(VK_CONTROL) & 0x8000))) && + if (((wParam == VK_INSERT && (GetKeyState(VK_SHIFT) & 0x8000)) || (wParam == 'V' && (GetKeyState(VK_CONTROL) & 0x8000))) && !(GetKeyState(VK_MENU) & 0x8000)) // ctrl-v (paste clean text) { SendMessage(hwnd, WM_PASTE, 0, 0); return 0; } - if (wParam == VK_UP && (GetKeyState(VK_CONTROL) & 0x8000) && - ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) + if (wParam == VK_UP && (GetKeyState(VK_CONTROL) & 0x8000) && + ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) { if (pdat->cmdList->realCount) { @@ -371,8 +371,8 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar UpdateReadChars(GetParent(hwnd), pdat->hwndStatus); return 0; } - else if (wParam == VK_DOWN && (GetKeyState(VK_CONTROL) & 0x8000) && - ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) + else if (wParam == VK_DOWN && (GetKeyState(VK_CONTROL) & 0x8000) && + ((g_dat->flags & (SMF_AUTOCLOSE | SMF_CTRLSUPPORT)) == SMF_CTRLSUPPORT)) { if (pdat->cmdList->realCount && pdat->cmdListInd >= 0) { @@ -402,7 +402,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar case WM_SYSCHAR: dat->lastEnterTime = 0; - if ((wParam == 's' || wParam == 'S') && GetKeyState(VK_MENU) & 0x8000) + if ((wParam == 's' || wParam == 'S') && GetKeyState(VK_MENU) & 0x8000) { PostMessage(GetParent(hwnd), WM_COMMAND, IDOK, 0); return 0; @@ -428,7 +428,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar TranslateMenu(mwpd.hMenu); SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel); - if (sel.cpMin == sel.cpMax) + if (sel.cpMin == sel.cpMax) { EnableMenuItem(mwpd.hMenu, IDM_CUT, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(mwpd.hMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED); @@ -448,7 +448,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar EnableMenuItem(mwpd.hMenu, IDM_PASTE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(mwpd.hMenu, IDM_PASTESEND, MF_BYCOMMAND | MF_GRAYED); } - if (lParam == 0xFFFFFFFF) + if (lParam == 0xFFFFFFFF) { SendMessage(hwnd, EM_POSFROMCHAR, (WPARAM)&mwpd.pt, (LPARAM)sel.cpMax); ClientToScreen(hwnd, &mwpd.pt); @@ -560,7 +560,7 @@ static LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, return 0; case WM_MOUSEMOVE: - if (GetCapture() == hwnd) { + if (GetCapture() == hwnd) { RECT rc; GetClientRect(hwnd, &rc); SendMessage(GetParent(hwnd), DM_SPLITTERMOVED, rc.right > rc.bottom ? (short) HIWORD(GetMessagePos()) + rc.bottom / 2 : (short) LOWORD(GetMessagePos()) + rc.right / 2, (LPARAM) hwnd); @@ -581,7 +581,7 @@ static int MessageDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL * if (!(g_dat->flags&SMF_SHOWINFO) && !(g_dat->flags&SMF_SHOWBTNS)) { int i; for (i = 0; i < SIZEOF(buttonLineControls); i++) - if (buttonLineControls[i] == urc->wId) + if (buttonLineControls[i] == urc->wId) OffsetRect(&urc->rcItem, 0, -dat->lineHeight); } @@ -702,10 +702,10 @@ static void NotifyTyping(struct SrmmWindowData *dat, int mode) if (protoStatus < ID_STATUS_ONLINE) return; - if (protoCaps & PF1_VISLIST && DBGetContactSettingWord(dat->hContact, dat->szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE) + if (protoCaps & PF1_VISLIST && DBGetContactSettingWord(dat->hContact, dat->szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE) return; - if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && DBGetContactSettingWord(dat->hContact, dat->szProto, "ApparentMode", 0) != ID_STATUS_ONLINE) + if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && DBGetContactSettingWord(dat->hContact, dat->szProto, "ApparentMode", 0) != ID_STATUS_ONLINE) return; if (!(g_dat->flags & SMF_TYPINGUNKNOWN) && DBGetContactSettingByte(dat->hContact, "CList", "NotOnList", 0)) @@ -802,7 +802,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP pt.x = 0; ScreenToClient(hwndDlg, &pt); dat->originalSplitterPos = pt.y; - if (dat->splitterPos == -1) + if (dat->splitterPos == -1) dat->splitterPos = dat->originalSplitterPos;// + 60; GetWindowRect(GetDlgItem(hwndDlg, IDC_ADD), &rc); dat->lineHeight = rc.bottom - rc.top + 3; @@ -851,11 +851,11 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.cbSize = sizeof(dbei); for (i = DBGetContactSettingWord(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT); i--; ) { - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) hPrevEvent = (HANDLE) CallService(MS_DB_EVENT_FINDLAST, (WPARAM) dat->hContact, 0); else hPrevEvent = (HANDLE) CallService(MS_DB_EVENT_FINDPREV, (WPARAM) dat->hDbEventFirst, 0); - if (hPrevEvent == NULL) + if (hPrevEvent == NULL) break; dbei.cbBlob = 0; @@ -873,18 +873,18 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DWORD firstTime; dbei.cbSize = sizeof(dbei); - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) dbei.timestamp = (DWORD)time(NULL); else CallService(MS_DB_EVENT_GET, (WPARAM) dat->hDbEventFirst, (LPARAM) & dbei); firstTime = dbei.timestamp - 60 * DBGetContactSettingWord(NULL, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME); for (;;) { - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) hPrevEvent = (HANDLE) CallService(MS_DB_EVENT_FINDLAST, (WPARAM) dat->hContact, 0); else hPrevEvent = (HANDLE) CallService(MS_DB_EVENT_FINDPREV, (WPARAM) dat->hDbEventFirst, 0); - if (hPrevEvent == NULL) + if (hPrevEvent == NULL) break; dbei.cbBlob = 0; CallService(MS_DB_EVENT_GET, (WPARAM) hPrevEvent, (LPARAM) & dbei); @@ -909,7 +909,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ZeroMemory(&dbei, sizeof(dbei)); dbei.cbSize = sizeof(dbei); CallService(MS_DB_EVENT_GET, (WPARAM) hdbEvent, (LPARAM) & dbei); - if (( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && !(dbei.flags & DBEF_SENT)) { + if (( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && !(dbei.flags & DBEF_SENT)) { dat->lastMessage = dbei.timestamp; PostMessage(hwndDlg, DM_UPDATELASTMESSAGE, 0, 0); break; @@ -973,7 +973,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } case WM_CONTEXTMENU: - if (dat->hwndStatus && dat->hwndStatus == (HWND) wParam) { + if (dat->hwndStatus && dat->hwndStatus == (HWND) wParam) { POINT pt, pt2; HMENU hMenu; RECT rc; @@ -1021,7 +1021,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { BITMAP bminfo; - if (dat->avatarPic == NULL || !(g_dat->flags&SMF_AVATAR)) + if (dat->avatarPic == NULL || !(g_dat->flags&SMF_AVATAR)) { dat->avatarWidth=50; dat->avatarHeight=50; @@ -1246,7 +1246,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP else SetDlgItemText(hwndDlg, IDC_NAME, contactName); - szStatus = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, dat->szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE), GSMDF_TCHAR); + szStatus = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, dat->szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE), GSMDF_TCHAR); if (statusIcon) mir_sntprintf(newtitle, SIZEOF(newtitle), _T("%s - %s"), contactName, TranslateTS(pszNewTitleEnd)); else @@ -1271,12 +1271,12 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP TCHAR *szOldStatus = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) dat->wOldStatus, GSMDF_TCHAR); TCHAR *szNewStatus = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) dat->wStatus, GSMDF_TCHAR); - if (dat->wStatus == ID_STATUS_OFFLINE) + if (dat->wStatus == ID_STATUS_OFFLINE) { iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed off (was %s)"), szOldStatus); SendMessage(hwndDlg, DM_TYPING, 0, 0); } - else if (dat->wOldStatus == ID_STATUS_OFFLINE) + else if (dat->wOldStatus == ID_STATUS_OFFLINE) iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("signed on (%s)"), szNewStatus); else iLen = mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("is now %s (was %s)"), szNewStatus, szOldStatus); @@ -1293,7 +1293,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.timestamp = (DWORD)time(NULL); dbei.szModule = dat->szProto; hNewEvent = (HANDLE) CallService(MS_DB_EVENT_ADD, (WPARAM) dat->hContact, (LPARAM) & dbei); - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) { dat->hDbEventFirst = hNewEvent; SendMessage(hwndDlg, DM_REMAKELOG, 0, 0); @@ -1336,7 +1336,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } case DM_CASCADENEWWINDOW: - if ((HWND) wParam == hwndDlg) + if ((HWND) wParam == hwndDlg) break; { RECT rcThis, rcNew; @@ -1421,7 +1421,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case DM_SPLITTERMOVED: { - if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_SPLITTER)) + if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_SPLITTER)) { POINT pt; RECT rc; @@ -1482,30 +1482,30 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.cbSize = sizeof(dbei); CallService(MS_DB_EVENT_GET, lParam, (LPARAM) & dbei); - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) dat->hDbEventFirst = (HANDLE) lParam; if (DbEventIsShown(&dbei, dat) && !(dbei.flags & DBEF_READ)) { - if ((dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && !(dbei.flags & DBEF_SENT)) + if ((dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && !(dbei.flags & DBEF_SENT)) { - if (GetForegroundWindow() == hwndDlg) + if (GetForegroundWindow() == hwndDlg) SkinPlaySound("RecvMsgActive"); else SkinPlaySound("RecvMsgInactive"); } - if (( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && dat->hwndStatus && !(dbei.flags & DBEF_SENT)) + if (( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)) && dat->hwndStatus && !(dbei.flags & DBEF_SENT)) { dat->lastMessage = dbei.timestamp; SendMessage(hwndDlg, DM_UPDATELASTMESSAGE, 0, 0); } - if ((HANDLE) lParam != dat->hDbEventFirst && (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, lParam, 0) == NULL) + if ((HANDLE) lParam != dat->hDbEventFirst && (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, lParam, 0) == NULL) SendMessage(hwndDlg, DM_APPENDTOLOG, lParam, 0); else SendMessage(hwndDlg, DM_REMAKELOG, 0, 0); if (!(dbei.flags & DBEF_SENT) && dbei.eventType != EVENTTYPE_STATUSCHANGE) { - if (GetActiveWindow() == hwndDlg && GetForegroundWindow() == hwndDlg) + if (GetActiveWindow() == hwndDlg && GetForegroundWindow() == hwndDlg) { HWND hwndLog = GetDlgItem(hwndDlg, IDC_LOG); if (GetWindowLongPtr(hwndLog, GWL_STYLE) & WS_VSCROLL) @@ -1531,7 +1531,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case WM_TIMER: - if (wParam == TIMERID_FLASHWND) + if (wParam == TIMERID_FLASHWND) { FlashWindow(hwndDlg, TRUE); if (dat->nFlash > 2 * g_dat->nFlashMax) @@ -1542,10 +1542,10 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } dat->nFlash++; } - else if (wParam == TIMERID_TYPE) + else if (wParam == TIMERID_TYPE) { ShowTime(dat); - if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON && GetTickCount() - dat->nLastTyping > TIMEOUT_TYPEOFF) + if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON && GetTickCount() - dat->nLastTyping > TIMEOUT_TYPEOFF) NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF); if (dat->showTyping) @@ -1553,7 +1553,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (dat->nTypeSecs) { dat->nTypeSecs--; - if (GetForegroundWindow() == hwndDlg) + if (GetForegroundWindow() == hwndDlg) SendMessage(hwndDlg, DM_UPDATEWINICON, 0, 0); } else @@ -1592,7 +1592,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_MEASUREITEM: { LPMEASUREITEMSTRUCT mis = (LPMEASUREITEMSTRUCT) lParam; - if (mis->CtlType == ODT_MENU) + if (mis->CtlType == ODT_MENU) return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam); } break; @@ -1600,14 +1600,14 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_DRAWITEM: { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT) lParam; - if (dis->CtlType == ODT_MENU) + if (dis->CtlType == ODT_MENU) return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam); - else if (dis->hwndItem == dat->hwndStatus) + else if (dis->hwndItem == dat->hwndStatus) { DrawStatusIcons(dat->hContact, dis->hDC, dis->rcItem, 2); return TRUE; } - else if (dis->CtlID == IDC_PROTOCOL) + else if (dis->CtlID == IDC_PROTOCOL) { if (dat->szProto) { @@ -1634,7 +1634,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } } } - else if (dis->CtlID == IDC_AVATAR && dat->avatarPic && (g_dat->flags & SMF_AVATAR)) + else if (dis->CtlID == IDC_AVATAR && dat->avatarPic && (g_dat->flags & SMF_AVATAR)) { HPEN hPen = CreatePen(PS_SOLID, 1, RGB(0,0,0)); HPEN hOldPen = (HPEN)SelectObject(dis->hDC, hPen); @@ -1683,13 +1683,13 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP tcmdlist_append(dat->cmdList, temp); dat->cmdListInd = -1; - if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) + if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE)); - if (dat->hDbEventFirst == NULL) + if (dat->hDbEventFirst == NULL) { dat->hDbEventFirst = hNewEvent; SendMessage(hwndDlg, DM_REMAKELOG, 0, 0); @@ -1744,7 +1744,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case IDC_MESSAGE: - if (HIWORD(wParam) == EN_CHANGE) + if (HIWORD(wParam) == EN_CHANGE) { int len = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_MESSAGE)); UpdateReadChars(hwndDlg, dat->hwndStatus); @@ -1754,10 +1754,10 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->nLastTyping = GetTickCount(); if (len) { - if (dat->nTypeMode == PROTOTYPE_SELFTYPING_OFF) + if (dat->nTypeMode == PROTOTYPE_SELFTYPING_OFF) NotifyTyping(dat, PROTOTYPE_SELFTYPING_ON); } - else if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) + else if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF); } } @@ -1766,16 +1766,16 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case WM_NOTIFY: - if (dat && ((LPNMHDR) lParam)->hwndFrom == dat->hwndStatus) + if (dat && ((LPNMHDR) lParam)->hwndFrom == dat->hwndStatus) { - if (((LPNMHDR) lParam)->code == NM_CLICK || ((LPNMHDR) lParam)->code == NM_RCLICK) + if (((LPNMHDR) lParam)->code == NM_CLICK || ((LPNMHDR) lParam)->code == NM_RCLICK) { NMMOUSE *nm = (NMMOUSE *) lParam; RECT rc; SendMessage(dat->hwndStatus, SB_GETRECT, SendMessage(dat->hwndStatus, SB_GETPARTS, 0, 0) - 1, (LPARAM)&rc); if (nm->pt.x >= rc.left) - CheckIconClick(dat->hContact, dat->hwndStatus, nm->pt, rc, 2, ((LPNMHDR) lParam)->code == NM_RCLICK ? MBCF_RIGHTBUTTON : 0); + CheckIconClick(dat->hContact, dat->hwndStatus, nm->pt, rc, 2, ((LPNMHDR) lParam)->code == NM_RCLICK ? MBCF_RIGHTBUTTON : 0); return TRUE; } } @@ -1791,8 +1791,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_LBUTTONDOWN: { HCURSOR hCur = GetCursor(); - if (hCur == LoadCursor(NULL, IDC_SIZENS) || hCur == LoadCursor(NULL, IDC_SIZEWE) - || hCur == LoadCursor(NULL, IDC_SIZENESW) || hCur == LoadCursor(NULL, IDC_SIZENWSE)) + if (hCur == LoadCursor(NULL, IDC_SIZENS) || hCur == LoadCursor(NULL, IDC_SIZEWE) + || hCur == LoadCursor(NULL, IDC_SIZENESW) || hCur == LoadCursor(NULL, IDC_SIZENWSE)) { SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; @@ -1802,8 +1802,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_MOUSEMOVE: { HCURSOR hCur = GetCursor(); - if (hCur == LoadCursor(NULL, IDC_SIZENS) || hCur == LoadCursor(NULL, IDC_SIZEWE) - || hCur == LoadCursor(NULL, IDC_SIZENESW) || hCur == LoadCursor(NULL, IDC_SIZENWSE)) + if (hCur == LoadCursor(NULL, IDC_SIZENS) || hCur == LoadCursor(NULL, IDC_SIZEWE) + || hCur == LoadCursor(NULL, IDC_SIZENESW) || hCur == LoadCursor(NULL, IDC_SIZENWSE)) SetCursor(LoadCursor(NULL, IDC_ARROW)); break; } @@ -1817,7 +1817,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP hSubMenu = GetSubMenu(hMenu, 0); TranslateMenu(hSubMenu); SendMessage(((NMHDR *) lParam)->hwndFrom, EM_EXGETSEL, 0, (LPARAM) & sel); - if (sel.cpMin == sel.cpMax) + if (sel.cpMin == sel.cpMax) EnableMenuItem(hSubMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED); pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam); pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam); @@ -1850,7 +1850,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case EN_VSCROLL: - if (LOWORD(wParam) == IDC_LOG && GetWindowLongPtr((HWND)lParam, GWL_STYLE) & WS_VSCROLL) + if (LOWORD(wParam) == IDC_LOG && GetWindowLongPtr((HWND)lParam, GWL_STYLE) & WS_VSCROLL) { SCROLLINFO si = {0}; si.cbSize = sizeof(si); @@ -1881,12 +1881,12 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP tr.chrg = ((ENLINK *) lParam)->chrg; tr.lpstrText = (TCHAR*)_alloca((tr.chrg.cpMax - tr.chrg.cpMin + 8) * sizeof(TCHAR)); SendDlgItemMessage(hwndDlg, IDC_LOG, EM_GETTEXTRANGE, 0, (LPARAM) & tr); - if (_tcschr(tr.lpstrText, '@') != NULL && _tcschr(tr.lpstrText, ':') == NULL && _tcschr(tr.lpstrText, '/') == NULL) + if (_tcschr(tr.lpstrText, '@') != NULL && _tcschr(tr.lpstrText, ':') == NULL && _tcschr(tr.lpstrText, '/') == NULL) { memmove(tr.lpstrText + 7, tr.lpstrText, (tr.chrg.cpMax - tr.chrg.cpMin + 1) * sizeof(TCHAR)); memcpy(tr.lpstrText, _T("mailto:"), 7 * sizeof(TCHAR)); } - if (((ENLINK *) lParam)->msg == WM_RBUTTONDOWN) + if (((ENLINK *) lParam)->msg == WM_RBUTTONDOWN) { HMENU hMenu, hSubMenu; POINT pt; @@ -1958,7 +1958,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBDeleteContactSetting(dat->hContact, SRMSGMOD, DBSAVEDMSG); } KillTimer(hwndDlg, TIMERID_TYPE); - if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) + if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON) NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF); if (dat->hBkgBrush) diff --git a/plugins/SRMM/msglog.cpp b/plugins/SRMM/msglog.cpp index e32c98ae50..d24cda4032 100644 --- a/plugins/SRMM/msglog.cpp +++ b/plugins/SRMM/msglog.cpp @@ -72,7 +72,7 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA char *d; int lineLen; - if (line == NULL) + if (line == NULL) return 0; lineLen = (int)_tcslen(line) * 9 + 8; @@ -88,32 +88,32 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA for (; *line; line++, textCharsCount++) { - if (*line == '\r' && line[1] == '\n') + if (*line == '\r' && line[1] == '\n') { memcpy(d, "\\par ", 5); line++; d += 5; } - else if (*line == '\n') { + else if (*line == '\n') { memcpy(d, "\\par ", 5); d += 5; } - else if (*line == '\t') + else if (*line == '\t') { memcpy(d, "\\tab ", 5); d += 5; } - else if (*line == '\\' || *line == '{' || *line == '}') + else if (*line == '\\' || *line == '{' || *line == '}') { *d++ = '\\'; *d++ = (char) *line; } - else if (*line == '[' && (g_dat->flags & SMF_SHOWFORMAT)) + else if (*line == '[' && (g_dat->flags & SMF_SHOWFORMAT)) { int i, found = 0; for (i = 0; i < SIZEOF(bbcodes); ++i) { - if (line[1] == bbcodes[i][1]) + if (line[1] == bbcodes[i][1]) { size_t lenb = _tcslen(bbcodes[i]); if (!_tcsnicmp(line, bbcodes[i], lenb)) @@ -134,7 +134,7 @@ static int AppendToBufferWithRTF(char **buffer, int *cbBufferEnd, int *cbBufferA TCHAR* tag = _tcschr(line + 4, ']'); if (tag) { - TCHAR *tagu = (line[4] == '=') ? line + 5 : tag + 1; + TCHAR *tagu = (line[4] == '=') ? line + 5 : tag + 1; TCHAR *tage = _tcsstr(tag, _T("[/url]")); if (!tage) tage = _tcsstr(tag, _T("[/URL]")); if (tage) @@ -209,7 +209,7 @@ static char *CreateRTFHeader(struct SrmmWindowData *dat) LoadMsgDlgFont(i, NULL, &colour); AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\red%u\\green%u\\blue%u;", GetRValue(colour), GetGValue(colour), GetBValue(colour)); } - if (GetSysColorBrush(COLOR_HOTLIGHT) == NULL) + if (GetSysColorBrush(COLOR_HOTLIGHT) == NULL) colour = RGB(0, 0, 255); else colour = GetSysColor(COLOR_HOTLIGHT); @@ -259,7 +259,7 @@ int DbEventIsShown(DBEVENTINFO * dbei, struct SrmmWindowData *dat) case EVENTTYPE_JABBER_PRESENCE: case EVENTTYPE_STATUSCHANGE: case EVENTTYPE_FILE: - return (dbei->flags & DBEF_READ) == 0; + return (dbei->flags & DBEF_READ) == 0; } return DbEventIsForMsgWindow(dbei); } @@ -274,7 +274,7 @@ static char *CreateRTFFromDbEvent(struct SrmmWindowData *dat, HANDLE hContact, H dbei.cbSize = sizeof(dbei); dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM) hDbEvent, 0); - if (dbei.cbBlob == -1) + if (dbei.cbBlob == -1) return NULL; dbei.pBlob = (PBYTE) mir_alloc(dbei.cbBlob); CallService(MS_DB_EVENT_GET, (WPARAM) hDbEvent, (LPARAM) & dbei); @@ -282,12 +282,12 @@ static char *CreateRTFFromDbEvent(struct SrmmWindowData *dat, HANDLE hContact, H mir_free(dbei.pBlob); return NULL; } - if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) + if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) { CallService(MS_DB_EVENT_MARKREAD, (WPARAM) hContact, (LPARAM) hDbEvent); CallService(MS_CLIST_REMOVEEVENT, (WPARAM) hContact, (LPARAM) hDbEvent); } - else if (dbei.eventType == EVENTTYPE_STATUSCHANGE || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) { + else if (dbei.eventType == EVENTTYPE_STATUSCHANGE || dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) { CallService(MS_DB_EVENT_MARKREAD, (WPARAM) hContact, (LPARAM) hDbEvent); } bufferEnd = 0; @@ -460,7 +460,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG { struct LogStreamData *dat = (struct LogStreamData *) dwCookie; - if (dat->buffer == NULL) + if (dat->buffer == NULL) { dat->bufferOffset = 0; switch (dat->stage) @@ -479,9 +479,9 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG if (dat->buffer) dat->hDbEventLast = dat->hDbEvent; dat->hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) dat->hDbEvent, 0); - if (--dat->eventsToInsert == 0) + if (--dat->eventsToInsert == 0) break; - } while (dat->buffer == NULL && dat->hDbEvent); + } while (dat->buffer == NULL && dat->hDbEvent); if (dat->buffer) { dat->isEmpty = 0; @@ -503,7 +503,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG *pcb = min(cb, dat->bufferLen - dat->bufferOffset); CopyMemory(pbBuff, dat->buffer + dat->bufferOffset, *pcb); dat->bufferOffset += *pcb; - if (dat->bufferOffset == dat->bufferLen) + if (dat->bufferOffset == dat->bufferLen) { mir_free(dat->buffer); dat->buffer = NULL; @@ -528,7 +528,7 @@ void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend) streamData.hDbEvent = hDbEventFirst; streamData.dlgDat = dat; streamData.eventsToInsert = count; - streamData.isEmpty = !fAppend || GetWindowTextLength(hwndLog) == 0; + streamData.isEmpty = !fAppend || GetWindowTextLength(hwndLog) == 0; stream.pfnCallback = LogStreamInEvents; stream.dwCookie = (DWORD_PTR)&streamData; diff --git a/plugins/SRMM/msgoptions.cpp b/plugins/SRMM/msgoptions.cpp index a3458d348a..4524966d56 100644 --- a/plugins/SRMM/msgoptions.cpp +++ b/plugins/SRMM/msgoptions.cpp @@ -108,7 +108,7 @@ void RegisterSRMMFonts( void ) fontid.order = index; fontid.flags &= ~FIDF_CLASSMASK; - fontid.flags |= (fontOptionsList[i].defStyle == FONTF_BOLD) ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL; + fontid.flags |= (fontOptionsList[i].defStyle == FONTF_BOLD) ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL; fontid.deffontsettings.colour = fontOptionsList[i].defColour; fontid.deffontsettings.size = fontOptionsList[i].defSize; @@ -173,7 +173,7 @@ static DWORD MakeCheckBoxTreeFlags(HWND hwndTree) tvi.hItem = TreeView_GetRoot(hwndTree); while (tvi.hItem) { TreeView_GetItem(hwndTree, &tvi); - if (((tvi.state & TVIS_STATEIMAGEMASK) >> 12 == 2)) + if (((tvi.state & TVIS_STATEIMAGEMASK) >> 12 == 2)) flags |= tvi.lParam; tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem); } @@ -261,7 +261,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_NOTIFY: switch (((LPNMHDR) lParam)->idFrom) { case IDC_POPLIST: - if (((LPNMHDR) lParam)->code == NM_CLICK) { + if (((LPNMHDR) lParam)->code == NM_CLICK) { TVHITTESTINFO hti; hti.pt.x = (short) LOWORD(GetMessagePos()); hti.pt.y = (short) HIWORD(GetMessagePos()); @@ -272,7 +272,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP tvi.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvi.hItem = hti.hItem; TreeView_GetItem(((LPNMHDR) lParam)->hwndFrom, &tvi); - tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1; + tvi.iImage = tvi.iSelectedImage = tvi.iImage == 1 ? 2 : 1; TreeView_SetItem(((LPNMHDR) lParam)->hwndFrom, &tvi); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } diff --git a/plugins/SRMM/msgs.cpp b/plugins/SRMM/msgs.cpp index ce278f36bd..9bf26a38cb 100644 --- a/plugins/SRMM/msgs.cpp +++ b/plugins/SRMM/msgs.cpp @@ -56,7 +56,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) dbei.cbSize = sizeof(dbei); CallService(MS_DB_EVENT_GET, lParam, (LPARAM) & dbei); - if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) + if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) return 0; CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1); @@ -73,7 +73,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) } else { - if (GetForegroundWindow() == hwnd) + if (GetForegroundWindow() == hwnd) SkinPlaySound("RecvMsgActive"); else SkinPlaySound("RecvMsgInactive"); @@ -215,7 +215,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam; HANDLE hContact = (HANDLE)wParam; - if (cws->szModule == NULL) return 0; + if (cws->szModule == NULL) return 0; if (!strcmp(cws->szModule, "CList")) WindowList_Broadcast(g_dat->hMessageWindowList, DM_UPDATETITLE, (WPARAM) cws, 0); @@ -267,7 +267,7 @@ static void RestoreUnreadMessageAlerts(void) autoPopup = 0; dbei.cbBlob = 0; CallService(MS_DB_EVENT_GET, (WPARAM) hDbEvent, (LPARAM) & dbei); - if (!(dbei.flags & (DBEF_SENT | DBEF_READ)) && ( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) + if (!(dbei.flags & (DBEF_SENT | DBEF_READ)) && ( dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) { windowAlreadyExists = WindowList_Find(g_dat->hMessageWindowList, hContact) != NULL; if (windowAlreadyExists) @@ -425,7 +425,7 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam) int LoadSendRecvMessageModule(void) { - if (LoadLibraryA("riched20.dll") == NULL) { + if (LoadLibraryA("riched20.dll") == NULL) { if (IDYES != MessageBox(0, TranslateT @@ -469,7 +469,7 @@ int LoadSendRecvMessageModule(void) hCurSplitNS = LoadCursor(NULL, IDC_SIZENS); hCurSplitWE = LoadCursor(NULL, IDC_SIZEWE); hCurHyperlinkHand = LoadCursor(NULL, IDC_HAND); - if (hCurHyperlinkHand == NULL) + if (hCurHyperlinkHand == NULL) hCurHyperlinkHand = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_HYPERLINKHAND)); InitStatusIcons(); @@ -493,7 +493,7 @@ STDMETHODIMP CREOleCallback::QueryInterface(REFIID riid, LPVOID * ppvObj) STDMETHODIMP_(ULONG) CREOleCallback::AddRef() { - if (refCount == 0) { + if (refCount == 0) { if (S_OK != StgCreateDocfile(NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &pictStg)) pictStg = NULL; nextStgId = 0; @@ -503,7 +503,7 @@ STDMETHODIMP_(ULONG) CREOleCallback::AddRef() STDMETHODIMP_(ULONG) CREOleCallback::Release() { - if (--refCount == 0) { + if (--refCount == 0) { if (pictStg) pictStg->Release(); } @@ -546,7 +546,7 @@ STDMETHODIMP CREOleCallback::GetNewStorage(LPSTORAGE * lplpstg) char szName[64]; wsprintfA(szName, "s%u", nextStgId++); MultiByteToWideChar(CP_ACP, 0, szName, -1, szwName, SIZEOF(szwName)); - if (pictStg == NULL) + if (pictStg == NULL) return STG_E_MEDIUMFULL; return pictStg->CreateStorage(szwName, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, lplpstg); } diff --git a/plugins/SRMM/msgtimedout.cpp b/plugins/SRMM/msgtimedout.cpp index 5b85682d87..1b1773aa8e 100644 --- a/plugins/SRMM/msgtimedout.cpp +++ b/plugins/SRMM/msgtimedout.cpp @@ -98,7 +98,7 @@ void MessageFailureProcess(TMsgQueue *item, const char* err) CallService(MS_DB_EVENT_DELETE, (WPARAM)item->hContact, (LPARAM)item->hDbEvent); hwnd = WindowList_Find(g_dat->hMessageWindowList, (HANDLE)item->hContact); - if (hwnd == NULL) + if (hwnd == NULL) { SendMessageCmd(item->hContact, NULL, 0); hwnd = WindowList_Find(g_dat->hMessageWindowList, (HANDLE)item->hContact); diff --git a/plugins/SRMM/richutil.cpp b/plugins/SRMM/richutil.cpp index 5210f1bf00..92065ca0c8 100644 --- a/plugins/SRMM/richutil.cpp +++ b/plugins/SRMM/richutil.cpp @@ -131,7 +131,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ru = (TRichUtil *)li.List_Find(&sListInt, (TRichUtil*)&hwnd); LeaveCriticalSection(&csRich); - if (ru == NULL) return 0; + if (ru == NULL) return 0; switch(msg) { @@ -209,7 +209,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM RECT rcClient ={0}; HDC hdc = GetDC(GetParent(hwnd)); - if (MyGetThemeBackgroundContentRect(hTheme, hdc, EP_EDITTEXT, ETS_NORMAL, &ncsParam->rgrc[0], &rcClient) == S_OK) + if (MyGetThemeBackgroundContentRect(hTheme, hdc, EP_EDITTEXT, ETS_NORMAL, &ncsParam->rgrc[0], &rcClient) == S_OK) { ru->rect.left = rcClient.left-ncsParam->rgrc[0].left; ru->rect.top = rcClient.top-ncsParam->rgrc[0].top; @@ -241,7 +241,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (IsWindow(hwnd)) { - if ((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) + if ((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)ru->origProc); } diff --git a/plugins/SRMM/statusicon.cpp b/plugins/SRMM/statusicon.cpp index 7e45c4c844..cd7ac3872e 100644 --- a/plugins/SRMM/statusicon.cpp +++ b/plugins/SRMM/statusicon.cpp @@ -55,7 +55,7 @@ INT_PTR RemoveStatusIcon(WPARAM wParam, LPARAM lParam) { struct StatusIconListNode *current = status_icon_list, *prev = 0; while(current) { - if(strcmp(current->sid.szModule, sid->szModule) == 0 && current->sid.dwId == sid->dwId) { + if(strcmp(current->sid.szModule, sid->szModule) == 0 && current->sid.dwId == sid->dwId) { if(prev) prev->next = current->next; else status_icon_list = current->next; @@ -102,7 +102,7 @@ INT_PTR ModifyStatusIcon(WPARAM wParam, LPARAM lParam) { struct StatusIconListNode *current = status_icon_list, *prev = 0; while(current) { - if(strcmp(current->sid.szModule, sid->szModule) == 0 && current->sid.dwId == sid->dwId) { + if(strcmp(current->sid.szModule, sid->szModule) == 0 && current->sid.dwId == sid->dwId) { if (!hContact) { current->sid.flags = sid->flags; if(sid->hIcon) { -- cgit v1.2.3