Miranda API sync with small compilation fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@8083 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 34 insertions, 43 deletions

diff --git a/plugins/ExternalAPI/delphi/m_smileyadd.inc b/plugins/ExternalAPI/delphi/m_smileyadd.inc
index ecb3ebb7d1..4562f575f1 100644
--- a/plugins/ExternalAPI/delphi/m_smileyadd.inc
+++ b/plugins/ExternalAPI/delphi/m_smileyadd.inc
@@ -33,15 +33,15 @@ type
     cbSize             :uint;       // size of the structure

     hwndRichEditControl:HWND;       // handle to the rich edit control

     rangeToReplace     :PCHARRANGE; // same meaning as for normal Richedit use (NULL = replaceall)

-    Protocolname       :PAnsiChar;      // protocol to use... if you have defined a

+    Protocolname       :PAnsiChar;  // protocol to use... if you have defined a

        // protocol, u can use your own protocol name. SmileyAdd will

        // automatically select the smileypack that is defined for your protocol.

        // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

        // if you prefer those icons.

        // If not found or NULL, "Standard" will be used

-    flags              :uint;    // Flags (SAFLRE_*) that define the behaivior

-    disableRedraw      :BOOL;    // Parameter have been depricated, have no effect on operation

-    hContact           :THANDLE; // Contact handle

+    flags              :uint;       // Flags (SAFLRE_*) that define the behaivior

+    disableRedraw      :BOOL;       // Parameter have been depricated, have no effect on operation

+    hContact           :HCONTACT;   // Contact handle

   end;

 

 {

@@ -63,17 +63,15 @@ type
       // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

       // if you prefer those icons.

       // If not found or NULL: "Standard" will be used

-    xPosition    : int;     // Postition to place the selectwindow

+    xPosition    : int;       // Postition to place the selectwindow

     yPosition    : int;

-    Direction    : int;     // Direction (i.e. size upwards/downwards/etc) of

-                            // the window 0, 1, 2, 3

-    hwndTarget   : HWND;    // Window, where to send the message when smiley

-                            // is selected.

-    targetMessage: uint;    // Target message, to be sent.

-    targetWParam : LPARAM;  // Target WParam to be sent (LParam will be PAnsiChar to

-                            // select smiley) see the example file.

-    hwndParent   : HWND;    // Parent window for smiley dialog

-    hContact     : THANDLE; // Contact handle

+    Direction    : int;       // Direction (i.e. size upwards/downwards/etc) of the window 0, 1, 2, 3

+    hwndTarget   : HWND;      // Window, where to send the message when smiley is selected.

+    targetMessage: uint;      // Target message, to be sent.

+    targetWParam : LPARAM;    // Target WParam to be sent (LParam will be PAnsiChar to

+                              // select smiley) see the example file.

+    hwndParent   : HWND;      // Parent window for smiley dialog

+    hContact     : HCONTACT;  // Contact handle

   end;

 

 {

@@ -93,14 +91,14 @@ const
 type

   PSMADD_INFO2 = ^TSMADD_INFO2;

   TSMADD_INFO2 = record

-    cbSize                : int;     // size of the structure

+    cbSize                : int;       // size of the structure

     Protocolname          : PAnsiChar;

-    ButtonIcon            : HICON;   // RETURN VALUE: this is filled with the

+    ButtonIcon            : HICON;     // RETURN VALUE: this is filled with the

      // icon handle of the smiley that can be used on the button

      // do not destroy! NULL if the buttonicon is not defined...

-    NumberOfVisibleSmileys: int;     // Number of visible smileys defined.

-    NumberOfSmileys       : int;     // Number of total smileys defined

-    hContact              : THANDLE; //Contact handle

+    NumberOfVisibleSmileys: int;       // Number of visible smileys defined.

+    NumberOfSmileys       : int;       // Number of total smileys defined

+    hContact              : HCONTACT;  //Contact handle

   end;

 

 const

@@ -120,18 +118,18 @@ type
   TSMADD_BATCHPARSE2 = record

     cbSize      :uint;      // size of the structure

     Protocolname:PAnsiChar; // protocol to use... if you have defined a protocol, u can

-                          // use your own protocol name. Smiley add wil automatically

-                          // select the smileypack that is defined for your protocol.

-                          // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

-                          // if you prefer those icons.

-                          // If not found or NULL: "Standard" will be used

-    str         :TChar;   // String to parse

-    flag        :uint;    // One of the SAFL_ flags specifies parsing requirements

-                          // This parameter should be filled by the user

-    numSmileys  :uint;    // Number of Smileys found, this parameter filled by SmileyAdd

-    oflag       :uint;    // One of the SAFL_ flags specifies content of the parse results

-                          // this parameter filled by SmileyAdd

-    hContact    :THANDLE; // Contact handle

+                            // use your own protocol name. Smiley add wil automatically

+                            // select the smileypack that is defined for your protocol.

+                            // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

+                            // if you prefer those icons.

+                            // If not found or NULL: "Standard" will be used

+    str         :TChar;     // String to parse

+    flag        :uint;      // One of the SAFL_ flags specifies parsing requirements

+                            // This parameter should be filled by the user

+    numSmileys  :uint;      // Number of Smileys found, this parameter filled by SmileyAdd

+    oflag       :uint;      // One of the SAFL_ flags specifies content of the parse results

+                            // this parameter filled by SmileyAdd

+    hContact    :HCONTACT;  // Contact handle

   end;

 

 type

@@ -239,9 +237,9 @@ const
 type

   SMADD_CONT = record

     cbSize  :uint;

-    hContact:THANDLE;

-    _type   :int;     // 0 - directory, 1 - file;

-    path    :TChar;   // smiley category name for reference

+    hContact:HCONTACT;

+    _type   :int;      // 0 - directory, 1 - file;

+    path    :TChar;    // smiley category name for reference

   end;

 const

 //Loads all smileys for the contact

diff --git a/plugins/ExternalAPI/delphi/m_tipper.inc b/plugins/ExternalAPI/delphi/m_tipper.inc
index d9fea8208d..452904113d 100644
--- a/plugins/ExternalAPI/delphi/m_tipper.inc
+++ b/plugins/ExternalAPI/delphi/m_tipper.inc
@@ -10,7 +10,7 @@
 {$IFNDEF M_TIPPER}

 {$DEFINE M_TIPPER}

 type

-  TranslateFunc = function (hContact:THANDLE;module:PAnsiChar;setting_or_prefix:PAnsiChar;

+  TranslateFunc = function (hContact:HCONTACT;module:PAnsiChar;setting_or_prefix:PAnsiChar;

        buff:pWideChar;bufflen:int):pWideChar; cdecl;

 

 type

diff --git a/plugins/ExternalAPI/delphi/m_variables.inc b/plugins/ExternalAPI/delphi/m_variables.inc
index bcc1f9889f..3d4f1ae940 100644
--- a/plugins/ExternalAPI/delphi/m_variables.inc
+++ b/plugins/ExternalAPI/delphi/m_variables.inc
@@ -56,7 +56,7 @@ type
     szExtraText:TCHAR;       // Extra, context-specific string (can be NULL) ->

                              // The field "extratext" will be replaced by this

                              // string. (Previously szSource).

-    hContact   :THANDLE;     // Handle to contact (can be NULL) -> The field "subject"

+    hContact   :HCONTACT;    // Handle to contact (can be NULL) -> The field "subject"

                              // represents this contact.

     pCount     :int;         // (output) Number of succesful parsed tokens, needs to

                              // be set to 0 before the call

@@ -67,13 +67,6 @@ type
     cbTemporaryVarsSize:int; // Number of elements in szaTemporaryVars array

   end;

 

-const

-//  FORMATINFOV2_SIZE = (SizeOf(int)*4+SizeOf(pointer)*2 + SizeOf(THANDLE));

-  {$IFNDEF WIN64}

-  FORMATINFOV2_SIZE = 28;

-  {$ELSE}

-  FORMATINFOV2_SIZE = SIZEOF(TFORMATINFO);

-  {$ENDIF}

 

 const

 // Possible flags: