diff options
| author | wishmaster51@gmail.com <wishmaster51@gmail.com@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2012-03-23 11:35:09 +0000 |
|---|---|---|
| committer | wishmaster51@gmail.com <wishmaster51@gmail.com@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2012-03-23 11:35:09 +0000 |
| commit | f61db0e321fc405b459dafe87fe55e731559dc4a (patch) | |
| tree | 03cff479a82f46c6dbb9ad865189d72bdf3db667 | |
| parent | b81e14343d215b93c7b6fde1f30dff77bdd9b2b5 (diff) | |
Some fixes reported by borkra (thanks!)
git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@241 c086bb3d-8645-0410-b8da-73a8550f86e7
| -rw-r--r-- | Plugins/avatarhistory/AvatarHistory.cpp | 6 | ||||
| -rw-r--r-- | Plugins/avatarhistory/popup.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Plugins/avatarhistory/AvatarHistory.cpp b/Plugins/avatarhistory/AvatarHistory.cpp index ddddd63..d8c4a8d 100644 --- a/Plugins/avatarhistory/AvatarHistory.cpp +++ b/Plugins/avatarhistory/AvatarHistory.cpp @@ -971,9 +971,9 @@ void * GetHistoryEventText(HANDLE hContact, HANDLE hDbEvent, DBEVENTINFO *dbe, i if (dbe->pBlob[i] != 0)
{
- char absFile[MAX_PATH] = "";
- CallService(MS_UTILS_PATHTOABSOLUTE,(WPARAM)(char *) & dbe->pBlob[i], (LPARAM)absFile);
- HBITMAP hBmp = (HBITMAP) CallService(MS_IMG_LOAD, (WPARAM) absFile, 0);
+ TCHAR absFile[MAX_PATH] = _T("");
+ CallService(MS_UTILS_PATHTOABSOLUTET,(WPARAM) &dbe->pBlob[i], (LPARAM)absFile);
+ HBITMAP hBmp = (HBITMAP) CallService(MS_IMG_LOAD, (WPARAM) absFile, IMGL_TCHAR);
if (hBmp != NULL)
{
diff --git a/Plugins/avatarhistory/popup.cpp b/Plugins/avatarhistory/popup.cpp index 116833f..f67d07f 100644 --- a/Plugins/avatarhistory/popup.cpp +++ b/Plugins/avatarhistory/popup.cpp @@ -47,7 +47,7 @@ void InitPopups() hPopupWindow = CreateWindowEx(WS_EX_TOOLWINDOW, _T("static"), _T(MODULE_NAME) _T("_PopupWindow"),
0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP,
NULL, hInst, NULL);
- SetWindowLong(hPopupWindow, GWLP_WNDPROC, (LONG)PopupWndProc);
+ SetWindowLong(hPopupWindow, GWLP_WNDPROC, (LONG_PTR)PopupWndProc);
}
|