From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WebView/src/webview_alerts.cpp | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'plugins/WebView/src/webview_alerts.cpp') diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp index 5a3bca1cb4..946856a3ab 100644 --- a/plugins/WebView/src/webview_alerts.cpp +++ b/plugins/WebView/src/webview_alerts.cpp @@ -29,7 +29,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { case WM_COMMAND: case WM_CONTEXTMENU: - HCONTACT hContact = PUGetContact(hWnd); + MCONTACT hContact = PUGetContact(hWnd); ptrT url( db_get_tsa(hContact, MODULENAME, URL_KEY)); if (message == WM_COMMAND) { // left click @@ -44,7 +44,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if ( db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) { CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url); PUDeletePopup(hWnd); - db_set_w((HCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); + db_set_w((MCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); } // dismiss if ( db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1)) @@ -65,7 +65,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if ( db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) { CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url); PUDeletePopup(hWnd); - db_set_w((HCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); + db_set_w((MCONTACT)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); } // dismiss if ( db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0)) @@ -81,28 +81,28 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -int WDisplayDataAlert(HCONTACT hContact) +int WDisplayDataAlert(MCONTACT hContact) { NotifyEventHooks(hHookDisplayDataAlert, (WPARAM)hContact, 0); return 0; } /*****************************************************************************/ -int WAlertPopup(HCONTACT hContact, TCHAR *displaytext) +int WAlertPopup(MCONTACT hContact, TCHAR *displaytext) { NotifyEventHooks(hHookAlertPopup, (WPARAM)hContact, (LPARAM)displaytext); return 0; } /*****************************************************************************/ -int WErrorPopup(HCONTACT hContact, TCHAR *textdisplay) +int WErrorPopup(MCONTACT hContact, TCHAR *textdisplay) { NotifyEventHooks(hHookErrorPopup, (WPARAM)hContact, (LPARAM) textdisplay); return 0; } /*****************************************************************************/ -int WAlertOSD(HCONTACT hContact, TCHAR *displaytext) +int WAlertOSD(MCONTACT hContact, TCHAR *displaytext) { NotifyEventHooks(hHookAlertOSD, (WPARAM)hContact, (LPARAM) displaytext); return 0; @@ -115,13 +115,13 @@ int WPopupAlert(WPARAM wParam, LPARAM lParam) if( ((HANDLE)wParam) != NULL) { DBVARIANT dbv; - db_get_ts((HCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv); + db_get_ts((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv); lstrcpyn(ppd.lptzContactName, dbv.ptszVal, SIZEOF(ppd.lptzContactName)); db_free(&dbv); } else lstrcpy(ppd.lptzContactName, _A2T(MODULENAME)); - ppd.lchContact = (HCONTACT)wParam; + ppd.lchContact = (MCONTACT)wParam; ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)); TCHAR *displaytext = (TCHAR*)lParam; @@ -158,7 +158,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam) POPUPDATA ppd = { 0 }; if (((HANDLE)wParam) != NULL) { DBVARIANT dbv; - if ( !db_get_s((HCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) { + if ( !db_get_s((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) { lstrcpynA(ppd.lptzContactName, dbv.pszVal, SIZEOF(ppd.lptzContactName)); db_free(&dbv); } @@ -166,7 +166,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam) if (ppd.lptzContactName[0] == 0) strncpy_s(ppd.lptzContactName, SIZEOF(ppd.lptzContactName), MODULENAME, _TRUNCATE); - ppd.lchContact = (HCONTACT)wParam; + ppd.lchContact = (MCONTACT)wParam; ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)); char *displaytext = (char*)lParam; @@ -205,7 +205,7 @@ int OSDAlert(WPARAM wParam, LPARAM lParam) if (((HANDLE)wParam) != NULL) { DBVARIANT dbv; - if ( !db_get_s((HCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) { + if ( !db_get_s((MCONTACT)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv)) { strncpy_s(contactname, SIZEOF(contactname), dbv.pszVal, _TRUNCATE); db_free(&dbv); } @@ -225,7 +225,7 @@ int OSDAlert(WPARAM wParam, LPARAM lParam) /*****************************************************************************/ int ErrorMsgs(WPARAM wParam, LPARAM lParam) { - HCONTACT hContact = (HCONTACT)wParam; + MCONTACT hContact = (MCONTACT)wParam; TCHAR newdisplaytext[2000], *displaytext = (TCHAR*)lParam; if ( db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0)) @@ -254,7 +254,7 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -void SaveToFile(HCONTACT hContact, char *truncated) +void SaveToFile(MCONTACT hContact, char *truncated) { char *mode; if (!db_get_b(hContact, MODULENAME, APPEND_KEY, 0)) @@ -299,7 +299,7 @@ void SaveToFile(HCONTACT hContact, char *truncated) } /*****************************************************************************/ -int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactname, int notpresent) +int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactname, int notpresent) { char alertstring[255]; TCHAR displaystring[300]; @@ -479,7 +479,7 @@ int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactn // file exists? if ( _taccess(newcachepath, 0) != -1) { if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL) - WErrorPopup((HCONTACT)contactname, TranslateT("Cannot read from file")); + WErrorPopup((MCONTACT)contactname, TranslateT("Cannot read from file")); else { ZeroMemory(&cachecompare, sizeof(cachecompare)); fread(cachecompare, sizeof(cachecompare), 1, pcachefile); @@ -488,7 +488,7 @@ int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactn } // write to cache if ((pcachefile = _tfopen(newcachepath, _T("w"))) == NULL) - WErrorPopup((HCONTACT)contactname, TranslateT("Cannot write to file 1")); + WErrorPopup((MCONTACT)contactname, TranslateT("Cannot write to file 1")); else { fwrite(tempraw, strlen(tempraw), 1, pcachefile); //smaller cache fclose(pcachefile); @@ -691,7 +691,7 @@ int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactn // file exists? if ( _taccess(newcachepath, 0) != -1) { if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL) - WErrorPopup((HCONTACT)contactname, TranslateT("Cannot read from file")); + WErrorPopup((MCONTACT)contactname, TranslateT("Cannot read from file")); else { ZeroMemory(&cachecompare, sizeof(cachecompare)); fread(cachecompare, sizeof(cachecompare), 1, pcachefile); @@ -700,7 +700,7 @@ int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactn } // write to cache if ((pcachefile = _tfopen(newcachepath, _T("w"))) == NULL) - WErrorPopup((HCONTACT)contactname, TranslateT("Cannot write to file 2")); + WErrorPopup((MCONTACT)contactname, TranslateT("Cannot write to file 2")); else { fwrite(raw, strlen(raw), 1, pcachefile); //smaller cache db_set_ts(hContact, MODULENAME, CACHE_FILE_KEY, newcachepath); @@ -814,7 +814,7 @@ int ProcessAlerts(HCONTACT hContact, char *truncated, char *tstr, char *contactn /*****************************************************************************/ int DataWndAlertCommand(WPARAM wParam, LPARAM lParam) { - HCONTACT hContact = (HCONTACT)wParam; + MCONTACT hContact = (MCONTACT)wParam; if ( WindowList_Find(hWindowList, hContact)) return 0; @@ -838,7 +838,7 @@ int DataWndAlertCommand(WPARAM wParam, LPARAM lParam) /*****************************************************************************/ void ReadFromFile(void *param) { - HCONTACT hContact = (HCONTACT)param; + MCONTACT hContact = (MCONTACT)param; DBVARIANT dbv; char truncated[MAXSIZE1]; -- cgit v1.2.3