diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-04 14:15:55 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-04 14:15:55 +0300 |
| commit | 8937c49faab219b51b9863847406a21945d3a9cb (patch) | |
| tree | 95390d236af9d832f3c7c50a2fc2de357a353996 /plugins/YAMN/src | |
| parent | a5d8287df3cb04ddea3888cce55ce08f4d5fe73b (diff) | |
Windows lists:
- fix for a 64-bit issue that could cause a crash;
- code cleaning
Diffstat (limited to 'plugins/YAMN/src')
| -rw-r--r-- | plugins/YAMN/src/browser/mailbrowser.cpp | 10 | ||||
| -rw-r--r-- | plugins/YAMN/src/proto/pop3/pop3opt.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index a9f2b162ca..d26db00f7b 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -857,7 +857,7 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa } case UM_INITPOPUP: //This is the equivalent to WM_INITDIALOG you'd get if you were the maker of dialog popups. - WindowList_Add(YAMNVar.MessageWnds, hWnd, NULL); + WindowList_Add(YAMNVar.MessageWnds, hWnd); break; case UM_DESTROYPOPUP: WindowList_Remove(YAMNVar.MessageWnds, hWnd); @@ -949,7 +949,7 @@ LRESULT CALLBACK NoNewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l return FALSE; case UM_INITPOPUP: //This is the equivalent to WM_INITDIALOG you'd get if you were the maker of dialog popups. - WindowList_Add(YAMNVar.MessageWnds, hWnd, NULL); + WindowList_Add(YAMNVar.MessageWnds, hWnd); break; case UM_DESTROYPOPUP: WindowList_Remove(YAMNVar.MessageWnds, hWnd); @@ -1282,8 +1282,6 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg, UINT msg, WPARAM wParam, LPAR if (nullptr != iValueW) delete[] iValueW; - //WindowList_Add(YAMNVar.MessageWnds,hDlg,NULL); - //WindowList_Add(YAMNVar.NewMailAccountWnd,hDlg,ActualAccount); SendMessage(hDlg, WM_YAMN_CHANGECONTENT, 0, (LPARAM)MailParam); MoveWindow(hDlg, HeadPosX, HeadPosY, HeadSizeX, HeadSizeY, 0); ShowWindow(hDlg, SW_SHOWNORMAL); @@ -1607,7 +1605,7 @@ void __cdecl ShowEmailThread(void *Param) else { CREADTEVIEWMESSAGEWINDOW: MyParam.mail->MsgWindow = CreateDialogParamW(YAMNVar.hInst, MAKEINTRESOURCEW(IDD_DLGSHOWMESSAGE), nullptr, DlgProcYAMNShowMessage, (LPARAM)&MyParam); - WindowList_Add(YAMNVar.MessageWnds, MyParam.mail->MsgWindow, NULL); + WindowList_Add(YAMNVar.MessageWnds, MyParam.mail->MsgWindow); MSG msg; while (GetMessage(&msg, nullptr, 0, 0)) { if (MyParam.mail->MsgWindow == nullptr || !IsDialogMessage(MyParam.mail->MsgWindow, &msg)) { /* Wine fix. */ @@ -1673,7 +1671,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR ReadDoneFcn(ActualAccount->AccountAccessSO); - WindowList_Add(YAMNVar.MessageWnds, hDlg, NULL); + WindowList_Add(YAMNVar.MessageWnds, hDlg); WindowList_Add(YAMNVar.NewMailAccountWnd, hDlg, (UINT_PTR)ActualAccount); { diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 33a679651a..07889eaee3 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -665,7 +665,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP WindowList_Remove(pYAMNVar->MessageWnds, hDlg);
SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
}
- else WindowList_Add(pYAMNVar->MessageWnds, hDlg, NULL);
+ else WindowList_Add(pYAMNVar->MessageWnds, hDlg);
return TRUE;
case WM_YAMN_CHANGESTATUS:
@@ -1177,7 +1177,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg, UINT msg, WPARAM wParam, LPARAM SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
}
else {
- WindowList_Add(pYAMNVar->MessageWnds, hDlg, NULL);
+ WindowList_Add(pYAMNVar->MessageWnds, hDlg);
int index = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
HPOP3ACCOUNT temp = ActualAccount;
|