summaryrefslogtreecommitdiff
path: root/plugins/Scriver/utils.cpp
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-06-23 21:06:11 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-06-23 21:06:11 +0000
commit5b3b0020dd6b3797a5808c7362e358df48bd4e49 (patch)
tree9ee3e4de8b8f04a8faf4186ae2e1f84c3ef21b17 /plugins/Scriver/utils.cpp
parent449553a9543c7ecc601f74c4abccc07d13521b15 (diff)
Scriver:
plusified git-svn-id: http://svn.miranda-ng.org/main/trunk@591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/utils.cpp')
-rw-r--r--plugins/Scriver/utils.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Scriver/utils.cpp b/plugins/Scriver/utils.cpp
index 8a87b5a5cb..c2227ec745 100644
--- a/plugins/Scriver/utils.cpp
+++ b/plugins/Scriver/utils.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef TTI_NONE
#define TTI_NONE 0
#endif
-extern HANDLE g_hInst;
static unsigned hookNum = 0;
static unsigned serviceNum = 0;
@@ -247,14 +246,14 @@ static DWORD CALLBACK RichTextStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff,
char ** ppText = (char **) dwCookie;
if (*ppText == NULL) {
- *ppText = mir_alloc(cb + 1);
+ *ppText = (char *)mir_alloc(cb + 1);
memcpy(*ppText, pbBuff, cb);
(*ppText)[cb] = 0;
*pcb = cb;
dwRead = cb;
}
else {
- char *p = mir_alloc(dwRead + cb + 1);
+ char *p = (char *)mir_alloc(dwRead + cb + 1);
memcpy(p, *ppText, dwRead);
memcpy(p+dwRead, pbBuff, cb);
p[dwRead + cb] = 0;
@@ -534,7 +533,7 @@ void SetSearchEngineIcons(HMENU hMenu, HIMAGELIST hImageList) {
}
}
-void GetContactUniqueId(struct MessageWindowData *dat, char *buf, int maxlen) {
+void GetContactUniqueId(struct SrmmWindowData *dat, char *buf, int maxlen) {
CONTACTINFO ci;
ZeroMemory(&ci, sizeof(ci));
ci.cbSize = sizeof(ci);