summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-30 11:30:50 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-30 11:30:50 +0000
commitb8110ca7ca2d793ebd94a1a8c73aa7c081d7bd0e (patch)
treead34f1c8c75a7e309c67f4c0dff5cdad8d9376fd
parentcf93c024df40252d6ac1da20bf573e24235b38cb (diff)
various crash fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@2564 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/AVS/src/acc.cpp5
-rw-r--r--plugins/MetaContacts/src/meta_services.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp
index 00e0c644c8..598ccb6ab8 100644
--- a/plugins/AVS/src/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
@@ -567,7 +567,10 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
DestroyAnimation(hwnd, data);
data->hContact = (HANDLE) lParam;
- lstrcpynA(data->proto, GetContactProto(data->hContact), sizeof(data->proto));
+ if (lParam == NULL)
+ data->proto[0] = '\0';
+ else
+ lstrcpynA(data->proto, GetContactProto(data->hContact), sizeof(data->proto));
StartAnimation(hwnd, data);
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp
index 6e8318b0af..449812a1e3 100644
--- a/plugins/MetaContacts/src/meta_services.cpp
+++ b/plugins/MetaContacts/src/meta_services.cpp
@@ -499,7 +499,7 @@ INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
HANDLE most_online = Meta_GetMostOnline(ccs->hContact);
char *proto = GetContactProto(most_online);
if (proto)
- if ( CallProtoService(proto, PSR_MESSAGE, wParam, lParam) != CALLSERVICE_NOTFOUND)
+ if ( CallProtoService(proto, PSR_MESSAGE, 0, (LPARAM)pre) != CALLSERVICE_NOTFOUND)
return 0;
}