diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-04 18:05:38 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-04 18:05:38 +0300 |
| commit | c4c1ce437199d554133859c635c3b986f1b353a9 (patch) | |
| tree | 3a42f02723d5cb8d578bd7a21e1fc672cb700fdb /src/mir_app | |
| parent | 98786d882525db4b506eddb011901c60d51857ac (diff) | |
fixes #3333 (Tox: search in Find/Add contacts tries to search any random input)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/findadd.cpp | 5 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_interface.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/proto_internal.cpp | 4 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/mir_app/src/findadd.cpp b/src/mir_app/src/findadd.cpp index bd7613b444..4830a35cd3 100644 --- a/src/mir_app/src/findadd.cpp +++ b/src/mir_app/src/findadd.cpp @@ -825,7 +825,10 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP StopThrobber(hwndDlg, dat);
}
ListView_SortItemsEx(hwndList, SearchResultsCompareFunc, (LPARAM)hwndDlg);
- SetStatusBarSearchInfo(GetDlgItem(hwndDlg, IDC_STATUSBAR), dat);
+ if (ack->lParam)
+ SendMessage(GetDlgItem(hwndDlg, IDC_STATUSBAR), SB_SETTEXT, 0, ack->lParam);
+ else
+ SetStatusBarSearchInfo(GetDlgItem(hwndDlg, IDC_STATUSBAR), dat);
}
else if (ack->result == ACKRESULT_SEARCHRESULT && ack->lParam) {
CUSTOMSEARCHRESULTS *csr = (CUSTOMSEARCHRESULTS*)ack->lParam;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index e9f04abf2f..fa21d3f9bb 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -57,7 +57,7 @@ Button_SetSkin_IcoLib @24 ?RecvContacts@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @58 NONAME
?RecvFile@PROTO_INTERFACE@@UAEHIPAUPROTORECVFILE@@@Z @59 NONAME
?RecvMsg@PROTO_INTERFACE@@UAEIIPAUPROTORECVEVENT@@@Z @60 NONAME
-?SearchAdvanced@PROTO_INTERFACE@@UAEPAUHWND__@@PAU2@@Z @62 NONAME
+?SearchAdvanced@PROTO_INTERFACE@@UAEPAXPAUHWND__@@@Z @62 NONAME
?SearchBasic@PROTO_INTERFACE@@UAEPAXPB_W@Z @63 NONAME
?SearchByEmail@PROTO_INTERFACE@@UAEPAXPB_W@Z @64 NONAME
?SearchByName@PROTO_INTERFACE@@UAEPAXPB_W00@Z @65 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index ba56983a07..4aeacf9c19 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -57,7 +57,7 @@ Button_SetSkin_IcoLib @24 ?RecvContacts@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @58 NONAME
?RecvFile@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVFILE@@@Z @59 NONAME
?RecvMsg@PROTO_INTERFACE@@UEAAIIPEAUPROTORECVEVENT@@@Z @60 NONAME
-?SearchAdvanced@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @62 NONAME
+?SearchAdvanced@PROTO_INTERFACE@@UEAAPEAXPEAUHWND__@@@Z @62 NONAME
?SearchBasic@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @63 NONAME
?SearchByEmail@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @64 NONAME
?SearchByName@PROTO_INTERFACE@@UEAAPEAXPEB_W00@Z @65 NONAME
diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp index 16718039f7..d1f8317c2d 100644 --- a/src/mir_app/src/proto_interface.cpp +++ b/src/mir_app/src/proto_interface.cpp @@ -177,12 +177,12 @@ HANDLE PROTO_INTERFACE::SearchByName(const wchar_t*, const wchar_t*, const wchar return nullptr; // error
}
-HWND PROTO_INTERFACE::SearchAdvanced(HWND)
+HANDLE PROTO_INTERFACE::SearchAdvanced(MWindow)
{
return nullptr; // error
}
-HWND PROTO_INTERFACE::CreateExtendedSearchUI(HWND)
+MWindow PROTO_INTERFACE::CreateExtendedSearchUI(MWindow)
{
return nullptr; // error
}
diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp index 0b40f9cee1..802f2230bc 100644 --- a/src/mir_app/src/proto_internal.cpp +++ b/src/mir_app/src/proto_internal.cpp @@ -176,9 +176,9 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE }
- HWND SearchAdvanced(HWND owner) override
+ HANDLE SearchAdvanced(HWND owner) override
{
- return (HWND)ProtoCallService(m_szModuleName, PS_SEARCHBYADVANCED, 0, (LPARAM)owner);
+ return (HANDLE)ProtoCallService(m_szModuleName, PS_SEARCHBYADVANCED, 0, (LPARAM)owner);
}
HWND CreateExtendedSearchUI(HWND owner) override
|