diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-28 15:56:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-28 15:56:57 +0300 |
| commit | 1ab93d3afabe3a5872040b5acafc9f113c196a2b (patch) | |
| tree | ec309e3cdd8c34e830022525be003278fae0330f /plugins | |
| parent | 2be5844edd93ab3490b4689cad33d75b4c77f3a8 (diff) | |
some more fixes for 64-bit version
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/MirFox/src/MirandaUtils.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirLua/src/m_message.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/CAppletManager.cpp | 2 | ||||
| -rw-r--r-- | plugins/NewAwaySysMod/src/MsgEventAdded.cpp | 8 | ||||
| -rw-r--r-- | plugins/WinterSpeak/src/SpeakAnnounce.cpp | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index a149601659..caf5456467 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -357,7 +357,7 @@ int MirandaUtils::on_hook_OpenMW(WPARAM wParam, LPARAM lParam) }
MessageWindowData mwd;
- if (!Srmm_GetWindowData((WPARAM)param->targetHandle, (LPARAM)&mwd) && mwd.hwndWindow){
+ if (!Srmm_GetWindowData((WPARAM)param->targetHandle, mwd) && mwd.hwndWindow){
HWND parent;
HWND hWnd = mwd.hwndWindow;
while((parent = GetParent(hWnd)) != 0)
diff --git a/plugins/MirLua/src/m_message.cpp b/plugins/MirLua/src/m_message.cpp index 962745ef01..13cbba952d 100644 --- a/plugins/MirLua/src/m_message.cpp +++ b/plugins/MirLua/src/m_message.cpp @@ -6,7 +6,7 @@ static int message_Paste(lua_State *L) ptrW text(mir_utf8decodeW(luaL_checkstring(L, 2)));
MessageWindowData mwd;
- INT_PTR res = Srmm_GetWindowData(hContact, (LPARAM)&mwd);
+ INT_PTR res = Srmm_GetWindowData(hContact, mwd);
lua_pushinteger(L, res);
if (res)
return 1;
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index b4f00d44ab..6aee1a4f3c 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -789,7 +789,7 @@ MEVENT CAppletManager::SendMessageToContact(MCONTACT hContact, tstring strMessag bool CAppletManager::IsMessageWindowOpen(MCONTACT hContact) { MessageWindowData mwd; - Srmm_GetWindowData(hContact, (LPARAM)&mwd); + Srmm_GetWindowData(hContact, mwd); if (mwd.uState & MSG_WINDOW_STATE_EXISTS) return true; return false; diff --git a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp index b8d0570b46..97b64d22e3 100644 --- a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp +++ b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp @@ -84,12 +84,8 @@ void __cdecl AutoreplyDelayThread(void *_ad) int IsSRMsgWindowOpen(MCONTACT hContact, int DefaultRetVal)
{
- if (ServiceExists(MS_MSG_GETWINDOWDATA)) {
- MessageWindowData mwd;
- return !Srmm_GetWindowData(hContact, (LPARAM)&mwd) && mwd.hwndWindow;
- }
-
- return DefaultRetVal;
+ MessageWindowData mwd;
+ return !Srmm_GetWindowData(hContact, mwd) && mwd.hwndWindow;
}
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.cpp b/plugins/WinterSpeak/src/SpeakAnnounce.cpp index ef9c85a2ec..92eab57c48 100644 --- a/plugins/WinterSpeak/src/SpeakAnnounce.cpp +++ b/plugins/WinterSpeak/src/SpeakAnnounce.cpp @@ -148,7 +148,7 @@ bool SpeakAnnounce::readMessage(MCONTACT contact) if (m_db.getEventFlag(AnnounceDatabase::EventFlag_DialogOpen) || m_db.getEventFlag(AnnounceDatabase::EventFlag_DialogFocused)) {
// Do not notify if window is already opened
MessageWindowData mwd;
- if (Srmm_GetWindowData(contact, (LPARAM)&mwd) == 0) {
+ if (Srmm_GetWindowData(contact, mwd) == 0) {
if (m_db.getEventFlag(AnnounceDatabase::EventFlag_DialogOpen))
return ((mwd.uState & MSG_WINDOW_STATE_EXISTS) == 0);
else if (m_db.getEventFlag(AnnounceDatabase::EventFlag_DialogFocused))
|