From ff7faa65f97479df9f27d51666afc8ac2cef0a22 Mon Sep 17 00:00:00 2001
From: Alexey Kulakov <panda75@bk.ru>
Date: Tue, 7 Aug 2012 16:06:30 +0000
Subject: SmileyAdd NMHDR structure part fix History++ 64 bit smileys animation
 fixes Delphi API updates

git-svn-id: http://svn.miranda-ng.org/main/trunk@1393 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExternalAPI/m_smileyadd.h           |  6 +++---
 plugins/HistoryPlusPlus/hpp_itemprocess.pas |  2 +-
 plugins/HistoryPlusPlus/hpp_olesmileys.pas  | 30 +----------------------------
 3 files changed, 5 insertions(+), 33 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ExternalAPI/m_smileyadd.h b/plugins/ExternalAPI/m_smileyadd.h
index a4821aba31..5d0984ebee 100644
--- a/plugins/ExternalAPI/m_smileyadd.h
+++ b/plugins/ExternalAPI/m_smileyadd.h
@@ -222,9 +222,9 @@ typedef struct
 typedef struct  
 {   
     //NMHDR structure
-    HWND hwndFrom;              // Window of smiley host
-    UINT idFrom;                // ignored
-    UINT code;                  // NM_FIREVIEWCHANGE
+    HWND     hwndFrom;          // Window of smiley host
+    UINT_PTR idFrom;            // ignored
+    UINT     code;              // NM_FIREVIEWCHANGE
     
     size_t      cbSize;
     BYTE        bEvent;         // FVCN_ value - pre- or post- painting
diff --git a/plugins/HistoryPlusPlus/hpp_itemprocess.pas b/plugins/HistoryPlusPlus/hpp_itemprocess.pas
index 137fdd28b0..c873502176 100644
--- a/plugins/HistoryPlusPlus/hpp_itemprocess.pas
+++ b/plugins/HistoryPlusPlus/hpp_itemprocess.pas
@@ -459,7 +459,7 @@ begin
   sare.rangeToReplace := nil;
   sare.ProtocolName := ird^.pProto;
   //sare.flags := SAFLRE_INSERTEMF + mesSent[ird^.IsEventSent];
-  sare.flags := mesSent[ird^.IsEventSent];
+  sare.flags := mesSent[ird^.IsEventSent] or SAFLRE_FIREVIEW;
   sare.disableRedraw := True;
   sare.hContact := ird^.hContact;
   CallService(MS_SMILEYADD_REPLACESMILEYS,0,LPARAM(@sare));
diff --git a/plugins/HistoryPlusPlus/hpp_olesmileys.pas b/plugins/HistoryPlusPlus/hpp_olesmileys.pas
index 4a07d8259f..2aa278204f 100644
--- a/plugins/HistoryPlusPlus/hpp_olesmileys.pas
+++ b/plugins/HistoryPlusPlus/hpp_olesmileys.pas
@@ -94,40 +94,12 @@ type
 
 *)
 
-const
+const // additional for animated smileys (idk where introduced)
     // Type of Event one of
-    FVCN_PREFIRE  = 1;
-    FVCN_POSTFIRE = 2;
     FVCN_GETINFO  = 255;
-
     // Action of event are going to be done
-    FVCA_NONE           = 0;
-    FVCA_DRAW           = 1;   // do not modify hdc in case of _DRAW, Use _CUSTOMDRAW
-    FVCA_CUSTOMDRAW     = 2;
-    FVCA_INVALIDATE     = 3;
-    FVCA_SENDVIEWCHANGE = 4;
-    FVCA_SKIPDRAW       = 5;
     FVCA_INFO           = 255;
 
-type
-    // Extended NMHDR structure for WM_NOTIFY
-    PFVCNDATA_NMHDR= ^TFVCNDATA_NMHDR;
-    TFVCNDATA_NMHDR = record
-        nmhdr: TNMHdr;
-        cbSize: Integer;
-        bEvent: Byte;
-        bAction: Byte;
-        hDC: HDC;
-        rcRect: TRect;
-        clrBackground: COLORREF;
-        fTransparent: BOOL;
-        lParam: LPARAM;
-    end;
-
-const
-    // Code of WM_NOTIFY message (code)
-    NM_FIREVIEWCHANGE = NM_FIRST+1;
-
 implementation
 
 end.
-- 
cgit v1.2.3