From 253783569bef2320d04fe1d310709c64c64fd3a1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Feb 2014 18:08:37 +0000 Subject: - custom list of time zones removed; - adaptation of ICQ for new Time API; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@8140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp | 272 ++++++++++++------------- 1 file changed, 126 insertions(+), 146 deletions(-) (limited to 'protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp') diff --git a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp index 4a1f068b7e..e8d71f869f 100644 --- a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp +++ b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp @@ -27,7 +27,6 @@ // ----------------------------------------------------------------------------- #include "icqoscar.h" - #define DM_PROTOACK (WM_USER+10) static int DrawTextUtf(HDC hDC, char *text, LPRECT lpRect, UINT uFormat, LPSIZE lpSize) @@ -43,7 +42,6 @@ static int DrawTextUtf(HDC hDC, char *text, LPRECT lpRect, UINT uFormat, LPSIZE return res; } - char* ChangeInfoData::GetItemSettingText(int i, char *buf, size_t bufsize) { char *text = buf; @@ -51,66 +49,69 @@ char* ChangeInfoData::GetItemSettingText(int i, char *buf, size_t bufsize) buf[0] = '\0'; - if (settingData[i].value == 0 && !(setting[i].displayType & LIF_ZEROISVALID)) - { - if (setting[i].displayType & LIF_CHANGEONLY) + const SettingItem &si = setting[i]; + SettingItemData &sid = settingData[i]; + if (sid.value == 0 && !(si.displayType & LIF_ZEROISVALID)) { + if (si.displayType & LIF_CHANGEONLY) text = ICQTranslateUtfStatic(LPGEN(""), buf, bufsize); else text = ICQTranslateUtfStatic(LPGEN(""), buf, bufsize); } - else - { - switch (setting[i].displayType & LIM_TYPE) { + else { + switch (si.displayType & LIM_TYPE) { case LI_STRING: case LI_LONGSTRING: - text = BinaryToEscapes((char*)settingData[i].value); + text = BinaryToEscapes((char*)sid.value); alloced = 1; break; case LI_NUMBER: - _itoa(settingData[i].value, text, 10); + _itoa(sid.value, text, 10); break; case LI_LIST: - if (setting[i].dbType == DBVT_ASCIIZ) - text = ICQTranslateUtfStatic((char*)settingData[i].value, buf, bufsize); - else - { + if (si.dbType == DBVT_ASCIIZ) + text = ICQTranslateUtfStatic((char*)sid.value, buf, bufsize); + else { text = ICQTranslateUtfStatic(LPGEN("Unknown value"), buf, bufsize); - FieldNamesItem *list = (FieldNamesItem*)setting[i].pList; - for (int j=0; TRUE; j++) - if (list[j].code == settingData[i].value) - { + FieldNamesItem *list = (FieldNamesItem*)si.pList; + if (list == timezonesField) { + HANDLE tz = tmi.createByContact(NULL, ppro->m_szModuleName, 0); + text = make_utf8_string_static(tmi.getTzName(tz), buf, bufsize); + break; + } + + for (int j = 0;; j++) { + if (list[j].code == sid.value) { text = ICQTranslateUtfStatic(list[j].text, buf, bufsize); break; } - else if (!list[j].text) - { - if (list[j].code == settingData[i].value) + else if (!list[j].text) { + if (list[j].code == sid.value) text = ICQTranslateUtfStatic("Unspecified", buf, bufsize); break; } + } } break; } } - if (setting[i].displayType & LIF_PASSWORD) - { - if (settingData[i].changed) - for (int j=0; text[j]; j++) text[j] = '*'; - else - { - if (alloced) - { + + if (si.displayType & LIF_PASSWORD) { + if (sid.changed) { + for (int j = 0; text[j]; j++) + text[j] = '*'; + } + else { + if (alloced) { SAFE_FREE(&text); alloced = 0; } text = "********"; } } - if (text != buf) - { + if (text != buf) { char *tmp = text; text = null_strcpy(buf, text, bufsize - 1); @@ -121,29 +122,26 @@ char* ChangeInfoData::GetItemSettingText(int i, char *buf, size_t bufsize) return text; } - void ChangeInfoData::PaintItemSetting(HDC hdc, RECT *rc, int i, UINT itemState) { char str[MAX_PATH]; char *text = GetItemSettingText(i, str, SIZEOF(str)); - if (settingData[i].value == 0 && !(setting[i].displayType & LIF_ZEROISVALID)) + const SettingItem &si = setting[i]; + SettingItemData &sid = settingData[i]; + if (sid.value == 0 && !(si.displayType & LIF_ZEROISVALID)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); - if ((setting[i].displayType & LIM_TYPE) == LI_LIST && (itemState & CDIS_SELECTED || iEditItem == i)) - { - RECT rcBtn; - - rcBtn = *rc; + if ((si.displayType & LIM_TYPE) == LI_LIST && (itemState & CDIS_SELECTED || iEditItem == i)) { + RECT rcBtn = *rc; rcBtn.left = rcBtn.right - rc->bottom + rc->top; - InflateRect(&rcBtn,-2,-2); + InflateRect(&rcBtn, -2, -2); rc->right = rcBtn.left; - DrawFrameControl(hdc, &rcBtn, DFC_SCROLL, iEditItem == i ? DFCS_SCROLLDOWN|DFCS_PUSHED : DFCS_SCROLLDOWN); + DrawFrameControl(hdc, &rcBtn, DFC_SCROLL, iEditItem == i ? DFCS_SCROLLDOWN | DFCS_PUSHED : DFCS_SCROLLDOWN); } - DrawTextUtf(hdc, text, rc, DT_END_ELLIPSIS|DT_LEFT|DT_NOCLIP|DT_NOPREFIX|DT_SINGLELINE|DT_VCENTER, NULL); + DrawTextUtf(hdc, text, rc, DT_END_ELLIPSIS | DT_LEFT | DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER, NULL); } - static int ChangeInfoDlg_Resize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc) { switch (urc->wId) { @@ -151,10 +149,10 @@ static int ChangeInfoDlg_Resize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL * return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT; case IDC_SAVE: - return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM; + return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM; case IDC_UPLOADING: - return RD_ANCHORX_WIDTH | RD_ANCHORY_BOTTOM; + return RD_ANCHORX_WIDTH | RD_ANCHORY_BOTTOM; } return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; // default @@ -165,7 +163,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM { ChangeInfoData* dat = (ChangeInfoData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); - switch(msg) { + switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); @@ -179,35 +177,31 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ListView_SetExtendedListViewStyle(dat->hwndList, LVS_EX_FULLROWSELECT); dat->iEditItem = -1; { - HFONT hFont; - LOGFONT lf; - dat->hListFont = (HFONT)SendMessage(dat->hwndList, WM_GETFONT, 0, 0); + + LOGFONT lf; GetObject(dat->hListFont, sizeof(lf), &lf); lf.lfHeight -= 5; - hFont = CreateFontIndirect(&lf); + HFONT hFont = CreateFontIndirect(&lf); SendMessage(dat->hwndList, WM_SETFONT, (WPARAM)hFont, 0); - } - { // Prepare ListView Columns - LV_COLUMN lvc = {0}; - RECT rc; + // Prepare ListView Columns + RECT rc; GetClientRect(dat->hwndList, &rc); rc.right -= GetSystemMetrics(SM_CXVSCROLL); + + LV_COLUMN lvc = { 0 }; lvc.mask = LVCF_WIDTH; lvc.cx = rc.right / 3; ListView_InsertColumn(dat->hwndList, 0, &lvc); lvc.cx = rc.right - lvc.cx; ListView_InsertColumn(dat->hwndList, 1, &lvc); - } - { // Prepare Setting Items - LV_ITEM lvi = {0}; - lvi.mask = LVIF_PARAM | LVIF_TEXT; - for (lvi.iItem = 0; lvi.iItem < settingCount; lvi.iItem++) - { + // Prepare Setting Items + LV_ITEM lvi = { 0 }; + lvi.mask = LVIF_PARAM | LVIF_TEXT; + for (lvi.iItem = 0; lvi.iItem < settingCount; lvi.iItem++) { TCHAR text[MAX_PATH]; - lvi.lParam = lvi.iItem; lvi.pszText = text; utf8_to_tchar_static(setting[lvi.iItem].szDescription, text, SIZEOF(text)); @@ -227,7 +221,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM dat->LoadSettingsFromDb(0); { char *pwd = dat->ppro->GetUserPassword(TRUE); - strcpy(dat->Password, (pwd) ? pwd : "" ); /// FIXME + strcpy(dat->Password, (pwd) ? pwd : ""); /// FIXME } break; @@ -241,25 +235,20 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break; case PSN_APPLY: - if (dat->ChangesMade()) - { - if (MessageBox(hwndDlg, TranslateT("You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?"), TranslateT("Change ICQ Details"), MB_YESNOCANCEL) != IDYES) - { + if (dat->ChangesMade()) { + if (MessageBox(hwndDlg, TranslateT("You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?"), TranslateT("Change ICQ Details"), MB_YESNOCANCEL) != IDYES) { SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); return TRUE; } } - break; } break; case IDC_LIST: switch (((LPNMHDR)lParam)->code) { case LVN_GETDISPINFO: - if (dat->iEditItem != -1) - { - if (dat->editTopIndex != ListView_GetTopIndex(dat->hwndList)) - { + if (dat->iEditItem != -1) { + if (dat->editTopIndex != ListView_GetTopIndex(dat->hwndList)) { dat->EndStringEdit(1); dat->EndListEdit(1); } @@ -268,56 +257,48 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case NM_CUSTOMDRAW: { - LPNMLVCUSTOMDRAW cd=(LPNMLVCUSTOMDRAW)lParam; + LPNMLVCUSTOMDRAW cd = (LPNMLVCUSTOMDRAW)lParam; - switch(cd->nmcd.dwDrawStage) { + switch (cd->nmcd.dwDrawStage) { case CDDS_PREPAINT: SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW); return TRUE; case CDDS_ITEMPREPAINT: + if (dat->iEditItem != -1) { + if (dat->editTopIndex != ListView_GetTopIndex(dat->hwndList)) { + dat->EndStringEdit(1); + dat->EndListEdit(1); + } + } { RECT rcItem; - - if (dat->iEditItem != -1) - { - if (dat->editTopIndex != ListView_GetTopIndex(dat->hwndList)) - { - dat->EndStringEdit(1); - dat->EndListEdit(1); - } - } - ListView_GetItemRect(dat->hwndList, cd->nmcd.dwItemSpec, &rcItem, LVIR_BOUNDS); - if (GetWindowLongPtr(dat->hwndList, GWL_STYLE) & WS_DISABLED) - { // Disabled List + if (GetWindowLongPtr(dat->hwndList, GWL_STYLE) & WS_DISABLED) { // Disabled List SetTextColor(cd->nmcd.hdc, cd->clrText); FillRect(cd->nmcd.hdc, &rcItem, GetSysColorBrush(COLOR_3DFACE)); } else if ((cd->nmcd.uItemState & CDIS_SELECTED || dat->iEditItem == (int)cd->nmcd.dwItemSpec) - && setting[cd->nmcd.lItemlParam].displayType != LI_DIVIDER) - { // Selected item + && setting[cd->nmcd.lItemlParam].displayType != LI_DIVIDER) { // Selected item SetTextColor(cd->nmcd.hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); FillRect(cd->nmcd.hdc, &rcItem, GetSysColorBrush(COLOR_HIGHLIGHT)); } - else - { // Unselected item + else { // Unselected item SetTextColor(cd->nmcd.hdc, GetSysColor(COLOR_WINDOWTEXT)); FillRect(cd->nmcd.hdc, &rcItem, GetSysColorBrush(COLOR_WINDOW)); } HFONT hoFont = (HFONT)SelectObject(cd->nmcd.hdc, dat->hListFont); - if (setting[cd->nmcd.lItemlParam].displayType == LI_DIVIDER) - { + if (setting[cd->nmcd.lItemlParam].displayType == LI_DIVIDER) { RECT rcLine; SIZE textSize; char str[MAX_PATH]; char *szText = ICQTranslateUtfStatic(setting[cd->nmcd.lItemlParam].szDescription, str, MAX_PATH); SetTextColor(cd->nmcd.hdc, GetSysColor(COLOR_3DSHADOW)); - DrawTextUtf(cd->nmcd.hdc, szText, &rcItem, DT_CENTER|DT_NOCLIP|DT_NOPREFIX|DT_SINGLELINE|DT_VCENTER, &textSize); + DrawTextUtf(cd->nmcd.hdc, szText, &rcItem, DT_CENTER | DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER, &textSize); rcLine.top = (rcItem.top + rcItem.bottom) / 2 - 1; rcLine.bottom = rcLine.top + 2; rcLine.left = rcItem.left + 3; @@ -327,8 +308,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM rcLine.right = rcItem.right - 3; DrawEdge(cd->nmcd.hdc, &rcLine, BDR_SUNKENOUTER, BF_RECT); } - else - { + else { RECT rcItemDescr, rcItemValue; char str[MAX_PATH]; @@ -337,7 +317,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM rcItemDescr.right = rcItemValue.left; rcItemDescr.left += 2; - DrawTextUtf(cd->nmcd.hdc, ICQTranslateUtfStatic(setting[cd->nmcd.lItemlParam].szDescription, str, MAX_PATH), &rcItemDescr, DT_END_ELLIPSIS|DT_LEFT|DT_NOCLIP|DT_NOPREFIX|DT_SINGLELINE|DT_VCENTER, NULL); + DrawTextUtf(cd->nmcd.hdc, ICQTranslateUtfStatic(setting[cd->nmcd.lItemlParam].szDescription, str, MAX_PATH), &rcItemDescr, DT_END_ELLIPSIS | DT_LEFT | DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER, NULL); dat->PaintItemSetting(cd->nmcd.hdc, &rcItemValue, cd->nmcd.lItemlParam, cd->nmcd.uItemState); } @@ -348,18 +328,19 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return TRUE; } } - break; } + break; + case NM_CLICK: - { - LPNMLISTVIEW nm=(LPNMLISTVIEW)lParam; + { + LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; LV_ITEM lvi; RECT rc; dat->EndStringEdit(1); dat->EndListEdit(1); if (nm->iSubItem != 1) break; - lvi.mask = LVIF_PARAM|LVIF_STATE; + lvi.mask = LVIF_PARAM | LVIF_STATE; lvi.stateMask = 0xFFFFFFFF; lvi.iItem = nm->iItem; lvi.iSubItem = nm->iSubItem; ListView_GetItem(dat->hwndList, &lvi); @@ -371,61 +352,65 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case LI_STRING: case LI_LONGSTRING: case LI_NUMBER: - dat->BeginStringEdit(nm->iItem, &rc, lvi. lParam, 0); + dat->BeginStringEdit(nm->iItem, &rc, lvi.lParam, 0); break; case LI_LIST: - dat->BeginListEdit(nm->iItem, &rc, lvi. lParam, 0); + dat->BeginListEdit(nm->iItem, &rc, lvi.lParam, 0); break; } - break; } + break; + case LVN_KEYDOWN: - { - LPNMLVKEYDOWN nm=(LPNMLVKEYDOWN)lParam; + { + LPNMLVKEYDOWN nm = (LPNMLVKEYDOWN)lParam; LV_ITEM lvi; RECT rc; dat->EndStringEdit(1); dat->EndListEdit(1); - if(nm->wVKey==VK_SPACE || nm->wVKey==VK_RETURN || nm->wVKey==VK_F2) nm->wVKey=0; - if(nm->wVKey && (nm->wVKey<'0' || (nm->wVKey>'9' && nm->wVKey<'A') || (nm->wVKey>'Z' && nm->wVKeywVKey>=VK_F1)) + if (nm->wVKey == VK_SPACE || nm->wVKey == VK_RETURN || nm->wVKey == VK_F2) nm->wVKey = 0; + if (nm->wVKey && (nm->wVKey<'0' || (nm->wVKey>'9' && nm->wVKey<'A') || (nm->wVKey>'Z' && nm->wVKey < VK_NUMPAD0) || nm->wVKey >= VK_F1)) break; - lvi.mask=LVIF_PARAM|LVIF_STATE; - lvi.stateMask=0xFFFFFFFF; - lvi.iItem = ListView_GetNextItem(dat->hwndList, -1, LVNI_ALL|LVNI_SELECTED); - if (lvi.iItem==-1) break; - lvi.iSubItem=1; - ListView_GetItem(dat->hwndList,&lvi); - ListView_EnsureVisible(dat->hwndList,lvi.iItem,FALSE); - ListView_GetSubItemRect(dat->hwndList,lvi.iItem,lvi.iSubItem,LVIR_BOUNDS,&rc); + lvi.mask = LVIF_PARAM | LVIF_STATE; + lvi.stateMask = 0xFFFFFFFF; + lvi.iItem = ListView_GetNextItem(dat->hwndList, -1, LVNI_ALL | LVNI_SELECTED); + if (lvi.iItem == -1) break; + lvi.iSubItem = 1; + ListView_GetItem(dat->hwndList, &lvi); + ListView_EnsureVisible(dat->hwndList, lvi.iItem, FALSE); + ListView_GetSubItemRect(dat->hwndList, lvi.iItem, lvi.iSubItem, LVIR_BOUNDS, &rc); dat->editTopIndex = ListView_GetTopIndex(dat->hwndList); - switch(setting[lvi.lParam].displayType & LIM_TYPE) { + switch (setting[lvi.lParam].displayType & LIM_TYPE) { case LI_STRING: case LI_LONGSTRING: case LI_NUMBER: - dat->BeginStringEdit(lvi.iItem,&rc,lvi.lParam,nm->wVKey); + dat->BeginStringEdit(lvi.iItem, &rc, lvi.lParam, nm->wVKey); break; case LI_LIST: - dat->BeginListEdit(lvi.iItem,&rc,lvi.lParam,nm->wVKey); + dat->BeginListEdit(lvi.iItem, &rc, lvi.lParam, nm->wVKey); break; } SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); - return TRUE; } + return TRUE; + case NM_KILLFOCUS: - if (!IsStringEditWindow(GetFocus())) dat->EndStringEdit(1); - if (!IsListEditWindow(GetFocus())) dat->EndListEdit(1); - break; + if (!IsStringEditWindow(GetFocus())) + dat->EndStringEdit(1); + if (!IsListEditWindow(GetFocus())) + dat->EndListEdit(1); } - break; } break; + case WM_KILLFOCUS: dat->EndStringEdit(1); dat->EndListEdit(1); break; + case WM_COMMAND: - switch(LOWORD(wParam)) { + switch (LOWORD(wParam)) { case IDCANCEL: SendMessage(GetParent(hwndDlg), msg, wParam, lParam); break; @@ -441,21 +426,19 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ShowDlgItem(hwndDlg, IDC_UPLOADING, SW_SHOW); dat->hAckHook = HookEventMessage(ME_PROTO_ACK, hwndDlg, DM_PROTOACK); - if (!dat->UploadSettings()) - { + if (!dat->UploadSettings()) { EnableDlgItem(hwndDlg, IDC_SAVE, TRUE); EnableDlgItem(hwndDlg, IDC_LIST, TRUE); ShowDlgItem(hwndDlg, IDC_UPLOADING, SW_HIDE); - UnhookEvent(dat->hAckHook); + UnhookEvent(dat->hAckHook); dat->hAckHook = NULL; } - break; } break; case WM_SIZE: { // make the dlg resizeable - UTILRESIZEDIALOG urd = {0}; + UTILRESIZEDIALOG urd = { 0 }; if (IsIconic(hwndDlg)) break; urd.cbSize = sizeof(urd); @@ -464,7 +447,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM urd.lParam = 0; // user-defined urd.lpTemplate = MAKEINTRESOURCEA(IDD_INFO_CHANGEINFO); urd.pfnResizer = ChangeInfoDlg_Resize; - CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM) &urd); + CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd); { // update listview column widths RECT rc; @@ -474,18 +457,17 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ListView_SetColumnWidth(dat->hwndList, 0, rc.right / 3); ListView_SetColumnWidth(dat->hwndList, 1, rc.right - rc.right / 3); } - break; } + break; case DM_PROTOACK: { - ACKDATA *ack=(ACKDATA*)lParam; - int i,done; + ACKDATA *ack = (ACKDATA*)lParam; + int i, done; if (ack->type != ACKTYPE_SETINFO) break; - if (ack->result == ACKRESULT_SUCCESS) - { - for (i=0; i < SIZEOF(dat->hUpload); i++) + if (ack->result == ACKRESULT_SUCCESS) { + for (i = 0; i < SIZEOF(dat->hUpload); i++) if (dat->hUpload[i] && ack->hProcess == dat->hUpload[i]) break; if (i == SIZEOF(dat->hUpload)) break; @@ -493,21 +475,20 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM for (done = 0, i = 0; i < SIZEOF(dat->hUpload); i++) done += dat->hUpload[i] == NULL; TCHAR buf[MAX_PATH]; - mir_sntprintf(buf, sizeof(buf), TranslateT("Upload in progress...%d%%"), 100*done/(SIZEOF(dat->hUpload))); + mir_sntprintf(buf, sizeof(buf), TranslateT("Upload in progress...%d%%"), 100 * done / (SIZEOF(dat->hUpload))); SetDlgItemText(hwndDlg, IDC_UPLOADING, buf); if (done < SIZEOF(dat->hUpload)) break; dat->ClearChangeFlags(); - UnhookEvent(dat->hAckHook); + UnhookEvent(dat->hAckHook); dat->hAckHook = NULL; EnableDlgItem(hwndDlg, IDC_LIST, TRUE); EnableDlgItem(hwndDlg, IDC_UPLOADING, FALSE); SetDlgItemText(hwndDlg, IDC_UPLOADING, TranslateT("Upload complete")); SendMessage(GetParent(hwndDlg), PSM_FORCECHANGED, 0, 0); } - else if (ack->result==ACKRESULT_FAILED) - { - UnhookEvent(dat->hAckHook); + else if (ack->result == ACKRESULT_FAILED) { + UnhookEvent(dat->hAckHook); dat->hAckHook = NULL; EnableDlgItem(hwndDlg, IDC_LIST, TRUE); EnableDlgItem(hwndDlg, IDC_UPLOADING, FALSE); @@ -515,18 +496,17 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SendMessage(GetParent(hwndDlg), PSM_FORCECHANGED, 0, 0); EnableDlgItem(hwndDlg, IDC_SAVE, TRUE); } - break; } + break; + case WM_DESTROY: - if (dat->hAckHook) - { + if (dat->hAckHook) { UnhookEvent(dat->hAckHook); dat->hAckHook = NULL; } - { - HFONT hFont = (HFONT)SendMessage(dat->hwndList, WM_GETFONT, 0, 0); - DeleteObject(hFont); - } + + DeleteObject((HFONT)SendMessage(dat->hwndList, WM_GETFONT, 0, 0)); + dat->FreeStoredDbSettings(); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0); delete dat; -- cgit v1.2.3