diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2013-01-12 20:44:06 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2013-01-12 20:44:06 +0000 |
| commit | d67a4ccb6bdb9827e11bbe3da750901c86a6b852 (patch) | |
| tree | 6c8c124f6d13b25e08c3635169bc99d94e033752 /protocols/Yahoo/src/util.cpp | |
| parent | 1eb5d33e9916cd042323e8065961494c492d9416 (diff) | |
minor x64 fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@3082 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/util.cpp')
| -rw-r--r-- | protocols/Yahoo/src/util.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index aa5aa7803e..d0c54de4b4 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -196,7 +196,7 @@ DWORD CYahooProto::SetStringUtf(HANDLE hContact, const char* valueName, const ch /////////////////////////////////////////////////////////////////////////////////////////
// Popups
-static int CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
+static LRESULT CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{
switch(message) {
case WM_COMMAND:
@@ -232,11 +232,11 @@ static int CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPA int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char *szURL)
{
- if ( !ServiceExists(MS_POPUP_ADDPOPUPEX))
+ if ( !ServiceExists(MS_POPUP_ADDPOPUPT))
return 0;
POPUPDATAT ppd = { 0 };
- ppd.PluginWindowProc = (WNDPROC)PopupWindowProc;
+ ppd.PluginWindowProc = PopupWindowProc;
lstrcpyn(ppd.lptzContactName, nickname, SIZEOF(ppd.lptzContactName));
lstrcpyn(ppd.lptzText, msg, SIZEOF(ppd.lptzText));
@@ -248,7 +248,7 @@ int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char * DebugLog("[MS_POPUP_ADDPOPUPEX] Generating a popup for [%S] %S", nickname, msg);
- CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);
+ PUAddPopUpT(&ppd);
return 1;
}
@@ -262,7 +262,7 @@ int CYahooProto::ShowNotification(const TCHAR *title, const TCHAR *info, DWORD f err.tszInfo = (TCHAR*)info;
err.dwInfoFlags = flags | NIIF_INTERN_UNICODE;
err.uTimeout = 1000 * 3;
- int ret = CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM) & err);
+ INT_PTR ret = CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM) & err);
if (ret == 0)
return 1;
}
@@ -306,11 +306,6 @@ bool CYahooProto::IsMyContact(HANDLE hContact) return szProto && !strcmp(szProto, m_szModuleName);
}
-char* YAHOO_GetContactName(HANDLE hContact)
-{
- return (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0);
-}
-
extern PLUGININFOEX pluginInfo;
/*
|