massive Variables-related code cleaning (removed TCHAR, manually created unions replaced with MAllString etc)

1 files changed, 199 insertions, 237 deletions

diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h
index 0e015f7ce6..3a7605c118 100644
--- a/plugins/ExternalAPI/m_variables.h
+++ b/plugins/ExternalAPI/m_variables.h
@@ -1,39 +1,35 @@
 /*

-    Variables Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	 Variables Plugin for Miranda-IM (www.miranda-im.org)

+	 Copyright 2003-2006 P. Boon

+

+	 This program is free software; you can redistribute it and/or modify

+	 it under the terms of the GNU General Public License as published by

+	 the Free Software Foundation; either version 2 of the License, or

+	 (at your option) any later version.

+

+	 This program is distributed in the hope that it will be useful,

+	 but WITHOUT ANY WARRANTY; without even the implied warranty of

+	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+	 GNU General Public License for more details.

+

+	 You should have received a copy of the GNU General Public License

+	 along with this program; if not, write to the Free Software

+	 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

 #ifndef __M_VARS

 #define __M_VARS

 

-#if !defined(_TCHAR_DEFINED)

-	#include <tchar.h>

-#endif

-

 #if !defined(M_CORE_H__)

-	#include <m_core.h>

+#include <m_core.h>

 #endif

 

 #ifndef VARIABLES_NOHELPER

-	#include <m_button.h>

+#include <m_button.h>

 #endif

 

 #ifndef _countof

-	#include <win2k.h>

+#include <win2k.h>

 #endif

 

 // --------------------------------------------------------------------------

@@ -61,48 +57,27 @@
 

 // Note: The returned pointer needs to be freed using mir_free().

 

-typedef struct {

-  int cbSize;  // Set this to sizeof(FORMATINFO).

-  int flags;  // Flags to use (see FIF_* below).

-  union {

-    char *szFormat;  // Text in which the tokens will be replaced (can't be

-                     // NULL).

-    WCHAR *wszFormat;

-    TCHAR *tszFormat;

-  };

-  union {

-    char *szExtraText;  // Extra, context-specific string (can be NULL) ->

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

-                        // string. (Previously szSource).

-    WCHAR *wszExtraText;

-    TCHAR *tszExtraText;

-  };

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

-                    // represents this contact.

-  int pCount;  // (output) Number of succesful parsed tokens, needs to be set

-               // to 0 before the call

-  int eCount;  // (output) Number of failed tokens, needs to be set to 0

-               // before the call

-  union {

-     char **szaTemporaryVars;	// Temporary variables valid only in the duration of the format call

-     TCHAR **tszaTemporaryVars;	// By pos: [i] is var name, [i + 1] is var value

-     WCHAR **wszaTemporaryVars;

-  };

-  int cbTemporaryVarsSize;		// Number of elements in szaTemporaryVars array

-

-} FORMATINFO;

-

-#define FORMATINFOV2_SIZE (sizeof(int)*4+sizeof(void*)*2 + sizeof(HANDLE))

+struct FORMATINFO

+{

+	int cbSize;  // Set this to sizeof(FORMATINFO).

+	int flags;  // Flags to use (see FIF_* below).

+	MAllStrings szFormat;    // Text in which the tokens will be replaced (can't be NULL).

+	MAllStrings szExtraText; // Extra, context-specific string (can be NULL) ->

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

+								 // string. (Previously szSource).

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

+							// represents this contact.

+	int pCount;  // (output) Number of succesful parsed tokens, needs to be set

+					 // to 0 before the call

+	int eCount;  // (output) Number of failed tokens, needs to be set to 0

+					 // before the call

+	MAllStringArray szTemporaryVars;	// Temporary variables valid only in the duration of the format call

+	int cbTemporaryVarsSize;		// Number of elements in szaTemporaryVars array

+};

 

 // Possible flags:

 #define FIF_UNICODE 0x01  // Expects and returns unicode text (WCHAR*).

 

-#if defined(UNICODE) || defined(_UNICODE)

-#define FIF_TCHAR   FIF_UNICODE // Strings in structure are TCHAR*.

-#else

-#define FIF_TCHAR   0

-#endif

-

 // Helper functions for easy using:

 

 // Helper #1: variables_parse

@@ -110,31 +85,29 @@ typedef struct {
 // The returned string needs to be freed using mir_free.

 

 #ifndef VARIABLES_NOHELPER

-__inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact)

+__inline static wchar_t *variables_parse(wchar_t *tszFormat, wchar_t *tszExtraText, MCONTACT hContact)

 {

 	FORMATINFO fi = { sizeof(fi) };

-	fi.tszFormat = tszFormat;

-	fi.tszExtraText = tszExtraText;

+	fi.szFormat.w = tszFormat;

+	fi.szExtraText.w = tszExtraText;

 	fi.hContact = hContact;

-	fi.flags = FIF_TCHAR;

-	return (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

+	fi.flags = FIF_UNICODE;

+	return (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

 }

 #endif

 

-__inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact,

- 										  TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize) {

-

-	FORMATINFO fi = { 0 };

-

-	ZeroMemory(&fi, sizeof(fi));

+__inline static wchar_t *variables_parse_ex(wchar_t *tszFormat, wchar_t *tszExtraText, MCONTACT hContact,

+	wchar_t **tszaTemporaryVars, int cbTemporaryVarsSize)

+{

+	FORMATINFO fi = {};

 	fi.cbSize = sizeof(fi);

-	fi.tszFormat = tszFormat;

-	fi.tszExtraText = tszExtraText;

+	fi.szFormat.w = tszFormat;

+	fi.szExtraText.w = tszExtraText;

 	fi.hContact = hContact;

-	fi.flags = FIF_TCHAR;

-	fi.tszaTemporaryVars = tszaTemporaryVars;

+	fi.flags = FIF_UNICODE;

+	fi.szTemporaryVars.w = tszaTemporaryVars;

 	fi.cbTemporaryVarsSize = cbTemporaryVarsSize;

-	return (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

+	return (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

 }

 

 // Helper #2: variables_parsedup

@@ -145,33 +118,33 @@ __inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText,
 // Note: The returned pointer needs to be released using your own free().

 

 #ifndef VARIABLES_NOHELPER

-__inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact)

+__inline static wchar_t *variables_parsedup(wchar_t *tszFormat, wchar_t *tszExtraText, MCONTACT hContact)

 {

 	if (ServiceExists(MS_VARS_FORMATSTRING)) {

 		FORMATINFO fi = { sizeof(fi) };

-		fi.tszFormat = tszFormat;

-		fi.tszExtraText = tszExtraText;

+		fi.szFormat.w = tszFormat;

+		fi.szExtraText.w = tszExtraText;

 		fi.hContact = hContact;

-		fi.flags |= FIF_TCHAR;

-		TCHAR *tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

+		fi.flags |= FIF_UNICODE;

+		wchar_t *tszParsed = (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

 		if (tszParsed)

 			return tszParsed;

 	}

 	return tszFormat ? mir_wstrdup(tszFormat) : tszFormat;

 }

 

-__inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact,

-										  TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize)

+__inline static wchar_t *variables_parsedup_ex(wchar_t *tszFormat, wchar_t *tszExtraText, MCONTACT hContact,

+	wchar_t **tszaTemporaryVars, int cbTemporaryVarsSize)

 {

 	if (ServiceExists(MS_VARS_FORMATSTRING)) {

 		FORMATINFO fi = { sizeof(fi) };

-		fi.tszFormat = tszFormat;

-		fi.tszExtraText = tszExtraText;

+		fi.szFormat.w = tszFormat;

+		fi.szExtraText.w = tszExtraText;

 		fi.hContact = hContact;

-		fi.flags |= FIF_TCHAR;

-		fi.tszaTemporaryVars = tszaTemporaryVars;

+		fi.flags |= FIF_UNICODE;

+		fi.szTemporaryVars.w = tszaTemporaryVars;

 		fi.cbTemporaryVarsSize = cbTemporaryVarsSize;

-		TCHAR *tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

+		wchar_t *tszParsed = (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

 		if (tszParsed)

 			return tszParsed;

 	}

@@ -179,8 +152,6 @@ __inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraTe
 }

 #endif

 

-

-

 // --------------------------------------------------------------------------

 // Register tokens

 // --------------------------------------------------------------------------

@@ -205,131 +176,119 @@ __inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraTe
 // 'overwritten' if registered twice.

 

 // Needed for szService and parseFunction:

-typedef struct {

-  int cbSize;  // You need to check if this is >=sizeof(ARGUMENTSINFO)

-               // (already filled in).

-  FORMATINFO *fi;  // Arguments passed to MS_VARS_FORMATSTRING.

-  unsigned int argc;  // Number of elements in the argv array.

-  union {

-    char **argv; // Argv[0] will be the token name, the following elements

-                 // are the additional arguments.

-    WCHAR **wargv;  // If the registered token was registered as a unicode

-                    // token, wargv should be accessed.

-    TCHAR **targv;

-  };

-  int flags;  // (output) You can set flags here (initially 0), use the

-              // AIF_* flags (see below).

-} ARGUMENTSINFO;

+

+struct ARGUMENTSINFO

+{

+	int cbSize;  // You need to check if this is >=sizeof(ARGUMENTSINFO)

+					 // (already filled in).

+	FORMATINFO *fi;  // Arguments passed to MS_VARS_FORMATSTRING.

+	unsigned int argc;  // Number of elements in the argv array.

+	MAllStringArray argv; // Argv[0] will be the token name, the following elements

+						       // are the additional arguments.

+

+	int flags;  // (output) You can set flags here (initially 0), use the

+					// AIF_* flags (see below).

+};

 

 // Available flags for ARGUMENTSINFO:

 // Set the flags of the ARGUMENTSINFO struct to any of these to influence

 // further parsing.

 #define AIF_DONTPARSE   0x01    // Don't parse the result of this function,

-                                // usually the result of a token is parsed

-                                // again, if the `?` is used as a function

-                                // character.

+										  // usually the result of a token is parsed

+										  // again, if the `?` is used as a function

+										  // character.

 #define AIF_FALSE       0x02    // The function returned logical false.

 

 // Definition of parse/cleanup functions:

 typedef char* (*VARPARSEFUNCA)(ARGUMENTSINFO *ai);

 typedef WCHAR* (*VARPARSEFUNCW)(ARGUMENTSINFO *ai);

+

 typedef void (*VARCLEANUPFUNCA)(char *szReturn);

 typedef void (*VARCLEANUPFUNCW)(WCHAR *wszReturn);

 

-#if defined(UNICODE) || defined(_UNICODE)

-#define VARPARSEFUNC    VARPARSEFUNCW

-#define VARCLEANUPFUNC  VARCLEANUPFUNCW

-#else

-#define VARPARSEFUNC    VARPARSEFUNCA

-#define VARCLEANUPFUNC  VARCLEANUPFUNCA

-#endif

-

-typedef struct {

-  int cbSize;  // Set this to sizeof(TOKENREGISTER).

-  union {

-    char *szTokenString;  // Name of the new token to be created, without %,

-                          // ?, ! etc. signs (can't be NULL).

-    WCHAR *wszTokenString;

-    TCHAR *tszTokenString;

-  };

-  union {

-    char *szService;  // Name of a service that is used to request the

-                      // token's value, if no service is used, a function

-                      // and TRF_PARSEFUNC must be used.

-    VARPARSEFUNCA parseFunction;  // See above, use with TRF_PARSEFUNC.

-    VARPARSEFUNCW parseFunctionW;

-    VARPARSEFUNC parseFunctionT;

-  };

-  union {

-    char *szCleanupService;  // Name of a service to be called when the

-                             // memory allocated in szService can be freed

-                             // (only used when flag VRF_CLEANUP is set,

-                             // else set this to NULL).

-    VARCLEANUPFUNCA cleanupFunction;  // See above, use with TRF_CLEANUPFUNC.

-    VARCLEANUPFUNCW cleanupFunctionW;

-    VARCLEANUPFUNC cleanupFunctionT;

-  };

-  char *szHelpText;  // Help info shown in help dialog (can be NULL). Has to

-                     // be in the following format:

-                     // "subject\targuments\tdescription"

-                     // (Example: "math\t(x, y ,...)\tx + y + ..."), or:

-                     // "subject\tdescription"

-                     // (Example: "miranda\tPath to the Miranda-IM

-                     // executable").

-                     // Note: subject and description are translated by

-                     // Variables.

-  int memType;  // Describes which method Varibale's plugin needs to use to

-                // free the returned buffer, use one of the VR_MEM_* values

-                // (see below). Only valid if the flag VRF_FREEMEM is set,

-                // use TR_MEM_OWNER otherwise).

-  int flags; // Flags to use (see below), one of TRF_* (see below).

-} TOKENREGISTER;

+struct TOKENREGISTER

+{

+	int cbSize;  // Set this to sizeof(TOKENREGISTER).

+	MAllStrings szTokenString;  // Name of the new token to be created, without %, ?, ! etc. signs (can't be NULL).

+

+	union

+	{

+		char *szService;  // Name of a service that is used to request the

+								// token's value, if no service is used, a function

+								// and TRF_PARSEFUNC must be used.

+		VARPARSEFUNCA parseFunction;  // See above, use with TRF_PARSEFUNC.

+		VARPARSEFUNCW parseFunctionW;

+	};

+	union

+	{

+		char *szCleanupService;  // Name of a service to be called when the

+										 // memory allocated in szService can be freed

+										 // (only used when flag VRF_CLEANUP is set,

+										 // else set this to NULL).

+		VARCLEANUPFUNCA cleanupFunction;  // See above, use with TRF_CLEANUPFUNC.

+		VARCLEANUPFUNCW cleanupFunctionW;

+	};

+	char *szHelpText;  // Help info shown in help dialog (can be NULL). Has to

+							 // be in the following format:

+							 // "subject\targuments\tdescription"

+							 // (Example: "math\t(x, y ,...)\tx + y + ..."), or:

+							 // "subject\tdescription"

+							 // (Example: "miranda\tPath to the Miranda-IM

+							 // executable").

+							 // Note: subject and description are translated by

+							 // Variables.

+	int memType;  // Describes which method Varibale's plugin needs to use to

+					  // free the returned buffer, use one of the VR_MEM_* values

+					  // (see below). Only valid if the flag VRF_FREEMEM is set,

+					  // use TR_MEM_OWNER otherwise).

+	int flags; // Flags to use (see below), one of TRF_* (see below).

+};

 

 // Available Memory Storage Types:

 // These values describe which method Variables Plugin will use to free the

 // buffer returned by the parse function or service

 #define TR_MEM_MIRANDA      2  // Memory is allocated using Miranda's Memory

-                               // Manager Interface (using the functions

-                               // returned by MS_SYSTEM_GET_MMI), if

-                               // VRF_FREEMEM is set, the memory will be

-                               // freed by Variables.

+										 // Manager Interface (using the functions

+										 // returned by MS_SYSTEM_GET_MMI), if

+										 // VRF_FREEMEM is set, the memory will be

+										 // freed by Variables.

 #define TR_MEM_OWNER        3  // Memory is owned by the calling plugin

-                               // (can't be freed by Variables Plugin

-                               // automatically). This should be used if

-                               // VRF_FREEMEM is not specified in the flags.

+										 // (can't be freed by Variables Plugin

+										 // automatically). This should be used if

+										 // VRF_FREEMEM is not specified in the flags.

 

 // Available Flags for TOKENREGISTER:

 #define TRF_FREEMEM     0x01  // Variables Plugin will automatically free the

-                              // pointer returned by the parse function or

-                              // service (which method it will us is

-                              // specified in memType -> see above).

+										// pointer returned by the parse function or

+										// service (which method it will us is

+										// specified in memType -> see above).

 #define TRF_CLEANUP     0x02  // Call cleanup service or function, notifying

-                              // that the returned buffer can be freed.

-                              // Normally you should use either TRF_FREEMEM

-                              // or TRF_CLEANUP.

+										// that the returned buffer can be freed.

+										// Normally you should use either TRF_FREEMEM

+										// or TRF_CLEANUP.

 #define TRF_PARSEFUNC   0x40  // parseFunction will be used instead of a

-                              // service.

+										// service.

 #define TRF_CLEANUPFUNC 0x80  // cleanupFunction will be used instead of a

-                              // service.

+										// service.

 #define TRF_USEFUNCS    TRF_PARSEFUNC|TRF_CLEANUPFUNC

 #define TRF_UNPARSEDARGS    0x04  // Provide the arguments for the parse

-                                  // function in their raw (unparsed) form.

-                                  // By default, arguments are parsed before

-                                  // presenting them to the parse function.

+											 // function in their raw (unparsed) form.

+											 // By default, arguments are parsed before

+											 // presenting them to the parse function.

 #define TRF_FIELD       0x08  // The token can be used as a %field%.

 #define TRF_FUNCTION    0x10  // The token can be used as a ?function().

-                              // Normally you should use either TRF_FIELD or

-                              // TRF_FUNCTION.

+										// Normally you should use either TRF_FIELD or

+										// TRF_FUNCTION.

 #define TRF_UNICODE     0x20  // Strings in structure are unicode (WCHAR*).

-                              // In this case, the strings pointing to the

-                              // arguments in the ARGUMENTS struct are

-                              // unicode also. The returned buffer is

-                              // expected to be unicode also, and the

-                              // unicode parse and cleanup functions are

-                              // called.

+										// In this case, the strings pointing to the

+										// arguments in the ARGUMENTS struct are

+										// unicode also. The returned buffer is

+										// expected to be unicode also, and the

+										// unicode parse and cleanup functions are

+										// called.

 

 #if defined(UNICODE) || defined(_UNICODE)

-#define TRF_TCHAR   TRF_UNICODE // Strings in structure are TCHAR*.

+#define TRF_TCHAR   TRF_UNICODE // Strings in structure are wchar_t*.

 #else

 #define TRF_TCHAR   0

 #endif

@@ -391,52 +350,53 @@ typedef struct {
 // ------------------------

 // Returns 0 on succes, any other value on error.

 

-typedef struct {

-  int cbSize;  // Set to sizeof(VARHELPINFO).

-  FORMATINFO *fi;  // Used for both input and output. If this pointer is not

-                   // NULL, the information is used as the initial values for

-                   // the dialog.

-  HWND hwndCtrl;  // Used for both input and output. The window text of this

-                  // window will be read and used as the initial input of the

-                  // input dialog. If the user presses the OK button the window

-                  // text of this window will be set to the text of the input

-                  // field and a EN_CHANGE message via WM_COMMAND is send to

-                  // this window. (Can be NULL).

-  char *szSubjectDesc;  // The description of the %subject% token will be set

-                        // to this text, if not NULL. This is translated

-                        // automatically.

-  char *szExtraTextDesc;  // The description of the %extratext% token will be

-                          // set to this text, if not NULL. This is translated

-                          // automatically.

-  int flags;  // Flags, see below.

-} VARHELPINFO;

+struct VARHELPINFO

+{

+	int cbSize;  // Set to sizeof(VARHELPINFO).

+	FORMATINFO *fi;  // Used for both input and output. If this pointer is not

+						  // NULL, the information is used as the initial values for

+						  // the dialog.

+	HWND hwndCtrl;  // Used for both input and output. The window text of this

+						 // window will be read and used as the initial input of the

+						 // input dialog. If the user presses the OK button the window

+						 // text of this window will be set to the text of the input

+						 // field and a EN_CHANGE message via WM_COMMAND is send to

+						 // this window. (Can be NULL).

+	char *szSubjectDesc;  // The description of the %subject% token will be set

+								 // to this text, if not NULL. This is translated

+								 // automatically.

+	char *szExtraTextDesc;  // The description of the %extratext% token will be

+									// set to this text, if not NULL. This is translated

+									// automatically.

+	int flags;  // Flags, see below.

+};

 

 

 // Flags for VARHELPINFO

 #define VHF_TOKENS              0x00000001  // Create a dialog with the list of

-                                            // tokens

+														  // tokens

 #define VHF_INPUT               0x00000002  // Create a dialog with an input

-                                            // field (this contains the list of

-                                            // tokens as well).

+														  // field (this contains the list of

+														  // tokens as well).

 #define VHF_SUBJECT             0x00000004  // Create a dialog to select a

-                                            // contact for the %subject% token.

+														  // contact for the %subject% token.

 #define VHF_EXTRATEXT           0x00000008  // Create a dialog to enter a text

-                                            // for the %extratext% token.

+														  // for the %extratext% token.

 #define VHF_HELP                0x00000010  // Create a dialog with help info.

 #define VHF_HIDESUBJECTTOKEN    0x00000020  // Hide the %subject% token in the

-                                            // list of tokens.

+														  // list of tokens.

 #define VHF_HIDEEXTRATEXTTOKEN  0x00000040  // Hide the %extratext% token in

-                                            // the list of tokens.

+														  // the list of tokens.

 #define VHF_DONTFILLSTRUCT      0x00000080  // Don't fill the struct with the

-                                            // new information if OK is pressed

+														  // new information if OK is pressed

 #define VHF_FULLFILLSTRUCT      0x00000100  // Fill all members of the struct

-                                            // when OK is pressed. By default

-                                            // only szFormat is set. With this

-                                            // flag on, hContact and

-                                            // szExtraText are also set.

+														  // when OK is pressed. By default

+														  // only szFormat is set. With this

+														  // flag on, hContact and

+														  // szExtraText are also set.

 #define VHF_SETLASTSUBJECT      0x00000200  // Set the last contact that was

-                                            // used in the %subject% dialog in

-                                            // case fi.hContact is NULL.

+														  // used in the %subject% dialog in

+														  // case fi.hContact is NULL.

 

 // Predefined flags

 #define VHF_FULLDLG             VHF_INPUT|VHF_SUBJECT|VHF_EXTRATEXT|VHF_HELP

@@ -455,21 +415,22 @@ typedef struct {
 

 // Helper function for easy use in standard case:

 #ifndef VARIABLES_NOHELPER

-__inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, char *szSubjectDesc, char *szExtraDesc) {

+__inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, char *szSubjectDesc, char *szExtraDesc)

+{

 

-  VARHELPINFO vhi;

+	VARHELPINFO vhi;

 

-  ZeroMemory(&vhi, sizeof(VARHELPINFO));

-  vhi.cbSize = sizeof(VARHELPINFO);

-  if (flags == 0) {

-    flags = VHF_SIMPLEDLG;

-  }

-  vhi.flags = flags;

-  vhi.hwndCtrl = GetDlgItem(hwndDlg, uIDEdit);

-  vhi.szSubjectDesc = szSubjectDesc;

-  vhi.szExtraTextDesc = szExtraDesc;

+	ZeroMemory(&vhi, sizeof(VARHELPINFO));

+	vhi.cbSize = sizeof(VARHELPINFO);

+	if (flags == 0) {

+		flags = VHF_SIMPLEDLG;

+	}

+	vhi.flags = flags;

+	vhi.hwndCtrl = GetDlgItem(hwndDlg, uIDEdit);

+	vhi.szSubjectDesc = szSubjectDesc;

+	vhi.szExtraTextDesc = szExtraDesc;

 

-  return CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);

+	return CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);

 }

 #endif

 

@@ -492,12 +453,12 @@ __inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, ch
 

 // VSI_ constants

 #define VSI_HELPICON    1  // Can be used on the button accessing the

-                           // Variables help dialog. Returns (HICON)hIcon on

-                           // success or NULL on failure;

+									// Variables help dialog. Returns (HICON)hIcon on

+									// success or NULL on failure;

 #define VSI_HELPTIPTEXT 2  // Returns the tooltip text you can use for the

-                           // help button. Returns (char *)szTipText, a

-                           // static, translated buffer containing the help

-                           // text or NULL on error.

+									// help button. Returns (char *)szTipText, a

+									// static, translated buffer containing the help

+									// text or NULL on error.

 

 // Helper to set the icon on a button accessing the help dialog.

 // Preferably a 16x14 MButtonClass control, but it works on a standard

@@ -505,9 +466,10 @@ __inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, ch
 // Variables) the string "V" is shown on the button. If Variables is not

 // available, the button will be hidden.

 #ifndef VARIABLES_NOHELPER

-__inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) {

+__inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton)

+{

 

-	TCHAR tszClass[32];

+	wchar_t tszClass[32];

 

 	HICON hIcon = nullptr;

 	int res = 0;

@@ -517,7 +479,7 @@ __inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) {
 	GetClassName(GetDlgItem(hwndDlg, uIDButton), tszClass, _countof(tszClass));

 	if (!mir_wstrcmp(tszClass, L"Button")) {

 		if (hIcon != nullptr) {

-			SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)|BS_ICON);

+			SetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE) | BS_ICON);

 			SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);

 		}

 		else {