Changeset 172

Timestamp:

May 29, 2001, 5:41:22 PM (24 years ago)

Author:

tahola

Message:

* empty log message *

Location:

trunk

Files:

• include/wicpm/gui_helpers.h (modified) (2 diffs)
• include/wicpm/gui_notebook.h (modified) (1 diff)
• include/wicpm/gui_objwnd.h (modified) (1 diff)
• include/wicpm/gui_trad_cntr.h (modified) (1 diff)
• include/wicpm/gui_trad_nb_dlgproc.h (modified) (4 diffs)
• include/wicpm/gui_wicpm.h (modified) (3 diffs)
• include/wicpm/script.hpp (modified) (35 diffs)
• include/wicpm/trad_arc_thread.h (modified) (1 diff)
• src/wicpm/gui_helpers.cpp (modified) (1 diff)
• src/wicpm/gui_notebook.cpp (modified) (2 diffs)
• src/wicpm/gui_objwnd.cpp (modified) (1 diff)
• src/wicpm/gui_trad_cntr.cpp (modified) (1 diff)
• src/wicpm/gui_trad_nb_dlgproc.cpp (modified) (17 diffs)
• src/wicpm/gui_wicpm.cpp (modified) (10 diffs)
• src/wicpm/makefile (modified) (1 diff)
• src/wicpm/script.cpp (modified) (184 diffs)
• src/wicpm/trad_arc_thread.cpp (modified) (10 diffs)
• src/wicpm/wicpm.def (modified) (1 diff)
• src/wicpm/wicpm.dlg (modified) (6 diffs)
• src/wicpm/wicpm.rc (modified) (2 diffs)

trunk/include/wicpm/gui_helpers.h ¶

@@ -1 @@
-
 /*
  * gui_helpers.h
@@ -56 +55 @@
 USHORT guiSetEntryFieldTextLimit(HWND hwndParent, ULONG ulEFId, SHORT sTextLimit);
 USHORT guiShowFileDialog (HWND, USHORT, PSZ, PAPSZ, PSZ, PSZ *, PAPSZ *, ULONG *);
+USHORT guiLoadString(HAB, ULONG, PSZ *);
 
 

trunk/include/wicpm/gui_notebook.h ¶

@@ -1 @@
-
 /*
  * gui_notebook.h

trunk/include/wicpm/gui_objwnd.h ¶

@@ -1 +1 @@
 
-/*
- * gui_objwnd.h
- *
- *  Copyright (C) 1999-2000 Teemu Ahola.
- *
- */
 
 #ifndef _GUI_OBJWND_H_

trunk/include/wicpm/gui_trad_cntr.h ¶

@@ -1 @@
-
 /*
  * gui_trad_cntr.h

trunk/include/wicpm/gui_trad_nb_dlgproc.h ¶

@@ -1 @@
-
 /*
  * gui_trad_nb_dlgproc.h
@@ -43 +42 @@
 #define TEXT_SETUPSTRING_EXENAME            "EXENAME="
 #define TEXT_SETUPSTRING_OBJECTID           "OBJECTID="
+    // Target combo box.
+#define TEXT_TARGET_DEFAPPPATH              "$(WARPIN_DEFAULTAPPSPATH)\\"
+#define TEXT_TARGET_DEFTOOLPATH             "$(WARPIN_DEFAULTTOOLSPATH)\\"
+#define TEXT_TARGET_BOOTDRIVER              "?:\\"
+#define TEXT_TARGET_PCKINDEX                "$(i)"
+#define TEXT_TARGET_PCK                     "$(vendor\\application\\package)"
+#define TEXT_TARGET_ENV                     "$(enviromental variable)"
+
 
 
@@ -59 +66 @@
     HWND hwndObjWnd;
     } SCRIPTDLGINFO, *PSCRIPTDLGINFO;
+
+typedef struct
+    {
+    PFNWP OldProc;
+    } OLDPROC;
 
 
@@ -95 +107 @@
 MRESULT EXPENTRY fnTradCntrDlgProc(HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2);
 MRESULT EXPENTRY fnTradCnfgDlgProc(HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY fnCnfgLbox(HWND hwndWnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 
 

trunk/include/wicpm/gui_wicpm.h ¶

@@ -1 @@
-
 /*
  * gui_wicpm.h
@@ -68 +67 @@
  *  General window info structure for storing windows information
  */
-typedef struct _WICPMINFO
+struct _WICPMINFO
     {
     HAB                 hab;                        // Handle to an anchor block.
@@ -95 +94 @@
         strcpy(szWicPMPath, "e:\\testi");
         }
-    } WICPMINFO, *PWICPMINFO;
+    };
+typedef _WICPMINFO WICPMINFO, *PWICPMINFO;
 
 struct StatusDlgInfo

trunk/include/wicpm/script.hpp ¶

@@ -3 +3 @@
  *                  (c) Copyright Teemu Ahola 2000
  *
- *              WarpIN Script Class 0.9.3
+ *              WarpIN Script Class 0.9.5
  *
- * script.hpp
+ *@@script.hpp
  *  Header file for script.cpp.
  *  This file contains class headers for script classes.
@@ -17 +17 @@
 #define _SCRIPT_HPP
 
-#define MAXCHILDREN                         20
-
-#define MAXAPPNAMELENGTH                    64
-#define MAXVENDORNAMELENGTH                 64
-#define MAXPCKNAMELENGTH                    32
-#define MAXINETADDRESSLENGTH                128
-#define MAXVERSIONLENGTH                    10
-#define MAXTITLELENGTH                      128
-#define MAXSTATEMENTLENGTH                  128
-#define MAXSEARCHSTRINGLENGTH               128
-#define MAXCLASSNAMELENGTH                  256
-#define MAXCLASSTITLELENGTH                 256
-#define MAXCLASSCONFIGLENGTH                256
-#define MAXSCRIPTLENGTH                     4096
-#define MAXSCRIPTLINELENGTH                 256
-#define MAXSCRIPTSTRINGLENGTH               256
-#define MAXPROFILEAPPLICATIONLENGTH         256
-#define MAXPROFILEKEYLENGTH                 256
-#define MAXPAGETEXTLENGTH                   1024
-#define MAXPAGETITLELENGTH                  256
-#define MAXNEXTBTNTEXTLENGTH                256
-#define MAXMESSAGELENGTH                    256
-#define MAXOPERATIGSYSTEMLENGTH             64
-#define MAXTARGETLENGTH                     256
-#define MAXTAGLENGTH                        256
-#define MAXATTRIBUTELENGTH                  256
+#define MAXCHILDREN                                     20
+
+#define MAXAPPNAMELENGTH                                64
+#define MAXVENDORNAMELENGTH                             64
+#define MAXPCKNAMELENGTH                                32
+#define MAXINETADDRESSLENGTH                            128
+#define MAXVERSIONLENGTH                                10
+#define MAXTITLELENGTH                                  128
+#define MAXSTATEMENTLENGTH                              128
+#define MAXSEARCHSTRINGLENGTH                           128
+#define MAXCLASSNAMELENGTH                              256
+#define MAXCLASSTITLELENGTH                             256
+#define MAXCLASSCONFIGLENGTH                            256
+#define MAXSCRIPTLENGTH                                 4096
+#define MAXSCRIPTLINELENGTH                             256
+#define MAXSCRIPTSTRINGLENGTH                           256
+#define MAXPROFILEAPPLICATIONLENGTH                     256
+#define MAXPROFILEKEYLENGTH                             256
+#define MAXPAGETEXTLENGTH                               1024
+#define MAXPAGETITLELENGTH                              256
+#define MAXNEXTBTNTEXTLENGTH                            256
+#define MAXMESSAGELENGTH                                256
+#define MAXOPERATIGSYSTEMLENGTH                         64
+#define MAXTARGETLENGTH                                 256
+#define MAXTAGLENGTH                                    256
+#define MAXATTRIBUTELENGTH                              256
 
 // Keyword attributes.
-#define KEYWORD_BASE                                1
-#define KEYWORD_FIXED                               2
-#define KEYWORD_SELECT                              4
-#define KEYWORD_NODESELECT                          8
+#define KEYWORD_BASE                                    1
+#define KEYWORD_FIXED                                   2
+#define KEYWORD_SELECT                                  4
+#define KEYWORD_NODESELECT                              8
 
 // ConfigSys modifiers.
-#define MODIFIER_NONE                               0
-#define MODIFIER_UNIQUE                             1
-#define MODIFIER_ADDRIGHT                           2
-#define MODIFIER_ADDLEFT                            4
-#define MODIFIER_ADDTOP                             8
-#define MODIFIER_ADDAFTER                           16
-#define MODIFIER_ADDBEFORE                          32
-#define MODIFIER_REMOVELINE                         64
-#define MODIFIER_REMOVEPART                         128
+#define MODIFIER_NONE                                   0
+#define MODIFIER_UNIQUE                                 1
+#define MODIFIER_ADDRIGHT                               2
+#define MODIFIER_ADDLEFT                                4
+#define MODIFIER_ADDTOP                                 8
+#define MODIFIER_ADDAFTER                               16
+#define MODIFIER_ADDBEFORE                              32
+#define MODIFIER_REMOVELINE                             64
+#define MODIFIER_REMOVEPART                             128
 
 // Execute context flags
-#define FLAG_NOCONTEXT                              0
-#define FLAG_CONFIGSYS                              1
-#define FLAG_REGISTERCLASS                          2
-#define FLAG_CREATEOBJECT                           3
+#define FLAG_NOCONTEXT                                  0
+#define FLAG_CONFIGSYS                                  1
+#define FLAG_REGISTERCLASS                              2
+#define FLAG_CREATEOBJECT                               3
 
 // ReadMe formats.
-#define README_FORMAT_NONE                          0
-#define README_FORMAT_PLAIN                         1
-#define README_FORMAT_FLOW                          2
-#define README_FORMAT_HTML                          3
+#define README_FORMAT_NONE                              0
+#define README_FORMAT_PLAIN                             1
+#define README_FORMAT_FLOW                              2
+#define README_FORMAT_HTML                              3
 
 // Page types.
-#define PAGE_TYPES_TEXT                             0
-#define PAGE_TYPES_README                           1
-#define PAGE_TYPES_CONTAINER                        2
-#define PAGE_TYPES_CONFIGURE                        3
+#define PAGE_TYPES_TEXT                                 0
+#define PAGE_TYPES_README                               1
+#define PAGE_TYPES_CONTAINER                            2
+#define PAGE_TYPES_CONFIGURE                            3
 
 // Operating system
-#define OS_OS2_2X                                   0
-#define OS_OS2_3X                                   1
-#define OS_OS2_4X                                   2
+#define OS_OS2_2X                                       0
+#define OS_OS2_3X                                       1
+#define OS_OS2_4X                                       2
 
 
 // Error codes
-#define NO_ERROR                                    0
+#define NO_ERROR                                        0
+#define STRING_TOO_LONG                                 1
+#define MEM_ALLOC_ERROR                                 2
 
     // Configsys error codes
-#define ERR_CONFIGSYS_ADDRIGHT_SETTED               1
-#define ERR_CONFIGSYS_ADDLEFT_SETTED                2
-#define ERR_CONFIGSYS_UNIQUE_SETTED                 4
-#define ERR_CONFIGSYS_ADDTOP_SETTED                 8
-#define ERR_CONFIGSYS_ADDAFTER_SETTED               16
-#define ERR_CONFIGSYS_ADDBEFORE_SETTED              32
-#define ERR_CONFIGSYS_REMOVELINE_SETTED             64
-#define ERR_CONFIGSYS_REMOVEPART_SETTED             128
+#define ERR_CONFIGSYS_ADDRIGHT_SETTED                   1
+#define ERR_CONFIGSYS_ADDLEFT_SETTED                    2
+#define ERR_CONFIGSYS_UNIQUE_SETTED                     4
+#define ERR_CONFIGSYS_ADDTOP_SETTED                     8
+#define ERR_CONFIGSYS_ADDAFTER_SETTED                   16
+#define ERR_CONFIGSYS_ADDBEFORE_SETTED                  32
+#define ERR_CONFIGSYS_REMOVELINE_SETTED                 64
+#define ERR_CONFIGSYS_REMOVEPART_SETTED                 128
 
     // Script parsing errors
-#define ERR_PARSE_NOERROR                           0
-#define ERR_PARSE_NULLPOINTER                       1
-#define ERR_PARSE_PCK_NOTFOUND                      2
-#define ERR_PARSE_INDEX_NOTFOUND                    3
-#define ERR_PARSE_PCKID_NOTFOUND                    4
-#define ERR_PARSE_TITLE_NOTFOUND                    5
-#define ERR_PARSE_TARGET_NOTFOUND                   6
-#define ERR_PARSE_KEYWORD_NOTFOUND                  7
-#define ERR_PARSE_REQUIRES_NOTFOUND                 8
-#define ERR_PARSE_REQUIRES_MAJOR_NOTFOUND           9
-#define ERR_PARSE_REQUIRES_PACKAGE_NOTFOUND         10
-#define ERR_PARSE_REQUIRES_VENDOR_NOTFOUND          11
-#define ERR_PARSE_REQUIRES_APP_NOTFOUND             12
-#define ERR_PARSE_EXECUTE_NOTFOUND                  13
-#define ERR_PARSE_CLEARPROFILE_NOTFOUND             14
-#define ERR_PARSE_CLEARPROFILE_STRINGTOOLONG        15
-#define ERR_PARSE_CONFIGSYS_NOTFOUND                16
-#define ERR_PARSE_REGISTERCLASS_NOTFOUND            17
-#define ERR_PARSE_REPLACECLASS_NOTFOUND             18
-#define ERR_PARSE_CREATEOBJECT_NOTFOUND             19
-#define ERR_PARSE_CREATEOBJECT_LOCATION_NOTFOUND    20
-#define ERR_PARSE_CREATEOBJECT_TITLE_NOTFOUND       21
-#define ERR_PARSE_CREATEOBJECT_CLASSNAME_NOTFOUND   22
-#define ERR_PARSE_KILLPROCESS_NOTFOUND              23
-#define ERR_PARSE_WRITEPROFILE_NOTFOUND             24
-#define ERR_PARSE_WRITEPROFILE_STRINGTOOLONG        25
-#define ERR_PARSE_WRITEPROFILE_APP_NOTFOUND         26
-#define ERR_PARSE_WRITEPROFILE_KEY_NOTFOUND         27
-#define ERR_PARSE_WRITEPROFILE_STRING_NOTFOUND      28
+#define ERR_PARSE_NOERROR                               0
+#define ERR_PARSE_NULLPOINTER                           1
+#define ERR_PARSE_PCK_NOTFOUND                          2
+#define ERR_PARSE_INDEX_NOTFOUND                        3
+#define ERR_PARSE_PCKID_NOTFOUND                        4
+#define ERR_PARSE_TITLE_NOTFOUND                        5
+#define ERR_PARSE_TARGET_NOTFOUND                       6
+#define ERR_PARSE_KEYWORD_NOTFOUND                      7
+#define ERR_PARSE_REQUIRES_NOTFOUND                     8
+#define ERR_PARSE_REQUIRES_MAJOR_NOTFOUND               9
+#define ERR_PARSE_REQUIRES_PACKAGE_NOTFOUND             10
+#define ERR_PARSE_REQUIRES_VENDOR_NOTFOUND              11
+#define ERR_PARSE_REQUIRES_APP_NOTFOUND                 12
+#define ERR_PARSE_EXECUTE_NOTFOUND                      13
+#define ERR_PARSE_CLEARPROFILE_NOTFOUND                 14
+#define ERR_PARSE_CLEARPROFILE_STRINGTOOLONG            15
+#define ERR_PARSE_CONFIGSYS_NOTFOUND                    16
+#define ERR_PARSE_REGISTERCLASS_NOTFOUND                17
+#define ERR_PARSE_REPLACECLASS_NOTFOUND                 18
+#define ERR_PARSE_CREATEOBJECT_NOTFOUND                 19
+#define ERR_PARSE_CREATEOBJECT_LOCATION_NOTFOUND        20
+#define ERR_PARSE_CREATEOBJECT_TITLE_NOTFOUND           21
+#define ERR_PARSE_CREATEOBJECT_CLASSNAME_NOTFOUND       22
+#define ERR_PARSE_KILLPROCESS_NOTFOUND                  23
+#define ERR_PARSE_WRITEPROFILE_NOTFOUND                 24
+#define ERR_PARSE_WRITEPROFILE_STRINGTOOLONG            25
+#define ERR_PARSE_WRITEPROFILE_APP_NOTFOUND             26
+#define ERR_PARSE_WRITEPROFILE_KEY_NOTFOUND             27
+#define ERR_PARSE_WRITEPROFILE_STRING_NOTFOUND          28
+
+// Message class types:
+#define MSG_TYPE_UNDEF                                  0
+#define MSG_TYPE_INFO                                   1
+#define MSG_TYPE_WARNING                                2
+#define MSG_TYPE_ERROR                                  3
+
+// Message values.
+#define MSG_VALUE_UNDEF                                 0
+#define MSG_ATTRIBUTE_INDEX_NOTFOUND                    1
+#define MSG_ATTRIBUTE_PACKAGEID_NOTFOUND                2
+#define MSG_ATTRIBUTE_PACKAGEID_MAJOR_NOTFOUND          3
+#define MSG_ATTRIBUTE_PACKAGEID_MINOR_NOTFOUND          4
+#define MSG_ATTRIBUTE_PACKAGEID_PACKAGE_NOTFOUND        5
+#define MSG_ATTRIBUTE_PACKAGEID_APPL_NOTFOUND           6
+#define MSG_ATTRIBUTE_PACKAGEID_VENDOR_NOTFOUND         7
+#define MSG_ATTRIBUTE_PACKAGEID_PACKAGE_STRTOOLONG      8
+#define MSG_ATTRIBUTE_PACKAGEID_APPL_STRTOOLONG         9
+#define MSG_ATTRIBUTE_PACKAGEID_VENDOR_STRTOOLONG       10
+#define MSG_ATTRIBUTE_TITLE_TITLE_STRTOOLONG            11
+#define MSG_ATTRIBUTE_TITLE_TITLE_NOTFOUND              12
+#define MSG_ATTRIBUTE_TARGET_TARGET_STRTOOLONG          13
+#define MSG_ATTRIBUTE_TARGET_TARGET_NOTFOUND            14
+#define MSG_KEYWORD_PCKKW_NOTFOUND                      15
+#define MSG_ATTRIBUTE_REQUIRES_NOTFOUND                 16
+#define MSG_ATTRIBUTE_REQUIRES_MINOR_NOTFOUND           17
+#define MSG_ATTRIBUTE_REQUIRES_MAJOR_NOTFOUND           18
+#define MSG_ATTRIBUTE_REQUIRES_PACKAGE_NOTFOUND         19
+#define MSG_ATTRIBUTE_REQUIRES_APPL_NOTFOUND            20
+#define MSG_ATTRIBUTE_REQUIRES_VENDOR_NOTFOUND          21
+#define MSG_ATTRIBUTE_REQUIRES_REV_NOTFOUND             22
+#define MSG_ATTRIBUTE_REQUIRES_VENDOR_STRTOOLONG        23
+#define MSG_ATTRIBUTE_REQUIRES_APPL_STRTOOLONG          24
+#define MSG_ATTRIBUTE_REQUIRES_PACKAGE_STRTOOLONG       25
+#define MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB         26
+#define MSG_ATTRIBUTE_CFGSYS_STATEMENT_STRTOOLONG       27
+#define MSG_ATTRIBUTE_CFGSYS_NOTFOUND                   28
+#define MSG_ATTRIBUTE_REGISTER_NOTFOUND                 29
+#define MSG_ATTRIBUTE_REGISTER_CLASSNAME_NOTFOUND       30
+#define MSG_ATTRIBUTE_REGISTER_DLLPATH_NOTFOUND         31
+#define MSG_ATTRIBUTE_REGISTER_CLASSNAME_STRTOOLONG     32
+#define MSG_ATTRIBUTE_REGISTER_DLLPATH_STRTOOLONG       33
+#define MSG_ATTRIBUTE_REPLACE_CLASSNAME_STRTOOLONG      34
+#define MSG_ATTRIBUTE_REPLACE_NEWNAME_STRTOOLONG        35
+#define MSG_ATTRIBUTE_REPLACE_NOTFOUND                  36
+#define MSG_ATTRIBUTE_REGISTER_CLASSNAME_MISSING        37
+#define MSG_ATTRIBUTE_CREATE_CLASSNAME_STRTOOLONG       38
+#define MSG_ATTRIBUTE_CREATE_TITLE_STRTOOLONG           39
+#define MSG_ATTRIBUTE_CREATE_LOCATION_STRTOOLONG        40
+#define MSG_ATTRIBUTE_CREATE_CONFIG_STRTOOLONG          41
+#define MSG_ATTRIBUTE_CREATE_NOTFOUND                   42
+#define MSG_ATTRIBUTE_CREATE_LOCATION_MISSING           43
+#define MSG_ATTRIBUTE_CREATE_TITLE_MISSING              44
+#define MSG_ATTRIBUTE_CREATE_CLASSNAME_MISSING          45
+#define MSG_ATTRIBUTE_EXECUTE_EXEFILEPARAM_STRTOOLONG   46
+#define MSG_ATTRIBUTE_EXECUTE_MISSING                   47
+#define MSG_ATTRIBUTE_EXECUTE_EXEFILEPARAM_MISSING      48
+#define MSG_ATTRIBUTE_EXECUTE_CONTEXT_MISSING           49
+#define MSG_ATTRIBUTE_CLRPROFILE_PROFILE_STRTOOLONG     50
+#define MSG_ATTRIBUTE_CLRPROFILE_APPL_STRTOOLONG        51
+#define MSG_ATTRIBUTE_CLRPROFILE_KEY_STRTOOLONG         52
+#define MSG_ATTRIBUTE_CLRPROFILE_PROFILE_MISSING        53
+#define MSG_ATTRIBUTE_CLRPROFILE_APPL_MISSING           54
+#define MSG_ATTRIBUTE_CLRPROFILE_KEY_MISSING            55
+#define MSG_ATTRIBUTE_CLRPROFILE_MISSING                56
+
+#define MSG_ATTRIBUTE_WRITEPROFILE_PROFILE_STRTOOLONG   57
+#define MSG_ATTRIBUTE_WRITEPROFILE_APPL_STRTOOLONG      58
+#define MSG_ATTRIBUTE_WRITEPROFILE_KEY_STRTOOLONG       59
+#define MSG_ATTRIBUTE_WRITEPROFILE_PROFILE_MISSING      60
+#define MSG_ATTRIBUTE_WRITEPROFILE_APPL_MISSING         61
+#define MSG_ATTRIBUTE_WRITEPROFILE_KEY_MISSING          62
+#define MSG_ATTRIBUTE_WRITEPROFILE_MISSING              63
+#define MSG_ATTRIBUTE_WRITEPROFILE_STRING_MISSING       64
+#define MSG_ATTRIBUTE_KILLPROCESS_FILENAME_STRTOOLONG   65
+#define MSG_ATTRIBUTE_KILLPROCESS_MISSING               66
+
+#define MSG_TAG_PCK_NOTFOUND                            70
+
 
 
@@ -216 +297 @@
 /*
  *@@INDEX structure
- * This structure is for indexes in script classes. Because script class
- * needs a way to locate different objects this structure is designed for
- * it.
  */
 struct INDEX
@@ -233 +311 @@
 
 /*
- *@@ ScriptIndex class
+ *@@Message
+ *  This class is the message class used in MessageLogger.
+ */
+class Message
+    {
+    USHORT      _usType;// MSG_TYPE_INFO
+                        // MSG_TYPE_WARNING
+                        // MSG_TYPE_ERROR
+    BSString    _strMessageText;
+    ULONG       _ulLineNumber;
+    USHORT      _usMessageValue;
+    public:
+        Message();
+        virtual ~Message();
+        USHORT SetType(USHORT);
+        USHORT SetMessageText(const BSString &);
+        USHORT SetMessageText(const PSZ);
+        USHORT SetLineNumber(ULONG);
+        USHORT SetMessageValue(USHORT);
+        USHORT ReturnType();
+        BSString &ReturnMessageText();
+        ULONG ReturnLineNumber();
+        USHORT ReturnMessageValue();
+        BSString &ComposeMessage();
+   };
+
+
+
+/*
+ *@@MessageLogger
+ *  This class is for logging of messages occurred during manipulating of script
+ *  objects or during building of script text. There are different types of messages
+ *  such as informative, warning and error in WarpINScript.
+ */
+class MessageLogger
+    {
+    list<Message*>          _lstMessage;
+    USHORT                  _usMessages;
+    MessageLogger           *_pParentLogger;
+    public:
+        MessageLogger();
+        MessageLogger(MessageLogger&);
+        ~MessageLogger();
+        MessageLogger &operator=(MessageLogger &);
+        USHORT SetParentLogger(MessageLogger&);
+        USHORT LogMessage(Message &);
+        USHORT ReturnMessageCount();
+        const list<Message*> ReturnMessageList();
+        BSString &ReturnComposedMessageString();
+        USHORT DeleteLogs();
+    };
+
+
+
+
+/*
+ *@@WarpINScriptBase
+ *  This class is base class (super class) for all other classes which belongs to
+ *  the script classes except for message logger class which is base class for
+ *  WarpINScriptBase class. There are few virtual functions which must be definited in
+ *  sub class (derived class) in order to script classes actually work.
+ */
+class WarpINScriptBase
+    {
+    USHORT              _usIndex;
+    public:
+        MessageLogger   _messageLogger;
+
+        //WarpINScriptBase();
+        ~WarpINScriptBase();
+        USHORT SetIndex(const USHORT);
+        USHORT ReturnIndex();
+        virtual PSZ MakeScriptText(BOOL = TRUE){return NULL;}
+        virtual PSZ BuildFromText(PSZ, ULONG){return NULL;}
+    };
+
+
+/*
+ *@@ScriptIndex class
  *  This class is used in ScriptPackage and ScriptPage classes and it contains datas used
  *  while creating INDEX attribute.
  */
-class ScriptIndex
-    {
-    USHORT              usIndex;
-
-    USHORT              usIndexAttribute;
-
-    public:
-        ScriptIndex(USHORT usIndex = 1);
+class ScriptIndex : public WarpINScriptBase
+    {
+    USHORT usIndexAttribute;
+
+    public:
+        ScriptIndex(USHORT = 1);
         ~ScriptIndex();
-
-        void SetIndexAttribute(USHORT usIndexAttribute);
-
-        void SetIndex(USHORT usIndex);
+        ScriptIndex &operator=(ScriptIndex &);
+
+        USHORT SetIndexAttribute(USHORT);
+
+        //void SetIndex(USHORT usIndex);
 
         USHORT ReturnIndexAttribute();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
-    };
-
-
-
-
-/*
- *@@ ScriptPackageID class
+        //USHORT ReturnIndex();
+
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+    };
+
+
+
+
+/*
+ *@@ScriptPackageID class
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating package ID attribute.
  */
-class ScriptPackageID
-    {
-    // Identifier number of packageID. Can be used to determine which
-    // package ID is this.
-    USHORT              usIndex;
-
-    CHAR                szVendor[MAXVENDORNAMELENGTH];
-    CHAR                szApplication[MAXAPPNAMELENGTH];
-    CHAR                szPackage[MAXPCKNAMELENGTH];
-    USHORT              usMajor;
-    USHORT              usMinor;
-    USHORT              usRevision;
+class ScriptPackageID : public WarpINScriptBase
+    {
+    CHAR                _szVendor[MAXVENDORNAMELENGTH];
+    CHAR                _szApplication[MAXAPPNAMELENGTH];
+    CHAR                _szPackage[MAXPCKNAMELENGTH];
+    USHORT              _usMajor;
+    USHORT              _usMinor;
+    USHORT              _usRevision;
 
     public:
         // Constructor for the class
-        ScriptPackageID(USHORT usIndex = 1);
+        ScriptPackageID(USHORT = 1);
         // Destructor for the class
         ~ScriptPackageID();
 
-        void SetIndex(USHORT usIndex);
-
         // Sets datas to strings
-        void SetVendor(const PSZ pszVendor);
-        void SetApplication(const PSZ pszApplication);
-        void SetPackage(const PSZ pszPackage);
-        void SetMajor(USHORT usMajor);
-        void SetMinor(USHORT usMinor);
-        void SetRevision(USHORT usRevision);
-        void SetPackageID(PACKAGEIDDATA packageIDData);
+        USHORT SetVendor(const PSZ);
+        USHORT SetApplication(const PSZ);
+        USHORT SetPackage(const PSZ);
+        USHORT SetMajor(USHORT);
+        USHORT SetMinor(USHORT);
+        USHORT SetRevision(USHORT);
+        USHORT SetPackageID(PACKAGEIDDATA);
 
         const PSZ ReturnVendor();
@@ -307 +455 @@
         PACKAGEIDDATA ReturnPackageID();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bShowAttribute = TRUE);
-        PSZ BuildFromText(PSZ pszAttrText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
+        PSZ MakeScriptText(BOOL = TRUE);
+        PSZ BuildFromText(PSZ, ULONG);
     };
 
@@ -321 +466 @@
  *  while creating title attribute.
  */
-class ScriptTitle
-    {
-    USHORT              usIndex;
-
-    CHAR                szTitle[MAXTITLELENGTH];
-
-    public:
-        ScriptTitle(USHORT usIndex = 1);
+class ScriptTitle : public WarpINScriptBase
+    {
+    CHAR        _szTitle[MAXTITLELENGTH];
+
+    public:
+        ScriptTitle(USHORT = 1);
         ~ScriptTitle();
 
-        void SetTitle(const PSZ pszTitle);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetTitle(const PSZ);
 
         const PSZ ReturnTitle();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
     };
 
@@ -352 +490 @@
  *  while creating target attribute.
  */
-class ScriptTarget
-    {
-    USHORT              usIndex;
-
-    CHAR                szTarget[CCHMAXPATH];
-
-    public:
-        ScriptTarget(USHORT usIndex = 1);
+class ScriptTarget : public WarpINScriptBase
+    {
+    CHAR                _szTarget[CCHMAXPATH];
+
+    public:
+        ScriptTarget(USHORT = 1);
         ~ScriptTarget();
 
-        void SetTarget(const PSZ pszTarget);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetTarget(const PSZ);
 
         const PSZ ReturnTarget();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
-    };
-
-
-
-/*
- *@@ ScriptKeyWord class
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+    };
+
+
+
+/*
+ *@@ScriptKeyWord:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating keyword attribute.
  */
-class ScriptKeyWord
-    {
-    USHORT              usIndex;
-
-    BOOL                bBase;
-    BOOL                bFixed;
-    BOOL                bSelect;
-    BOOL                bNoDeselect;
-
-    public:
-        ScriptKeyWord(USHORT usIndex = 1);
+class ScriptKeyWord : public WarpINScriptBase
+    {
+    BOOL                _bBase;
+    BOOL                _bFixed;
+    BOOL                _bSelect;
+    BOOL                _bNoDeselect;
+
+    public:
+        ScriptKeyWord(USHORT = 1);
         ~ScriptKeyWord();
 
-        void SetBase(BOOL bBase);
-        void SetFixed(BOOL bFixed);
-        void SetSelect(BOOL bSelect);
-        void SetNoDeselect(BOOL bNoDeselect);
-            // Old way. Sometimes usefull and is needed on some part of WicPM.
-        void SetKeyWord(USHORT usKeyWords);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetBase(BOOL);
+        USHORT SetFixed(BOOL);
+        USHORT SetSelect(BOOL);
+        USHORT SetNoDeselect(BOOL);
+        USHORT SetKeyWord(USHORT);
 
         BOOL ReturnBase();
@@ -411 +537 @@
         USHORT ReturnKeyWord();
 
-        USHORT ReturnIndex();
-
         PSZ MakeScriptText(BOOL bAttribute = TRUE, BOOL bLineFeed = FALSE);
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-    };
-
-
-
-
-/*
- *@@ ScriptRequires class
+        PSZ BuildFromText(PSZ, ULONG);
+    };
+
+
+
+
+/*
+ *@@ScriptRequires:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating requires attribute.
  */
-class ScriptRequires
-    {
-    USHORT              usIndex;
-
-    CHAR                szVendor[MAXVENDORNAMELENGTH];
-    CHAR                szApplication[MAXAPPNAMELENGTH];
-    CHAR                szPackage[MAXPCKNAMELENGTH];
-    USHORT              usMajor;
-    USHORT              usMinor;
-    USHORT              usRevision;
-    USHORT              usPckIndex;
+class ScriptRequires : public WarpINScriptBase
+    {
+    CHAR                _szVendor[MAXVENDORNAMELENGTH];
+    CHAR                _szApplication[MAXAPPNAMELENGTH];
+    CHAR                _szPackage[MAXPCKNAMELENGTH];
+    USHORT              _usMajor;
+    USHORT              _usMinor;
+    USHORT              _usRevision;
+    USHORT              _usPckIndex;
 
     public:
         // Constructor for the class
-        ScriptRequires(USHORT usIndex = 1);
+        ScriptRequires(USHORT = 1);
         // Destructor for the class
         ~ScriptRequires();
 
         // Sets datas to strings
-        void SetVendor(const PSZ pszVendor);
-        void SetApplication(const PSZ pszApplication);
-        void SetPackage(const PSZ pszPackage);
-        void SetMajor(USHORT usMajor);
-        void SetMinor(USHORT usMinor);
-        void SetRevision(USHORT usRevision);
-        void SetPckIndex(USHORT usPckIndex);
-        void SetRequires(REQUIRESDATA requiresData);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetVendor(const PSZ);
+        USHORT SetApplication(const PSZ);
+        USHORT SetPackage(const PSZ);
+        USHORT SetMajor(USHORT);
+        USHORT SetMinor(USHORT);
+        USHORT SetRevision(USHORT);
+        USHORT SetPckIndex(USHORT);
+        USHORT SetRequires(REQUIRESDATA);
 
         const PSZ ReturnVendor();
@@ -465 +584 @@
         REQUIRESDATA ReturnRequires();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bShowAttribute = TRUE);
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-    };
-
-
-
-/*
- *@@ ScriptConfigSys class
+        PSZ MakeScriptText(BOOL = TRUE);
+        PSZ BuildFromText(PSZ, ULONG);
+    };
+
+
+
+/*
+ *@@ScriptConfigSys:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating configsys attribute.
  */
-class ScriptConfigSys
-    {
-    USHORT              usIndex;
-
-    CHAR                szStatement[MAXSTATEMENTLENGTH];
-    BOOL                bUnique;
-    BOOL                bAddRight;
-    BOOL                bAddLeft;
-    BOOL                bAddTop;
-    BOOL                bAddAfter;
-    BOOL                bAddBefore;
-    BOOL                bRemoveLine;
-    BOOL                bRemovePart;
-    CHAR                szSearchString[MAXSEARCHSTRINGLENGTH];
-
-    public:
-        ScriptConfigSys(USHORT usIndex = 1);
+class ScriptConfigSys : public WarpINScriptBase
+    {
+    CHAR                _szStatement[MAXSTATEMENTLENGTH];
+    BOOL                _bUnique;
+    BOOL                _bAddRight;
+    BOOL                _bAddLeft;
+    BOOL                _bAddTop;
+    BOOL                _bAddAfter;
+    BOOL                _bAddBefore;
+    BOOL                _bRemoveLine;
+    BOOL                _bRemovePart;
+    CHAR                _szSearchString[MAXSEARCHSTRINGLENGTH];
+
+    public:
+        ScriptConfigSys(USHORT = 1);
         ~ScriptConfigSys();
 
-        void SetStatement(const PSZ pszStatement);
-        USHORT SetUnique(BOOL bUnique);
-        USHORT SetAddRight(BOOL bAddRight);
-        USHORT SetAddLeft(BOOL bAddLeft);
-        USHORT SetAddTop(BOOL bAddTop);
-        USHORT SetAddAfter(BOOL bAddAfter);
-        USHORT SetAddBefore(BOOL bAddBefore);
-        USHORT SetRemoveLine(BOOL bRemoveLine);
-        USHORT SetRemovePart(BOOL bRemovePart);
-        void SetSearchString(const PSZ pszSearchString);
-        USHORT SetConfigSys(CONFIGSYSDATA configSys);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetStatement(const PSZ);
+        USHORT SetUnique(BOOL);
+        USHORT SetAddRight(BOOL);
+        USHORT SetAddLeft(BOOL);
+        USHORT SetAddTop(BOOL);
+        USHORT SetAddAfter(BOOL);
+        USHORT SetAddBefore(BOOL);
+        USHORT SetRemoveLine(BOOL);
+        USHORT SetRemovePart(BOOL);
+        USHORT SetSearchString(const PSZ);
+        USHORT SetConfigSys(CONFIGSYSDATA);
 
         const PSZ ReturnStatement();
@@ -524 +636 @@
         CONFIGSYSDATA ReturnConfigSys();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-
-    };
-
-
-
-
-/*
- *@@ ScriptRegisterClass class
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+    };
+
+
+
+
+/*
+ *@@ScriptRegisterClass:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating register class attribute.
  */
-class ScriptRegisterClass
-    {
-    USHORT              usIndex;
-
-    CHAR                szClassName[MAXCLASSNAMELENGTH];
-    CHAR                szDLLPath[CCHMAXPATH];
-
-    public:
-        ScriptRegisterClass(USHORT usIndex = 1);
+class ScriptRegisterClass : public WarpINScriptBase
+    {
+    CHAR                _szClassName[MAXCLASSNAMELENGTH];
+    CHAR                _szDLLPath[CCHMAXPATH];
+
+    public:
+        ScriptRegisterClass(USHORT = 1);
         ~ScriptRegisterClass();
 
-        void SetClassName(const PSZ pszClassName);
-        void SetDLLPath(const PSZ pszDLLPath);
-        void SetRegisterClass(REGISTERCLASSDATA registerClass);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetClassName(const PSZ);
+        USHORT SetDLLPath(const PSZ);
+        USHORT SetRegisterClass(REGISTERCLASSDATA);
 
         const PSZ ReturnClassName();
@@ -562 +666 @@
         REGISTERCLASSDATA ReturnRegisterClass();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-
-
-    };
-
-
-
-/*
- *@@ ScriptReplaceClass class
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+
+
+    };
+
+
+
+/*
+ *@@ScriptReplaceClass:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating replace class attribute.
  */
-class ScriptReplaceClass
-    {
-    USHORT              usIndex;
-
-    CHAR                szClassName[MAXCLASSNAMELENGTH];
-    CHAR                szNewClassName[MAXCLASSNAMELENGTH];
-
-    public:
-        ScriptReplaceClass(USHORT usIndex = 1);
+class ScriptReplaceClass : public WarpINScriptBase
+    {
+    CHAR                _szClassName[MAXCLASSNAMELENGTH];
+    CHAR                _szNewClassName[MAXCLASSNAMELENGTH];
+
+    public:
+        ScriptReplaceClass(USHORT = 1);
         ~ScriptReplaceClass();
 
-        void SetClassName(const PSZ pszClassName);
-        void SetNewClassName(const PSZ pszNewClassName);
-        void SetReplaceClass(REPLACECLASSDATA replaceClass);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetClassName(const PSZ);
+        USHORT SetNewClassName(const PSZ);
+        USHORT SetReplaceClass(REPLACECLASSDATA);
 
         const PSZ ReturnClassName();
@@ -600 +697 @@
         REPLACECLASSDATA ReturnReplaceClass();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-
-    };
-
-
-
-/*
- *@@ ScriptCreateObject class
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+
+    };
+
+
+
+/*
+ *@@ScriptCreateObject:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating create object attribute.
  */
-class ScriptCreateObject
-    {
-    USHORT              usIndex;
-
-    CHAR                szClassName[MAXCLASSNAMELENGTH];
-    CHAR                szTitle[MAXCLASSTITLELENGTH];
-    CHAR                szLocation[CCHMAXPATH];
-    CHAR                szConfig[MAXCLASSCONFIGLENGTH];
-    BOOL                bReplace;
-
-    public:
-        ScriptCreateObject(USHORT usIndex = 1);
+class ScriptCreateObject : public WarpINScriptBase
+    {
+    CHAR                _szClassName[MAXCLASSNAMELENGTH];
+    CHAR                _szTitle[MAXCLASSTITLELENGTH];
+    CHAR                _szLocation[CCHMAXPATH];
+    CHAR                _szConfig[MAXCLASSCONFIGLENGTH];
+    BOOL                _bReplace;
+
+    public:
+        ScriptCreateObject(USHORT = 1);
         ~ScriptCreateObject();
 
-        void SetClassName(const PSZ pszClassName);
-        void SetTitle(const PSZ pszTitle);
-        void SetLocation(const PSZ pszLocation);
-        void SetConfig(const PSZ pszConfig);
-        void SetReplace(BOOL bReplace);
-        void SetCreateObject(CREATEOBJECTDATA createObject);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetClassName(const PSZ);
+        USHORT SetTitle(const PSZ);
+        USHORT SetLocation(const PSZ);
+        USHORT SetConfig(const PSZ);
+        USHORT SetReplace(BOOL);
+        USHORT SetCreateObject(CREATEOBJECTDATA);
 
         const PSZ ReturnClassName();
@@ -646 +736 @@
         CREATEOBJECTDATA ReturnCreateObject();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
-
-    };
-
-
-
-
-/*
- *@@ ScriptExecute class
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+
+    };
+
+
+
+
+/*
+ *@@ScriptExecute:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating execute attribute.
  */
-class ScriptExecute
-    {
-    USHORT              usIndex;
-
-    CHAR                szExecFileParams[CCHMAXPATH];
-    USHORT              fusContext;
-
-    public:
-        ScriptExecute(USHORT usIndex = 1);
+class ScriptExecute : public WarpINScriptBase
+    {
+    CHAR                _szExecFileParams[CCHMAXPATH];
+    USHORT              _usContext;
+
+    public:
+        ScriptExecute(USHORT = 1);
         ~ScriptExecute();
 
-        void SetExecFileParams(const PSZ pszExecFileParams);
-        void SetContext(USHORT fusContext);
-
-        void SetIndex(USHORT usIndex);
-
-        void SetExecute(EXECUTEDATA execData);
+        USHORT SetExecFileParams(const PSZ);
+        USHORT SetContext(USHORT);
+
+        USHORT SetExecute(EXECUTEDATA);
 
         const PSZ ReturnExecFileParams();
         USHORT ReturnContext();
 
-        USHORT ReturnIndex();
-
-         EXECUTEDATA ReturnExecute();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
-
-    };
-
-
-
-/*
- *@@ ScriptClearProfile class
+        EXECUTEDATA ReturnExecute();
+
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
+
+    };
+
+
+
+/*
+ *@@ScriptClearProfile:
  *  This class is used in ScriptPackage class and it contains datas used
  *  while creating clearprofile attribute.
  */
-class ScriptClearProfile
-    {
-    USHORT              usIndex;
-
-    CHAR                szProfileString[CCHMAXPATH];
-    CHAR                szApplication[MAXPROFILEAPPLICATIONLENGTH];
-    CHAR                szKey[MAXPROFILEKEYLENGTH];
-
-    public:
-        ScriptClearProfile(USHORT usIndex = 1);
+class ScriptClearProfile : public WarpINScriptBase
+    {
+    CHAR                _szProfileString[CCHMAXPATH];
+    CHAR                _szApplication[MAXPROFILEAPPLICATIONLENGTH];
+    CHAR                _szKey[MAXPROFILEKEYLENGTH];
+
+    public:
+        ScriptClearProfile(USHORT = 1);
         ~ScriptClearProfile();
 
-        void SetProfileString(const PSZ pszProfile);
-        void SetApplication(const PSZ pszApplication);
-        void SetKey(const PSZ pszKey);
-        void SetProfile(PROFILEDATA profile);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetProfileString(const PSZ);
+        USHORT SetApplication(const PSZ);
+        USHORT SetKey(const PSZ);
+        USHORT SetProfile(PROFILEDATA);
 
         const PSZ ReturnProfileString();
@@ -726 +802 @@
         PROFILEDATA ReturnProfile();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
 
     };
@@ -743 +816 @@
  *  while creating writeprofile attribute.
  */
-class ScriptWriteProfile
-    {
-    USHORT              usIndex;
-
-    CHAR                szProfileString[CCHMAXPATH];
-    CHAR                szApplication[MAXPROFILEAPPLICATIONLENGTH];
-    CHAR                szKey[MAXPROFILEKEYLENGTH];
-    PSZ                 pszString;
-
-    public:
-        ScriptWriteProfile(USHORT usIndex = 1);
+class ScriptWriteProfile : public WarpINScriptBase
+    {
+    CHAR                _szProfileString[CCHMAXPATH];
+    CHAR                _szApplication[MAXPROFILEAPPLICATIONLENGTH];
+    CHAR                _szKey[MAXPROFILEKEYLENGTH];
+    PSZ                 _pszString;
+
+    public:
+        ScriptWriteProfile(USHORT = 1);
         ~ScriptWriteProfile();
-        ScriptWriteProfile &operator=(const ScriptWriteProfile &writeProfile);
-
-        void SetProfileString(const PSZ pszProfile);
-        void SetApplication(const PSZ pszApplication);
-        void SetKey(const PSZ pszKey);
-        void SetProfile(PROFILEDATA profile);
-        void SetString(const PSZ pszString);
-
-        void SetIndex(USHORT usIndex);
-
-        const PSZ ReturnProfileString();
-        const PSZ ReturnApplication();
-        const PSZ ReturnKey();
-        const PSZ ReturnString();
+        ScriptWriteProfile &operator=(ScriptWriteProfile &);
+
+        USHORT SetProfileString(const PSZ);
+        USHORT SetApplication(const PSZ);
+        USHORT SetKey(const PSZ);
+        USHORT SetProfile(PROFILEDATA);
+        USHORT SetString(const PSZ);
+
+        const PSZ ReturnProfileString() const;
+        const PSZ ReturnApplication() const;
+        const PSZ ReturnKey() const;
+        const PSZ ReturnString() const;
         PROFILEDATA ReturnProfile();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **ppScriptError,
-                          USHORT *pusErrorTableSize, ULONG ulLineNumber);
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
 
     };
@@ -788 +854 @@
  *  while creating KILLPROCESS attribute.
  */
-class ScriptKillProcess
-    {
-    USHORT              usIndex;
-
-    CHAR                szFileName[CCHMAXPATH];
-
-    public:
-        ScriptKillProcess(USHORT usIndex = 1);
+class ScriptKillProcess : public WarpINScriptBase
+    {
+    CHAR                _szFileName[CCHMAXPATH];
+
+    public:
+        ScriptKillProcess(USHORT = 1);
         ~ScriptKillProcess();
 
-        void SetFileName(const PSZ pszFileName);
-
-        void SetIndex(USHORT usIndex);
+        USHORT SetFileName(const PSZ);
 
         const PSZ ReturnFileName();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
-
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
+        PSZ MakeScriptText(BOOL = TRUE);
+
+        PSZ BuildFromText(PSZ, ULONG);
     };
 
@@ -822 +881 @@
  *  related to package. There are two different index ordering modes...
  */
-class ScriptPackage
-    {
-    USHORT              usIndex;
-
+class ScriptPackage : public WarpINScriptBase
+    {
         // Used when removing object from table. If TRUE object indexes are
-        // automatically ordered.
+        // automatically reordered.
         //  Ex. 0, 1, 2, 3, 4
         //  Number 3 is removed -> indexing: 0, 1, 2, 3
         //  New object -> indexing: 0, 1, 2, 3, 4
         //  => New object is now number 4.
-        // If FALSE object indexes are not ordered.
+        // If FALSE object indexes are not reordered.
         //  Ex. 0, 1, 2, 3, 4
         //  Number 3 is removed -> indexing: 0, 1, 2, 4
         //  New object -> indexing: 0, 1, 2, 4, 3
         //  => New object is now number 3.
-    BOOL                bAllowIndexArrangement;
-
-    ScriptIndex         Index;
-    PSZ                 pszDescription;
-    ScriptPackageID     PckID;
-    ScriptTitle         Title;
-    ScriptTarget        Target;
-    ScriptKeyWord       KeyWords;
-
-    ScriptRequires      *pRequires;
-    USHORT              usRequiresCount;
-
-    ScriptConfigSys     *pConfigSys;
-    USHORT              usConfigSysCount;
-
-    ScriptRegisterClass *pRegisterClass;
-    USHORT              usRegisterClassCount;
-
-    ScriptReplaceClass  *pReplaceClass;
-    USHORT              usReplaceClassCount;
-
-    ScriptCreateObject  *pCreateObject;
-    USHORT              usCreateObjectCount;
-
-    ScriptExecute       *pExecute;
-    USHORT              usExecuteCount;
-
-    ScriptWriteProfile  *pWriteProfile;
-    USHORT              usWriteProfileCount;
-
-    ScriptClearProfile  *pProfile;
-    USHORT              usProfileCount;
-
-    ScriptKillProcess   *pKillProcess;
-    USHORT              usKillProcessCount;
-
-    // Functions for finding of unused indexes.
-    // Function for copying table to another table.
-        // ScriptRequires
-    ScriptRequires *CopyTable(ScriptRequires *DestTable, ScriptRequires *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptRequires *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptRequires *Table, USHORT usTableSize);
-         // ScriptConfigSys
-    ScriptConfigSys *CopyTable(ScriptConfigSys *DestTable, ScriptConfigSys *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptConfigSys *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptConfigSys *Table, USHORT usTableSize);
-         // ScriptRegisterClass
-    ScriptRegisterClass *CopyTable(ScriptRegisterClass *DestTable, ScriptRegisterClass *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptRegisterClass *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptRegisterClass *Table, USHORT usTableSize);
-         // ScriptReplaceClass
-    ScriptReplaceClass *CopyTable(ScriptReplaceClass *DestTable, ScriptReplaceClass *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptReplaceClass *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptReplaceClass *Table, USHORT usTableSize);
-         // ScriptCreateObject
-    ScriptCreateObject *CopyTable(ScriptCreateObject *DestTable, ScriptCreateObject *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptCreateObject *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptCreateObject *Table, USHORT usTableSize);
-         // ScriptClearProfile
-    ScriptClearProfile *CopyTable(ScriptClearProfile *DestTable, ScriptClearProfile *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptClearProfile *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptClearProfile *Table, USHORT usTableSize);
-         // ScriptWriteProfile
-    ScriptWriteProfile *CopyTable(ScriptWriteProfile *DestTable, ScriptWriteProfile *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptWriteProfile *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptWriteProfile *Table, USHORT usTableSize);
-         // ScriptExecuteClass
-    ScriptExecute *CopyTable(ScriptExecute *DestTable, ScriptExecute *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptExecute *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptExecute *Table, USHORT usTableSize);
-         // ScriptKillProcess
-    ScriptKillProcess *CopyTable(ScriptKillProcess *DestTable, ScriptKillProcess *SrcTable,
-        USHORT usSize, USHORT usSkipIndex = 0);
-    void ReBuildIndexes(ScriptKillProcess *Table, USHORT usTableSize);
-    USHORT FindUnusedIndex(ScriptKillProcess *Table, USHORT usTableSize);
-    public:
-        ScriptPackage(USHORT usIndex = 1, BOOL bAllowIndexArrangement = TRUE);
+    BOOL                _bAllowIndexArrangement;
+
+    ScriptIndex         _Index;
+    PSZ                 _pszDescription;
+    ScriptPackageID     _PckID;
+    ScriptTitle         _Title;
+    ScriptTarget        _Target;
+    ScriptKeyWord       _KeyWords;
+
+    ScriptRequires      *_pRequires;
+    USHORT              _usRequiresCount;
+
+    ScriptConfigSys     *_pConfigSys;
+    USHORT              _usConfigSysCount;
+
+    ScriptRegisterClass *_pRegisterClass;
+    USHORT              _usRegisterClassCount;
+
+    ScriptReplaceClass  *_pReplaceClass;
+    USHORT              _usReplaceClassCount;
+
+    ScriptCreateObject  *_pCreateObject;
+    USHORT              _usCreateObjectCount;
+
+    ScriptExecute       *_pExecute;
+    USHORT              _usExecuteCount;
+
+    ScriptWriteProfile  *_pWriteProfile;
+    USHORT              _usWriteProfileCount;
+
+    ScriptClearProfile  *_pProfile;
+    USHORT              _usProfileCount;
+
+    ScriptKillProcess   *_pKillProcess;
+    USHORT              _usKillProcessCount;
+
+    public:
+        ScriptPackage(USHORT = 1, BOOL = TRUE);
         ~ScriptPackage();
         // Copy constructor. Needed when adding, removing or moving objects
@@ -927 +937 @@
         ScriptPackage(ScriptPackage &);
         // Assignment operator. Needed when adding, removing or moving objects.
-        ScriptPackage &operator=(const ScriptPackage &);
-
-        USHORT SetDescription(const PSZ pszDescription);
+        ScriptPackage &operator=(ScriptPackage &);
+        // Clear all.
+        USHORT ClearAll();
+
+        USHORT SetDescription(const PSZ);
         //SetPackageData(PACKAGEDATA package);
-
-        void SetIndex(USHORT usIndex);
 
         const PSZ ReturnDescription();
         //PACKAGEDATA ReturnPackageData();
 
-        void SetPackageIndex(USHORT usPckIndex);
-        void SetPackageID(PACKAGEIDDATA);
-        void SetTitle(const PSZ pszTitle);
-        void SetTarget(const PSZ pszTarget);
-        void SetKeyWords(USHORT usKeyWords);
+        USHORT SetPackageIndex(USHORT);
+        USHORT SetPackageID(PACKAGEIDDATA);
+        USHORT SetTitle(const PSZ);
+        USHORT SetTarget(const PSZ);
+        USHORT SetKeyWords(USHORT);
         ScriptIndex *ReturnPackageIndex();
         USHORT ReturnPackageIndexNumber();
@@ -951 +961 @@
         ScriptKeyWord *ReturnKeyWordObject();
 
-        USHORT ReturnIndex();
-
-        PSZ MakeScriptText(BOOL bAttribute = TRUE);
+        PSZ MakeScriptText(BOOL = TRUE);
 
         // Build package accordingly to pszScriptText. If there is any errors
         // in script text, error information is returned in *pScriptError table.
-        PSZ BuildFromText(PSZ pszScriptText, SCRIPTERROR **pScriptError,
-                         USHORT *usErrorTableSize, ULONG ulLineNumber);
+        PSZ BuildFromText(PSZ, ULONG);
 
         // Functions for handling of requires class
@@ -964 +971 @@
             // pointer to the new object.
         ScriptRequires *CreateRequiresObject();
-        ScriptRequires *CreateRequiresObject(REQUIRESDATA requiresData);
+        ScriptRequires *CreateRequiresObject(REQUIRESDATA);
             // Returns address of ScriptRequires object which index is usIndex.
-        ScriptRequires *ReturnRequiresObject(USHORT usIndex);
+        ScriptRequires *ReturnRequiresObject(USHORT);
             // Deletes ScriptRequires object which index is usIndex.
-        USHORT DeleteRequiresObject(USHORT usIndex);
+        USHORT DeleteRequiresObject(USHORT);
             // Deletes ScriptRequires object which address is
             // *ScriptRequiresClass.
-        USHORT DeleteRequiresObject(ScriptRequires *ScriptRequiresObject);
+        USHORT DeleteRequiresObject(ScriptRequires *);
             // Returns how many ScriptRequires objectes belongs to ScriptPackage
             // (this) object.
@@ -982 +989 @@
             // pointer to the new object.
         ScriptConfigSys *CreateConfigSysObject();
-         ScriptConfigSys *CreateConfigSysObject(CONFIGSYSDATA data);
+         ScriptConfigSys *CreateConfigSysObject(CONFIGSYSDATA);
             // Returns address of ScriptConfigSys object which index is usIndex.
-        ScriptConfigSys *ReturnConfigSysObject(USHORT usIndex);
+        ScriptConfigSys *ReturnConfigSysObject(USHORT);
             // Deletes ScriptConfigSys object which index is usIndex.
-        USHORT DeleteConfigSysObject(USHORT usIndex);
+        USHORT DeleteConfigSysObject(USHORT);
             // Deletes ScriptConfigSys object which address is
             // *ScriptConfigSysObject.
-        USHORT DeleteConfigSysObject(ScriptConfigSys *ScriptConfigSysObject);
+        USHORT DeleteConfigSysObject(ScriptConfigSys *);
             // Returns index of object which address is *ScriptConfigSysObject.
-        USHORT ReturnIndexOfConfigSysObject(ScriptConfigSys *ScriptConfigSysObject);
+        USHORT ReturnIndexOfConfigSysObject(ScriptConfigSys *);
             // Returns how many ScriptConfigSys objectes belongs to ScriptPackage
             // (this) object.
@@ -1002 +1009 @@
             // pointer to the new object.
         ScriptRegisterClass *CreateRegisterClassObject();
-        ScriptRegisterClass *CreateRegisterClassObject(REGISTERCLASSDATA data);
+        ScriptRegisterClass *CreateRegisterClassObject(REGISTERCLASSDATA);
             // Returns address of ScriptRegisterClass object which index is
             // usIndex.
-        ScriptRegisterClass *ReturnRegisterClassObject(USHORT usIndex);
+        ScriptRegisterClass *ReturnRegisterClassObject(USHORT);
             // Deletes ScriptRegisterClass object which index is usIndex.
-        USHORT DeleteRegisterClassObject(USHORT usIndex);
+        USHORT DeleteRegisterClassObject(USHORT);
             // Deletes ScriptRegisterClass object which address is
             // *ScriptRegisterClassObject.
-        USHORT DeleteRegisterClassObject(ScriptRegisterClass
-                                        *ScriptRegisterClassObject);
+        USHORT DeleteRegisterClassObject(ScriptRegisterClass *);
             // Returns how many ScriptRegisterClass objectes belongs to ScriptPackage
             // (this) object.
@@ -1022 +1028 @@
             // pointer to the new object.
         ScriptReplaceClass *CreateReplaceClassObject();
-        ScriptReplaceClass *CreateReplaceClassObject(REPLACECLASSDATA data);
+        ScriptReplaceClass *CreateReplaceClassObject(REPLACECLASSDATA);
             // Returns address of ScriptReplaceClass object which index is
             // usIndex.
-        ScriptReplaceClass *ReturnReplaceClassObject(USHORT usIndex);
+        ScriptReplaceClass *ReturnReplaceClassObject(USHORT);
             // Deletes ScriptReplaceClass object which index is usIndex.
-        USHORT DeleteReplaceClassObject(USHORT usIndex);
+        USHORT DeleteReplaceClassObject(USHORT);
             // Deletes ScriptReplaceClass object which address is
             // *ScriptReplaceClassObject.
-        USHORT DeleteReplaceClassObject(ScriptReplaceClass
-                                      *ScriptReplaceClassObject);
+        USHORT DeleteReplaceClassObject(ScriptReplaceClass *);
             // Returns how many ScriptReplaceClass objectes belongs to ScriptPackage
             // (this) object.
@@ -1042 +1047 @@
             // pointer to the new object.
         ScriptCreateObject *CreateCreateObjectObject();
-        ScriptCreateObject *CreateCreateObjectObject(CREATEOBJECTDATA data);
+        ScriptCreateObject *CreateCreateObjectObject(CREATEOBJECTDATA);
             // Returns address of ScriptCreateObject object which index is
             // usIndex.
-        ScriptCreateObject *ReturnCreateObjectObject(USHORT usIndex);
+        ScriptCreateObject *ReturnCreateObjectObject(USHORT);
             // Deletes ScriptCreateObject object which index is usIndex.
-        USHORT DeleteCreateObjectObject(USHORT usIndex);
+        USHORT DeleteCreateObjectObject(USHORT);
             // Deletes ScriptCreateObject object which address is
             // *ScriptCreateObjectObject.
-        USHORT DeleteCreateObjectObject(ScriptCreateObject
-                                      *ScriptCreateObjectObject);
+        USHORT DeleteCreateObjectObject(ScriptCreateObject *);
             // Returns how many ScriptCreateObject objectes belongs to ScriptPackage
             // (this) object.
@@ -1062 +1066 @@
             // pointer to the new object.
         ScriptExecute *CreateExecuteObject();
-        ScriptExecute *CreateExecuteObject(PSZ pszExecute);
+        ScriptExecute *CreateExecuteObject(PSZ);
             // Returns address of ScriptExecute object which index is
             // usIndex.
-        ScriptExecute *ReturnExecuteObject(USHORT usIndex);
+        ScriptExecute *ReturnExecuteObject(USHORT);
             // Deletes ScriptExecute object which index is usIndex.
-        USHORT DeleteExecuteObject(USHORT usIndex);
+        USHORT DeleteExecuteObject(USHORT);
             // Deletes ScriptExecute object which address is
             // *ScriptExecuteObject.
-        USHORT DeleteExecuteObject(ScriptExecute
-                                  *ScriptExecuteObject);
+        USHORT DeleteExecuteObject(ScriptExecute *);
             // Returns how many ScriptCreateObject objectes belongs to ScriptPackage
             // (this) object.
@@ -1082 +1085 @@
             // pointer to the new object.
         ScriptClearProfile *CreateClearProfileObject();
-        ScriptClearProfile *CreateClearProfileObject(PROFILEDATA data);
+        ScriptClearProfile *CreateClearProfileObject(PROFILEDATA);
             // Returns address of ScriptClearProfile object which index is
             // usIndex.
-        ScriptClearProfile *ReturnClearProfileObject(USHORT usIndex);
+        ScriptClearProfile *ReturnClearProfileObject(USHORT);
             // Deletes ScriptClearProfile object which index is usIndex.
-        USHORT DeleteClearProfileObject(USHORT usIndex);
+        USHORT DeleteClearProfileObject(USHORT);
             // Deletes ScriptClearProfile object which address is
             // *ScriptClearProfileObject.
-        USHORT DeleteClearProfileObject(ScriptClearProfile
-                                       *ScriptClearProfileObject);
+        USHORT DeleteClearProfileObject(ScriptClearProfile *);
             // Returns how many ScriptCreateObject objectes belongs to ScriptPackage
             // (this) object.
         USHORT ReturnClearProfileObjectCount();
+
 
 
@@ -1101 +1104 @@
             // pointer to the new object.
         ScriptWriteProfile *CreateWriteProfileObject();
-        ScriptWriteProfile *CreateWriteProfileObject(PROFILEDATA data);
+        ScriptWriteProfile *CreateWriteProfileObject(PROFILEDATA);
             // Returns address of ScriptWriteProfile object which index is
             // usIndex.
-        ScriptWriteProfile *ReturnWriteProfileObject(USHORT usIndex);
+        ScriptWriteProfile *ReturnWriteProfileObject(USHORT);
             // Deletes ScriptWriteProfile object which index is usIndex.
-        USHORT DeleteWriteProfileObject(USHORT usIndex);
+        USHORT DeleteWriteProfileObject(USHORT);
             // Deletes ScriptWriteProfile object which address is
             // *ScriptWriteProfileObject.
-        USHORT DeleteWriteProfileObject(ScriptWriteProfile
-                                       *ScriptWriteProfileObject);
+        USHORT DeleteWriteProfileObject(ScriptWriteProfile *);
             // Returns how many ScriptCreateObject objectes belongs to ScriptPackage
             // (this) object.
         USHORT ReturnWriteProfileObjectCount();
+
 
 
@@ -1120 +1123 @@
             // pointer to the new object.
         ScriptKillProcess *CreateKillProcessObject();
-        ScriptKillProcess *CreateKillProcessObject(const PSZ pszFileName);
+        ScriptKillProcess *CreateKillProcessObject(const PSZ);
             // Returns address of ScriptKillProcess object which index is
             // usIndex.
-        ScriptKillProcess *ReturnKillProcessObject(USHORT usIndex);
+        ScriptKillProcess *ReturnKillProcessObject(USHORT);
             // Deletes ScriptKillProcess object which index is usIndex.
-        USHORT DeleteKillProcessObject(USHORT usIndex);
+        USHORT DeleteKillProcessObject(USHORT);
             // Deletes ScriptKillProcess object which address is
             // *ScriptKillProcessObject.
-        USHORT DeleteKillProcessObject(ScriptKillProcess
-                                       *ScriptKillProcessObject);
+        USHORT DeleteKillProcessObject(ScriptKillProcess *);
             // Returns how many ScriptCreateObject objectes belongs to ScriptPackage
             // (this) object.
@@ -1213 +1215 @@
                    BOOL bAllowIndexArrangement = TRUE);
         ~ScriptGroup();
-        ScriptGroup(const ScriptGroup &);
-        ScriptGroup &operator=(const ScriptGroup &);
+        ScriptGroup(ScriptGroup &);
+        USHORT ClearAll();
+        ScriptGroup &operator=(ScriptGroup &);
 
         void SetVirtual(BOOL bVirtual);
@@ -1238 +1241 @@
             // pointer to the new object.
         ScriptPackage *CreatePackageObject();
-        ScriptPackage *CreatePackageObject(const ScriptPackage *pPck);
+        ScriptPackage *CreatePackageObject(ScriptPackage *pPck);
             // Returns address of ScriptPackage object which index is
             // usIndex.
@@ -1347 +1350 @@
 /*
  *@@ ScriptHead class
- *  This class is used in WarpINScript class and it contains datas used
+ *  This class is used in WarpINScriptBase class and it contains datas used
  *  while creating head tag. This class contains all other classes
  *  related to head attribute including group, title and message. Although
@@ -1563 +1566 @@
 /*
  *@@ ScriptBody class
- *  This class is used in WarpINScript class and it contains datas used
+ *  This class is used in WarpINScriptBase class and it contains datas used
  *  while creating body tag. This class contains page class.
  */
@@ -1620 +1623 @@
 /*
  *@@ ScriptVersion class
- *  This class is used in WarpINScript class and it contains datas used
+ *  This class is used in WarpINScriptBase class and it contains datas used
  *  while creating version attribute. This class contains no other classes.
  */
@@ -1658 +1661 @@
 /*
  *@@ ScriptOS class
- *  This class is used in WarpINScript class and it contains datas used
+ *  This class is used in WarpINScriptBase class and it contains datas used
  *  while creating operating system attribute. This class contains no other
  *  classes.
@@ -1697 +1700 @@
 /*
  *@@ ScriptCodePage class
- *  This class is used in WarpINScript class and it contains datas used
+ *  This class is used in WarpINScriptBase class and it contains datas used
  *  while creating codepage attribute. This class contains no other
  *  classes.

trunk/include/wicpm/trad_arc_thread.h ¶

@@ -1 @@
-
-/*
- * trad_arc_thread.h
- *
- *  Copyright (C) 1999-2000 Teemu Ahola.
- *
- */
 
 

trunk/src/wicpm/gui_helpers.cpp ¶

@@ -324 +324 @@
     }
 
+
+USHORT guiLoadString(HAB habThread, ULONG ulID, PSZ *ppsz)
+    {
+    CHAR szBuf[255];
+    USHORT rc = 0;
+
+    if (*ppsz)
+        free(*ppsz);
+    if (WinLoadString(habThread, NULLHANDLE, ulID ,
+                      sizeof(szBuf), szBuf))
+        *ppsz = strdup(szBuf);
+    else
+        {
+        *ppsz = strdup("Error: String resource not found");
+        rc = 1;
+        }
+
+    return rc;
+    }

trunk/src/wicpm/gui_notebook.cpp ¶

@@ -13 +13 @@
 #include <stdlib.h>
 #include "setup.h"
+#include "helpers\dosh.h"
 
 #include "wicpm\gui_notebook.h"
@@ -172 +173 @@
     /*ulNBStyle = WinQueryWindowULong (hwndNotebook, QWL_STYLE);
     ulNBStyle &= 0xffff0000;
-    ulNBStyle |= BKS_SOLIDBIND | BKS_BACKPAGESBR | BKS_MAJORTABTOP |
-                 BKS_SQUARETABS | BKS_TABTEXTCENTER | BKS_STATUSTEXTLEFT |
-                 WS_GROUP;
+
+    if (doshIsWarp4())
+        ulNBStyle |= 0x800 | BKS_BACKPAGESBR | BKS_TABTEXTCENTER | WS_GROUP;
+    else
+        ulNBStyle |= BKS_SOLIDBIND | BKS_BACKPAGESBR | BKS_MAJORTABTOP |
+                     BKS_SQUARETABS | BKS_TABTEXTCENTER | BKS_STATUSTEXTLEFT |
+                     WS_GROUP;
+
     WinSetWindowULong (hwndNotebook, QWL_STYLE, ulNBStyle);
     WinInvalidateRect (hwndNotebook, NULL, TRUE);*/
-
 
     if (!SizeTabs (hwndNotebook))

trunk/src/wicpm/gui_objwnd.cpp ¶

@@ -26 +26 @@
 #include "helpers\dosh.h"
 #include "helpers\stringh.h"
+#include <list>
+#include "helpers\stringh.h"
+#include "helpers\xstring.h"
+#include "base\bs_string.h"
 
 #include "wicpm\script.hpp"

trunk/src/wicpm/gui_trad_cntr.cpp ¶

@@ -29 +29 @@
 #include "helpers\cnrh.h"
 #include "helpers\linklist.h"
+#include <list>
+#include "helpers\stringh.h"
+#include "helpers\xstring.h"
+#include "base\bs_string.h"
 
 #include "wicpm\script.hpp"

trunk/src/wicpm/gui_trad_nb_dlgproc.cpp ¶

@@ -23 +23 @@
 #include "helpers\linklist.h"
 #include "helpers\cnrh.h"
+#include "helpers\stringh.h"
+#include "helpers\xstring.h"
+#include "base\bs_string.h"
+
 
 #include "wiarchive\wiarchive.h" // WIArchive created by Jens B„ckman.
@@ -77 +81 @@
     {
     MRESULT mrc = 0;
+    static BOOL bSelectedFromList = FALSE;
 
     switch (msg)
@@ -110 +115 @@
             sprintf(szNumber, "%d", pPckID->ReturnRevision());
             WinSetDlgItemText(hwndDlg, IDD_NB_GENERAL_VERSIONREVISION, szNumber);
+
+            // Insert target combo box list items.
+            /*HWND hwndTarget = WinWindowFromID(hwndDlg, IDD_NB_GENERAL_TARGETPATH);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_DEFAPPPATH);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_DEFTOOLPATH);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_BOOTDRIVER);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_PCKINDEX);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_PCK);
+            WinInsertLboxItem(hwndTarget, LIT_END, TEXT_TARGET_ENV);*/
+
             break;
             }
@@ -142 +157 @@
                         case IDD_NB_GENERAL_PCKNAME:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_PCKNAME,
-                                                MAXPCKNAMELENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_PCKNAME,
+                                               MAXPCKNAMELENGTH, szString);
                             pPckID->SetPackage(szString);
 
@@ -150 +165 @@
                         case IDD_NB_GENERAL_AUTHORNAME:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_AUTHORNAME,
-                                                MAXVENDORNAMELENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_AUTHORNAME,
+                                               MAXVENDORNAMELENGTH, szString);
                             pPckID->SetVendor(szString);
                             break;
@@ -157 +172 @@
                         case IDD_NB_GENERAL_APPNAME:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_APPNAME,
-                                                MAXAPPNAMELENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_APPNAME,
+                                               MAXAPPNAMELENGTH, szString);
                             pPckID->SetApplication(szString);
                             break;
@@ -164 +179 @@
                         case IDD_NB_GENERAL_VERSIONMAJOR:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_VERSIONMAJOR,
-                                                MAXVERSIONLENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_VERSIONMAJOR,
+                                               MAXVERSIONLENGTH, szString);
                             pPckID->SetMajor(atoi(szString));
                             break;
@@ -171 +186 @@
                         case IDD_NB_GENERAL_VERSIONMINOR:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_VERSIONMINOR,
-                                                MAXVERSIONLENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_VERSIONMINOR,
+                                               MAXVERSIONLENGTH, szString);
                             pPckID->SetMinor(atoi(szString));
                             break;
@@ -178 +193 @@
                         case IDD_NB_GENERAL_VERSIONREVISION:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_VERSIONREVISION,
-                                                MAXVERSIONLENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_VERSIONREVISION,
+                                               MAXVERSIONLENGTH, szString);
                             pPckID->SetRevision(atoi(szString));
                             break;
@@ -185 +200 @@
                         case IDD_NB_GENERAL_TITLE:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_TITLE,
-                                                MAXTITLELENGTH, szString);
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_TITLE,
+                                               MAXTITLELENGTH, szString);
                             pPckDlgInfo->pPackage->SetTitle(szString);
-                            break;
-                            }
+                            //break;
+                          //  }
+                        //case IDD_NB_GENERAL_TARGETPATH:
+                            //{
+                            WinQueryDlgItemText(hwndDlg, IDD_NB_GENERAL_TARGETPATH,
+                                               CCHMAXPATH, szString);
+                            pPckDlgInfo->pPackage->SetTarget(szString);
+                            break;
+                            }
+                        }
+                    break;
+                    } // endcase EN_KILLFOCUS.
+                /*case CBN_LBSELECT:
+                    {
+                    switch (SHORT1FROMMP(mp1))
+                        {
                         case IDD_NB_GENERAL_TARGETPATH:
                             {
-                            WinQueryDlgItemText (hwndDlg, IDD_NB_GENERAL_TARGETPATH,
-                                                CCHMAXPATH, szString);
-                            pPckDlgInfo->pPackage->SetTarget(szString);
-                            break;
-                            }
-                        }
-                    break;
-                    } // endcase EN_KILLFOCUS.
+                            // An item has been selected from list.
+                            //bSelectedFromList = TRUE;
+                            break;
+                            }
+                        }
+                    break;
+                    }*/
+                /*case CBN_LBSELECT:
+                    {
+                    switch (SHORT1FROMMP(mp1))
+                        {
+                        case IDD_NB_GENERAL_TARGETPATH:
+                            {
+                            CHAR szTemp[CCHMAXPATH];
+                            PSZ pszFirst = NULL, pszLast = NULL, pszTemp = NULL;
+                            USHORT usFirst = 0, usLast = 0;
+                            HWND hwndEF = (HWND)LONGFROMMP(mp2);
+
+                            // Check that the text was selected from the list.
+                            // If not, break.
+                            if (bSelectedFromList == FALSE)
+                                break;
+                            bSelectedFromList = FALSE;
+
+                            WinQueryWindowText(hwndEF, CCHMAXPATH, szTemp);
+
+                            // Check if there is '(' somewhere.
+                            pszFirst = strchr(szTemp, '(');
+                            // If there is '(', try to find ending ')'.
+                            if (pszFirst)
+                                {
+                                pszLast = strchr(szTemp, ')');
+                                // There is no ')' in the string. Leave.
+                                if (!pszLast)
+                                    break;
+                                // Get first ('s index.
+                                pszTemp = szTemp;
+                                while (pszTemp != pszFirst)
+                                    {
+                                    usFirst ++;
+                                    pszTemp ++;
+                                    }
+                                // Get last )'s index.
+                                pszTemp = szTemp;
+                                while (pszTemp != pszLast)
+                                    {
+                                    usLast ++;
+                                    pszTemp ++;
+                                    }
+                                // Select the text between '(' and ')'.
+                                WinSendMsg(hwndEF, EM_SETSEL,
+                                           MPFROM2SHORT(usFirst + 1, usLast - 1), 0);
+                                }
+                            break;
+                            }
+                        }
+                    break;
+                    }*/
                 }
             break;
@@ -847 +926 @@
  *  Dialog procedure for object page dialog in the package notebook.
  */
-MRESULT EXPENTRY fnTradObjectPageProc (HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
+MRESULT EXPENTRY fnTradObjectPageProc(HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
     {
     MRESULT mrc = 0;
@@ -865 +944 @@
             HWND hwndClassLbox = WinWindowFromID (hwndDlg, IDD_NB_OBJECT_CLASSNAME);
             HWND hwndConfigLbox = WinWindowFromID (hwndDlg, IDD_NB_OBJECT_CONFIG);
+
+            /*  // Subclass config listbox's window procedure with fnCnfgLbox.
+                // This way we can modify the function of the listbox.
+                PFNWP OldLboxProc = WinSubclassWindow(hwndConfigLbox, fnCnfgLbox);
+                if (OldLboxProc)
+                    {
+                    OLDPROC *pData = (OLDPROC*)malloc(sizeof(OLDPROC));
+                    pData->OldProc = OldLboxProc;
+                    WinSetWindowULong(hwndConfigLbox, QWL_USER, (ULONG)pData);
+                    }
+            */
 
             pMsgData = new MSGDATA;
@@ -978 +1068 @@
                 case IDD_NB_OBJECT_REMOVE:
                     {
-                    PPCKDLGINFO pPckDlgInfo = (PPCKDLGINFO)WinQueryWindowPtr (hwndDlg, 0);
-                    HWND hwndLbox = WinWindowFromID (hwndDlg,
+                    PPCKDLGINFO pPckDlgInfo = (PPCKDLGINFO)WinQueryWindowPtr(hwndDlg, 0);
+                    HWND hwndLbox = WinWindowFromID(hwndDlg,
                         IDD_NB_OBJECT_LIST);
                     ScriptPackage *pPck = pPckDlgInfo->pPackage;
@@ -988 +1078 @@
                         pPck->DeleteCreateObjectObject((USHORT)sSelected);
                             // Clear entry fields.
-                        WinSetDlgItemText (hwndDlg, IDD_NB_OBJECT_CLASSNAME, "");
-                        WinSetDlgItemText (hwndDlg, IDD_NB_OBJECT_TITLE, "");
-                        WinSetDlgItemText (hwndDlg, IDD_NB_OBJECT_LOCATION, "");
-                        WinSetDlgItemText (hwndDlg, IDD_NB_OBJECT_CONFIG, "");
+                        WinSetDlgItemText(hwndDlg, IDD_NB_OBJECT_CLASSNAME, "");
+                        WinSetDlgItemText(hwndDlg, IDD_NB_OBJECT_TITLE, "");
+                        WinSetDlgItemText(hwndDlg, IDD_NB_OBJECT_LOCATION, "");
+                        WinSetDlgItemText(hwndDlg, IDD_NB_OBJECT_CONFIG, "");
                             // Uncheck replace check button.
-                        WinCheckButton (hwndDlg, IDD_NB_OBJECT_REPLACE, FALSE);
+                        WinCheckButton(hwndDlg, IDD_NB_OBJECT_REPLACE, FALSE);
                         }
                     sSelected = 0;
                     if (pPck->ReturnCreateObjectObjectCount() == 0)
-                        WinEnableControl (hwndDlg, IDD_NB_OBJECT_REMOVE, FALSE);
-                    WinEnableControl (hwndDlg, IDD_NB_OBJECT_UP, FALSE);
-                    WinEnableControl (hwndDlg, IDD_NB_OBJECT_DOWN, FALSE);
+                        WinEnableControl(hwndDlg, IDD_NB_OBJECT_REMOVE, FALSE);
+                    WinEnableControl(hwndDlg, IDD_NB_OBJECT_UP, FALSE);
+                    WinEnableControl(hwndDlg, IDD_NB_OBJECT_DOWN, FALSE);
+                    break;
+                    }
+                case IDD_NB_OBJECT_UP:
+                    {
+                    PPCKDLGINFO pPckDlgInfo = (PPCKDLGINFO)WinQueryWindowPtr (hwndDlg, 0);
+                    HWND hwndLbox = WinWindowFromID (hwndDlg,
+                        IDD_NB_OBJECT_LIST);
+                    ScriptCreateObject *pObject = NULL, *pDestination = NULL, temp;
+                    ScriptPackage *pPck = pPckDlgInfo->pPackage;
+                    PSZ pszScript = NULL;
+
+                    // If user has selected an list box item and it is not the first
+                    // one, it can be moved upwards.
+                    if (sSelected > 1)
+                        {
+                        // Get selected entity.
+                        pObject = pPck->ReturnCreateObjectObject(sSelected);
+                        // Get entity before selected entity.
+                        pDestination = pPck->ReturnCreateObjectObject(sSelected - 1);
+                        // Swap the contents of the entities.
+                        temp = *pObject;
+                        *pObject = *pDestination;
+                        *pDestination = temp;
+                        // Swap indexes.
+                        pDestination->SetIndex(pObject->ReturnIndex());
+                        pObject->SetIndex(temp.ReturnIndex());
+                        // Delete old list box items. We have to substract 1 and 2
+                        // because indexing in script class doesn't start from 0
+                        // but it starts from 1 and sSelected tells which object
+                        // is selected and not which list index is selected.
+                        WinSendMsg(hwndLbox, LM_DELETEITEM, MPFROMSHORT(sSelected - 1),
+                                   0);
+                        WinSendMsg(hwndLbox, LM_DELETEITEM, MPFROMSHORT(sSelected - 2),
+                                   0);
+                        // Set proper script texts to the list box.
+                        pszScript = pDestination->MakeScriptText(FALSE);
+                        WinInsertLboxItem(hwndLbox, pDestination->ReturnIndex() - 1,
+                                          pszScript);
+                        delete [] pszScript;
+                        pszScript = pObject->MakeScriptText(FALSE);
+                        WinInsertLboxItem(hwndLbox, pObject->ReturnIndex() - 1,
+                                          pszScript);
+                        delete [] pszScript;
+                        // Select object which was selected before.
+                        WinSendMsg(hwndLbox, LM_SELECTITEM, MPFROMSHORT(sSelected - 2),
+                                   MPFROMSHORT(TRUE));
+                        }
+                    break;
+                    }
+                case IDD_NB_OBJECT_DOWN:
+                    {
+                    PPCKDLGINFO pPckDlgInfo = (PPCKDLGINFO)WinQueryWindowPtr (hwndDlg, 0);
+                    HWND hwndLbox = WinWindowFromID (hwndDlg,
+                        IDD_NB_OBJECT_LIST);
+                    ScriptCreateObject *pObject = NULL, *pDestination = NULL, temp;
+                    ScriptPackage *pPck = pPckDlgInfo->pPackage;
+                    PSZ pszScript = NULL;
+
+                    // If user has selected an list box item and it is not the last
+                    // one, it can be moved downwards.
+                    if (sSelected < pPck->ReturnCreateObjectObjectCount())
+                        {
+                        // Get selected entity.
+                        pObject = pPck->ReturnCreateObjectObject(sSelected);
+                        // Get entity after selected entity.
+                        pDestination = pPck->ReturnCreateObjectObject(sSelected + 1);
+                        // Swap the contents of the entities.
+                        temp = *pObject;
+                        *pObject = *pDestination;
+                        *pDestination = temp;
+                        // Swap indexes.
+                        pDestination->SetIndex(pObject->ReturnIndex());
+                        pObject->SetIndex(temp.ReturnIndex());
+                        // Delete old list box items. We have to subtract 1
+                        // because indexing in script class doesn't start from 0
+                        // but it starts from 1 and sSelected tells which object
+                        // is selected and not which list index is selected.
+                        WinSendMsg(hwndLbox, LM_DELETEITEM, MPFROMSHORT(sSelected),
+                                   0);
+                        WinSendMsg(hwndLbox, LM_DELETEITEM, MPFROMSHORT(sSelected - 1),
+                                   0);
+                        // Set proper script texts to the list box.
+                        pszScript = pObject->MakeScriptText(FALSE);
+                        WinInsertLboxItem(hwndLbox, pObject->ReturnIndex() - 1,
+                                          pszScript);
+                        delete [] pszScript;
+                        pszScript = pDestination->MakeScriptText(FALSE);
+                        WinInsertLboxItem(hwndLbox, pDestination->ReturnIndex() - 1,
+                                          pszScript);
+                        delete [] pszScript;
+                        // Select object which was selected before.
+                        WinSendMsg(hwndLbox, LM_SELECTITEM, MPFROMSHORT(sSelected),
+                                   MPFROMSHORT(TRUE));
+                        }
                     break;
                     }
@@ -1021 +1205 @@
                             SHORT sCount = SHORT1FROMMR(WinSendDlgItemMsg(hwndDlg,
                                 IDD_NB_OBJECT_LIST, LM_QUERYITEMCOUNT, 0, 0));
+                            // If something is selected.
                             if (sRet != LIT_NONE)
                                 {
                                 sSelected = sRet + 1;
+                                // Send message to this dialog, which is actually
+                                // converted to function call, to set controls.
                                 WinSendMsg(hwndDlg, USER_OBJECT_SETDLGITEMS, NULL,
                                            NULL);
@@ -1039 +1226 @@
                         }
                     break;
-                    }
+                    } // endof LN_SELECT
                 }
             break;
@@ -3162 +3349 @@
     return mrc;
     }
+
+
+/*
+ *@@fnCnfgLbox:
+ *      This is the window procedure for the config listbox control.
+ *
+ *      This is not a stand-alone window procedure, but must only
+ *      be used with config listbox control subclassed in
+ *      fnTradObjectPageProc.
+ *
+ */
+MRESULT EXPENTRY fnCnfgLbox(HWND hwndWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+    {
+    OLDPROC *pOldProc = (OLDPROC*)WinQueryWindowULong(hwndWnd, QWL_USER);
+
+    MRESULT mrc = NULL;
+
+    if (pOldProc)
+        {
+        PFNWP OldLboxProc = pOldProc->OldProc;
+        switch(msg)
+            {
+            case WM_DESTROY:
+                {
+                mrc = OldLboxProc(hwndWnd, msg, mp1, mp2);
+                free(pOldProc);
+                break;
+                }
+            case WM_CONTROL:
+                {
+                switch (SHORT2FROMMP(mp1))
+                    {
+                    case CBN_EFCHANGE:
+                        {
+                        CHAR szTemp[256];
+                        CHAR szTemp1[256];
+                        CHAR szTemp2[512];
+                        SHORT sItem = SHORT1FROMMR(WinSendMsg(hwndWnd,
+                                                             LM_QUERYSELECTION,
+                                                             MPFROMSHORT(LIT_FIRST),
+                                                             MPFROMSHORT(0)));
+                        WinSendMsg(hwndWnd, LM_QUERYITEMTEXT, MPFROM2SHORT(sItem, 256),
+                                   MPFROMP(szTemp));
+                        WinQueryWindowText(hwndWnd, 256, szTemp1);
+                        sprintf(szTemp2, "%s|%s", szTemp1, szTemp);
+                        WinSetWindowText(hwndWnd, szTemp2);
+                        break;
+                        }
+                    }
+                break;
+                }
+            default:
+                {
+                mrc = OldLboxProc(hwndWnd, msg, mp1, mp2);
+                break;
+                }
+            }
+        }
+    return(mrc);
+    }
+

trunk/src/wicpm/gui_wicpm.cpp ¶

@@ -26 +26 @@
 #include "helpers\linklist.h"
 #include "helpers\cnrh.h"
+#include <list>
+#include "helpers\stringh.h"
 #include "helpers\xstring.h"
+#include "base\bs_string.h"
 
 #include "wicpm\script.hpp"
@@ -343 +346 @@
                     PMAINWINDOWINFO pWinInfo =
                         (PMAINWINDOWINFO) WinQueryWindowPtr(hwndWnd, 0);
+
+
                     break;
                     }
@@ -408 +413 @@
                     if (WinProcessDlg(hwndAdd)) // Processing of the main window procedure
                         {                       // stops while proessing Add package dialog.
-                        *pPckTemp1 = *pPckTemp;
+
+                        *pPckTemp1 = *pPckTemp; // Update original package object.
                         pDBPck->usPckIndexAttr = pPckTemp1->ReturnPackageIndexNumber();
                         pPckIDTemp = pPckTemp1->ReturnPackageIDObject();
@@ -493 +499 @@
                     break;
                     }
+                case IDM_MAIN_EDIT_REMOVE_PCK:
                 case IDM_PCKCONTAINER_REMOVE:
                     {
@@ -559 +566 @@
                     break;
                     }
+                case IDM_MAIN_EDIT_REMOVE_FILE:
                 case IDM_FILECONTAINER_REMOVE:
                     {
@@ -630 +638 @@
                     pTradArcThInfo->pszArchiveFileName = pszFileName;
                     pTradArcThInfo->pWarpIN = &(pWinInfo->WarpIN);
-                    //DosCreateEventSem(SEM_STATUSDLGREADY,
-                    //                  &pTradArcThInfo->hevStatusDlgReady,
-                    //                  0L,
-                    //                  FALSE);
+                    DosCreateEventSem(SEM_STATUSDLGREADY,
+                                      &pTradArcThInfo->hevStatusDlgReady,
+                                      0L,
+                                      FALSE);
                     PLISTNODE pNode = lstQueryFirstNode(pWinInfo->plPackageList);
                     DBPackage *pDBPackage;
@@ -665 +673 @@
 
                     WinProcessDlg(pTradArcThInfo->hwndStatusDlg);
-                    //DosCloseEventSem(pTradArcThInfo->hevStatusDlgReady);
+                    DosCloseEventSem(pTradArcThInfo->hevStatusDlgReady);
                     delete pTradArcThInfo;
                     delete pSDlgInfo;
@@ -741 +749 @@
                                     pWinInfo->fileContainerInfo.hwndContextMenu,
                                     IDM_FILECONTAINER_ADD, TRUE);
+                                WinEnableMenuItem(
+                                    pWinInfo->hwndMainMenu,
+                                    IDM_MAIN_EDIT_ADD_FILE, TRUE);
                                 }
                             break;
@@ -792 +803 @@
                                          // selected pointer to point to it.
                             PNOTIFYRECORDEMPHASIS pEmphasis = (PNOTIFYRECORDEMPHASIS)mp2;
+                            PMAINWINDOWINFO pWinInfo =
+                                (PMAINWINDOWINFO)WinQueryWindowPtr(hwndWnd, 0);
+                            if ((pEmphasis->fEmphasisMask & CRA_SELECTED) &&
+                                (pEmphasis->pRecord) &&
+                                (G_pSelectedFileRecord != (PFILERECORD)pEmphasis->pRecord))
+                                {
+                                WinEnableMenuItem(
+                                    pWinInfo->hwndMainMenu,
+                                    IDM_MAIN_EDIT_REMOVE_FILE, TRUE);
+                                }
                             }
                         } // endswitch
@@ -1250 +1271 @@
                               MPFROMSHORT(usMaxPercentage));
             WinSetDlgItemText(hwndDlg, IDD_CREATING_FILE, (PSZ)mp2);
-            break;
-            }
+            // Post semaphore so WIArchive can continue it's work.
+            DosPostEventSem(pSDlgInfo->hevStatusDlgReady);
+            break;
+            }
+        // A file has been added to archive so insert information
+        // to MLE.
         case USER_ARCTM_FILE_UPDATING:
             {
-            XSTRING strStatus;
-            xstrInit(&strStatus, 100);
+            XSTRING xstrStatus;
             CHAR szRation[4];
             USHORT usCompRation = SHORT1FROMMP(mp1);
-            xstrcat(&strStatus, "File ", 0);
-            xstrcat(&strStatus, (PSZ)mp2, 0);
-            xstrcat(&strStatus, " has been compressed.\n", 0);
+            xstrInit(&xstrStatus, 0);
+            xstrcat(&xstrStatus, "File ", 0);
+            xstrcat(&xstrStatus, (PSZ)mp2, 0);
+            xstrcat(&xstrStatus, " has been compressed.\n", 0);
             sprintf(szRation, "%i", usCompRation);
-            xstrcat(&strStatus, "\t-> ", 0);
-            xstrcat(&strStatus, szRation, 0);
-            xstrcat(&strStatus, "% compression ratio.\n", 0);
+            xstrcat(&xstrStatus, "\t-> ", 0);
+            xstrcat(&xstrStatus, szRation, 0);
+            xstrcat(&xstrStatus, "% compression ratio.\n", 0);
             WinSendMsg(WinWindowFromID(hwndDlg, IDD_CREATING_REPORT),
                        MLM_INSERT,
-                       (MPARAM)(strStatus.psz),
+                       (MPARAM)xstrStatus.psz,
                        MPNULL);
-            xstrClear(&strStatus);
+            xstrClear(&xstrStatus);
+            // Post semaphore so WIArchive can continue it's work.
+            DosPostEventSem(pSDlgInfo->hevStatusDlgReady);
             break;
             }

trunk/src/wicpm/makefile ¶

@@ -124 +124 @@
                             $(HLPINC)\comctl.h \
                             $(HLPINC)\except.h \
+                            $(FEINC)\gui_wicpm.h \
                             $(INC)\setup.h
 

trunk/src/wicpm/script.cpp ¶

@@ -3 +3 @@
  *                  (c) Copyright Teemu Ahola 2000
  *
- *              WarpINScript Class 0.9.4
+ *              WarpIN Script Handling Class 0.9.6
  *
  *  Special thanks to Ulrich M”ller about his great helper functions for
@@ -9 +9 @@
  *
  *
- *@@ sourcefile: script.cpp
+ *@@sourcefile: script.cpp
  *  Source code file for Script C++ class.
- *  This file contains source codes for WarpINScript class.
- *  This file is not platform independent. More detailed information about
+ *  This file contains source codes for WarpIN Script handling class.
+ *  This file <U>is</U> platform independent. More detailed information about
  *  WarpIN script can be found from WarpIN programmer guide.
  *
@@ -21 +21 @@
  * script can be created and script text can be parsed back to objects.
  *
+ *@todo:
+ *  - Inlining and optimization. The classes are terribly slow so in older
+ *    computers script parsing and generating takes a lot of time.
+ *
+ *@added v.0.9.5 [tahola]: Message logging system.
+ *@changed v.0.9.6 [tahola]: New conding conversion.
  */
 
@@ -30 +36 @@
 #include <direct.h>
 
-#include "setup.h"      // Teemu, this must be first V0.9.7 (2000-12-08) [umoeller]
-
+#include "setup.h"
+#include <list>
 #include "helpers\stringh.h"
 #include "helpers\xstring.h"
+#include "base\bs_string.h"
 #include "wicpm\script.hpp"
+
+
 
 // Script tags and attributes
@@ -133 +142 @@
 #define SZ_TAG_ENDWARPIN                "/WARPIN"
 
+// Message types.
+#define SZ_MESSAGE_INFO                 "Informative"
+#define SZ_MESSAGE_WARNING              "Warning"
+#define SZ_MESSAGE_ERROR                "Error"
+#define SZ_MESSAGE_MSG                  "Message"
+
 
 
@@ -144 +159 @@
 
 
-
-/***************************************************************************
- *@@ AddErrorToTable
+//
+//
+//  Templates:
+//
+//
+
+/*
+ *@@CopyTables:
+ *  This is a function template for copying table of classes to another table. This
+ *  way we don't have to create so much overloaded CopyTable functions.
+ *
+ *@@added v.0.9.5 (2000-08-22) [tahola]
+ */
+template <class T>
+T *CopyTable(T *p_destTable,//in: Pointer to destination table.
+              T *p_srcTable,//in: Pointer to source table.
+              USHORT p_usSize,//in: Size of source table.
+              USHORT p_usSkipIndex//in: Index to be skipped. If 0 no skipping.
+              )
+    {
+    USHORT srcIndex, destIndex;
+    if (!p_destTable)
+        return NULL;
+    if (!p_srcTable)
+        return p_destTable;
+    for (srcIndex = 0, destIndex = 0; srcIndex < p_usSize; srcIndex ++, destIndex ++)
+        {
+        if (p_srcTable[srcIndex].ReturnIndex() == p_usSkipIndex)
+            if (srcIndex < p_usSize - 1)
+                srcIndex ++;
+            else
+                break;
+        p_destTable[destIndex] = p_srcTable[srcIndex];
+        }
+
+    return p_destTable;
+    }
+
+
+/*
+ *@@RebuildIndexes:
+ *  Rebuilds indexes after deletion. The order of the indexes does not matter.
+ *  Example:
+ *      Old indexing: 1, 4, 3, 5
+ *      New indexing: 1, 3, 2, 4
+ *
+ *@@added v.0.9.5 (2000-08-22) [tahola]
+ */
+template <class T>
+USHORT RebuildIndexes(T *p_table, // A pointer to a table of objects.
+                      USHORT p_usTableSize // The size of the table.
+                      )
+    {
+    USHORT usIndex, usIndex2, usIndex3, usMissing, usMax = 0, i;
+    BOOL bFinded = FALSE, bReady = FALSE;
+
+    // First find largest index number.
+    for (usIndex = 0; usIndex < p_usTableSize; usIndex ++)
+        if (p_table[usIndex].ReturnIndex() > usMax)
+            usMax = p_table[usIndex].ReturnIndex();
+
+    // Do this until it is sure that there is no skipped indexes left.
+    while (!bReady)
+        {
+        bReady = TRUE;
+        // Go through all index values from 1 to usMax.
+        for (usIndex = 1; usIndex <= usMax; usIndex ++)
+            {
+            // Check that Index number will be found.
+            for (usIndex2 = 0; usIndex2 < p_usTableSize; usIndex2 ++)
+                if (usIndex == p_table[usIndex2].ReturnIndex())
+                    bFinded = TRUE;
+            // If it did not found sub 1 from every index number above
+            // the index number which did not found.
+            if (bFinded == FALSE)
+                {
+                for (usIndex3 = usIndex + 1; usIndex3 <= usMax; usIndex3 ++)
+                    for (usIndex2 = 0; usIndex2 < p_usTableSize; usIndex2 ++)
+                        if (usIndex3 == p_table[usIndex2].ReturnIndex())
+                            p_table[usIndex2].SetIndex(usIndex3 - 1);
+                usMax --;
+                }
+            if (bFinded == FALSE)
+                bReady = FALSE;
+            bFinded = FALSE;
+            }
+        }
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@FindUnusedIndex:
+ *  Returns first unused index number.
+ *  Ex. 1, 2, 4, 5
+ *      returns: 3
+ *
+ *@@added v.0.9.5 (2000-08-22) [tahola]
+ */
+template <class T>
+USHORT FindUnusedIndex(T *p_table, // A pointer to a table of objects.
+                       USHORT p_usTableSize // The size of the table.
+                       )
+    {
+    USHORT usIndex, usIndex2, usMax = 0;
+    BOOL bFinded = FALSE;
+
+    // First find the largest index number.
+    for (usIndex = 0; usIndex < p_usTableSize; usIndex ++)
+        if (p_table[usIndex].ReturnIndex() > usMax)
+            usMax = p_table[usIndex].ReturnIndex();
+
+    for (usIndex = 1; usIndex <= usMax; usIndex ++)
+        {
+        // Go through all the objects on the table.
+        for (usIndex2 = 0; usIndex2 < p_usTableSize; usIndex2 ++)
+            if (usIndex == p_table[usIndex2].ReturnIndex())
+                {
+                bFinded = TRUE;
+                break;
+                }
+        // If Index found from the table, continue.
+        if (bFinded == TRUE)
+            bFinded = FALSE;
+        // If not break.
+        else
+            break;
+        }
+
+    return usIndex;
+    }
+
+
+//
+//
+//  Handy functions.
+//
+//
+
+
+/*
+ *@@AddErrorToTable:
  *  Adds error information structure to table. Returns error code if
  *  necessary.
@@ -176 +330 @@
 
 
-/***************************************************************************
- *@@ AddCharacterAfterEOL
- *  This function adds character (ex. \t, \n)  before each line.
+/*
+ *@@AddCharacterAfterEOL:
+ *  This function adds character (ex. \t, \n)  before each line in the string.
  */
 void AddCharacterAfterEOL(PSZ *pszText, // Pointer to PSZ pointer.
@@ -190 +344 @@
         return;
 
-    pszTemp1 = strhins(pszTemp, ulOffset, &szCharacter);
+    // Add the character to the beginning of the string.
+    pszTemp1 = strhins(pszTemp, 0, &szCharacter);
     delete [] pszTemp;
     pszTemp = pszTemp1;
+    // Repeat.
     while (TRUE)
         {
+        // Find next line.
         pszReturn = strhFindNextLine(pszTemp + ulOffset, &ulOffset);
+        // If no more lines, break.
         if (*pszReturn == '\0')
             break;
+        // Set ulOffset to beginning of next line.
         ulOffset += ulTempOffset;
         ulTempOffset = ulOffset;
+        // Add the character.
         pszTemp1 = strhins(pszTemp, ulOffset, &szCharacter);
         delete [] pszTemp;
@@ -288 +448 @@
 
 
+/****************************************************************************
+ ****************************************************************************
+        @@Message class:
+
+    <B>Description:</B>
+        Message class is a simple message data handling class which is used
+        in MessageLogger and all script classes.
+
+    Member functions:
+        Message()                           Constructor.
+        virtual ~Message()                  Virtual destructor.
+        USHORT SetType(USHORT)              Sets message type. In Script
+                                            classes there are three different
+                                            types: informative, warning and
+                                            error.
+        USHORT SetMessageString(BSString &) Sets message string.
+        USHORT SetLineNumber(ULONG)         Sets line number of script where
+                                            message is related to. Can also
+                                            be 0.
+        USHORT SetMessageValue(USHORT)      Sets message value.
+        USHORT ReturnType()                 Returns message type.
+        BSString &ReturnMessageString()     Returns message string.
+        ULONG ReturnLineNumber()            Returns Line number.
+        USHORT ReturnMessageValue()         Returns message valuer.
+
+****************************************************************************/
+
+
+
+/*
+ *@@Message:
+ *      Constructor for Message class.Initializes _usType and _usLineNumber
+ *      variables.
+ */
+Message::Message()
+    {
+    _usType = MSG_TYPE_UNDEF;
+    _ulLineNumber = 0;
+    };
+
+
+/*
+ *@@~Message:
+ *      Destructor for Message class. Sets variables to zero and clears
+ *      message string.
+ */
+Message::~Message()
+    {
+    _usType = MSG_TYPE_UNDEF;
+    _ulLineNumber = 0;
+    _usMessageValue = 0;
+    _strMessageText = ""; // Clear text string.
+    };
+
+
+/*
+ *@@SetType:
+ *      Sets message type. In Script classes only three defined types are
+ *      used: MSG_TYPE_INFO, MSG_TYPE_WARNING and MSG_TYPE_ERROR.
+ */
+USHORT Message::SetType(USHORT p_usType // Message type number.
+                       )
+    {
+    _usType = p_usType;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetMessageString:
+ *      Sets message string.
+ */
+USHORT Message::
+        SetMessageText(const BSString &p_strMsgText // Reference to message string.
+                      )
+    {
+    _strMessageText = p_strMsgText;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetMessageText:
+ *      Sets message string.
+ */
+USHORT Message::SetMessageText(const PSZ p_pszMsgText // Pointer to message text.
+                              )
+    {
+    _strMessageText = p_pszMsgText;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetLineNumber:
+ *      Sets line number. Some messages may need line number for example
+ *      there is a syntax error in a script and the line number of the
+ *      syntax error is in _ulLineNumber.
+ */
+USHORT Message::SetLineNumber(ULONG p_ulLineNumber // Line number.
+                             )
+    {
+    _ulLineNumber = p_ulLineNumber;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetMessageValue:
+ *      Sets message value. Gives more detailed information about message.
+ */
+USHORT Message::SetMessageValue(USHORT p_usMsgValue // Message value.
+                               )
+    {
+    _usMessageValue = p_usMsgValue;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnType:
+ *      Return message type. (See SetType)
+ */
+USHORT Message::ReturnType()
+    {
+    return _usType;
+    }
+
+
+/*
+ *@@ ReturnLineNumber
+ *      Return line number. (See SetLineNumber)
+ */
+ULONG Message::ReturnLineNumber()
+    {
+    return _ulLineNumber;
+    }
+
+
+/*
+ *@@ReturnMessageValue:
+ *      Returns message value.
+ */
+USHORT Message::ReturnMessageValue()
+    {
+    return _usMessageValue;
+    }
+
+
+/*
+ *@@ReturnMessageString:
+ *      Return message string. (See SetMessageText)
+ */
+BSString &Message::ReturnMessageText()
+    {
+    return _strMessageText;
+    }
+
+
+/*
+ *@@ComposeMessage:
+ *      Composes message. New BSString is allocated.
+ *      Formats the string to "message type": "message text".
+ */
+BSString &Message::ComposeMessage()
+    {
+    BSString *strMsg = new BSString;
+
+    switch(_usType)
+        {
+        case MSG_TYPE_INFO:
+            {
+            *strMsg += SZ_MESSAGE_INFO;
+            break;
+            }
+        case MSG_TYPE_WARNING:
+            {
+            *strMsg += SZ_MESSAGE_WARNING;
+            break;
+            }
+        case MSG_TYPE_ERROR:
+            {
+            *strMsg += SZ_MESSAGE_ERROR;
+            break;
+            }
+        default:
+            {
+            *strMsg += SZ_MESSAGE_MSG;
+            break;
+            }
+        }
+
+    *strMsg += ": ";
+    CHAR szValue[128];
+    sprintf(szValue, "Message value: %i", _usMessageValue);
+    *strMsg += szValue;
+    *strMsg += "  " + _strMessageText;
+    if (_ulLineNumber > 0)
+        {
+        CHAR szLineNumber[256];
+        sprintf(szLineNumber, "at line: %i", _ulLineNumber);
+        *strMsg += szLineNumber;
+        }
+    return *strMsg;
+    }
+
+
+
+
+
+/****************************************************************************
+ ****************************************************************************
+        @@MessageLogger class:
+
+    Member functions:
+
+****************************************************************************/
+
+
+/*
+ *@@MessageLogger:
+ *  Default constructor for MessageLogger class.
+ *  Initializes variables.
+ */
+MessageLogger::MessageLogger()
+    {
+    _pParentLogger = NULL;
+    _usMessages = 0;
+    }
+
+
+/*
+ *@@MessageLogger:
+ *  Copy constructor for MessageLogger class.
+ */
+MessageLogger::MessageLogger(MessageLogger &p_pLogger // Reference to a object.
+                            )
+    {
+    _pParentLogger = &p_pLogger;
+    _usMessages = 0;
+    }
+
+
+/*
+ *@@~MessageLogger:
+ *  Destructor for MessageLogger class.
+ *  Deletes all logged messages and clears other variables.
+ */
+MessageLogger::~MessageLogger()
+    {
+    DeleteLogs();
+    _pParentLogger = NULL;
+    _usMessages = 0;
+    }
+
+
+/*
+ *@@operator=:
+ *  Assignment operator for MessageLogger.
+ */
+MessageLogger &MessageLogger::operator=(MessageLogger &p_msgLog // Reference to a object.
+                                       )
+    {
+    list<Message*>::iterator start, end;
+    Message *pMsg;
+
+    // Delete current logged messages.
+    DeleteLogs();
+
+    _pParentLogger = p_msgLog._pParentLogger;
+    _usMessages = p_msgLog._usMessages;
+
+    // Query list of messages from object logger and log all messages to
+    // local message list.
+    list<Message*> lstMsg = p_msgLog.ReturnMessageList();
+    start = lstMsg.begin(); end = lstMsg.end();
+    for (; start != end; start++)
+        {
+        pMsg = *start;
+        LogMessage(*pMsg);
+        }
+
+    return (*this);
+    }
+
+
+/*
+ *@@ReturnMessageList:
+ *  Return constant list of pointers to messages.
+ */
+const list<Message*> MessageLogger::ReturnMessageList()
+    {
+    return _lstMessage;
+    }
+
+
+USHORT MessageLogger::DeleteLogs()
+    {
+    // Go through all messages in the list and delete them.
+    /*if (_usMessages == 0)
+        return NO_ERROR;*/
+    list<Message*>::iterator start, end;
+    start = _lstMessage.begin();  end = _lstMessage.end();
+    _lstMessage.erase(start, end);
+    _usMessages = 0;
+    return NO_ERROR;
+    }
+
+
+USHORT MessageLogger::LogMessage(Message &p_Msg)
+    {
+    if (_pParentLogger)
+        // If there is a parent logger, use it to log a message.
+        _pParentLogger->LogMessage(p_Msg);
+    else
+        {
+        // If not, put the message to local message list.
+        Message *msg = new(Message);
+        *msg = p_Msg;
+        _lstMessage.push_back(msg);
+        _usMessages ++;
+        }
+    return NO_ERROR;
+    }
+
+
+USHORT MessageLogger::SetParentLogger(MessageLogger &p_MsgLog)
+    {
+    list<Message*>::iterator start, end;
+    Message *pMsg = NULL;
+    start = _lstMessage.begin ();  end = _lstMessage.end ();
+
+    _pParentLogger = &p_MsgLog;
+
+    if (_pParentLogger)
+        {
+        for (; start != end; start++)
+            {
+            pMsg = *start;
+            _pParentLogger->LogMessage(*pMsg);
+            }
+        DeleteLogs();
+        _usMessages = 0;
+        }
+
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnComposedMessageString:
+ *      Returns string which is composed from message text and line number
+ *      in Message objects which are in message list. Every line is
+ *      string is formatted as follow: MESSAGE_TYPE: MESSAGE_TEXT LINE_NBR.
+ *@@changed v.0.9.6 [tahola]: Do not use parent message logger any more.
+ */
+BSString &MessageLogger::ReturnComposedMessageString()
+    {
+    // If there is a parent logger, use it.
+    //if (_pParentLogger)
+    //    return _pParentLogger->ReturnComposedMessageString();
+
+    BSString *MsgString = new BSString;
+    Message *pMsg = NULL;
+    list<Message*>::iterator start, end;
+
+    // Go through local list of messages and compose them to string.
+    start = _lstMessage.begin ();  end = _lstMessage.end ();
+    for (; start != end; start++)
+        {
+        pMsg = *start;
+        *MsgString += pMsg->ComposeMessage() + "\n";
+        }
+    return *MsgString;
+    }
+
+
+
+
+/****************************************************************************
+ ****************************************************************************
+        @@ WarpINScriptBase class:
+
+    <B>Description:</B>
+        Base class for all script classes. Includes some virtual functions
+        which must be implemented in derived classes.
+
+    Member functions:
+        USHORT SetIndex(USHORT)     Sets index number.
+*****************************************************************************/
+
+/*
+ *@@SetIndex:
+ *      Sets usIndex number.
+ */
+USHORT WarpINScriptBase::SetIndex(const USHORT p_usIndex)
+    {
+    _usIndex = p_usIndex;
+    }
+
+
+/*
+ *@@ReturnIndex:
+ *      Returns UsIndex number.
+ */
+
+USHORT WarpINScriptBase::ReturnIndex()
+    {
+    return _usIndex;
+    }
+
+
+WarpINScriptBase::~WarpINScriptBase()
+    {
+
+    }
+
+
+
 
 /****************************************************************************
  ****************************************************************************
         ScriptIndex class:
-
- ****************************************************************************
- *  ScriptIndex class member functions:
- *  ScripitIndex        Constructor.
- *  ~ScriptIndex        Destructor.
- *  SetIndexAttribute   Sets title attribute.
- *  SetIndex            Sets title object ID. Should be used for identification.
- *  ReturnIndexAttributeReturns index attribute.
- *  ReturnIndex         Returns object ID number.
- *  MakeScriptText      Returns pointer to script text.
- *  BuildFromText       Builds object accordingly to script text.
- ***************************************************************************/
-
-
-/***************************************************************************
- *@@ ScriptIndex::ScriptIndex
- *  Constructor for ScriptIndex class. Initializes usIndex  by setting
- *  it to 0.
+            :public WarpINScriptBase
+
+    Member functions:
+        ScripitIndex()              Constructor.
+        ~ScriptIndex()              Destructor.
+        SetIndexAttribute(USHORT)   Sets title attribute.
+        ReturnIndexAttribute        Returns index attribute.
+        ReturnIndex                 Returns object ID number.
+        MakeScriptText              Returns pointer to script text.
+        BuildFromText               Builds object accordingly to script text.
+****************************************************************************/
+
+
+/*
+ *@@ScriptIndex:
+ *      Constructor for ScriptIndex class. Initializes usIndex  by setting
+ *      it to 0.
  */
 ScriptIndex::ScriptIndex(USHORT usIndex)
     {
-    usIndex = 0;
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptIndex::~ScriptIndex
- *  destructor for ScriptIndex class. Does nothing special.
+    usIndexAttribute = 0;
+    SetIndex(usIndex);
+    }
+
+
+
+/*
+ *@@~ScriptIndex:
+ *      Destructor for ScriptIndex class. Does nothing special.
  */
 
@@ -329 +907 @@
 
 
-/***************************************************************************
- *@@ ScriptIndex::SetIndex
- *  Sets usIndexAttribute.
- */
-
-void ScriptIndex::SetIndexAttribute(USHORT usIndexAttribute)
+/*
+ *@@operator=:
+ *@@added v.0.9.5 (2000-08-20) [tahola]
+ */
+ScriptIndex &ScriptIndex::operator=(ScriptIndex &p_index)
+    {
+    SetIndex(p_index.ReturnIndex());
+    usIndexAttribute = p_index.usIndexAttribute;
+    return (*this);
+    }
+
+
+/*
+ *@@SetIndexAttribute:
+ *      Sets usIndexAttribute.
+ */
+
+USHORT ScriptIndex::SetIndexAttribute(USHORT usIndexAttribute)
     {
     this->usIndexAttribute = usIndexAttribute;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptIndex::SetIndex
- *  Sets usIndex number.
- */
-
-void ScriptIndex::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptIndex::ReturnIndex
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnIndex:
  *  Returns usIndexAttribute number.
  */
@@ -364 +942 @@
 
 
-
-/***************************************************************************
- *@@ ScriptIndex::ReturnIndex
- *  Returns UsIndex number.
- */
-
-USHORT ScriptIndex::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptIndex::MakeScriptText
- *  Returns pointer to script text.
+/*
+ *@@MakeScriptText:
+ *      Returns pointer to script text.
  */
 PSZ ScriptIndex::MakeScriptText(BOOL bAttribute)
@@ -386 +950 @@
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
-    ulTextLength = LtoALength((LONG) usIndexAttribute);
+    ulTextLength = LtoALength((LONG)usIndexAttribute);
 
     if (bAttribute)
@@ -404 +968 @@
 
 
-/***************************************************************************
- *@@ScriptIndex::BuildFromText
+/*
+ *@@BuildFromText:
  *  Builds INDEX accordingly to script text. If any errors is found in script
  *  text, error informations are returned in table where to *pScriptError
  *  points. Pointer to after end of tag is returned so multiple searches can be
  *  done.
+ *@@changed v.0.9.5 (2000-08-30) [tahola]: modified message logging.
  */
 PSZ ScriptIndex::BuildFromText(PSZ pszScriptText,
-                               SCRIPTERROR **ppScriptError,
-                               USHORT *pusErrorTableSize,
                                ULONG ulLineNumber)
     {
-    SCRIPTERROR Error;
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszAttr = NULL;
@@ -427 +990 @@
     else
         {
-        Error.usErrorCode = ERR_PARSE_INDEX_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_INDEX_NOTFOUND);
+        msg.SetLineNumber(ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -446 +1006 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptPackageID class:
-    This class is for PACKAGEID attribute in PCK tag. This attribute contains
-    information from vendor , application name, package identifier
-    and version numbering. Different ScriptPackageID objects are identified
-    from each others by usIndex. So when creating new object unique index
-    number should be used. This class does not check if index is not valid ie.
-    if same index number is already in use.
-
- ****************************************************************************
- *  ScriptPackageID class member functions:
- *      ScriptPackageID     constructor
- *      ~ScriptPackageID    destructor
- *      SetVendor           sets vendor text
- *      SetApplication      sets application text
- *      SetMajor            sets major version number
- *      SetMinor            sets minor version number
- *      SetRevision         sets revision version number
- *      ReturnVendor        returns const pointer to vendor string
- *      ReturnApplication   returns const pointer to application string
- *      ReturnPackage       returns const pointer to package string
- *      ReturnMajor         returns value of major version number
- *      ReturnMinor         returns value of minor version number
- *      ReturnRevision      returns value of revision version number
- *      MakeScriptText      returns pointer to script text
- *      BuildFromText       builds package ID datas from text
+        @@ScriptPackageID class:
+
+    <B>Description:</B>
+        This class is for PACKAGEID attribute in PCK tag. This attribute
+        contains information from vendor , application name, package identifier
+        and version numbering. Different ScriptPackageID objects are identified
+        from each others by usIndex. So when creating new object unique index
+        number should be used. This class does not check if index is not
+        valid ie. if same index number is already in use.
+
+    Member functions:
+        ScriptPackageID     constructor
+        ~ScriptPackageID    destructor
+        SetVendor           sets vendor text
+        SetApplication      sets application text
+        SetMajor            sets major version number
+        SetMinor            sets minor version number
+        SetRevision         sets revision version number
+        ReturnVendor        returns const pointer to vendor string
+        ReturnApplication   returns const pointer to application string
+        ReturnPackage       returns const pointer to package string
+        ReturnMajor         returns value of major version number
+        ReturnMinor         returns value of minor version number
+        ReturnRevision      returns value of revision version number
+        MakeScriptText      returns pointer to script text
+        BuildFromText       builds package ID datas from text
  ****************************************************************************/
 
 
-/****************************************************************************
- *@@ScriptPackageID::ScriptPackageID
+/*
+ *@@ScriptPackageID:
  *  This is default constructor for ScriptPackageID class. This initializes
  *  all local variables.
  */
-ScriptPackageID::ScriptPackageID(USHORT usIndex)
+ScriptPackageID::ScriptPackageID(USHORT p_usIndex)
     {
     // Set first character is char tables to '\0' (end of line).
-    *szVendor = '\0';
-    *szApplication = '\0';
-    *szPackage = '\0';
-
-    usMajor = 0;
-    usMinor = 0;
-    usRevision = 0;
-
-    this->usIndex = usIndex;
-    }
-
-/****************************************************************************
- *@@ScriptPackageID::~ScriptPackageID
+    *_szVendor = '\0';
+    *_szApplication = '\0';
+    *_szPackage = '\0';
+
+    _usMajor = 0;
+    _usMinor = 0;
+    _usRevision = 0;
+
+    SetIndex(p_usIndex);
+    }
+
+/*
+ *@@~ScriptPackageID:
  *  This is default destructor for ScriptPackageID class. This does not do
  *  anything special.
@@ -504 +1065 @@
 
 
-/****************************************************************************
- *@@ScriptPackageID::SetVendor
+/*
+ *@@SetVendor:
  *  This function sets vendor string.
  */
-void ScriptPackageID::SetVendor(const PSZ pszVendor)
-    {
-    if (strlen(pszVendor) < MAXVENDORNAMELENGTH)
-        strcpy(this->szVendor, pszVendor);
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetApplication
+USHORT ScriptPackageID::SetVendor(const PSZ p_pszVendor)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszVendor) < MAXVENDORNAMELENGTH)
+        strcpy(this->_szVendor, p_pszVendor);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_VENDOR_STRTOOLONG);
+        msg.SetMessageText(p_pszVendor);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+
+/*
+ *@@SetApplication:
  *  This function sets application string.
  */
-void ScriptPackageID::SetApplication(const PSZ pszApplication)
-    {
-    if (strlen(szApplication) < MAXAPPNAMELENGTH)
-        strcpy(this->szApplication, pszApplication);
-    }
-
-/****************************************************************************
- *@@ScriptPackageID::SetPackage
+USHORT ScriptPackageID::SetApplication(const PSZ p_pszApplication)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszApplication) < MAXAPPNAMELENGTH)
+        strcpy(this->_szApplication, p_pszApplication);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_APPL_STRTOOLONG);
+        msg.SetMessageText(p_pszApplication);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+/*
+ *@@SetPackage:
  *  This function sets package string.
  */
-void ScriptPackageID::SetPackage(const PSZ pszPackage)
-    {
-    if (strlen(szPackage) < MAXPCKNAMELENGTH)
-        strcpy(this->szPackage, pszPackage);
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetMajor
+USHORT ScriptPackageID::SetPackage(const PSZ p_pszPackage)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszPackage) < MAXPCKNAMELENGTH)
+        strcpy(this->_szPackage, p_pszPackage);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_PACKAGE_STRTOOLONG);
+        msg.SetMessageText(p_pszPackage);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+
+/*
+ *@@SetMajor:
  *  This function sets major number.
  */
-void ScriptPackageID::SetMajor(USHORT usMajor)
-    {
-    this->usMajor = usMajor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetMinor
+USHORT ScriptPackageID::SetMajor(USHORT p_usMajor)
+    {
+    this->_usMajor = p_usMajor;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetMinor:
  *  This function sets minor number.
  */
-void ScriptPackageID::SetMinor(USHORT usMinor)
-    {
-    this->usMinor = usMinor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetRevision
+USHORT ScriptPackageID::SetMinor(USHORT p_usMinor)
+    {
+    this->_usMinor = p_usMinor;
+    return NO_ERROR;
+    }
+
+
+
+/*
+ *@@SetRevision:
  *  This function sets revision number.
  */
-void ScriptPackageID::SetRevision(USHORT usRevision)
-    {
-    this->usRevision = usRevision;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetIndex
- *  This function sets index number.
- */
-void ScriptPackageID::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::SetPackageID
- */
-void ScriptPackageID::SetPackageID(PACKAGEIDDATA packageIDData)
-    {
-
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnVendor
+USHORT ScriptPackageID::SetRevision(USHORT p_usRevision)
+    {
+    this->_usRevision = p_usRevision;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetPackageID:
+ *  For compatibility only. Does actually nothing. Must be removed at some point.
+ *  Useless. No need anymore. Nobody will need it. Nobody cares about it.
+ */
+USHORT ScriptPackageID::SetPackageID(PACKAGEIDDATA packageIDData)
+    {
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnVendor:
  *  This function returns const pointer to vendor string.
  */
 const PSZ ScriptPackageID::ReturnVendor()
     {
-    return (PSZ)szVendor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnApplication
+    return (PSZ)_szVendor;
+    }
+
+
+
+/*
+ *@@ReturnApplication:
  *  This function returns const pointer to application string.
  */
 const PSZ ScriptPackageID::ReturnApplication()
     {
-    return (PSZ)szApplication;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnPackage
+    return (PSZ)_szApplication;
+    }
+
+
+
+/*
+ *@@ReturnPackage:
  *  This function returns const pointer to package string.
  */
 const PSZ ScriptPackageID::ReturnPackage()
     {
-    return (PSZ)szPackage;
-    }
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnMajor
+    return (PSZ)_szPackage;
+    }
+
+
+/*
+ *@@ReturnMajor:
  *  This function returns major version number.
  */
 USHORT ScriptPackageID::ReturnMajor()
     {
-    return usMajor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnMinor
+    return _usMajor;
+    }
+
+
+/*
+ *@@ReturnMinor:
  *  This function returns minor version number.
  */
 USHORT ScriptPackageID::ReturnMinor()
     {
-    return usMinor;
-    }
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnRevision
+    return _usMinor;
+    }
+
+
+/*
+ *@@ReturnRevision:
  *  This function returns revision version number.
  */
 USHORT ScriptPackageID::ReturnRevision()
     {
-    return usRevision;
-    }
-
-
-/****************************************************************************
- *@@ScriptPackageID::ReturnIndex
- *  This function returns index number.
- */
-USHORT ScriptPackageID::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptPackageID::MakeScriptText
+    return _usRevision;
+    }
+
+
+/*
+ *@@MakeScriptText:
  *  This function returns pointer to script text. If bShowAttribute is FALSE
  *  PACKAGEID="" text will not be included to the script text.
  */
-PSZ ScriptPackageID::MakeScriptText(BOOL bShowAttribute)
+PSZ ScriptPackageID::MakeScriptText(BOOL p_bShowAttribute)
     {
     ULONG ulTextLength = 0;
-    XSTRING strScriptText;
+    XSTRING xstrScriptText;
     CHAR szTemp[1024];
-    xstrInit(&strScriptText, 0);
+
+    xstrInit(&xstrScriptText, 0);
     szTemp[0]='\0';
-    ulTextLength = strlen(szVendor) + strlen(szApplication) + sizeof(szPackage);
-    ulTextLength += LtoALength(usMajor) + LtoALength(usMinor) +
-        LtoALength(usRevision);
+    ulTextLength = strlen(_szVendor) + strlen(_szApplication) + sizeof(_szPackage);
+    ulTextLength += LtoALength(_usMajor) + LtoALength(_usMinor) +
+        LtoALength(_usRevision);
     ulTextLength += 5;
 
-    if (bShowAttribute)
+    if (p_bShowAttribute)
         // Length of the attribute, =, " and "
         ulTextLength += strlen(SZ_ATTRIBUTE_PACKAGEID) + 3;
 
-    //pszScriptText = new CHAR[ulTextLength + 1];
-    //*pszScriptText = '\0';
-
-    if (bShowAttribute)
+    if (p_bShowAttribute)
         sprintf(szTemp, "%s=\"%s\\%s\\%s\\%i\\%i\\%i\"", SZ_ATTRIBUTE_PACKAGEID,
-            szVendor, szApplication, szPackage, usMajor, usMinor, usRevision);
+            _szVendor, _szApplication, _szPackage, _usMajor, _usMinor, _usRevision);
     else
         sprintf(szTemp, "%s\\%s\\%s\\%i\\%i\\%i",
-            szVendor, szApplication, szPackage, usMajor, usMinor, usRevision);
-
-    xstrcat(&strScriptText, szTemp, 0);
-    return strScriptText.psz;
-    }
-
-
-/***************************************************************************
- *@@ScriptPackageID:: BuildFromText
+            _szVendor, _szApplication, _szPackage, _usMajor, _usMinor, _usRevision);
+
+    xstrcat(&xstrScriptText, szTemp, 0);
+    return xstrScriptText.psz;
+    }
+
+
+/*
+ *@@BuildFromText:
  *  Builds package ID accordingly to script text. If any errors is found in script
  *  text, error informations are returned in table where to *pScriptError
@@ -711 +1281 @@
  */
 PSZ ScriptPackageID::BuildFromText(PSZ pszScriptText,
-                                   SCRIPTERROR **ppScriptError,
-                                   USHORT *pusErrorTableSize,
                                    ULONG ulLineNumber)
     {
-    SCRIPTERROR Error;
+    Message msg;
     PSZ pszTemp = NULL, pszTemp2 = NULL, pszTemp3 = NULL;
     PSZ pszAttr = NULL;
@@ -724 +1292 @@
     pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_PACKAGEID, &ulOffset);
 
-    if (!pszAttr && ppScriptError)
-        {
-        Error.usErrorCode = ERR_PARSE_PCKID_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+    if (!pszAttr)
+        {
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_NOTFOUND);
+        msg.SetLineNumber(ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -741 +1306 @@
         {
         pszTemp3 = strhSubstr(pszTemp2, pszTemp);
+        if (strlen(pszTemp3) == 0)
+            {
+            // There is no vendor string so report it.
+            msg.SetType(MSG_TYPE_WARNING);
+            msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_VENDOR_NOTFOUND);
+            msg.SetLineNumber(ulLineNumber);
+            _messageLogger.LogMessage(msg);
+            }
         this->SetVendor(pszTemp3);
         delete [] pszTemp3;
@@ -748 +1321 @@
             {
             pszTemp3 = strhSubstr(pszTemp2, pszTemp);
+            if (strlen(pszTemp3) == 0)
+                {
+                // There is no application string so report it.
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_APPL_NOTFOUND);
+                msg.SetLineNumber(ulLineNumber);
+                _messageLogger.LogMessage(msg);
+                }
             this->SetApplication(pszTemp3);
             delete [] pszTemp3;
@@ -755 +1336 @@
                 {
                 pszTemp3 = strhSubstr(pszTemp2, pszTemp);
+                if (strlen(pszTemp3) == 0)
+                    {
+                    // There is no package string so report it.
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_PACKAGE_NOTFOUND);
+                    msg.SetLineNumber(ulLineNumber);
+                    _messageLogger.LogMessage(msg);
+                    }
                 this->SetPackage(pszTemp3);
                 delete [] pszTemp3;
@@ -762 +1351 @@
                     {
                     pszTemp3 = strhSubstr(pszTemp2, pszTemp);
+                    if (strlen(pszTemp3) == 0)
+                        {
+                        // There is no major number so report it.
+                        msg.SetType(MSG_TYPE_WARNING);
+                        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_MAJOR_NOTFOUND);
+                        msg.SetLineNumber(ulLineNumber);
+                        _messageLogger.LogMessage(msg);
+                        }
                     sscanf(pszTemp3, "%d", &ulVersion);
                     this->SetMajor((USHORT)ulVersion);
@@ -770 +1367 @@
                         {
                         pszTemp3 = strhSubstr(pszTemp2, pszTemp);
+                        if (strlen(pszTemp3) == 0)
+                            {
+                            // There is no minor number so report it.
+                            msg.SetType(MSG_TYPE_WARNING);
+                            msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_MINOR_NOTFOUND);
+                            msg.SetLineNumber(ulLineNumber);
+                            _messageLogger.LogMessage(msg);
+                            }
                         sscanf(pszTemp3, "%d", &ulVersion);
                         this->SetMinor((USHORT)ulVersion);
@@ -795 +1400 @@
                         }
                     }
-                else // Major
+                else // Major warning.
                     {
-                    // Error
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_NOTFOUND);
+                    msg.SetLineNumber(ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 }
-            else // Package
+            else // Package warning.
                 {
-                // Error
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_PACKAGE_NOTFOUND);
+                msg.SetLineNumber(ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
-        else // Application
+        else // Application warning.
             {
-            // Error
+            msg.SetType(MSG_TYPE_WARNING);
+            msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_APPL_NOTFOUND);
+            msg.SetLineNumber(ulLineNumber);
+            _messageLogger.LogMessage(msg);
             }
         }
-    else // Vendor
-        {
-        // Error
-        }
-
-
+    else // Vendor warning.
+        {
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_PACKAGEID_VENDOR_NOTFOUND);
+        msg.SetLineNumber(ulLineNumber);
+        _messageLogger.LogMessage(msg);
+        }
 
     ulAttrLen = strlen(pszAttr);
@@ -828 +1443 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptTitle class:
-
- ****************************************************************************
- *  ScriptTitle class member functions:
- *  ScripitTitle    Constructor.
- *  ~ScriptTitle    Destructor.
- *  SetTitle        Sets title text.
- *  SetIndex        Sets title object ID. Should be used for identification.
- *  ReturnTitle     Returns const pointer to title text.
- *  ReturnIndex     Returns object ID number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText   Builds object accordingly to script text.
- ***************************************************************************/
-
-
-/***************************************************************************
- *@@ ScriptTitle::ScriptTitle
+        @@ScriptTitle class:
+
+    <B>Description:</B>
+        This class is for TITLE attribute in PCK tag. This class contains
+        information about title. Title is used to specify what will be
+        displayed in WarpIN's container page.
+
+    Class member functions:
+        ScripitTitle(USHORT)            Constructor.
+        ~ScriptTitle()                  Destructor.
+        USHORT SetTitle(const PSZ)      Sets title text.
+        PSZ ReturnTitle()               Returns const pointer to title text.
+        PSZ MakeScriptText()            Returns pointer to script text.
+        PSZ BuildFromText(PSZ, ULONG)   Builds object accordingly to script text.
+ ****************************************************************************/
+
+
+/*
+ *@@ScriptTitle:
  *  Constructor for ScriptTitle class. Initializes szTitle string by setting
  *  first char to '\0'.
  */
-ScriptTitle::ScriptTitle(USHORT usIndex)
-    {
-    *szTitle = '\0';
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTitle::~ScriptTitle
+ScriptTitle::ScriptTitle(USHORT p_usIndex)
+    {
+    *_szTitle = '\0';
+    SetIndex(p_usIndex);
+    }
+
+
+/*
+ *@@~ScriptTitle:
  *  destructor for ScriptTitle class. Does nothing special.
  */
@@ -866 +1482 @@
 
 
-/***************************************************************************
- *@@ ScriptTitle::SetTitle
+/*
+ *@@SetTitle:
  *  Sets title text.
  */
-
-void ScriptTitle::SetTitle(const PSZ pszTitle)
-    {
-    if (strlen(szTitle) < MAXTITLELENGTH)
-        strcpy(this->szTitle, pszTitle);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTitle::SetIndex
- *  Sets title text.
- */
-
-void ScriptTitle::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTitle::ReturnTitle
+USHORT ScriptTitle::SetTitle(const PSZ p_pszTitle)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+
+    if (strlen(p_pszTitle) < MAXTITLELENGTH)
+        strcpy(this->_szTitle, p_pszTitle);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_TITLE_TITLE_STRTOOLONG);
+        msg.SetMessageText(p_pszTitle);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@ReturnTitle:
  *  Returns const pointer to title text.
  */
-
 const PSZ ScriptTitle::ReturnTitle()
     {
-    return szTitle;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTitle::ReturnIndex
- *  Sets title text.
- */
-
-USHORT ScriptTitle::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptTitle::MakeScriptText
+    return _szTitle;
+    }
+
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptTitle::MakeScriptText(BOOL bAttribute)
+PSZ ScriptTitle::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
-    ulTextLength = strlen(szTitle);
+    ulTextLength = strlen(_szTitle);
     CHAR szTemp[1024];
     szTemp[0]='\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         // Length of the attribute, =, " and "
-        ulTextLength += strlen("TITLE") + 3;
+        ulTextLength += strlen(SZ_ATTRIBUTE_TITLE) + 3;
 
     pszScriptText = new CHAR[ulTextLength + 1];
     *pszScriptText = '\0';
 
-    if (bAttribute)
-        sprintf(pszScriptText, "%s=\"%s\"", SZ_ATTRIBUTE_TITLE, szTitle);
+    if (p_bAttribute)
+        sprintf(pszScriptText, "%s=\"%s\"", SZ_ATTRIBUTE_TITLE, _szTitle);
     else
-        sprintf(pszScriptText, "%s", szTitle);
+        sprintf(pszScriptText, "%s", _szTitle);
 
     return pszScriptText;
@@ -944 +1542 @@
 
 
-/***************************************************************************
- *@@ScriptTitle::BuildFromText
+/*
+ *@@BuildFromText:
  *  Builds package ID accordingly to script text. If any errors is found in script
  *  text, error informations are returned in table where to *pScriptError
@@ -952 +1550 @@
  */
 PSZ ScriptTitle::BuildFromText(PSZ pszScriptText,
-                               SCRIPTERROR **ppScriptError,
-                               USHORT *pusErrorTableSize,
-                               ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+                               ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszAttr = NULL;
@@ -968 +1564 @@
     else
         {
-        Error.usErrorCode = ERR_PARSE_TITLE_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_TITLE_TITLE_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -988 +1581 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptTarget class:
-
- ****************************************************************************
- *  ScriptTarget class member functions:
- *  ScripitTarget   Constructor.
- *  ~ScriptTarget   Destructor.
- *  SetTarget       Sets title text.
- *  SetIndex        Sets target object ID. Should be used for identification.
- *  ReturnTarget    Returns const pointer to title text.
- *  ReturnIndex     Returns object ID number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText   Construct object from script text.
+        @@ScriptTarget class:
+
+    <B>Description:</B>
+        This class is for TARGET attribute in PCK tag. This class contains
+        information about target path where files will be installed by
+        default. Same path will be displayed in WarpIN's container page.
+
+
+    Member functions:
+        ScripitTarget(USHORT)           Constructor.
+        ~ScriptTarget()                 Destructor.
+        USHORT SetTarget(const PSZ)     Sets title text.
+        const PSZ ReturnTarget()        Returns const pointer to title text.
+        PSZ MakeScriptText(BOOL)        Returns pointer to script text.
+        PSZ BuildFromText(PSZ, ULONG)   Construct object from script text.
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptTarget::ScriptTarget
+/*
+ *@@ScriptTarget:
  *  Constructor for ScriptTarget class. Initializes szTarget string by
  *  setting first char to '\0'.
  */
-ScriptTarget::ScriptTarget(USHORT usIndex)
-    {
-    *szTarget = '\0';
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTarget::~ScriptTarget
- *  destructor for ScriptTarget class. Does nothing special.
+ScriptTarget::ScriptTarget(USHORT p_usIndex)
+    {
+    *_szTarget = '\0';
+    SetIndex(p_usIndex);
+    }
+
+
+
+/*
+ *@@~ScriptTarget:
+ *  destructor for ScriptTarget class.
  */
 ScriptTarget::~ScriptTarget()
     {
-    }
-
-
-/***************************************************************************
- *@@ ScriptTarget::SetTarget
+    *_szTarget = '\0';
+    }
+
+
+/*
+ *@@SetTarget:
  *  Sets target text.
  */
-void ScriptTarget::SetTarget(const PSZ pszTarget)
-    {
-    if (strlen(szTarget) < MAXTARGETLENGTH)
-        strcpy(this->szTarget, pszTarget);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTarget::SetIndex
- *  Sets object's index.
- */
-void ScriptTarget::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTarget::ReturnTitle
+USHORT ScriptTarget::SetTarget(const PSZ p_pszTarget)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszTarget) < MAXTARGETLENGTH)
+        strcpy(this->_szTarget, p_pszTarget);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_TARGET_TARGET_STRTOOLONG);
+        msg.SetMessageText(p_pszTarget);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@ReturnTitle:
  *  Returns const pointer to target text.
  */
 const PSZ ScriptTarget::ReturnTarget()
     {
-    return szTarget;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptTarget::ReturnIndex
- *  Returns object's index number.
- */
-USHORT ScriptTarget::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptTarget::MakeScriptText
+    return _szTarget;
+    }
+
+
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptTarget::MakeScriptText(BOOL bAttribute)
-    {
-    ULONG ulTextLength = 0;
-    XSTRING strScriptText;
-    xstrInit(&strScriptText, 0);
-    ulTextLength = strlen(szTarget);
+PSZ ScriptTarget::MakeScriptText(BOOL p_bAttribute)
+    {
+    XSTRING xstrScriptText;
     CHAR szTemp[1024];
     szTemp[0]='\0';
-
-    if (bAttribute)
-        // Length of the attribute, =, " and "
-        ulTextLength += strlen("TARGET") + 3;
-
-    //pszScriptText = new CHAR[ulTextLength + 1];
-    //*pszScriptText = '\0';
-
-    if (bAttribute)
-        sprintf(szTemp, "%s=\"%s\"", SZ_ATTRIBUTE_TARGET, szTarget);
+    xstrInit(&xstrScriptText, 0);
+
+    if (p_bAttribute)
+        sprintf(szTemp, "%s=\"%s\"", SZ_ATTRIBUTE_TARGET, _szTarget);
     else
-        sprintf(szTemp, "%s\"", szTarget);
-
-    xstrcat(&strScriptText, szTemp, 0);
-    return strScriptText.psz;
-    }
-
-
-
-/***************************************************************************
- *@@ScriptTarget::BuildFromText
+        sprintf(szTemp, "%s\"", _szTarget);
+
+    xstrcat(&xstrScriptText, szTemp, 0);
+    return xstrScriptText.psz;
+    }
+
+
+
+/*
+ *@@BuildFromText:
  *  Builds target object accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptTarget::BuildFromText(PSZ pszScriptText,
-                               SCRIPTERROR **ppScriptError,
-                               USHORT *pusErrorTableSize,
-                               ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  NULL pointer is returned.If no errors occurred, pointer to after end of
+ *  tag is returned so multiple searches can be done.
+ */
+PSZ ScriptTarget::BuildFromText(PSZ p_pszScriptText,
+                               ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszAttr = NULL;
@@ -1121 +1692 @@
 
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_TARGET, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_TARGET, &ulOffset);
     if (pszAttr)
         this->SetTarget(pszAttr);
     else
         {
-        Error.usErrorCode = ERR_PARSE_TITLE_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_TARGET_TARGET_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -1138 +1706 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -1145 +1713 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptKeyWord class:
-
- ****************************************************************************
- *  ScriptKeyWord class member functions:
- *  ScripitKeyWord  Constructor.
- *  ~ScriptKeyWord  Destructor.
- *  SetBase         Sets BASE keyword.
- *  SetFixed        Sets FIXED keyword.
- *  SetSelect       Sets SELECT keyword.
- *  SetNoDeselect   Sets BODESELECT keyword.
- *  SetKeyWord      Sets all keywords simultaniously.
- *  SetIndex        Sets object ID. Should be used for identification.
- *  ReturnBase      Returns BASE keyword state.
- *  ReturnFixed     Returns FIXED keyword state.
- *  ReturnSelect    Returns SELECT keyword state.
- *  ReturnNoDeselect Returns NODESELECT keyword state.
- *  ReturnIndex     Returns object ID number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText   Builds object from text.
+        @@ScriptKeyWord class:
+
+    <B>Description:</B>
+        This class is for keywords in PCK tag. This class contains
+        all four keywords: BASE, FIXED, SELECT and NODESELECT. Detailed
+        information about the meaning of the keywords can be found from
+        <I>WarpIN Programmer's Guide and Reference</I>.
+
+
+    Member functions:
+        ScripitKeyWord(USHORT)          Constructor.
+        ~ScriptKeyWord                  Destructor.
+        USHORT SetBase(BOOL)            Sets BASE keyword.
+        USHORT SetFixed(BOOL)           Sets FIXED keyword.
+        USHORT SetSelect(BOOL)          Sets SELECT keyword.
+        USHORT SetNoDeselect(BOOL)      Sets BODESELECT keyword.
+        USHORT SetKeyWord(USHORT)       Sets all keywords simultaniously.
+        BOOL ReturnBase()               Returns BASE keyword state.
+        BOOL ReturnFixed()              Returns FIXED keyword state.
+        BOOL ReturnSelect()             Returns SELECT keyword state.
+        BOOL ReturnNoDeselect()         Returns NODESELECT keyword state.
+        PSZ MakeScriptText(BOOL)        Returns pointer to script text.
+        PSZ BuildFromText(PSZ, ULONG)   Builds object from text.
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptKeyWord::ScriptKeyWord
+/*
+ *@@ScriptKeyWord:
  *  Constructor for ScriptKeyWord class. Initializes object by setting
  *  usIndex to given value on uses default value (1).
  */
-ScriptKeyWord::ScriptKeyWord(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    bBase = FALSE;
-    bFixed = FALSE;
-    bSelect = FALSE;
-    bNoDeselect = FALSE;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::~ScriptKeyWord
+ScriptKeyWord::ScriptKeyWord(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    _bBase = FALSE;
+    _bFixed = FALSE;
+    _bSelect = FALSE;
+    _bNoDeselect = FALSE;
+    }
+
+
+/*
+ *@@~ScriptKeyWord:
  *  Destructor for ScriptKeyWord class.
  */
 ScriptKeyWord::~ScriptKeyWord()
     {
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::SetBase
+    _bBase = FALSE;
+    _bFixed = FALSE;
+    _bSelect = FALSE;
+    _bNoDeselect = FALSE;
+    }
+
+
+/*
+ *@@SetBase:
  *  Sets BASE keyword state.
  */
-void ScriptKeyWord::SetBase(BOOL bBase)
-    {
-    this->bBase = bBase;
-    }
-
-
-
-/***************************************************************************
+USHORT ScriptKeyWord::SetBase(BOOL p_bBase)
+    {
+    _bBase = p_bBase;
+    return NO_ERROR;
+    }
+
+
+/*
  *@@ ScriptKeyWord::SetFixed
  *  Sets FIXED keyword state.
  */
-void ScriptKeyWord::SetFixed(BOOL bFixed)
-    {
-    this->bFixed = bFixed;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::SetSelect
+USHORT ScriptKeyWord::SetFixed(BOOL p_bFixed)
+    {
+    _bFixed = p_bFixed;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetSelect:
  *  Sets SELECT keyword state.
  */
-void ScriptKeyWord::SetSelect(BOOL bSelect)
-    {
-    this->bSelect = bSelect;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::SetNoDeselect
+USHORT ScriptKeyWord::SetSelect(BOOL p_bSelect)
+    {
+    _bSelect = p_bSelect;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetNoDeselect:
  *  Sets NODESELECT keyword state.
  */
-void ScriptKeyWord::SetNoDeselect(BOOL bNoDeselect)
-    {
-    this->bNoDeselect = bNoDeselect;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::SetKeyWord
+USHORT ScriptKeyWord::SetNoDeselect(BOOL p_bNoDeselect)
+    {
+    _bNoDeselect = p_bNoDeselect;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetKeyWord:
  *  Sets all keyword states acconding to usKeyWords. Different keywords can
  *  be combined with OR. Example: KEYWORD_BASE | KEYWORD_FIXED.
  */
-void ScriptKeyWord::SetKeyWord(USHORT usKeyWords)
-    {
-    if (usKeyWords & KEYWORD_BASE)
-        bBase = TRUE;
+USHORT ScriptKeyWord::SetKeyWord(USHORT p_usKeyWords)
+    {
+    if (p_usKeyWords & KEYWORD_BASE)
+        _bBase = TRUE;
     else
-        bBase = FALSE;
-
-    if (usKeyWords & KEYWORD_FIXED)
-        bFixed = TRUE;
+        _bBase = FALSE;
+
+    if (p_usKeyWords & KEYWORD_FIXED)
+        _bFixed = TRUE;
     else
-        bFixed = FALSE;
-
-    if (usKeyWords & KEYWORD_SELECT)
-        bSelect = TRUE;
+        _bFixed = FALSE;
+
+    if (p_usKeyWords & KEYWORD_SELECT)
+        _bSelect = TRUE;
     else
-        bSelect = FALSE;
-
-    if (usKeyWords & KEYWORD_NODESELECT)
-        bNoDeselect = TRUE;
+        _bSelect = FALSE;
+
+    if (p_usKeyWords & KEYWORD_NODESELECT)
+        _bNoDeselect = TRUE;
     else
-        bNoDeselect = FALSE;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::SetIndex
- *  Sets object's index.
- */
-void ScriptKeyWord::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnBase
+        _bNoDeselect = FALSE;
+
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnBase:
  *  Returns bBase state.
  */
 BOOL ScriptKeyWord::ReturnBase()
     {
-    return bBase;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnFixed
+    return _bBase;
+    }
+
+
+/*
+ *@@ReturnFixed:
  *  Returns bFixed state.
  */
 BOOL ScriptKeyWord::ReturnFixed()
     {
-    return bFixed;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnSelect
+    return _bFixed;
+    }
+
+
+/*
+ *@@ReturnSelect:
  *  Returns bSelect state.
  */
 BOOL ScriptKeyWord::ReturnSelect()
     {
-    return bSelect;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnNoDeselect
+    return _bSelect;
+    }
+
+
+/*
+ *@@ReturnNoDeselect:
  *  Returns bBase state.
  */
 BOOL ScriptKeyWord::ReturnNoDeselect()
     {
-    return bNoDeselect;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnKeyWord
+    return _bNoDeselect;
+    }
+
+
+/*
+ *@@ReturnKeyWord:
  *  Returns all keyword states.
  */
@@ -1332 +1890 @@
     USHORT usReturnValue = 0;
 
-    if (bBase)
+    if (_bBase)
         usReturnValue |= KEYWORD_BASE;
-    if (bFixed)
+    if (_bFixed)
         usReturnValue |= KEYWORD_FIXED;
-    if (bSelect)
+    if (_bSelect)
         usReturnValue |= KEYWORD_SELECT;
-    if (bNoDeselect)
+    if (_bNoDeselect)
         usReturnValue |= KEYWORD_NODESELECT;
 
@@ -1345 +1903 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptKeyWord::ReturnIndex
- *  Returns index of current object.
- */
-USHORT ScriptKeyWord::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKeyWords::MakeScriptText
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptKeyWord::MakeScriptText(BOOL bAttribute, BOOL bLineFeed)
-    {
-    ULONG ulTextLength = 0;
+PSZ ScriptKeyWord::MakeScriptText(BOOL p_bAttribute, BOOL p_bLineFeed)
+    {
     ULONG ulSpaces = 0;
-    PSZ pszScriptText = NULL;
-
-    if (bBase)
-        {
-        ulTextLength += strlen(SZ_KEYWORD_BASE);
+    XSTRING xstrScriptText;
+    xstrInit(&xstrScriptText, 0);
+
+    if (_bBase)
         ulSpaces ++;
-        }
-    if (bFixed)
-        {
-        ulTextLength += strlen(SZ_KEYWORD_FIXED);
+    if (_bFixed)
         ulSpaces ++;
-        }
-    if (bSelect)
-        {
-        ulTextLength += strlen(SZ_KEYWORD_SELECT);
+    if (_bSelect)
         ulSpaces ++;
-        }
-    if (bNoDeselect)
-        {
-        ulTextLength += strlen(SZ_KEYWORD_NODESELECT);
+    if (_bNoDeselect)
         ulSpaces ++;
-        }
-
-    pszScriptText = new CHAR[ulTextLength + (--ulSpaces) + 1];
-    *pszScriptText = '\0';
-
-    if (bBase)
-        {
-        strcat(pszScriptText, SZ_KEYWORD_BASE);
-        if (bLineFeed && ulSpaces > 0)
-            strcat(pszScriptText, "\n");
+
+    if (_bBase)
+        {
+        xstrcat(&xstrScriptText, SZ_KEYWORD_BASE, 0);
+        if (p_bLineFeed && ulSpaces > 0)
+            xstrcat(&xstrScriptText, "\n", 0);
         else if (ulSpaces > 0)
-            strcat(pszScriptText, " ");
+            xstrcat(&xstrScriptText, " ", 0);
         ulSpaces--;
         }
-    if (bFixed)
-        {
-        strcat(pszScriptText, SZ_KEYWORD_FIXED);
-        if (bLineFeed && ulSpaces > 0)
-            strcat(pszScriptText, "\n");
+    if (_bFixed)
+        {
+        xstrcat(&xstrScriptText, SZ_KEYWORD_FIXED, 0);
+        if (p_bLineFeed && ulSpaces > 0)
+            xstrcat(&xstrScriptText, "\n", 0);
         else if (ulSpaces > 0)
-            strcat(pszScriptText, " ");
+            xstrcat(&xstrScriptText, " ", 0);
         ulSpaces--;
         }
-    if (bSelect)
-        {
-        strcat(pszScriptText, SZ_KEYWORD_SELECT);
-        if (bLineFeed && ulSpaces > 0)
-            strcat(pszScriptText, "\n");
+    if (_bSelect)
+        {
+        xstrcat(&xstrScriptText, SZ_KEYWORD_SELECT, 0);
+        if (p_bLineFeed && ulSpaces > 0)
+           xstrcat(&xstrScriptText, "\n", 0);
         else if (ulSpaces > 0)
-            strcat(pszScriptText, " ");
+            xstrcat(&xstrScriptText, " ", 0);
         ulSpaces--;
         }
-    if (bNoDeselect)
-        {
-        strcat(pszScriptText, SZ_KEYWORD_NODESELECT);
-        if (bLineFeed && ulSpaces > 0)
-            strcat(pszScriptText, "\n");
+    if (_bNoDeselect)
+        {
+        xstrcat(&xstrScriptText, SZ_KEYWORD_NODESELECT, 0);
+        if (p_bLineFeed && ulSpaces > 0)
+            xstrcat(&xstrScriptText, "\n", 0);
         else if (ulSpaces > 0)
-            strcat(pszScriptText, " ");
+            xstrcat(&xstrScriptText, " ", 0);
         ulSpaces--;
         }
 
-    return pszScriptText;
-    }
-
-
-
-/***************************************************************************
- *@@ScriptKeyWord::BuildFromText
+    return xstrScriptText.psz;
+    }
+
+
+/*
+ *@@BuildFromText:
  *  Builds keyword object accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptKeyWord::BuildFromText(PSZ pszScriptText,
-                               SCRIPTERROR **ppScriptError,
-                               USHORT *pusErrorTableSize,
-                               ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  NULL is returned otherwice pointer to just after end of tag is returned so
+ *  multiple searches can be done.
+ */
+PSZ ScriptKeyWord::BuildFromText(PSZ p_pszScriptText,
+                               ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszKWord = NULL;
     BOOL KWFound = FALSE;
 
 
-    pszKWord = strhFindWord(pszScriptText, SZ_KEYWORD_BASE, "\x0d\x0a ()/\\-,.",
+    pszKWord = strhFindWord(p_pszScriptText, SZ_KEYWORD_BASE, "\x0d\x0a ()/\\-,.",
                             "\x0d\x0a ()/\\-,.:;");
     if (pszKWord)
@@ -1461 +1987 @@
         this->SetBase(FALSE);
 
-    pszKWord = strhFindWord(pszScriptText, SZ_KEYWORD_FIXED, "\x0d\x0a ()/\\-,.",
+    pszKWord = strhFindWord(p_pszScriptText, SZ_KEYWORD_FIXED, "\x0d\x0a ()/\\-,.",
                             "\x0d\x0a ()/\\-,.:;");
     if (pszKWord)
@@ -1471 +1997 @@
         this->SetFixed(FALSE);
 
-    pszKWord = strhFindWord(pszScriptText, SZ_KEYWORD_SELECT, "\x0d\x0a ()/\\-,.",
+    pszKWord = strhFindWord(p_pszScriptText, SZ_KEYWORD_SELECT, "\x0d\x0a ()/\\-,.",
                             "\x0d\x0a ()/\\-,.:;");
     if (pszKWord)
@@ -1481 +2007 @@
         this->SetSelect(FALSE);
 
-    pszKWord = strhFindWord(pszScriptText, SZ_KEYWORD_NODESELECT, "\x0d\x0a ()/\\-,.",
+    pszKWord = strhFindWord(p_pszScriptText, SZ_KEYWORD_NODESELECT, "\x0d\x0a ()/\\-,.",
                             "\x0d\x0a ()/\\-,.:;");
     if (pszKWord)
@@ -1493 +2019 @@
     if (KWFound)
         {
-        Error.usErrorCode = ERR_PARSE_KEYWORD_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_KEYWORD_PCKKW_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
 
-    return pszScriptText;
+    return p_pszScriptText;
     }
 
@@ -1511 +2034 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptRequires class:
-
- ****************************************************************************
- *  ScriptRequires class member functions:
- *  ScripitRequires Constructor.
- *  ~ScriptRequires Destructor.
- *  SetVendor       Sets vendor text.
- *  SetApplication  Sets application text.
- *  SetPackage      Sets package text.
- *  SetMajor        Sets major number.
- *  SetMinor        Sets minor number.
- *  SetIndex        Sets index number. Used for identifying.
- *  SetRevision     Sets revision number.
- *  SetRequires     Sets all fields simultaneously.
- *  ReturnVendor    Returns const pointer to vendor string.
- *  ReturnApplication Returns const pointer to application string.
- *  ReturnPackage   Returns const pointer to package string.
- *  ReturnMajor     Returns major number.
- *  ReturnMinor     Returns minor number.
- *  ReturnRevision  Returns revision number.
- *  ReturnRequires  Returns all fields.
- *  ReturnIndex     Returns index number.
- *  MakeScriptText  Returns pointer to script text.
+        @@ScriptRequires class:
+
+    <B>Description:</B>
+        This class is for REQUIRES attribute in PCK tag. This class contains
+        Detailed information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScripitRequires(USHORT)     Constructor.
+        ~ScriptRequires()           Destructor.
+        SetVendor                   Sets vendor text.
+        SetApplication              Sets application text.
+        SetPackage                  Sets package text.
+        SetMajor                    Sets major number.
+        SetMinor                    Sets minor number.
+        SetRevision                 Sets revision number.
+        SetRequires                 Sets all fields simultaneously.
+        ReturnVendor                Returns const pointer to vendor string.
+        ReturnApplication           Returns const pointer to application string.
+        ReturnPackage               Returns const pointer to package string.
+        ReturnMajor                 Returns major number.
+        ReturnMinor                 Returns minor number.
+        ReturnRevision              Returns revision number.
+        ReturnRequires              Returns all fields.
+        MakeScriptText              Returns pointer to script text.
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptRequires::ScriptRequires
+/*
+ *@@ScriptRequires:
  *  Constructor for ScriptRequires class. Initializes object by setting
  *  fields to zero.
  */
-ScriptRequires::ScriptRequires(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    *szVendor = '\0';
-    *szApplication = '\0';
-    *szPackage = '\0';
-    usMajor = 0;
-    usMinor = 0;
-    usRevision = 0;
-    usPckIndex = 0;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::~ScriptRequires
+ScriptRequires::ScriptRequires(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szVendor = '\0';
+    *_szApplication = '\0';
+    *_szPackage = '\0';
+    _usMajor = 0;
+    _usMinor = 0;
+    _usRevision = 0;
+    _usPckIndex = 0;
+    }
+
+
+/*
+ *@@~ScriptRequires:
  *  Destructor for ScriptRequires class.
  */
 ScriptRequires::~ScriptRequires()
     {
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::SetVendor
+    *_szVendor = '\0';
+    *_szApplication = '\0';
+    *_szPackage = '\0';
+    _usMajor = 0;
+    _usMinor = 0;
+    _usRevision = 0;
+    _usPckIndex = 0;
+    }
+
+
+/*
+ *@@SetVendor:
  *  Sets vendor text.
  */
-void ScriptRequires::SetVendor(const PSZ pszVendor)
-    {
-    if (strlen(szVendor) < MAXVENDORNAMELENGTH);
-        strcpy(this->szVendor, pszVendor);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::SetApplication
+USHORT ScriptRequires::SetVendor(const PSZ p_pszVendor)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszVendor) < MAXVENDORNAMELENGTH)
+        strcpy(this->_szVendor, p_pszVendor);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_VENDOR_STRTOOLONG);
+        msg.SetMessageText(p_pszVendor);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@SetApplication:
  *  Sets application text.
  */
-void ScriptRequires::SetApplication(const PSZ pszApplication)
-    {
-    if (strlen(szApplication) < MAXAPPNAMELENGTH);
-        strcpy(this->szApplication, pszApplication);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::SetPackage
+USHORT ScriptRequires::SetApplication(const PSZ p_pszApplication)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszApplication) < MAXAPPNAMELENGTH)
+        strcpy(this->_szApplication, p_pszApplication);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_APPL_STRTOOLONG);
+        msg.SetMessageText(p_pszApplication);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@SetPackage:
  *  Sets package text.
  */
-void ScriptRequires::SetPackage(const PSZ pszPackage)
-    {
-    if (strlen(szPackage) < MAXPCKNAMELENGTH);
-        strcpy(this->szPackage, pszPackage);
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptRequires::SetMajor
+USHORT ScriptRequires::SetPackage(const PSZ p_pszPackage)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszPackage) < MAXPCKNAMELENGTH)
+        strcpy(this->_szPackage, p_pszPackage);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_PACKAGE_STRTOOLONG);
+        msg.SetMessageText(p_pszPackage);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@SetMajor
  *  This function sets major number.
  */
-void ScriptRequires::SetMajor(USHORT usMajor)
-    {
-    this->usMajor = usMajor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptRequires::SetMinor
+USHORT ScriptRequires::SetMajor(USHORT p_usMajor)
+    {
+    this->_usMajor = p_usMajor;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetMinor:
  *  This function sets minor number.
  */
-void ScriptRequires::SetMinor(USHORT usMinor)
-    {
-    this->usMinor = usMinor;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptRequires::SetRevision
+USHORT ScriptRequires::SetMinor(USHORT p_usMinor)
+    {
+    this->_usMinor = p_usMinor;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetRevision:
  *  This function sets revision number.
  */
-void ScriptRequires::SetRevision(USHORT usRevision)
-    {
-    this->usRevision = usRevision;
-    }
-
-
-
-/****************************************************************************
- *@@ScriptRequires::SetPckIndex
+USHORT ScriptRequires::SetRevision(USHORT p_usRevision)
+    {
+    this->_usRevision = p_usRevision;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetPckIndex:
  *  This function sets required package number.
  */
-void ScriptRequires::SetPckIndex(USHORT usPckIndex)
-    {
-    this->usPckIndex = usPckIndex;
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptRequires::SetRequires
+USHORT ScriptRequires::SetPckIndex(USHORT p_usPckIndex)
+    {
+    this->_usPckIndex = p_usPckIndex;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetRequires:
  *  This function sets all datas.
  */
-void ScriptRequires::SetRequires(REQUIRESDATA requiresData)
-    {
-    if (strlen(requiresData.szVendor) < MAXVENDORNAMELENGTH);
-        strcpy(this->szVendor, requiresData.szVendor);
-    if (strlen(requiresData.szApplication) < MAXAPPNAMELENGTH);
-        strcpy(this->szApplication, requiresData.szApplication);
-    if (strlen(requiresData.szPackage) < MAXPCKNAMELENGTH);
-        strcpy(this->szPackage, requiresData.szPackage);
-    this->usMajor = requiresData.usMajor;
-    this->usMinor = requiresData.usMinor;
-    this->usRevision = requiresData.usRevision;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::SetIndex
- *  Sets object's index.
- */
-void ScriptRequires::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnVendor
+USHORT ScriptRequires::SetRequires(REQUIRESDATA p_requiresData)
+    {
+    USHORT rc = NO_ERROR;
+
+    if (SetVendor(p_requiresData.szVendor) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetApplication(p_requiresData.szApplication) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetPackage(p_requiresData.szPackage) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    SetMajor(p_requiresData.usMajor);
+    SetMinor(p_requiresData.usMinor);
+    SetRevision(p_requiresData.usRevision);
+
+    return rc;
+    }
+
+
+/*
+ *@@ReturnVendor:
  *  Returns const pointer to vendor text.
  */
 const PSZ ScriptRequires::ReturnVendor()
     {
-    return szVendor;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnApplication
+    return _szVendor;
+    }
+
+
+/*
+ *@@ReturnApplication:
  *  Returns const pointer to application text.
  */
 const PSZ ScriptRequires::ReturnApplication()
     {
-    return szApplication;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnPackage
+    return _szApplication;
+    }
+
+
+/*
+ *@@ReturnPackage:
  *  Returns const pointer to package text.
  */
 const PSZ ScriptRequires::ReturnPackage()
     {
-    return szPackage;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnMajor
+    return _szPackage;
+    }
+
+
+/*
+ *@@ReturnMajor:
  *  Returns major number.
  */
 USHORT ScriptRequires::ReturnMajor()
     {
-    return usMajor;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnMinor
+    return _usMajor;
+    }
+
+
+/*
+ *@@ReturnMinor:
  *  Returns minor number.
  */
 USHORT ScriptRequires::ReturnMinor()
     {
-    return usMinor;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnRevision
+    return _usMinor;
+    }
+
+
+/*
+ *@@ReturnRevision:
  *  Returns revision number.
  */
 USHORT ScriptRequires::ReturnRevision()
     {
-    return usRevision;
-    }
-
-
-
-/***************************************************************************
+    return _usRevision;
+    }
+
+
+/*
  *@@ ScriptRequires::ReturnPckIndex
  *  Returns revision number.
@@ -1752 +2294 @@
 USHORT ScriptRequires::ReturnPckIndex()
     {
-    return usPckIndex;
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptRequires::ReturnRequires
+    return _usPckIndex;
+    }
+
+
+/*
+ *@@ReturnRequires:
  *  This function returns all datas.
  */
@@ -1765 +2305 @@
     {
     REQUIRESDATA requiresData;
-    strcpy(requiresData.szVendor, this->szVendor);
-    strcpy(requiresData.szApplication, this->szApplication);
-    strcpy(requiresData.szPackage, this->szPackage);
-    requiresData.usMajor = this->usMajor;
-    requiresData.usMinor = this->usMinor;
-    requiresData.usRevision = this->usRevision;
+    strcpy(requiresData.szVendor, this->_szVendor);
+    strcpy(requiresData.szApplication, this->_szApplication);
+    strcpy(requiresData.szPackage, this->_szPackage);
+    requiresData.usMajor = this->_usMajor;
+    requiresData.usMinor = this->_usMinor;
+    requiresData.usRevision = this->_usRevision;
     return requiresData;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptRequires::ReturnIndex
- *  Returns index of current object.
- */
-USHORT ScriptRequires::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRequires::MakeScriptText
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptRequires::MakeScriptText(BOOL bAttribute)
+PSZ ScriptRequires::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
 
-    ulTextLength = strlen(szVendor) + strlen(szApplication) +
-                    strlen(szPackage);
-    ulTextLength += LtoALength(usMajor) + LtoALength(usMinor) +
-                    LtoALength(usRevision);
+    ulTextLength = strlen(_szVendor) + strlen(_szApplication) +
+                    strlen(_szPackage);
+    ulTextLength += LtoALength(_usMajor) + LtoALength(_usMinor) +
+                    LtoALength(_usRevision);
     ulTextLength += 5;
 
-    if (bAttribute)
-        ulTextLength += strlen("REQUIRES") + 3;
+    if (p_bAttribute)
+        ulTextLength += strlen(SZ_ATTRIBUTE_REQUIRES) + 3;
 
     pszScriptText = new CHAR[ulTextLength + 1];
     *pszScriptText = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         sprintf(pszScriptText, "%s=\"%s\\%s\\%s\\%i\\%i\\%i\"",
-            SZ_ATTRIBUTE_REQUIRES, szVendor, szApplication, szPackage,
-            usMajor, usMinor, usRevision);
+            SZ_ATTRIBUTE_REQUIRES, _szVendor, _szApplication, _szPackage,
+            _usMajor, _usMinor, _usRevision);
     else
         sprintf(pszScriptText, "%s\\%s\\%s\\%i\\%i\\%i",
-            szVendor, szApplication, szPackage, usMajor, usMinor,
-            usRevision);
+            _szVendor, _szApplication, _szPackage, _usMajor, _usMinor,
+            _usRevision);
     return pszScriptText;
     }
@@ -1821 +2349 @@
 
 
-/***************************************************************************
- *@@ScriptRequires:: BuildFromText
+/*
+ *@@BuildFromText:
  *  Builds requires accordingly to script text. If any errors is found in script
- *  text, error informations are returned in table where to *pScriptError
- *  points. Pointer to after end of tag is returned so multiple searches can be
- *  done.
- */
-PSZ ScriptRequires::BuildFromText(PSZ pszScriptText,
-                                  SCRIPTERROR **ppScriptError,
-                                  USHORT *pusErrorTableSize,
-                                  ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  text, NULL is returned otherwice pointer to after end of tag is returned so
+ *  multiple searches can be done.
+ */
+PSZ ScriptRequires::BuildFromText(PSZ p_pszScriptText,
+                                  ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL, pszTemp2 = NULL, pszTemp3 = NULL;
     PSZ pszAttr = NULL;
@@ -1841 +2366 @@
     ULONG ulAttrLen = 0;
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_REQUIRES, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_REQUIRES, &ulOffset);
 
     if (!pszAttr)
         {
-        Error.usErrorCode = ERR_PARSE_REQUIRES_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -1869 +2391 @@
             this->SetApplication(pszTemp3);
             delete [] pszTemp3;
-            pszTemp2 = ++pszTemp;
+            pszTemp2 =  ++pszTemp;
             pszTemp = strchr(pszTemp, '\\');
             if (pszTemp) // Set package
@@ -1888 +2410 @@
                     if (pszTemp) // Set minor and revision
                         {
-                        pszTemp3 = strhSubstr(pszTemp2, pszTemp);
-                        sscanf(pszTemp3, "%d", &ulVersion);
-                        this->SetMinor((USHORT)ulVersion);
-                        delete [] pszTemp3;
-                        pszTemp2 = ++pszTemp;
+                        if (pszTemp3 = strhSubstr(pszTemp2, pszTemp))
+                            {
+                            sscanf(pszTemp3, "%d", &ulVersion);
+                            this->SetMinor((USHORT)ulVersion);
+                            delete [] pszTemp3;
+                            pszTemp2 = ++pszTemp;
+                            }
+                        else
+                            {
+                            msg.SetType(MSG_TYPE_ERROR);
+                            msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_MINOR_NOTFOUND);
+                            msg.SetLineNumber(p_ulLineNumber);
+                            _messageLogger.LogMessage(msg);
+                            bError = TRUE;
+                            }
 
                         // Set revision
                         if (strlen(pszTemp) == 0) // There is \\ but no value.
+                            {
+                            msg.SetType(MSG_TYPE_INFO);
+                            msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_REV_NOTFOUND);
+                            msg.SetLineNumber(p_ulLineNumber);
+                            _messageLogger.LogMessage(msg);
                             this->SetRevision(0);
+                            }
                         else
                             {
@@ -1907 +2445 @@
                     else // Minor and revision
                         {
-                        pszTemp3 = strhSubstr(pszTemp2, pszTemp2 + strlen(pszTemp2));
-                        sscanf(pszTemp3, "%d", &ulVersion);
-                        this->SetMinor((USHORT)ulVersion);
-                        delete [] pszTemp3;
-                        this->SetRevision(0);
+                        if (pszTemp3 =
+                            strhSubstr(pszTemp2, pszTemp2 + strlen(pszTemp2)))
+                            {
+                            sscanf(pszTemp3, "%d", &ulVersion);
+                            this->SetMinor((USHORT)ulVersion);
+                            delete [] pszTemp3;
+                            this->SetRevision(0);
+                            }
+                        else
+                            {
+                            msg.SetType(MSG_TYPE_ERROR);
+                            msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_MINOR_NOTFOUND);
+                            msg.SetLineNumber(p_ulLineNumber);
+                            _messageLogger.LogMessage(msg);
+                            bError = TRUE;
+                            }
                         }
                     }
                 else // Major error
                     {
-                    Error.usErrorCode = ERR_PARSE_REQUIRES_MAJOR_NOTFOUND;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszAttr);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_ERROR);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_MAJOR_NOTFOUND);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     bError = TRUE;
                     }
@@ -1928 +2474 @@
             else // Package error
                 {
-                Error.usErrorCode = ERR_PARSE_REQUIRES_PACKAGE_NOTFOUND;
-                Error.ulLineNumber = ulLineNumber;
-                Error.pszStart = strhdup(pszAttr);
-                Error.ulLength = 0;
-                if (ppScriptError)
-                    *pusErrorTableSize =
-                        AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_PACKAGE_NOTFOUND);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 bError = TRUE;
                 }
@@ -1940 +2483 @@
         else // Application error
             {
-            Error.usErrorCode = ERR_PARSE_REQUIRES_APP_NOTFOUND;
-            Error.ulLineNumber = ulLineNumber;
-            Error.pszStart = strhdup(pszAttr);
-            Error.ulLength = 0;
-            if (ppScriptError)
-                *pusErrorTableSize =
-                    AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+            msg.SetType(MSG_TYPE_ERROR);
+            msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_APPL_NOTFOUND);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
             bError = TRUE;
             }
@@ -1952 +2492 @@
     else // Vendor error
         {
-        Error.usErrorCode = ERR_PARSE_REQUIRES_VENDOR_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszAttr);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_VENDOR_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         bError = TRUE;
         }
@@ -1966 +2503 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -1975 +2512 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptConfigSys class:
-
- ****************************************************************************
- *  ScriptConfigSys class member functions:
- *  ScriptConfigSys Constructor.
- *  ~ScriptConfigSys Destructor.
- *  SetStatement    Sets statement text.
- *  SetUnique       Sets unique modifier state.
- *  SetAddRight     Sets addright state.
- *  SetAddLeft      Sets addleft state.
- *  SetAddAfter     Sets addafter state.
- *  SetAddBefore    Sets addbefore state.
- *  SetRemoveLine   Sets removeline state.
- *  SetRemovePart   Sets removepart state.
- *  SetSearchString Sets search string.
- *  SetConfigSys    Sets all fields.
- *  SetIndex        Sets index number.
- *  ReturnStatement Returns const pointer to statement string.
- *  ReturnUnique    Returns state of unique modifier.
- *  ReturnAddRight  Returns state of addright modifier.
- *  ReturnAddLeft   Returns addleft modifier state.
- *  ReturnAddAfter  Returns addafter state.
- *  ReturnAddBefore Returns addbefore state.
- *  ReturnRemoveLine Returns removeline state.
- *  ReturnRemovePart Returns removepart state.
- *  ReturnSearchString Returns const pointer to search string.
- *  ReturnIndex     Returns index number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText   Builds object from text.
+        @@ScriptConfigSys class:
+
+    <B>Description:</B>
+        This class is for CONFIGSYS attributes in PCK tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+
+    Member functions:
+        ScriptConfigSys Constructor.
+        ~ScriptConfigSys Destructor.
+        SetStatement    Sets statement text.
+        SetUnique       Sets unique modifier state.
+        SetAddRight     Sets addright state.
+        SetAddLeft      Sets addleft state.
+        SetAddAfter     Sets addafter state.
+        SetAddBefore    Sets addbefore state.
+        SetRemoveLine   Sets removeline state.
+        SetRemovePart   Sets removepart state.
+        SetSearchString Sets search string.
+        SetConfigSys    Sets all fields.
+        ReturnStatement Returns const pointer to statement string.
+        ReturnUnique    Returns state of unique modifier.
+        ReturnAddRight  Returns state of addright modifier.
+        ReturnAddLeft   Returns addleft modifier state.
+        ReturnAddAfter  Returns addafter state.
+        ReturnAddBefore Returns addbefore state.
+        ReturnRemoveLine Returns removeline state.
+        ReturnRemovePart Returns removepart state.
+        ReturnSearchString Returns const pointer to search string.
+        MakeScriptText  Returns pointer to script text.
+        BuildFromText   Builds object from text.
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptConfigSys::ScriptConfigSys
+/*
+ *@@ScriptConfigSys:
  *  Constructor for ScriptConfigSys class. Initializes object by setting
  *  fields to zero.
  */
-ScriptConfigSys::ScriptConfigSys(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    *szStatement = '\0';
-    *szSearchString = '\0';
-    bUnique = FALSE;
-    bAddRight = FALSE;
-    bAddLeft = FALSE;
-    bAddRight = FALSE;
-    bAddTop = FALSE;
-    bAddAfter = FALSE;
-    bAddBefore = FALSE;
-    bRemoveLine = FALSE;
-    bRemovePart = FALSE;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::~ScriptConfigSys
+ScriptConfigSys::ScriptConfigSys(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szStatement = '\0';
+    *_szSearchString = '\0';
+    _bUnique = FALSE;
+    _bAddRight = FALSE;
+    _bAddLeft = FALSE;
+    _bAddRight = FALSE;
+    _bAddTop = FALSE;
+    _bAddAfter = FALSE;
+    _bAddBefore = FALSE;
+    _bRemoveLine = FALSE;
+    _bRemovePart = FALSE;
+    }
+
+
+/*
+ *@@~ScriptConfigSys:
  *  Destructor for ScriptConfigSys class.
  */
 ScriptConfigSys::~ScriptConfigSys()
     {
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetStatement
+    *_szStatement = '\0';
+    *_szSearchString = '\0';
+    _bUnique = FALSE;
+    _bAddRight = FALSE;
+    _bAddLeft = FALSE;
+    _bAddRight = FALSE;
+    _bAddTop = FALSE;
+    _bAddAfter = FALSE;
+    _bAddBefore = FALSE;
+    _bRemoveLine = FALSE;
+    _bRemovePart = FALSE;
+    }
+
+
+/*
+ *@@~SetStatement:
  *  This function sets statement string.
  */
-void ScriptConfigSys::SetStatement(const PSZ pszStatement)
-    {
-    if (strlen(szStatement) < MAXSTATEMENTLENGTH)
-        strcpy(this->szStatement, pszStatement);
-    }
-
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetUnique
+USHORT ScriptConfigSys::SetStatement(const PSZ p_pszStatement)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszStatement) < MAXSTATEMENTLENGTH)
+        strcpy(this->_szStatement, p_pszStatement);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_STATEMENT_STRTOOLONG);
+        msg.SetMessageText(p_pszStatement);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@SetUnique:
  *  This function sets unique state. Returns error code if error occurred.
- *  Error codes:
  *
- */
-USHORT ScriptConfigSys::SetUnique(BOOL bUnique)
-    {
+ *  <B>Return codes:</B>
+ *      ERR_CONFIGSYS_ADDRIGHT_SETTED:      ADDRIGHT modifier cannot
+ *                                          be used with UNIQUE.
+ *      ERR_CONFIGSYS_ADDLEFT_SETTED:       ADDLEFT modifier cannot
+ *                                          be used with UNIQUE.
+ *      ERR_CONFIGSYS_REMOVELINE_SETTED:    REMOVELINE modifier cannot
+ *                                          be used with UNIQUE.
+ *      ERR_CONFIGSYS_REMOVEPART_SETTED:    REMOVEPART modifier cannot
+ *                                          be used with UNOQUE.
+ *      The codes can be ORed with each others.
+ */
+USHORT ScriptConfigSys::SetUnique(BOOL p_bUnique)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_UNIQUE;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bUnique)
-        {
-        if (bAddRight)
+    if (p_bUnique)
+        {
+        if (_bAddRight)
+            {
             usRc |= ERR_CONFIGSYS_ADDRIGHT_SETTED;
-        if (bAddLeft)
+            string += SZ_MODIFIER_ADDRIGHT;
+            string += "|";
+            }
+        if (_bAddLeft)
+            {
             usRc |= ERR_CONFIGSYS_ADDLEFT_SETTED;
-        if (bRemoveLine)
+            string += SZ_MODIFIER_ADDLEFT;
+            string += "|";
+            }
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bUnique = bUnique;
+        }
+
+    this->_bUnique = p_bUnique;
 
     return usRc;
@@ -2082 +2673 @@
 
 
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetAddRight
+/*
+ *@@SetAddRight:
  *  This function sets addright state. Returns error code if error occurred.
  *
  */
-USHORT ScriptConfigSys::SetAddRight(BOOL bAddRight)
-    {
+USHORT ScriptConfigSys::SetAddRight(BOOL p_bAddRight)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_ADDRIGHT;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bAddRight)
-        {
-        if (bUnique)
+    if (p_bAddRight)
+        {
+        if (_bUnique)
+            {
             usRc |= ERR_CONFIGSYS_UNIQUE_SETTED;
-        if (bAddLeft)
+            string += SZ_MODIFIER_UNIQUE;
+            string += "|";
+            }
+        if (_bAddLeft)
+            {
             usRc |= ERR_CONFIGSYS_ADDLEFT_SETTED;
-        if (bRemoveLine)
+            string += SZ_MODIFIER_ADDLEFT;
+            string += "|";
+            }
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bAddRight = bAddRight;
+        }
+
+    this->_bAddRight = p_bAddRight;
 
     return usRc;
@@ -2112 +2726 @@
 
 
-
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetAddLeft
+/*
+ *@@SetAddLeft:
  *  This function sets addleft state. Returns error code if error occurred.
- *
- */
-USHORT ScriptConfigSys::SetAddLeft(BOOL bAddLeft)
-    {
+ */
+USHORT ScriptConfigSys::SetAddLeft(BOOL p_bAddLeft)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_ADDLEFT;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bAddLeft)
-        {
-        if (bUnique)
+    if (p_bAddLeft)
+        {
+        if (_bUnique)
+            {
             usRc |= ERR_CONFIGSYS_UNIQUE_SETTED;
-        if (bAddRight)
+            string += SZ_MODIFIER_UNIQUE;
+            string += "|";
+            }
+        if (_bAddRight)
+            {
             usRc |= ERR_CONFIGSYS_ADDRIGHT_SETTED;
-        if (bRemoveLine)
+            string += SZ_MODIFIER_ADDRIGHT;
+            string += "|";
+            }
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bAddLeft = bAddLeft;
+        }
+
+    this->_bAddLeft = p_bAddLeft;
 
     return usRc;
     }
 
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetAddAfter
+/*
+ *@@SetAddAfter:
  *  This function sets addafter state. Returns error code if error occurred.
- *
- */
-USHORT ScriptConfigSys::SetAddAfter(BOOL bAddAfter)
-    {
+ */
+USHORT ScriptConfigSys::SetAddAfter(BOOL p_bAddAfter)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_ADDAFTER;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bAddAfter)
-        {
-        if (bRemoveLine)
+    if (p_bAddAfter)
+        {
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bAddAfter = bAddAfter;
+        }
+
+    this->_bAddAfter = p_bAddAfter;
 
     return usRc;
@@ -2168 +2817 @@
 
 
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetAddTop
+/*
+ *@@SetAddTop:
  *  This function sets addtop state. Returns error code if error occurred.
  *
  */
-USHORT ScriptConfigSys::SetAddTop(BOOL bAddTop)
-    {
+USHORT ScriptConfigSys::SetAddTop(BOOL p_bAddTop)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_ADDTOP;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bAddTop)
-        {
-        if (bRemoveLine)
+    if (p_bAddTop)
+        {
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bAddTop = bAddTop;
+        }
+
+    this->_bAddTop = p_bAddTop;
 
     return usRc;
@@ -2194 +2858 @@
 
 
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetAddBefore
+/*
+ *@@SetAddBefore:
  *  This function sets addbefore state. Returns error code if error occurred.
- *
- */
-USHORT ScriptConfigSys::SetAddBefore(BOOL bAddBefore)
-    {
+ */
+USHORT ScriptConfigSys::SetAddBefore(BOOL p_bAddBefore)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_ADDBEFORE;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bAddBefore)
-        {
-        if (bRemoveLine)
+    if (p_bAddBefore)
+        {
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bRemovePart)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bAddBefore = bAddBefore;
+        }
+
+    this->_bAddBefore = p_bAddBefore;
 
     return usRc;
@@ -2220 +2898 @@
 
 
-
-/****************************************************************************
- *@@ScriptConfigSys::SetRemoveLine
+/*
+ *@@SetRemoveLine:
  *  This function sets removeline state. Returns error code if error occurred.
- *
- */
-USHORT ScriptConfigSys::SetRemoveLine(BOOL bRemoveLine)
-    {
+ */
+USHORT ScriptConfigSys::SetRemoveLine(BOOL p_bRemoveLine)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_REMOVELINE;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bRemoveLine)
-        {
-        if (bRemovePart)
+    if (p_bRemoveLine)
+        {
+        if (_bRemovePart)
+            {
             usRc |= ERR_CONFIGSYS_REMOVEPART_SETTED;
-        if (bUnique)
+            string += SZ_MODIFIER_REMOVEPART;
+            string += "|";
+            }
+        if (_bUnique)
+            {
             usRc |= ERR_CONFIGSYS_UNIQUE_SETTED;
-        if (bAddRight)
+            string += SZ_MODIFIER_UNIQUE;
+            string += "|";
+            }
+        if (_bAddRight)
+            {
             usRc |= ERR_CONFIGSYS_ADDRIGHT_SETTED;
-        if (bAddLeft)
+            string += SZ_MODIFIER_ADDRIGHT;
+            string += "|";
+            }
+        if (_bAddLeft)
+            {
             usRc |= ERR_CONFIGSYS_ADDLEFT_SETTED;
+            string += SZ_MODIFIER_ADDLEFT;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bRemoveLine = bRemoveLine;
+        }
+
+    this->_bRemoveLine = p_bRemoveLine;
 
     return usRc;
@@ -2249 +2950 @@
 
 
-
-/****************************************************************************
+/*
  *@@ScriptConfigSys::SetRemovePart
  *  This function sets removepart state. Returns error code if error occurred.
- *
- */
-USHORT ScriptConfigSys::SetRemovePart(BOOL bRemovePart)
-    {
+ */
+USHORT ScriptConfigSys::SetRemovePart(BOOL p_bRemovePart)
+    {
+    Message msg;
+    BSString string = SZ_MODIFIER_REMOVEPART;
+    string += "|";
     USHORT usRc = NO_ERROR;
-    if (bRemovePart)
-        {
-        if (bRemoveLine)
+    if (p_bRemovePart)
+        {
+        if (_bRemoveLine)
+            {
             usRc |= ERR_CONFIGSYS_REMOVELINE_SETTED;
-        if (bUnique)
+            string += SZ_MODIFIER_REMOVELINE;
+            string += "|";
+            }
+        if (_bUnique)
+            {
             usRc |= ERR_CONFIGSYS_UNIQUE_SETTED;
-        if (bAddRight)
+            string += SZ_MODIFIER_UNIQUE;
+            string += "|";
+            }
+        if (_bAddRight)
+            {
             usRc |= ERR_CONFIGSYS_ADDRIGHT_SETTED;
-        if (bAddLeft)
+            string += SZ_MODIFIER_ADDRIGHT;
+            string += "|";
+            }
+        if (_bAddLeft)
+            {
             usRc |= ERR_CONFIGSYS_ADDLEFT_SETTED;
+            string += SZ_MODIFIER_ADDLEFT;
+            string += "|";
+            }
         }
     if (usRc)
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+        msg.SetMessageText(string);
+        _messageLogger.LogMessage(msg);
         return usRc;
-
-    this->bRemovePart = bRemovePart;
+        }
+
+    this->_bRemovePart = p_bRemovePart;
 
     return usRc;
@@ -2278 +3002 @@
 
 
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetSearchString
+/*
+ *@@SetSearchString:
  *  This function sets search string.
  */
-void ScriptConfigSys::SetSearchString(const PSZ pszSearchString)
-    {
-    if (strlen(szSearchString) < MAXSEARCHSTRINGLENGTH)
-        strcpy(this->szSearchString, pszSearchString);
-    }
-
-
-
-/****************************************************************************
- *@@ScriptConfigSys::SetConfigSys
+USHORT ScriptConfigSys::SetSearchString(const PSZ p_pszSearchString)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszSearchString) < MAXSEARCHSTRINGLENGTH)
+        strcpy(this->_szSearchString, p_pszSearchString);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REQUIRES_PACKAGE_STRTOOLONG);
+        msg.SetMessageText(p_pszSearchString);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetConfigSys:
  *  This function sets statement string.
  */
 USHORT ScriptConfigSys::SetConfigSys(CONFIGSYSDATA configSys)
     {
-    if (strlen(szStatement) < MAXSTATEMENTLENGTH)
-        strcpy(this->szStatement, configSys.szStatement);
-    if (strlen(configSys.szSearchString) < MAXSEARCHSTRINGLENGTH)
-        strcpy(this->szSearchString, configSys.szSearchString);
+    USHORT rc = NO_ERROR;
+
+    if (SetStatement(configSys.szStatement) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetSearchString(configSys.szSearchString) != NO_ERROR)
+        rc = STRING_TOO_LONG;
     SetUnique(FALSE);
     SetAddRight(FALSE);
@@ -2327 +3062 @@
     if (configSys.usModifiers & MODIFIER_REMOVEPART)
         SetRemovePart(TRUE);
-    return 0;
-    }
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::SetIndex
- *  Sets object's index.
- */
-void ScriptConfigSys::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnStatement
+    return rc;
+    }
+
+
+/*
+ *@@ReturnStatement:
  *  Returns const pointer to statement string.
  */
 const PSZ ScriptConfigSys::ReturnStatement()
     {
-    return szStatement;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnUnique
+    return _szStatement;
+    }
+
+
+/*
+ *@@ReturnUnique:
  *  Returns the state of the unique modifier.
  */
 BOOL ScriptConfigSys::ReturnUnique()
     {
-    return bUnique;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnAddRight
+    return _bUnique;
+    }
+
+
+/*
+ *@@ReturnAddRight:
  *  Returns the state of the addright modifier.
  */
 BOOL ScriptConfigSys::ReturnAddRight()
     {
-    return bAddRight;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnAddLeft
+    return _bAddRight;
+    }
+
+
+/*
+ *@@ReturnAddLeft:
  *  Returns the state of the addleft modifier.
  */
 BOOL ScriptConfigSys::ReturnAddLeft()
     {
-    return bAddLeft;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnAddAfter
+    return _bAddLeft;
+    }
+
+
+
+/*
+ *@@ReturnAddAfter:
  *  Returns the state of the addafter modifier.
  */
 BOOL ScriptConfigSys::ReturnAddAfter()
     {
-    return bAddAfter;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnAddTop
+    return _bAddAfter;
+    }
+
+
+/*
+ *@@ReturnAddTop:
  *  Returns the state of the addtop modifier.
  */
 BOOL ScriptConfigSys::ReturnAddTop()
     {
-    return bAddTop;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnAddBefore
+    return _bAddTop;
+    }
+
+
+/*
+ *@@ReturnAddBefore:
  *  Returns the state of the addbefore modifier.
  */
 BOOL ScriptConfigSys::ReturnAddBefore()
     {
-    return bAddBefore;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnRemoveLine
+    return _bAddBefore;
+    }
+
+
+
+
+/*
+ *@@ReturnRemoveLine:
  *  Returns the state of the removeline modifier.
  */
 BOOL ScriptConfigSys::ReturnRemoveLine()
     {
-    return bRemoveLine;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnRemovePart
+    return _bRemoveLine;
+    }
+
+
+
+
+/*
+ *@@ReturnRemovePart:
  *  Returns the state of the removepart modifier.
  */
 BOOL ScriptConfigSys::ReturnRemovePart()
     {
-    return bRemovePart;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnSearchString
+    return _bRemovePart;
+    }
+
+
+
+/*
+ *@@ReturnSearchString:
  *  Returns const pointer to search string string.
  */
 const PSZ ScriptConfigSys::ReturnSearchString()
     {
-    return szSearchString;
-    }
-
-
-
-
-/****************************************************************************
- *@@ScriptConfigSys::ReturnConfigSys
+    return _szSearchString;
+    }
+
+
+
+
+/*
+ *@@ReturnConfigSys:
  *  This function returns statement string.
  */
@@ -2467 +3181 @@
     {
     CONFIGSYSDATA configSys;
-    strcpy(configSys.szStatement, this->szStatement);
-    strcpy(configSys.szSearchString, this->szSearchString);
-
-    if (bUnique)
+    strcpy(configSys.szStatement, this->_szStatement);
+    strcpy(configSys.szSearchString, this->_szSearchString);
+
+    if (_bUnique)
         configSys.usModifiers |= MODIFIER_UNIQUE;
-    if (bAddRight)
+    if (_bAddRight)
         configSys.usModifiers |= MODIFIER_ADDRIGHT;
-    if (bAddLeft)
+    if (_bAddLeft)
         configSys.usModifiers |= MODIFIER_ADDLEFT;
-    if (bAddAfter)
+    if (_bAddAfter)
         configSys.usModifiers |= MODIFIER_ADDAFTER;
-    if (bAddBefore)
+    if (_bAddBefore)
         configSys.usModifiers |= MODIFIER_ADDBEFORE;
-    if (bAddTop)
+    if (_bAddTop)
         configSys.usModifiers |= MODIFIER_ADDTOP;
-    if (bRemoveLine)
+    if (_bRemoveLine)
         configSys.usModifiers |= MODIFIER_REMOVELINE;
-    if (bRemovePart)
+    if (_bRemovePart)
         configSys.usModifiers |= MODIFIER_REMOVEPART;
+
     return configSys;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptConfigSys::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::MakeScriptText
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptConfigSys::MakeScriptText(BOOL bAttribute)
+PSZ ScriptConfigSys::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
-    XSTRING strScriptText;
-    xstrInit(&strScriptText, 0);
+    XSTRING xstrScriptText;
     PSZ pszFirstModifier = NULL;
     PSZ pszSecondModifier = NULL;
     USHORT ulSpaces = 0;
     CHAR szTemp[1024];
-
-    ulTextLength = strlen(szStatement);
-
-    if (bUnique)
+    xstrInit(&xstrScriptText, 0);
+
+    ulTextLength = strlen(_szStatement);
+
+    if (_bUnique)
         {
         ulTextLength += strlen(SZ_MODIFIER_UNIQUE);
@@ -2524 +3227 @@
         pszFirstModifier = SZ_MODIFIER_UNIQUE;
         }
-    if (bAddRight)
+    if (_bAddRight)
         {
         ulTextLength += strlen(SZ_MODIFIER_ADDRIGHT);
@@ -2530 +3233 @@
         pszFirstModifier = SZ_MODIFIER_ADDRIGHT;
         }
-    if (bAddLeft)
+    if (_bAddLeft)
         {
         ulTextLength += strlen(SZ_MODIFIER_ADDLEFT);
@@ -2536 +3239 @@
         pszFirstModifier = SZ_MODIFIER_ADDLEFT;
         }
-    if (bAddTop)
+    if (_bAddTop)
         {
         ulTextLength += strlen(SZ_MODIFIER_ADDTOP);
@@ -2545 +3248 @@
             pszFirstModifier = SZ_MODIFIER_ADDTOP;
         }
-    if (bAddAfter)
+    if (_bAddAfter)
         {
         ulTextLength += strlen(SZ_MODIFIER_ADDAFTER);
         ulSpaces += 3;
-        ulTextLength += strlen(szSearchString);
+        ulTextLength += strlen(_szSearchString);
         if (pszFirstModifier)
             pszSecondModifier = SZ_MODIFIER_ADDAFTER;
@@ -2555 +3258 @@
             pszFirstModifier = SZ_MODIFIER_ADDAFTER;
         }
-    if (bAddBefore)
+    if (_bAddBefore)
         {
         ulTextLength += strlen(SZ_MODIFIER_ADDBEFORE);
         ulSpaces += 3;
-        ulTextLength = strlen(szSearchString);
+        ulTextLength = strlen(_szSearchString);
         if (pszFirstModifier)
             pszSecondModifier = SZ_MODIFIER_ADDBEFORE;
@@ -2565 +3268 @@
             pszFirstModifier = SZ_MODIFIER_ADDBEFORE;
         }
-    if (bRemoveLine)
+    if (_bRemoveLine)
         {
         ulTextLength += strlen(SZ_MODIFIER_REMOVELINE);
@@ -2571 +3274 @@
         pszFirstModifier = SZ_MODIFIER_REMOVELINE;
         }
-    if (bRemovePart)
+    if (_bRemovePart)
         {
         ulTextLength += strlen(SZ_MODIFIER_REMOVEPART);
@@ -2578 +3281 @@
         }
 
-    if (bAttribute)
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_CONFIGSYS) + 3;
 
-    //pszScriptText = new CHAR[ulTextLength + ulSpaces + 1];
-    //*pszScriptText = '\0';
     szTemp[0] = '\0';
 
-    if (bAttribute)
-        sprintf(szTemp, "%s=\"%s", SZ_ATTRIBUTE_CONFIGSYS, szStatement);
+    if (p_bAttribute)
+        sprintf(szTemp, "%s=\"%s", SZ_ATTRIBUTE_CONFIGSYS, _szStatement);
     else
-        sprintf(szTemp, "%s", szStatement);
-    xstrcat(&strScriptText, szTemp, 0);
+        sprintf(szTemp, "%s", _szStatement);
+    xstrcat(&xstrScriptText, szTemp, 0);
 
     if (pszFirstModifier)
         {
-        xstrcat(&strScriptText, " | ", 0);
-        xstrcat(&strScriptText, pszFirstModifier, 0);
+        xstrcat(&xstrScriptText, " | ", 0);
+        xstrcat(&xstrScriptText, pszFirstModifier, 0);
         }
     if (pszSecondModifier)
         {
-        xstrcat(&strScriptText, " ", 0);
-        xstrcat(&strScriptText, pszSecondModifier, 0);
-        }
-    if (strlen(szSearchString) != 0)
-        {
-        xstrcat(&strScriptText, "(", 0);
-        xstrcat(&strScriptText, szSearchString, 0);
-        xstrcat(&strScriptText, ")", 0);
-        }
-    if(bAttribute)
-        xstrcat(&strScriptText, "\"", 0);
-
-    return strScriptText.psz;
-    }
-
-
-
-/***************************************************************************
+        xstrcat(&xstrScriptText, " ", 0);
+        xstrcat(&xstrScriptText, pszSecondModifier, 0);
+        }
+    if (strlen(_szSearchString) != 0)
+        {
+        xstrcat(&xstrScriptText, "(", 0);
+        xstrcat(&xstrScriptText, _szSearchString, 0);
+        xstrcat(&xstrScriptText, ")", 0);
+        }
+    if(p_bAttribute)
+        xstrcat(&xstrScriptText, "\"", 0);
+
+    return xstrScriptText.psz;
+    }
+
+
+
+/*
  *@@ScriptConfigSys:: BuildFromText
- *  Builds ScriptConfigSys object accordingly to script text. If any errors
- *  are found in script text, error informations are returned in table where
- *  to pScriptError points. Pointer to after end of tag is returned so
- *  multiple searches can be done.
- */
-PSZ ScriptConfigSys::BuildFromText(PSZ pszScriptText,
-                                  SCRIPTERROR **ppScriptError,
-                                  USHORT *pusErrorTableSize,
-                                  ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  Builds ScriptConfigSys object accordingly to script text.
+ */
+PSZ ScriptConfigSys::BuildFromText(PSZ p_pszScriptText,
+                                  ULONG p_ulLineNumber)
+    {
+    Message msg;
+    BSString string;
     PSZ pszTemp = NULL, pszTemp2 = NULL, pszModifiers = NULL;
     PSZ pszAttr = NULL;
@@ -2637 +3334 @@
 
     // Initialize class attributes.
-    *szStatement = '\0';
-    *szSearchString = '\0';
-    bUnique = FALSE;
-    bAddRight = FALSE;
-    bAddLeft = FALSE;
-    bAddRight = FALSE;
-    bAddTop = FALSE;
-    bAddAfter = FALSE;
-    bAddBefore = FALSE;
-    bRemoveLine = FALSE;
-    bRemovePart = FALSE;
-
-
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_CONFIGSYS, &ulOffset);
+    *_szStatement = '\0';
+    *_szSearchString = '\0';
+    _bUnique = FALSE;
+    _bAddRight = FALSE;
+    _bAddLeft = FALSE;
+    _bAddRight = FALSE;
+    _bAddTop = FALSE;
+    _bAddAfter = FALSE;
+    _bAddBefore = FALSE;
+    _bRemoveLine = FALSE;
+    _bRemovePart = FALSE;
+
+
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_CONFIGSYS, &ulOffset);
 
     if (!pszAttr)
         {
-        Error.usErrorCode = ERR_PARSE_CONFIGSYS_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -2702 +3396 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_ADDRIGHT;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2716 +3415 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_ADDLEFT;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2730 +3434 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_REMOVELINE;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2744 +3453 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_REMOVEPART;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2757 +3471 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_ADDTOP;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
            }
@@ -2774 +3493 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_ADDAFTER;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2791 +3515 @@
             else
                 {
-                // Error.
+                string = SZ_MODIFIER_ADDBEFORE;
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CFGSYS_MODIFIER_WRONGCOMB);
+                msg.SetMessageText(string);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
@@ -2798 +3527 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -2807 +3536 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptRegisterClass class:
-
- ****************************************************************************
- *  ScriptRegisterClass class member functions:
- *  ScriptRegisterClass Constructor.
- *  ~ScriptRegisterClass Destructor.
- *  SetClassName    Sets class name text.
- *  SetDLLPath      Sets DLL path name text.
- *  SetIndex        Sets index number.
- *  ReturnClassName Returns const pointer to class name string.
- *  ReturnDLLPath   Returns const pointer to DLL name string.
- *  ReturnIndex     Returns index number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText
+        @@ScriptRegisterClass class:
+
+    <B>Description:</B>
+        This class is for REGISTERCLASS attributes in PCK tag. Detailed
+        information about the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptRegisterClass             Constructor.
+        ~ScriptRegisterClass            Destructor.
+        SetClassName                    Sets class name text.
+        SetDLLPath                      Sets DLL path name text.
+        ReturnClassName                 Returns const pointer to class name string.
+        ReturnDLLPath                   Returns const pointer to DLL name string.
+        MakeScriptText                  Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptRegisterClass::ScriptRegisterClass
+/*
+ *@@ScriptRegisterClass:
  *  Constructor for ScriptRegisterClass class. Initializes object by setting
  *  strings to zero and sets index number too.
  */
-ScriptRegisterClass::ScriptRegisterClass(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-
-    *szClassName = '\0';
-    *szDLLPath = '\0';
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::~ScriptRegisterClass
- *  Destructor for ScriptRegisterClass class. Quess what it does?
- *  (Answer is: NOTHING)
- */
-ScriptRegisterClass::~ScriptRegisterClass() {}
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::SetClassName
+ScriptRegisterClass::ScriptRegisterClass(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+
+    *_szClassName = '\0';
+    *_szDLLPath = '\0';
+    }
+
+
+/*
+ *@@~ScriptRegisterClass:
+ *  Destructor for ScriptRegisterClass class.
+ */
+ScriptRegisterClass::~ScriptRegisterClass()
+    {
+    *_szClassName = '\0';
+    *_szDLLPath = '\0';
+    }
+
+
+/*
+ *@@SetClassName:
  *  Sets class name string text.
  */
-void ScriptRegisterClass::SetClassName(const PSZ pszClassName)
-    {
-    if (strlen(szClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, pszClassName);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::SetDLLPath
+USHORT ScriptRegisterClass::SetClassName(const PSZ p_pszClassName)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszClassName) < MAXCLASSNAMELENGTH)
+        strcpy(this->_szClassName, p_pszClassName);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_CLASSNAME_STRTOOLONG);
+        msg.SetMessageText(p_pszClassName);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@SetDLLPath:
  *  Sets DLL path string text.
  */
-void ScriptRegisterClass::SetDLLPath(const PSZ pszDLLPath)
-    {
-    if (strlen(szDLLPath) < CCHMAXPATH)
-        strcpy(this->szDLLPath, pszDLLPath);
-    }
-
-
-
-
-/***************************************************************************
+USHORT ScriptRegisterClass::SetDLLPath(const PSZ p_pszDLLPath)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszDLLPath) < CCHMAXPATH)
+        strcpy(this->_szDLLPath, p_pszDLLPath);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_DLLPATH_STRTOOLONG);
+        msg.SetMessageText(p_pszDLLPath);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
  *@@ ScriptRegisterClass::SetRegisterClass
  */
-void ScriptRegisterClass::SetRegisterClass(REGISTERCLASSDATA registerClass)
-    {
-    if (strlen(szClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, szClassName);
-    if (strlen(registerClass.szDLLPath) < CCHMAXPATH)
-        strcpy(this->szDLLPath, registerClass.szDLLPath);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::SetIndex
- *  Sets object's index.
- */
-void ScriptRegisterClass::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::ReturnClassName
+USHORT ScriptRegisterClass::SetRegisterClass(REGISTERCLASSDATA p_registerClass)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (SetClassName(p_registerClass.szClassname) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetDLLPath(p_registerClass.szDLLPath) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+
+    return STRING_TOO_LONG;
+    }
+
+
+/*
+ *@@ReturnClassName:
  *  Returns const pointer to class name string.
  */
 const PSZ ScriptRegisterClass::ReturnClassName()
     {
-    return szClassName;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::ReturnDLLPath
+    return _szClassName;
+    }
+
+
+/*
+ *@@ReturnDLLPath:
  *  Returns const pointer to DLL path string.
  */
 const PSZ ScriptRegisterClass::ReturnDLLPath()
     {
-    return szDLLPath;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::ReturnRegisterClass
+    return _szDLLPath;
+    }
+
+
+/*
+ *@@ReturnRegisterClass:
  */
 REGISTERCLASSDATA ScriptRegisterClass::ReturnRegisterClass()
     {
     REGISTERCLASSDATA registerClass;
-    strcpy(registerClass.szClassname, this->szClassName);
-    strcpy(registerClass.szDLLPath, this->szDLLPath);
+    strcpy(registerClass.szClassname, this->_szClassName);
+    strcpy(registerClass.szDLLPath, this->_szDLLPath);
     return registerClass;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptRegisterClass::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::MakeScriptText
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptRegisterClass::MakeScriptText(BOOL bAttribute)
+PSZ ScriptRegisterClass::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
 
-    ulTextLength = strlen(szClassName) + strlen(szDLLPath);
+    ulTextLength = strlen(_szClassName) + strlen(_szDLLPath);
     ulTextLength += 3;
 
-    if (bAttribute)
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_REGISTERCLASS) + 3;
 
@@ -2967 +3690 @@
     *pszScriptText = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         sprintf(pszScriptText, "%s=\"%s|%s\"", SZ_ATTRIBUTE_REGISTERCLASS,
-            szClassName, szDLLPath);
+            _szClassName, _szDLLPath);
     else
-        sprintf(pszScriptText, "%s|%s", szClassName, szDLLPath);
+        sprintf(pszScriptText, "%s|%s", _szClassName, _szDLLPath);
 
     return pszScriptText;
@@ -2977 +3700 @@
 
 
-/***************************************************************************
- *@@ScriptRegisterClass::BuildFromText
+/*
+ *@@BuildFromText:
  *  Builds ScriptRegisterClass object accordingly to script text.
- *  If any errors is found in script text, error informations are returned
- *  in table where to *pScriptError points. Pointer to after end of tag is
- *  returned so multiple searches can be done.
- */
-PSZ ScriptRegisterClass::BuildFromText(PSZ pszScriptText,
-                                      SCRIPTERROR **ppScriptError,
-                                      USHORT *pusErrorTableSize,
-                                      ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  Pointer to after end of tag is returned so multiple searches can be done.
+ */
+PSZ ScriptRegisterClass::BuildFromText(PSZ p_pszScriptText,
+                                       ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszAttr = NULL;
     PSZ pszTemp = NULL;
@@ -2997 +3716 @@
     ULONG ulAttrLen = 0;
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_REGISTERCLASS,
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_REGISTERCLASS,
                              &ulOffset);
 
     if (!pszAttr)
         {
-        Error.usErrorCode = ERR_PARSE_REGISTERCLASS_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
+        return NULL;
+        }
+
+    pszTemp = strchr(pszAttr, '|');
+    if (pszTemp)
+        {
+        pszTemp2 = pszTemp - 1;
+        // Remove leading spaces.
+        while ((*pszTemp2 == ' ') && (pszTemp2 > pszAttr))
+            pszTemp2 --;
+        if (pszTemp3 = strhSubstr(pszAttr, pszTemp2 + 1))
+            {
+            SetClassName(pszTemp3);
+            delete [] pszTemp3;
+            }
+        else
+            {
+            msg.SetType(MSG_TYPE_INFO);
+            msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_CLASSNAME_NOTFOUND);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
+            }
+
+        pszTemp2 = pszTemp + 1;
+        // Remove trailing spaces.
+        while ((*pszTemp2 == ' ') && (*pszTemp2))
+            pszTemp2 ++;
+        if (strlen(pszTemp2) > 1)
+            SetDLLPath(pszTemp2);
+        else
+            {
+            msg.SetType(MSG_TYPE_INFO);
+            msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_DLLPATH_NOTFOUND);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
+            }
+        }
+    else // Seems that DLL path is missing but get class name.
+        {
+        while (*pszTemp =! '\0')
+            pszTemp ++;
+        // Remove leading spaces.
+        while ((*pszTemp == ' ') && (pszTemp > pszAttr))
+            pszTemp --;
+        if (pszTemp3 = strhSubstr(pszAttr, pszTemp))
+            {
+            SetClassName(pszTemp3);
+            delete [] pszTemp3;
+            }
+        else
+            {
+            msg.SetType(MSG_TYPE_INFO);
+            msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_CLASSNAME_NOTFOUND);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
+            }
+        }
+
+    ulAttrLen = strlen(pszAttr);
+    delete [] pszAttr;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
+    }
+
+
+
+
+
+/****************************************************************************
+ ****************************************************************************
+        @@ScriptReplaceClass class:
+
+    <B>Description:</B>
+        This class is for REPLACECLASS attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptReplaceClass Constructor.
+        ~ScriptReplaceClass Destructor.
+        SetClassName    Sets class name text.
+        SetNewClassName Sets new class name text.
+        ReturnClassName Returns const pointer to class name string.
+        ReturnNewClassName Returns const pointer to new class name string.
+        MakeScriptText  Returns pointer to script text.
+        BuildFromText
+ ***************************************************************************/
+
+
+/*
+ *@@ScriptReplaceClass:
+ *  Constructor for ScriptReplaceClass class.
+ */
+ScriptReplaceClass::ScriptReplaceClass(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szClassName = '\0';
+    *_szNewClassName = '\0';
+    }
+
+
+/*
+ *@@~ScriptReplaceClass:
+ *  Destructor for ScriptRegisterClass class.
+ */
+ScriptReplaceClass::~ScriptReplaceClass()
+    {
+    *_szClassName = '\0';
+    *_szNewClassName = '\0';
+    }
+
+
+/*
+ *@@SetClassName:
+ *  Sets class name string text.
+ */
+USHORT ScriptReplaceClass::SetClassName(const PSZ p_pszClassName)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszClassName) < MAXCLASSNAMELENGTH)
+        strcpy(this->_szClassName, p_pszClassName);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REPLACE_CLASSNAME_STRTOOLONG);
+        msg.SetMessageText(p_pszClassName);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetNewClassName:
+ *  Sets new class name string text.
+ */
+USHORT ScriptReplaceClass::SetNewClassName(const PSZ p_pszNewClassName)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszNewClassName) < MAXCLASSNAMELENGTH)
+        strcpy(this->_szNewClassName, p_pszNewClassName);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REPLACE_NEWNAME_STRTOOLONG);
+        msg.SetMessageText(p_pszNewClassName);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetReplaceClass:
+ */
+USHORT ScriptReplaceClass::SetReplaceClass(REPLACECLASSDATA p_replaceClass)
+    {
+    USHORT rc = NO_ERROR;
+    if (SetClassName(p_replaceClass.szOldClassName) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetNewClassName(p_replaceClass.szNewClassName) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    return rc;
+    }
+
+
+/*
+ *@@ReturnClassName:
+ *  Returns const pointer to class name string.
+ */
+const PSZ ScriptReplaceClass::ReturnClassName()
+    {
+    return _szClassName;
+    }
+
+
+/*
+ *@@ ScriptReplaceClass::ReturnNewClassName
+ *  Returns const pointer to new class name string.
+ */
+const PSZ ScriptReplaceClass::ReturnNewClassName()
+    {
+    return _szNewClassName;
+    }
+
+
+
+/*
+ *@@ReturnReplaceClass:
+ */
+REPLACECLASSDATA ScriptReplaceClass::ReturnReplaceClass()
+    {
+    REPLACECLASSDATA replaceClass;
+    strcpy(replaceClass.szOldClassName, this->_szClassName);
+    strcpy(replaceClass.szNewClassName, this->_szNewClassName);
+    return replaceClass;
+    }
+
+
+/*
+ *@@MakeScriptText:
+ *  Returns pointer to script text.
+ */
+PSZ ScriptReplaceClass::MakeScriptText(BOOL p_bAttribute)
+    {
+    ULONG ulTextLength = 0;
+    PSZ pszScriptText = NULL;
+
+    ulTextLength = strlen(_szClassName) + strlen(_szNewClassName);
+    ulTextLength += 3;
+
+    if (p_bAttribute)
+        ulTextLength += strlen(SZ_ATTRIBUTE_REPLACECLASS) + 3;
+
+    pszScriptText = new CHAR[ulTextLength + 1];
+    *pszScriptText = '\0';
+
+    if (p_bAttribute)
+        sprintf(pszScriptText, "%s=\"%s|%s\"", SZ_ATTRIBUTE_REPLACECLASS,
+            _szClassName, _szNewClassName);
+    else
+        sprintf(pszScriptText, "%s|%s", _szClassName, _szNewClassName);
+
+    return pszScriptText;
+    }
+
+
+/*
+ *@@BuildFromText:
+ *  Builds ScriptReplaceClass object accordingly to script text.
+ *  If any errors is found in script text, error informations are returned
+ *  in table where to *pScriptError points. Pointer to after end of tag is
+ *  returned so multiple searches can be done.
+ */
+PSZ ScriptReplaceClass::BuildFromText(PSZ p_pszScriptText,
+                                      ULONG p_ulLineNumber)
+    {
+    Message msg;
+    PSZ pszAttr = NULL;
+    PSZ pszTemp = NULL;
+    PSZ pszTemp2 = NULL;
+    PSZ pszTemp3 = NULL;
+    ULONG ulOffset = 0;
+    ULONG ulAttrLen = 0;
+
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_REPLACECLASS,
+                             &ulOffset);
+
+    if (!pszAttr)
+        {
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REPLACE_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -3027 +4002 @@
         while ((*pszTemp2 == ' ') && (*pszTemp2))
             pszTemp2 ++;
-        SetDLLPath(pszTemp2);
+        if (pszTemp2)
+            SetNewClassName(pszTemp2);
+        else
+            {
+            msg.SetType(MSG_TYPE_ERROR);
+            msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_CLASSNAME_MISSING);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
+            }
         }
     else
         {
-        // Error.
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_REGISTER_CLASSNAME_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         }
 
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -3045 +4031 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptReplaceClass class:
-
- ****************************************************************************
- *  ScriptReplaceClass class member functions:
- *  ScriptReplaceClass Constructor.
- *  ~ScriptReplaceClass Destructor.
- *  SetClassName    Sets class name text.
- *  SetNewClassName Sets new class name text.
- *  SetIndex        Sets index number.
- *  ReturnClassName Returns const pointer to class name string.
- *  ReturnNewClassName Returns const pointer to new class name string.
- *  ReturnIndex     Returns index number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText
+        @@ScriptCreateObject class:
+
+    <B>Description:</B>
+        This class is for CREATEOBJECT attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptCreateObject  Constructor.
+        ~ScriptCreateObject Destructor.
+        SetClassName        Sets class name text.
+        SetTitle            Sets title text.
+        SetLocation         Sets location text.
+        SetConfig           Sets config text.
+        SetReplace          Sets replace parameter state.
+        ReturnClassName     Returns const pointer to class name string.
+        ReturnTitle         Returns const pointer to title string.
+        ReturnLocation      Returns const pointer to location string.
+        ReturnConfig        Returns const pointer to config string.
+        ReturnReplace       Returns the state of the replace parameter.
+        MakeScriptText      Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptReplaceClass::ScriptReplaceClass
- *  Constructor for ScriptReplaceClass class. Initializes object by setting
- *  strings to zero and sets index number too.
- */
-ScriptReplaceClass::ScriptReplaceClass(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-
-    *szClassName = '\0';
-    *szNewClassName = '\0';
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::~ScriptReplaceClass
- *  Destructor for ScriptRegisterClass class.
- */
-ScriptReplaceClass::~ScriptReplaceClass() {}
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::SetClassName
- *  Sets class name string text.
- */
-void ScriptReplaceClass::SetClassName(const PSZ pszClassName)
-    {
-    if (strlen(pszClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, pszClassName);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::SetNewClassName
- *  Sets new class name string text.
- */
-void ScriptReplaceClass::SetNewClassName(const PSZ pszNewClassName)
-    {
-    if (strlen(pszNewClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szNewClassName, pszNewClassName);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::SetReplaceClass
- */
-void ScriptReplaceClass::SetReplaceClass(REPLACECLASSDATA replaceClass)
-    {
-    if (strlen(replaceClass.szOldClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, replaceClass.szOldClassName);
-    if (strlen(replaceClass.szNewClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szNewClassName, replaceClass.szNewClassName);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::SetIndex
- *  Sets object's index.
- */
-void ScriptReplaceClass::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::ReturnClassName
- *  Returns const pointer to class name string.
- */
-const PSZ ScriptReplaceClass::ReturnClassName()
-    {
-    return szClassName;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::ReturnNewClassName
- *  Returns const pointer to new class name string.
- */
-const PSZ ScriptReplaceClass::ReturnNewClassName()
-    {
-    return szNewClassName;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::ReturnReplaceClass
- */
-REPLACECLASSDATA ScriptReplaceClass::ReturnReplaceClass()
-    {
-    REPLACECLASSDATA replaceClass;
-    strcpy(replaceClass.szOldClassName, this->szClassName);
-    strcpy(replaceClass.szNewClassName, this->szNewClassName);
-    return replaceClass;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptReplaceClass::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::MakeScriptText
- *  Returns pointer to script text.
- */
-PSZ ScriptReplaceClass::MakeScriptText(BOOL bAttribute)
-    {
-    ULONG ulTextLength = 0;
-    PSZ pszScriptText = NULL;
-
-    ulTextLength = strlen(szClassName) + strlen(szNewClassName);
-    ulTextLength += 3;
-
-    if (bAttribute)
-        ulTextLength += strlen(SZ_ATTRIBUTE_REPLACECLASS) + 3;
-
-    pszScriptText = new CHAR[ulTextLength + 1];
-    *pszScriptText = '\0';
-
-    if (bAttribute)
-        sprintf(pszScriptText, "%s=\"%s|%s\"", SZ_ATTRIBUTE_REPLACECLASS,
-            szClassName, szNewClassName);
-    else
-        sprintf(pszScriptText, "%s|%s", szClassName, szNewClassName);
-
-    return pszScriptText;
-    }
-
-
-/***************************************************************************
- *@@ScriptReplaceClass::BuildFromText
- *  Builds ScriptReplaceClass object accordingly to script text.
- *  If any errors is found in script text, error informations are returned
- *  in table where to *pScriptError points. Pointer to after end of tag is
- *  returned so multiple searches can be done.
- */
-PSZ ScriptReplaceClass::BuildFromText(PSZ pszScriptText,
-                                      SCRIPTERROR **ppScriptError,
-                                      USHORT *pusErrorTableSize,
-                                      ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
-    PSZ pszAttr = NULL;
-    PSZ pszTemp = NULL;
-    PSZ pszTemp2 = NULL;
-    PSZ pszTemp3 = NULL;
-    ULONG ulOffset = 0;
-    ULONG ulAttrLen = 0;
-
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_REPLACECLASS,
-                             &ulOffset);
-
-    if (!pszAttr)
-        {
-        Error.usErrorCode = ERR_PARSE_REPLACECLASS_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
-        return NULL;
-        }
-
-    pszTemp = strchr(pszAttr, '|');
-    if (pszTemp)
-        {
-        pszTemp2 = pszTemp - 1;
-        // Remove leading spaces.
-        while ((*pszTemp2 == ' ') && (pszTemp2 > pszAttr))
-            pszTemp2 --;
-        pszTemp3 = strhSubstr(pszAttr, pszTemp2 + 1);
-        SetClassName(pszTemp3);
-        delete [] pszTemp3;
-
-        pszTemp2 = pszTemp + 1;
-        // Remove trailing spaces.
-        while ((*pszTemp2 == ' ') && (*pszTemp2))
-            pszTemp2 ++;
-        SetNewClassName(pszTemp2);
-        }
-    else
-        {
-        // Error.
-        }
-
-    ulAttrLen = strlen(pszAttr);
-    delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
-    }
-
-
-
-
-
-/****************************************************************************
- ****************************************************************************
-        ScriptCreateObject class:
-
- ****************************************************************************
- *  ScriptCreateObject class member functions:
- *  ScriptCreateObject  Constructor.
- *  ~ScriptCreateObject Destructor.
- *  SetClassName        Sets class name text.
- *  SetTitle            Sets title text.
- *  SetLocation         Sets location text.
- *  SetConfig           Sets config text.
- *  SetReplace          Sets replace parameter state.
- *  SetIndex            Sets index number.
- *  ReturnClassName     Returns const pointer to class name string.
- *  ReturnTitle         Returns const pointer to title string.
- *  ReturnLocation      Returns const pointer to location string.
- *  ReturnConfig        Returns const pointer to config string.
- *  ReturnReplace       Returns the state of the replace parameter.
- *  ReturnIndex         Returns index number.
- *  MakeScriptText      Returns pointer to script text.
- *  BuildFromText
- ***************************************************************************/
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ScriptCreateObject
+/*
+ *@@ScriptCreateObject:
  *  Constructor for ScriptCreateObject class. Initializes object by setting
  *  strings to zero and sets index number.
  */
-ScriptCreateObject::ScriptCreateObject(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-
-    *szClassName = '\0';
-    *szTitle = '\0';
-    *szLocation = '\0';
-    *szConfig = '\0';
-    bReplace = FALSE;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::~ScriptCreateObject
+ScriptCreateObject::ScriptCreateObject(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+
+    *_szClassName = '\0';
+    *_szTitle = '\0';
+    *_szLocation = '\0';
+    *_szConfig = '\0';
+    _bReplace = FALSE;
+    }
+
+
+/*
+ *@@~ScriptCreateObject:
  *  Destructor for ScriptCreateObject class.
  */
-ScriptCreateObject::~ScriptCreateObject() {}
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetClassName
+ScriptCreateObject::~ScriptCreateObject()
+    {
+    *_szClassName = '\0';
+    *_szTitle = '\0';
+    *_szLocation = '\0';
+    *_szConfig = '\0';
+    _bReplace = FALSE;
+    }
+
+
+/*
+ *@@SetClassName:
  *  Sets class name string text.
  */
-void ScriptCreateObject::SetClassName(const PSZ pszClassName)
-    {
-    if (strlen(pszClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, pszClassName);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetTitle
+USHORT ScriptCreateObject::SetClassName(const PSZ p_pszClassName)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszClassName) < MAXCLASSNAMELENGTH)
+        strcpy(this->_szClassName, p_pszClassName);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_CLASSNAME_STRTOOLONG);
+        msg.SetMessageText(p_pszClassName);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+
+
+/*
+ *@@SetTitle:
  *  Sets new title string text.
  */
-void ScriptCreateObject::SetTitle(const PSZ pszTitle)
-    {
-    if (strlen(pszTitle) < MAXCLASSTITLELENGTH)
-        strcpy(this->szTitle, pszTitle);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetLocation
+USHORT ScriptCreateObject::SetTitle(const PSZ p_pszTitle)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszTitle) < MAXCLASSTITLELENGTH)
+        strcpy(this->_szTitle, p_pszTitle);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_TITLE_STRTOOLONG);
+        msg.SetMessageText(p_pszTitle);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetLocation:
  *  Sets new title string text.
  */
-void ScriptCreateObject::SetLocation(const PSZ pszLocation)
-    {
-    if (strlen(pszLocation) < CCHMAXPATH)
-        strcpy(this->szLocation, pszLocation);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetConfig
+USHORT ScriptCreateObject::SetLocation(const PSZ p_pszLocation)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszLocation) < CCHMAXPATH)
+        strcpy(this->_szLocation, p_pszLocation);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_LOCATION_STRTOOLONG);
+        msg.SetMessageText(p_pszLocation);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetConfig:
  *  Sets new config string text.
  */
-void ScriptCreateObject::SetConfig(const PSZ pszConfig)
-    {
-    if (strlen(pszConfig) < MAXCLASSCONFIGLENGTH)
-        strcpy(this->szConfig, pszConfig);
-    }
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetReplace
+USHORT ScriptCreateObject::SetConfig(const PSZ p_pszConfig)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszConfig) < MAXCLASSCONFIGLENGTH)
+        strcpy(this->_szConfig, p_pszConfig);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_CONFIG_STRTOOLONG);
+        msg.SetMessageText(p_pszConfig);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetReplace:
  *  Sets new config string text.
  */
-void ScriptCreateObject::SetReplace(BOOL bReplace)
-    {
-    this->bReplace = bReplace;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetCreateObject
- */
-void ScriptCreateObject::SetCreateObject(CREATEOBJECTDATA createObject)
-    {
-    if (strlen(createObject.szClassName) < MAXCLASSNAMELENGTH)
-        strcpy(this->szClassName, createObject.szClassName);
-    if (strlen(createObject.szTitle) < MAXCLASSTITLELENGTH)
-        strcpy(this->szTitle, createObject.szTitle);
-    if (strlen(createObject.szLocation) < CCHMAXPATH)
-        strcpy(this->szLocation, createObject.szLocation);
-    if (strlen(createObject.szConfig) < MAXCLASSCONFIGLENGTH)
-        strcpy(this->szConfig, createObject.szConfig);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::SetIndex
- *  Sets object's index.
- */
-void ScriptCreateObject::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnClassName
+USHORT ScriptCreateObject::SetReplace(BOOL p_bReplace)
+    {
+    this->_bReplace = p_bReplace;
+    }
+
+
+/*
+ *@@SetCreateObject:
+ */
+USHORT ScriptCreateObject::SetCreateObject(CREATEOBJECTDATA p_createObject)
+    {
+    USHORT rc = NO_ERROR;
+    if (SetClassName(p_createObject.szClassName) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetTitle(p_createObject.szTitle) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetLocation(p_createObject.szLocation) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetConfig(p_createObject.szConfig) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+
+    return rc;
+    }
+
+
+/*
+ *@@ReturnClassName:
  *  Returns const pointer to class name string.
  */
 const PSZ ScriptCreateObject::ReturnClassName()
     {
-    return szClassName;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnTitle
+    return _szClassName;
+    }
+
+
+/*
+ *@@ReturnTitle:
  *  Returns const pointer to title string.
  */
 const PSZ ScriptCreateObject::ReturnTitle()
     {
-    return szTitle;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnLocation
+    return _szTitle;
+    }
+
+
+/*
+ *@@ReturnLocation:
  *  Returns const pointer to location string.
  */
 const PSZ ScriptCreateObject::ReturnLocation()
     {
-    return szLocation;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnConfig
+    return _szLocation;
+    }
+
+
+/*
+ *@@ReturnConfig:
  *  Returns const pointer to config string.
  */
 const PSZ ScriptCreateObject::ReturnConfig()
     {
-    return szConfig;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnReplace
+    return _szConfig;
+    }
+
+
+/*
+ *@@ReturnReplace:
  *  Returns the state of the replace parameter.
  */
 BOOL ScriptCreateObject::ReturnReplace()
     {
-    return bReplace;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnCreateObject
+    return _bReplace;
+    }
+
+
+/*
+ *@@ReturnCreateObject:
  */
 CREATEOBJECTDATA ScriptCreateObject::ReturnCreateObject()
     {
     CREATEOBJECTDATA createObject;
-    strcpy(createObject.szClassName, this->szClassName);
-    strcpy(createObject.szTitle, this->szTitle);
-    strcpy(createObject.szLocation, this->szLocation);
-    strcpy(createObject.szConfig, this->szConfig);
-    createObject.bReplace = this->bReplace;
+    strcpy(createObject.szClassName, this->_szClassName);
+    strcpy(createObject.szTitle, this->_szTitle);
+    strcpy(createObject.szLocation, this->_szLocation);
+    strcpy(createObject.szConfig, this->_szConfig);
+    createObject.bReplace = this->_bReplace;
     return createObject;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptCreateObject::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
+/*
  *@@ ScriptCreateObject::MakeScriptText
  *  Returns pointer to script text.
  *
- *  @@ changed v0.9.4 (2000-08-02) [tahola]
- */
-PSZ ScriptCreateObject::MakeScriptText(BOOL bAttribute)
+ *@@changed v0.9.5 (2000-08-02) [tahola]
+ */
+PSZ ScriptCreateObject::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
-    XSTRING strReplace;
-    xstrInit(&strReplace, 0);
-
-    ulTextLength = strlen(szClassName) + strlen(szTitle) + strlen(szLocation);
-    if ((ulTextLength += strlen(szConfig)) > 0)
+    PSZ pszReplace = "";
+
+    ulTextLength = strlen(_szClassName) + strlen(_szTitle) + strlen(_szLocation);
+    if ((ulTextLength += strlen(_szConfig)) > 0)
         ulTextLength += 1; // No spaces allowed.
-    ulTextLength += 2;     // v0.9.4 (2000-08-02) [tahola]
-    if (bReplace)
+    ulTextLength += 2;     // v0.9.5 (2000-08-02) [tahola]
+    if (_bReplace)
         {
         ulTextLength += strlen(SZ_PARAMETER_REPLACE) + 2;
-        xstrcpy(&strReplace, SZ_PARAMETER_REPLACE, 0);
-        xstrcat(&strReplace, " ", 0);
+        pszReplace = new CHAR[strlen(SZ_PARAMETER_REPLACE) + 3];
+        strcpy(pszReplace, SZ_PARAMETER_REPLACE);
+        strcat(pszReplace, " ");
         }
     ulTextLength += 3;
 
-    if (bAttribute)
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_CREATEOBJECT) + 3;
 
@@ -3539 +4306 @@
     *pszScriptText = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         sprintf(pszScriptText, "%s=\"%s%s|%s|%s",  // No spaces allowed.
-            SZ_ATTRIBUTE_CREATEOBJECT, strReplace.psz, // v0.9.4 (2000-08-2) [tahola]
-            szClassName, szTitle, szLocation);
+            SZ_ATTRIBUTE_CREATEOBJECT, pszReplace, // v0.9.5 (2000-08-2) [tahola]
+            _szClassName, _szTitle, _szLocation);
     else
-        sprintf(pszScriptText, "%s%s|%s|%s", strReplace.psz, szClassName,
-            szTitle, szLocation); // No spaces allowed.
-                                  // v0.9.4 (2000-08-2) [tahola]
-    if (strlen(szConfig) != 0)
+        sprintf(pszScriptText, "%s%s|%s|%s", pszReplace, _szClassName,
+            _szTitle, _szLocation); // No spaces allowed.
+                                  // v0.9.5 (2000-08-2) [tahola]
+    if (strlen(_szConfig) != 0)
         {
         strcat(pszScriptText, "|");      // No spaces allowed.
-        strcat(pszScriptText, szConfig); // v0.9.4 (2000-08-2) [tahola]
-        }
-
-    if (bAttribute)
+        strcat(pszScriptText, _szConfig); // v0.9.5 (2000-08-2) [tahola]
+        }
+
+    if (p_bAttribute)
         strcat(pszScriptText, "\"");
 
-    xstrClear(&strReplace);
+    if (_bReplace)
+        delete [] pszReplace;
 
     return pszScriptText;
@@ -3562 +4330 @@
 
 
-/***************************************************************************
- *@@ScriptCreateObject:: BuildFromText
- *  Builds ScriptCreateObject accordingly to script text. If any errors is
- *  found in script text, error informations are returned in table where
- *  to *pScriptError points. Pointer to after end of tag is returned so
- *  multiple searches can be done.
- */
-PSZ ScriptCreateObject::BuildFromText(PSZ pszScriptText,
-                                     SCRIPTERROR **ppScriptError,
-                                     USHORT *pusErrorTableSize,
-                                     ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+/*
+ *@@BuildFromText:
+ *  Builds ScriptCreateObject accordingly to script text.
+ */
+PSZ ScriptCreateObject::BuildFromText(PSZ p_pszScriptText,
+                                      ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL, pszTemp2 = NULL, pszTemp3 = NULL;
     PSZ pszAttr = NULL;
     ULONG ulOffset = 0;
     ULONG ulVersion = 0;
-    BOOL bError = FALSE;
     ULONG ulAttrLen = 0;
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_CREATEOBJECT,
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_CREATEOBJECT,
                              &ulOffset);
 
     if (!pszAttr)
         {
-        Error.usErrorCode = ERR_PARSE_CREATEOBJECT_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -3633 +4392 @@
                 }
             else
-                SetLocation(pszTemp2);
+                {
+                if (pszTemp2)
+                    SetLocation(pszTemp2);
+                else
+                    {
+                    msg.SetType(MSG_TYPE_ERROR);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_LOCATION_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
+                    }
+                }
             }
         else // Title error.
             {
-            Error.usErrorCode = ERR_PARSE_CREATEOBJECT_TITLE_NOTFOUND;
-            Error.ulLineNumber = ulLineNumber;
-            Error.pszStart = strhdup(pszAttr);
-            Error.ulLength = 0;
-            if (ppScriptError)
-                *pusErrorTableSize =
-                    AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
-            bError = TRUE;
+            msg.SetType(MSG_TYPE_ERROR);
+            msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_TITLE_MISSING);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
             }
         }
     else // Class name error.
         {
-        Error.usErrorCode = ERR_PARSE_CREATEOBJECT_CLASSNAME_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszAttr);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
-        bError = TRUE;
-        }
-    if (bError == TRUE)
-        return NULL;
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CREATE_CLASSNAME_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
+        }
 
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -3672 +4431 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptExecute class:
-
- ****************************************************************************
- *  ScriptExecute class member functions:
- *  ScriptExecute           Constructor.
- *  ~ScriptExecute          Destructor.
- *  SetExecFileParams       Sets class name text.
- *  SetIndex                Sets index number.
- *  ReturnExecFileParams    Returns const pointer to ecec file params string.
- *  ReturnIndex             Returns index number.
- *  MakeScriptText          Returns pointer to script text.
- *  BuildFromText
+        @@ScriptExecute class:
+
+    <B>Description:</B>
+        This class is for EXECUTE attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+
+    Member functions:
+        ScriptExecute           Constructor.
+        ~ScriptExecute          Destructor.
+        SetExecFileParams       Sets class name text.
+        ReturnExecFileParams    Returns const pointer to exec file params string.
+        MakeScriptText          Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptExecute::ScriptExecute
+/*
+ *@@ScriptExecute:
  *  Constructor for ScriptExecute class. Initializes object by setting
  *  strings to zero and sets index number too.
  */
-ScriptExecute::ScriptExecute(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    *szExecFileParams = '\0';
-    fusContext = 0;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::~ScriptExecute
+ScriptExecute::ScriptExecute(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szExecFileParams = '\0';
+    _usContext = 0;
+    }
+
+
+/*
+ *@@~ScriptExecute:
  *  Destructor for ScriptExecute class.
  */
-ScriptExecute::~ScriptExecute() {}
-
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::SetClassName
+ScriptExecute::~ScriptExecute()
+    {
+    }
+
+
+/*
+ *@@SetClassName:
  *  Sets exec file params string text.
  */
-void ScriptExecute::SetExecFileParams(const PSZ pszExecFileParams)
-    {
-    if (strlen(pszExecFileParams) < CCHMAXPATH)
-        strcpy(this->szExecFileParams, pszExecFileParams);
-    }
-
-
-/***************************************************************************
+USHORT ScriptExecute::SetExecFileParams(const PSZ p_pszExecFileParams)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszExecFileParams) < CCHMAXPATH)
+        strcpy(this->_szExecFileParams, p_pszExecFileParams);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_EXECUTE_EXEFILEPARAM_STRTOOLONG);
+        msg.SetMessageText(p_pszExecFileParams);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
  *@@ ScriptExecute::SetContext
  *  Sets object's index.
  */
-void ScriptExecute::SetContext(USHORT fusContext)
-    {
-    if ((fusContext == FLAG_CONFIGSYS) || (fusContext == FLAG_REGISTERCLASS) ||
-        (fusContext == FLAG_CREATEOBJECT) || (fusContext == FLAG_NOCONTEXT))
-        this->fusContext = fusContext;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::SetIndex
- *  Sets object's index.
- */
-void ScriptExecute::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-/***************************************************************************
- *@@ ScriptExecute::SetExecute
- */
-void ScriptExecute::SetExecute(EXECUTEDATA execData)
-    {
-    SetExecFileParams(execData.szExecFileParams);
-    SetContext(execData.fusContext);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::ReturnszExecFileParams
+USHORT ScriptExecute::SetContext(USHORT p_usContext)
+    {
+    if ((p_usContext == FLAG_CONFIGSYS) || (p_usContext == FLAG_REGISTERCLASS) ||
+        (p_usContext == FLAG_CREATEOBJECT) || (p_usContext == FLAG_NOCONTEXT))
+        this->_usContext = p_usContext;
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetExecute:
+ */
+USHORT ScriptExecute::SetExecute(EXECUTEDATA p_execData)
+    {
+    USHORT rc = NO_ERROR;
+    if (SetExecFileParams(p_execData.szExecFileParams) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetContext(p_execData.fusContext) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    return rc;
+    }
+
+
+/*
+ *@@ReturnszExecFileParams:
  *  Returns const pointer to szExecFileParams string.
  */
 const PSZ ScriptExecute::ReturnExecFileParams()
     {
-    return szExecFileParams;
-    }
-
-
-/***************************************************************************
- *@@ ScriptExecute::ReturnContext
+    return _szExecFileParams;
+    }
+
+
+/*
+ *@@ReturnContext:
  *  Returns index number.
  */
 USHORT ScriptExecute::ReturnContext()
     {
-    return fusContext;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptExecute::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-/***************************************************************************
- *@@ ScriptExecute::ReturnExecute
+    return _usContext;
+    }
+
+
+/*
+ *@@ReturnExecute:
  */
 EXECUTEDATA ScriptExecute::ReturnExecute()
     {
     EXECUTEDATA execData;
-    strcpy(execData.szExecFileParams, this->szExecFileParams);
-    execData.fusContext = this->fusContext;
+    strcpy(execData.szExecFileParams, this->_szExecFileParams);
+    execData.fusContext = this->_usContext;
     return execData;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptExecute::MakeScriptText
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptExecute::MakeScriptText(BOOL bAttribute)
+PSZ ScriptExecute::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
-    XSTRING strTemp;
+    PSZ pszTemp = NULL;
+        XSTRING strTemp;
     xstrInit(&strTemp, 0);
 
-    ulTextLength = strlen(szExecFileParams);
-
-    if (fusContext == FLAG_CONFIGSYS)
+    ulTextLength = strlen(_szExecFileParams);
+
+    if (_usContext == FLAG_CONFIGSYS)
         {
         ulTextLength += strlen(SZ_FLAG_CONFIGSYS) + 1;
@@ -3821 +4573 @@
         xstrcat(&strTemp, "|", 0);
         }
-    else if (fusContext == FLAG_REGISTERCLASS)
+    else if (_usContext == FLAG_REGISTERCLASS)
         {
         ulTextLength += strlen(SZ_FLAG_REGISTERCLASS) + 1;
@@ -3827 +4579 @@
         xstrcat(&strTemp, "|", 0);
         }
-    else if (fusContext == FLAG_CREATEOBJECT)
+    else if (_usContext == FLAG_CREATEOBJECT)
         {
         ulTextLength += strlen(SZ_FLAG_CREATEOBJECT) + 1;
@@ -3834 +4586 @@
         }
 
-    if (bAttribute)
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_EXECUTE) + 3;
 
@@ -3840 +4592 @@
     *pszScriptText = '\0';
 
-    xstrcat(&strTemp, szExecFileParams, 0);
-
-    if (bAttribute)
-        sprintf(pszScriptText, "%s=\"%s\"", SZ_ATTRIBUTE_EXECUTE, strTemp.psz);
+    xstrcat(&strTemp, _szExecFileParams, 0);
+
+    if (p_bAttribute)
+        sprintf(pszScriptText, "%s=\"%s\"", SZ_ATTRIBUTE_EXECUTE, pszTemp);
     else
         sprintf(pszScriptText, "%s", strTemp.psz);
@@ -3852 +4604 @@
 
 
-
-/***************************************************************************
- *@@ScriptExecute::BuildFromText
- *  Builds execute object  accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptExecute::BuildFromText(PSZ pszScriptText,
-                                SCRIPTERROR **ppScriptError,
-                                USHORT *pusErrorTableSize,
-                                ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+/*
+ *@@BuildFromText:
+ *  Builds execute object  accordingly to script text.
+ */
+PSZ ScriptExecute::BuildFromText(PSZ p_pszScriptText,
+                                ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszAttr = NULL;
@@ -3873 +4619 @@
 
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_EXECUTE, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_EXECUTE, &ulOffset);
     if (pszAttr)
         {
@@ -3890 +4636 @@
                                   "\x0d\x0a ()/\\-,.:;|"))
                 this->SetContext(FLAG_CREATEOBJECT);
+            else // There is something in the context but it cannot be recognised.
+                {
+                msg.SetType(MSG_TYPE_INFO);
+                msg.SetMessageValue(MSG_ATTRIBUTE_EXECUTE_CONTEXT_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
+                }
             delete [] pszFlag;
             // Take the rest of the attribute.
@@ -3903 +4656 @@
             {
             this->SetContext(FLAG_NOCONTEXT);
-            if (strlen(pszAttr) < CCHMAXPATH)
+            if (pszAttr)
                 this->SetExecFileParams(pszAttr);
+            else
+                {
+                msg.SetType(MSG_TYPE_ERROR);
+                msg.SetMessageValue(MSG_ATTRIBUTE_EXECUTE_EXEFILEPARAM_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
+                }
             }
         }
     else
         {
-        Error.usErrorCode = ERR_PARSE_TITLE_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_ATTRIBUTE_EXECUTE_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -3930 +4687 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptClearProfile class:
-
- ****************************************************************************
- *  ScriptClearProfile class member functions:
- *  ScriptClearProfile      Constructor.
- *  ~ScriptClearProfile     Destructor.
- *  SetProfileString        Sets profile strting.
- *  SetApplication          Sets application string.
- *  SetKey                  Sets key string.
- *  SetProfile              Sets all fileds.
- *  SetIndex                Sets index number.
- *  ReturnProfileString     Returns const pointer to profile string.
- *  ReturnApplication       Returns const pointer to application string.
- *  ReturnKey               Returns const pointer to key string.
- *  ReturnProfile           Returns profile data.
- *  ReturnIndex             Returns index number.
- *  MakeScriptText          Returns pointer to script text.
- *  BuildFromText
+        @@ScriptClearProfile class:
+
+    <B>Description:</B>
+        This class is for CLEARPROFILE attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptClearProfile      Constructor.
+        ~ScriptClearProfile     Destructor.
+        SetProfileString        Sets profile strting.
+        SetApplication          Sets application string.
+        SetKey                  Sets key string.
+        SetProfile              Sets all fileds.
+        ReturnProfileString     Returns const pointer to profile string.
+        ReturnApplication       Returns const pointer to application string.
+        ReturnKey               Returns const pointer to key string.
+        ReturnProfile           Returns profile data.
+        MakeScriptText          Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptClearProfile::ScriptClearProfile
+/*
+ *@@ScriptClearProfile:
  *  Constructor for ScriptClearProfile class. Initializes object by setting
  *  strings to zero and sets index number too.
  */
-ScriptClearProfile::ScriptClearProfile(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    *szProfileString = '\0';
-    *szApplication = '\0';
-    *szKey = '\0';
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::~ScriptClearProfile
+ScriptClearProfile::ScriptClearProfile(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szProfileString = '\0';
+    *_szApplication = '\0';
+    *_szKey = '\0';
+    }
+
+
+/*
+ *@@~ScriptClearProfile:
  *  Destructor for ScriptClearProfile class.
  */
-ScriptClearProfile::~ScriptClearProfile() {}
-
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::SetProfileString
- *  Sets szProfileString string text.
- */
-void ScriptClearProfile::SetProfileString(const PSZ pszProfile)
-    {
-    if (strlen(pszProfile) < CCHMAXPATH)
-        strcpy(this->szProfileString, pszProfile);
-    }
-
-
-
-/***************************************************************************
+ScriptClearProfile::~ScriptClearProfile()
+    {
+    }
+
+
+/*
+ *@@SetProfileString:
+ *  Sets _szProfileString string text.
+ */
+USHORT ScriptClearProfile::SetProfileString(const PSZ p_pszProfile)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszProfile) < CCHMAXPATH)
+        strcpy(this->_szProfileString, p_pszProfile);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_PROFILE_STRTOOLONG);
+        msg.SetMessageText(p_pszProfile);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
  *@@ ScriptClearProfile::SetApplication
- *  Sets szApplication string text.
- */
-void ScriptClearProfile::SetApplication(const PSZ pszApplication)
-    {
-    if (strlen(pszApplication) < MAXPROFILEAPPLICATIONLENGTH)
-        strcpy(this->szApplication, pszApplication);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::SetKey
+ *  Sets _szApplication string text.
+ */
+USHORT ScriptClearProfile::SetApplication(const PSZ p_pszApplication)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszApplication) < MAXPROFILEAPPLICATIONLENGTH)
+        strcpy(this->_szApplication, p_pszApplication);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_APPL_STRTOOLONG);
+        msg.SetMessageText(p_pszApplication);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetKey:
  *  Sets szKey string text.
  */
-void ScriptClearProfile::SetKey(const PSZ pszKey)
-    {
-    if (strlen(pszKey) < MAXPROFILEKEYLENGTH)
-        strcpy(this->szKey, pszKey);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::SetProfile
+USHORT ScriptClearProfile::SetKey(const PSZ p_pszKey)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszKey) < MAXPROFILEKEYLENGTH)
+        strcpy(this->_szKey, p_pszKey);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_KEY_STRTOOLONG);
+        msg.SetMessageText(p_pszKey);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetProfile:
  *  Sets all string texts.
  */
-void ScriptClearProfile::SetProfile(PROFILEDATA profile)
-    {
-    if (strlen(profile.szProfile) < CCHMAXPATH)
-        strcpy(this->szProfileString, profile.szProfile);
-    if (strlen(profile.szApplication) < MAXPROFILEAPPLICATIONLENGTH)
-        strcpy(this->szApplication, profile.szApplication);
-    if (strlen(profile.szKey) < MAXPROFILEKEYLENGTH)
-        strcpy(this->szKey, profile.szKey);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::SetIndex
- *  Sets object's index.
- */
-void ScriptClearProfile::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReturnProfileString
+USHORT ScriptClearProfile::SetProfile(PROFILEDATA p_profile)
+    {
+    USHORT rc = NO_ERROR;
+    if (SetProfileString(p_profile.szProfile) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetApplication(p_profile.szApplication) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetKey(p_profile.szKey) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    return rc;
+    }
+
+
+/*
+ *ReturnProfileString:
  *  Returns const pointer to szProfileString string.
  */
 const PSZ ScriptClearProfile::ReturnProfileString()
     {
-    return szProfileString;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReturnApplication
+    return _szProfileString;
+    }
+
+
+/*
+ *@@ReturnApplication:
  *  Returns const pointer to szApplication string.
  */
 const PSZ ScriptClearProfile::ReturnApplication()
     {
-    return szApplication;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReturnKey
+    return _szApplication;
+    }
+
+
+/*
+ *@@ReturnKey:
  *  Returns const pointer to szKey string.
  */
 const PSZ ScriptClearProfile::ReturnKey()
     {
-    return szKey;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReturnProfile
+    return _szKey;
+    }
+
+
+/*
+ *@@ReturnProfile
  *  Sets all string texts.
  */
@@ -4081 +4857 @@
     PROFILEDATA profile;
 
-    strcpy(profile.szProfile, this->szProfileString);
-    strcpy(profile.szApplication, this->szApplication);
-    strcpy(profile.szKey, this->szKey);
+    strcpy(profile.szProfile, this->_szProfileString);
+    strcpy(profile.szApplication, this->_szApplication);
+    strcpy(profile.szKey, this->_szKey);
 
     return profile;
@@ -4089 +4865 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptClearProfile::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::MakeScriptText
- *  Returns pointer to script text.
- */
-PSZ ScriptClearProfile::MakeScriptText(BOOL bAttribute)
+/*
+ *@@MakeScriptText:
+ */
+PSZ ScriptClearProfile::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
-    PSZ pszApplication = '\0';
-    PSZ pszKey = '\0';
-    CHAR szTemp[1024];
-    szTemp[0]='\0';
-
-    ulTextLength = strlen(szProfileString) + strlen(szApplication) +
-        strlen(szKey) + 2;
-
-    /*if (strlen(szApplication) != 0)
-        {
-        strcpy(pszApplication, this->szApplication);
-        }
-    if (strlen(szKey) != 0)
-        {
-        strcpy(szKey, this->szKey);
-        }*/
-
-    if (bAttribute)
+
+    ulTextLength = strlen(_szProfileString) + strlen(_szApplication) +
+        strlen(_szKey) + 2;
+
+
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_CLEARPROFILE) + 3;
 
@@ -4133 +4883 @@
     *pszScriptText = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         sprintf(pszScriptText, "%s=\"%s\\%s\\%s\"", SZ_ATTRIBUTE_CLEARPROFILE,
-                szProfileString, szApplication, szKey);
+                _szProfileString, _szApplication, _szKey);
     else
-        sprintf(pszScriptText, "%s\\%s\\%s", szProfileString, szApplication,
-            szKey);
-    //xstrcat(&strScriptText, szTemp);
+        sprintf(pszScriptText, "%s\\%s\\%s", _szProfileString, _szApplication,
+            _szKey);
 
     return pszScriptText;
@@ -4145 +4894 @@
 
 
-/***************************************************************************
- *@@ScriptClearProfile::BuildFromText
- *  Builds clearprofile object  accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptClearProfile::BuildFromText(PSZ pszScriptText,
-                                      SCRIPTERROR **ppScriptError,
-                                      USHORT *pusErrorTableSize,
-                                      ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+/*
+ *@@BuildFromText:
+ *  Builds clearprofile object  accordingly to script text.
+ */
+PSZ ScriptClearProfile::BuildFromText(PSZ p_pszScriptText,
+                                      ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszTemp1 = NULL;
@@ -4165 +4909 @@
 
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_CLEARPROFILE, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_CLEARPROFILE, &ulOffset);
     if (pszAttr)
         {
@@ -4173 +4917 @@
             // Get profile string.
             pszString = strhSubstr(pszAttr, pszTemp);
-            if (strlen(pszString) < CCHMAXPATH)
+            if (pszString)
                 this->SetProfileString(pszString);
             else
                 {
-                Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                Error.ulLineNumber = ulLineNumber;
-                Error.pszStart = strhdup(pszString);
-                Error.ulLength = 0;
-                if (ppScriptError)
-                    *pusErrorTableSize =
-                        AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_PROFILE_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             delete [] pszString;
@@ -4190 +4931 @@
                 {
                 pszString = strhSubstr(pszTemp + 1, pszTemp1);
-                if (strlen(pszString) < MAXPROFILEAPPLICATIONLENGTH)
+                if (pszString)
                     this->SetApplication(pszString);
                 else
                     {
-                    Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszString);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_APPL_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 delete [] pszString;
 
-                if (strlen(pszTemp1 + 1) < MAXPROFILEKEYLENGTH)
+                if (*(pszTemp1 + 1) != '\0')
                     this->SetKey(pszTemp1 + 1);
                 else
                     {
-                    Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszTemp1);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_KEY_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 }
             else
                 {
-                if (strlen(pszTemp + 1) < MAXPROFILEAPPLICATIONLENGTH)
-                    this->SetKey(pszTemp + 1);
+                if (*(pszTemp + 1) != '\0')
+                    this->SetApplication(pszTemp + 1);
                 else
                     {
-                    Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszTemp + 1);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_APPL_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 }
@@ -4236 +4968 @@
             {
             // Get profile string.
-            this->SetProfileString(pszAttr);
-            if (strlen(pszAttr) < CCHMAXPATH)
+            if (pszAttr)
                 this->SetProfileString(pszAttr);
             else
                 {
-                Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                Error.ulLineNumber = ulLineNumber;
-                Error.pszStart = strhdup(pszString);
-                Error.ulLength = 0;
-                if (ppScriptError)
-                    *pusErrorTableSize =
-                        AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_PROFILE_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             delete [] pszString;
@@ -4254 +4982 @@
     else
         {
-        Error.usErrorCode = ERR_PARSE_CLEARPROFILE_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_CLRPROFILE_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -4266 +4991 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -4276 +5001 @@
         ScriptWriteProfile class:
 
- ****************************************************************************
- *  ScriptWriteProfile class member functions:
- *  ScriptWriteProfile      Constructor.
- *  ~ScriptWriteProfile     Destructor.
- *  SetProfileString        Sets profile strting.
- *  SetApplication          Sets application string.
- *  SetString               Sets string to be stored to INI file.
- *  SetKey                  Sets key string.
- *  SetProfile              Sets all fileds.
- *  SetIndex                Sets index number.
- *  ReturnProfileString     Returns const pointer to profile string.
- *  ReturnApplication       Returns const pointer to application string.
- *  ReturnKey               Returns const pointer to key string.
- *  ReturnProfile           Returns profile data.
- *  ReturnIndex             Returns index number.
- *  MakeScriptText          Returns pointer to script text.
- *  BuildFromText
+    <B>Description:</B>
+        This class is for WRITEPROFILE attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptWriteProfile      Constructor.
+        ~ScriptWriteProfile     Destructor.
+        SetProfileString        Sets profile strting.
+        SetApplication          Sets application string.
+        SetString               Sets string to be stored to INI file.
+        SetKey                  Sets key string.
+        SetProfile              Sets all fileds.
+        ReturnProfileString     Returns const pointer to profile string.
+        ReturnApplication       Returns const pointer to application string.
+        ReturnKey               Returns const pointer to key string.
+        ReturnProfile           Returns profile data.
+        MakeScriptText          Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptWriteProfile::ScriptWriteProfile
+/*
+ *@@ScriptWriteProfile:
  *  Constructor for ScriptWriteProfile class. Initializes object by setting
  *  strings to zero and sets index number too.
  */
-ScriptWriteProfile::ScriptWriteProfile(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    *szProfileString = '\0';
-    *szApplication = '\0';
-    *szKey = '\0';
-    pszString = NULL;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::~ScriptWriteProfile
+ScriptWriteProfile::ScriptWriteProfile(USHORT p_usIndex)
+    {
+    SetIndex(p_usIndex);
+    *_szProfileString = '\0';
+    *_szApplication = '\0';
+    *_szKey = '\0';
+    _pszString = NULL;
+    }
+
+
+/*
+ *@@~ScriptWriteProfile:
  *  Destructor for ScriptWriteProfile class.
  */
 ScriptWriteProfile::~ScriptWriteProfile()
     {
-    if (pszString)
-        delete [] pszString;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::~ScriptWriteProfile
+    *_szProfileString = '\0';
+    *_szApplication = '\0';
+    *_szKey = '\0';
+    if (_pszString)
+        delete [] _pszString;
+    _pszString = NULL;
+    }
+
+
+/*
+ *@@operator=:
  *  Assignment operator for ScriptWriteProfile class.
  */
-ScriptWriteProfile &ScriptWriteProfile::operator=(const
-                                                 ScriptWriteProfile &writeProfile)
-    {
-    this->usIndex = writeProfile.usIndex;
-    strcpy(this->szProfileString, writeProfile.szProfileString);
-    strcpy(this->szApplication, writeProfile.szApplication);
-    strcpy(this->szKey, writeProfile.szKey);
-    this->pszString = strhdup(writeProfile.pszString);
+ScriptWriteProfile &ScriptWriteProfile::operator=
+        (ScriptWriteProfile &p_writeProfile)
+    {
+    SetIndex(p_writeProfile.ReturnIndex());
+    SetProfileString(p_writeProfile.ReturnProfileString());
+    SetApplication(p_writeProfile.ReturnApplication());
+    SetKey(p_writeProfile.ReturnKey());
+    SetString(p_writeProfile.ReturnString());
     return (*this);
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetProfileString
+/*
+ *@@SetProfileString:
  *  Sets szProfileString string text.
  */
-void ScriptWriteProfile::SetProfileString(const PSZ pszProfile)
-    {
-    if (strlen(pszProfile) < CCHMAXPATH)
-        strcpy(this->szProfileString, pszProfile);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetApplication
+USHORT ScriptWriteProfile::SetProfileString(const PSZ p_pszProfile)
+    {
+
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszProfile) < CCHMAXPATH)
+        strcpy(this->_szProfileString, p_pszProfile);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_PROFILE_STRTOOLONG);
+        msg.SetMessageText(p_pszProfile);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetApplication:
  *  Sets szApplication string text.
  */
-void ScriptWriteProfile::SetApplication(const PSZ pszApplication)
-    {
-    if (strlen(pszApplication) < MAXPROFILEAPPLICATIONLENGTH)
-        strcpy(this->szApplication, pszApplication);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetKey
+USHORT ScriptWriteProfile::SetApplication(const PSZ p_pszApplication)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszApplication) < MAXPROFILEAPPLICATIONLENGTH)
+        strcpy(this->_szApplication, p_pszApplication);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_APPL_STRTOOLONG);
+        msg.SetMessageText(p_pszApplication);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+
+/*
+ *@@SetKey:
  *  Sets szKey string text.
  */
-void ScriptWriteProfile::SetKey(const PSZ pszKey)
-    {
-    if (strlen(pszKey) < MAXPROFILEKEYLENGTH)
-        strcpy(this->szKey, pszKey);
-    }
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetString
+USHORT ScriptWriteProfile::SetKey(const PSZ p_pszKey)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszKey) < MAXPROFILEKEYLENGTH)
+        strcpy(this->_szKey, p_pszKey);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_KEY_STRTOOLONG);
+        msg.SetMessageText(p_pszKey);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+
+    return rc;
+    }
+
+
+/*
+ *@@SetString:
  *  Sets pszString text.
  */
-void ScriptWriteProfile::SetString(const PSZ pszString)
-    {
-    if (pszString)
-        this->pszString = strhdup(pszString);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetProfile
+USHORT ScriptWriteProfile::SetString(const PSZ p_pszString)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (p_pszString)
+        this->_pszString = strhdup(p_pszString);
+    }
+
+
+/*
+ *@@SetProfile:
  *  Sets all string texts.
  */
-void ScriptWriteProfile::SetProfile(PROFILEDATA profile)
-    {
-    if (strlen(profile.szProfile) < CCHMAXPATH)
-        strcpy(this->szProfileString, profile.szProfile);
-    if (strlen(profile.szApplication) < MAXPROFILEAPPLICATIONLENGTH)
-        strcpy(this->szApplication, profile.szApplication);
-    if (strlen(profile.szKey) < MAXPROFILEKEYLENGTH)
-        strcpy(this->szKey, profile.szKey);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::SetIndex
- *  Sets object's index.
- */
-void ScriptWriteProfile::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReturnProfileString
+USHORT ScriptWriteProfile::SetProfile(PROFILEDATA p_profile)
+    {
+    USHORT rc = NO_ERROR;
+    if (SetProfileString(p_profile.szProfile) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetApplication(p_profile.szApplication) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    if (SetKey(p_profile.szKey) != NO_ERROR)
+        rc = STRING_TOO_LONG;
+    return rc;
+    }
+
+
+/*
+ *@@ReturnProfileString:
  *  Returns const pointer to szProfileString string.
  */
-const PSZ ScriptWriteProfile::ReturnProfileString()
-    {
-    return szProfileString;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReturnApplication
+const PSZ ScriptWriteProfile::ReturnProfileString() const
+    {
+    return (PSZ)_szProfileString;
+    }
+
+
+/*
+ *@@ReturnApplication:
  *  Returns const pointer to szApplication string.
  */
-const PSZ ScriptWriteProfile::ReturnApplication()
-    {
-    return szApplication;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReturnKey
+const PSZ ScriptWriteProfile::ReturnApplication() const
+    {
+    return (PSZ)_szApplication;
+    }
+
+
+
+/*
+ *@@ReturnKey:
  *  Returns const pointer to szKey string.
  */
-const PSZ ScriptWriteProfile::ReturnKey()
-    {
-    return szKey;
-    }
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReturnString
+const PSZ ScriptWriteProfile::ReturnKey() const
+    {
+    return (PSZ)_szKey;
+    }
+
+
+/*
+ *@@ReturnString:
  *  Returns const pointer to szProfileString string.
  */
-const PSZ ScriptWriteProfile::ReturnString()
-    {
-    return pszString;
-    }
-
-
-/***************************************************************************
+const PSZ ScriptWriteProfile::ReturnString() const
+    {
+    return _pszString;
+    }
+
+
+/*
  *@@ ScriptWriteProfile::ReturnProfile
  *  Sets all string texts.
@@ -4468 +5219 @@
     PROFILEDATA profile;
 
-    strcpy(profile.szProfile, this->szProfileString);
-    strcpy(profile.szApplication, this->szApplication);
-    strcpy(profile.szKey, this->szKey);
+    strcpy(profile.szProfile, this->_szProfileString);
+    strcpy(profile.szApplication, this->_szApplication);
+    strcpy(profile.szKey, this->_szKey);
 
     return profile;
@@ -4476 +5227 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptWriteProfile::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::MakeScriptText
- *  Returns pointer to script text.
- */
-PSZ ScriptWriteProfile::MakeScriptText(BOOL bAttribute)
+/*
+ *@@MakeScriptText:
+ *  Returns pointer to script text. The text is based on the object's datas.
+ */
+PSZ ScriptWriteProfile::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     PSZ pszScriptText = NULL;
 
-    if (!pszString)
+    if (!_pszString)
         return FALSE;
 
-    ulTextLength = strlen(szProfileString) + strlen(szApplication) +
-        strlen(szKey) + strlen(pszString) + 3;
-
-
-    if (bAttribute)
+    ulTextLength = strlen(_szProfileString) + strlen(_szApplication) +
+        strlen(_szKey) + strlen(_pszString) + 3;
+
+
+    if (p_bAttribute)
         ulTextLength += strlen(SZ_ATTRIBUTE_WRITEPROFILE) + 3;
 
@@ -4511 +5249 @@
     *pszScriptText = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         sprintf(pszScriptText, "%s=\"%s\\%s\\%s|%s\"", SZ_ATTRIBUTE_WRITEPROFILE,
-                szProfileString, szApplication, szKey, pszString);
+                _szProfileString, _szApplication, _szKey, _pszString);
     else
-        sprintf(pszScriptText, "%s\\%s\\%s|%s", szProfileString, szApplication,
-               szKey, pszString);
+        sprintf(pszScriptText, "%s\\%s\\%s|%s", _szProfileString, _szApplication,
+               _szKey, _pszString);
 
 
@@ -4523 +5261 @@
 
 
-/***************************************************************************
- *@@ScriptWriteProfile::BuildFromText
- *  Builds clearprofile object  accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptWriteProfile::BuildFromText(PSZ pszScriptText,
-                                      SCRIPTERROR **ppScriptError,
-                                      USHORT *pusErrorTableSize,
-                                      ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+/*
+ *@@BuildFromText:
+ *  Builds clearprofile object  accordingly to script text.
+ */
+PSZ ScriptWriteProfile::BuildFromText(PSZ p_pszScriptText,
+                                      ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszTemp1 = NULL;
@@ -4543 +5276 @@
 
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_WRITEPROFILE, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_WRITEPROFILE, &ulOffset);
     if (pszAttr)
         {
@@ -4551 +5284 @@
             // Get profile string.
             pszString = strhSubstr(pszAttr, pszTemp);
-            if (strlen(pszString) < CCHMAXPATH)
+            if (pszString)
                 this->SetProfileString(pszString);
             else
                 {
-                Error.usErrorCode = ERR_PARSE_WRITEPROFILE_STRINGTOOLONG;
-                Error.ulLineNumber = ulLineNumber;
-                Error.pszStart = strhdup(pszString);
-                Error.ulLength = 0;
-                if (ppScriptError)
-                    *pusErrorTableSize =
-                        AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_PROFILE_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             delete [] pszString;
@@ -4568 +5298 @@
                 {
                 pszString = strhSubstr(pszTemp + 1, pszTemp1);
-                if (strlen(pszString) < MAXPROFILEAPPLICATIONLENGTH)
+                if (pszString)
                     this->SetApplication(pszString);
                 else
                     {
-                    Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszString);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_APPL_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 delete [] pszString;
@@ -4586 +5313 @@
                     {
                     pszString = strhSubstr(pszTemp + 1, pszTemp1);
-                    if (strlen(pszString) < MAXPROFILEKEYLENGTH)
+                    if (pszString)
                         this->SetKey(pszString);
                     else
                         {
-                        Error.usErrorCode = ERR_PARSE_CLEARPROFILE_STRINGTOOLONG;
-                        Error.ulLineNumber = ulLineNumber;
-                        Error.pszStart = strhdup(pszTemp1);
-                        Error.ulLength = 0;
-                        if (ppScriptError)
-                            *pusErrorTableSize =
-                                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                        msg.SetType(MSG_TYPE_WARNING);
+                        msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_KEY_MISSING);
+                        msg.SetLineNumber(p_ulLineNumber);
+                        _messageLogger.LogMessage(msg);
                         }
                     delete [] pszString;
@@ -4607 +5331 @@
                 else
                     {
-                    Error.usErrorCode = ERR_PARSE_WRITEPROFILE_STRING_NOTFOUND;
-                    Error.ulLineNumber = ulLineNumber;
-                    Error.pszStart = strhdup(pszTemp + 1);
-                    Error.ulLength = 0;
-                    if (ppScriptError)
-                        *pusErrorTableSize =
-                            AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                    msg.SetType(MSG_TYPE_WARNING);
+                    msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_STRING_MISSING);
+                    msg.SetLineNumber(p_ulLineNumber);
+                    _messageLogger.LogMessage(msg);
                     }
                 }
             else
                 {
-                Error.usErrorCode = ERR_PARSE_WRITEPROFILE_KEY_NOTFOUND;
-                Error.ulLineNumber = ulLineNumber;
-                Error.pszStart = strhdup(pszTemp + 1);
-                Error.ulLength = 0;
-                if (ppScriptError)
-                    *pusErrorTableSize =
-                        AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+                msg.SetType(MSG_TYPE_WARNING);
+                msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_KEY_MISSING);
+                msg.SetLineNumber(p_ulLineNumber);
+                _messageLogger.LogMessage(msg);
                 }
             }
         else
             {
-            Error.usErrorCode = ERR_PARSE_WRITEPROFILE_APP_NOTFOUND;
-            Error.ulLineNumber = ulLineNumber;
-            Error.pszStart = strhdup(pszString);
-            Error.ulLength = 0;
-            if (ppScriptError)
-                *pusErrorTableSize =
-                    AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+            msg.SetType(MSG_TYPE_WARNING);
+            msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_APPL_MISSING);
+            msg.SetLineNumber(p_ulLineNumber);
+            _messageLogger.LogMessage(msg);
             }
         }
     else
         {
-        Error.usErrorCode = ERR_PARSE_WRITEPROFILE_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_WRITEPROFILE_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -4652 +5364 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -4661 +5373 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptKillProcess class:
-
- ****************************************************************************
- *  ScriptKillProcess class member functions:
- *  ScripitKillProcess   Constructor.
- *  ~ScriptKillProcess   Destructor.
- *  SetFileName     Sets file name text.
- *  SetIndex        Sets KillProcess object ID. Should be used for identification.
- *  ReturnFileName    Returns const pointer to title text.
- *  ReturnIndex     Returns object ID number.
- *  MakeScriptText  Returns pointer to script text.
- *  BuildFromText   Construct object from script text.
+        @@ScriptKillProcess class:
+
+    <B>Description:</B>
+        This class is for KILLPROCESS attribute in CONFIGSYS tag. Detailed
+        information about the meaning of the attribute can be found
+        from <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScripitKillProcess   Constructor.
+        ~ScriptKillProcess   Destructor.
+        SetFileName     Sets file name text.
+        ReturnFileName    Returns const pointer to title text.
+        MakeScriptText  Returns pointer to script text.
+        BuildFromText   Construct object from script text.
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptKillProcess::ScriptKillProcess
+/*
+ *@@ScriptKillProcess:
  *  Constructor for ScriptKillProcess class. Initializes szFileName string by
  *  setting first char to '\0'.
  */
-ScriptKillProcess::ScriptKillProcess(USHORT usIndex)
-    {
-    *szFileName = '\0';
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::~ScriptKillProcess
+ScriptKillProcess::ScriptKillProcess(USHORT p_usIndex)
+    {
+    *_szFileName = '\0';
+    SetIndex(p_usIndex);
+    }
+
+
+/*
+ *@@~ScriptKillProcess:
  *  destructor for ScriptKillProcess class. Does nothing special.
  */
 ScriptKillProcess::~ScriptKillProcess()
     {
-    }
-
-
-/***************************************************************************
- *@@ ScriptFileName::SetFileName
+    *_szFileName = '\0';
+    }
+
+
+/*
+ *@@SetFileName:
  *  Sets target text.
  */
-void ScriptKillProcess::SetFileName(const PSZ pszFileName)
-    {
-    if (strlen(pszFileName) < CCHMAXPATH)
-        strcpy(this->szFileName, pszFileName);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::SetIndex
- *  Sets object's index.
- */
-void ScriptKillProcess::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::ReturnFileName
+USHORT ScriptKillProcess::SetFileName(const PSZ p_pszFileName)
+    {
+    Message msg;
+    USHORT rc = NO_ERROR;
+    if (strlen(p_pszFileName) < CCHMAXPATH)
+        strcpy(this->_szFileName, p_pszFileName);
+    else
+        {
+        msg.SetType(MSG_TYPE_ERROR);
+        msg.SetMessageValue(MSG_ATTRIBUTE_KILLPROCESS_FILENAME_STRTOOLONG);
+        msg.SetMessageText(p_pszFileName);
+        _messageLogger.LogMessage(msg);
+        rc = STRING_TOO_LONG;
+        }
+    return rc;
+    }
+
+
+/*
+ *@@ReturnFileName:
  *  Returns const pointer to file name text.
  */
 const PSZ ScriptKillProcess::ReturnFileName()
     {
-    return szFileName;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::ReturnIndex
- *  Returns object's index number.
- */
-USHORT ScriptKillProcess::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::MakeScriptText
+    return _szFileName;
+    }
+
+
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptKillProcess::MakeScriptText(BOOL bAttribute)
+PSZ ScriptKillProcess::MakeScriptText(BOOL p_bAttribute)
     {
     ULONG ulTextLength = 0;
     XSTRING strScriptText;
     xstrInit(&strScriptText, 0);
-    ulTextLength = strlen(szFileName);
+    ulTextLength = strlen(_szFileName);
     CHAR szTemp[1024];
     *szTemp = '\0';
 
-    if (bAttribute)
+    if (p_bAttribute)
         // Length of the attribute, =, " and "
         ulTextLength += strlen(SZ_ATTRIBUTE_KILLPROCESS) + 3;
 
-    if (bAttribute)
-        sprintf(szTemp, "%s=\"%s\"", SZ_ATTRIBUTE_KILLPROCESS, szFileName);
+    if (p_bAttribute)
+        sprintf(szTemp, "%s=\"%s\"", SZ_ATTRIBUTE_KILLPROCESS, _szFileName);
     else
-        sprintf(szTemp, "%s\"", szFileName);
+        sprintf(szTemp, "%s\"", _szFileName);
 
     xstrcat(&strScriptText, szTemp, 0);
@@ -4772 +5472 @@
 
 
-/***************************************************************************
- *@@ScriptKillProcess::BuildFromText
- *  Builds target object accordingly to script text. If any errors is found
- *  in script text, error informations are returned in table where to
- *  *pScriptError points. Pointer to after end of tag is returned so multiple
- *  searches can be done.
- */
-PSZ ScriptKillProcess::BuildFromText(PSZ pszScriptText,
-                                    SCRIPTERROR **ppScriptError,
-                                    USHORT *pusErrorTableSize,
-                                    ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+/*
+ *@@BuildFromText:
+ *  Builds target object accordingly to script text.
+ */
+PSZ ScriptKillProcess::BuildFromText(PSZ p_pszScriptText,
+                                    ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszTemp = NULL;
     PSZ pszAttr = NULL;
@@ -4791 +5486 @@
 
 
-    pszAttr = strhGetTextAttr(pszScriptText, SZ_ATTRIBUTE_KILLPROCESS, &ulOffset);
+    pszAttr = strhGetTextAttr(p_pszScriptText, SZ_ATTRIBUTE_KILLPROCESS, &ulOffset);
     if (pszAttr)
         this->SetFileName(pszAttr);
     else
         {
-        Error.usErrorCode = ERR_PARSE_KILLPROCESS_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_WARNING);
+        msg.SetMessageValue(MSG_ATTRIBUTE_KILLPROCESS_MISSING);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -4808 +5500 @@
     ulAttrLen = strlen(pszAttr);
     delete [] pszAttr;
-    return pszScriptText + ulOffset + ulAttrLen + 1;
+    return p_pszScriptText + ulOffset + ulAttrLen + 1;
     }
 
@@ -4817 +5509 @@
 /****************************************************************************
  ****************************************************************************
-        ScriptPackage class:
-
- ****************************************************************************
- *  ScriptPackage class member functions:
- *  ScriptPackage           Constructor.
- *  ~ScriptPackage          Destructor.
- *  SetIndex                Sets index number.
- *  ReturnIndex             Returns index number.
- *  MakeScriptText          Returns pointer to script text.
- *  BuildFromText
+        @@ScriptPackage class:
+
+    <B>Description:</B>
+        This class is for CONFIGSYS tag. Detailed information about the
+        meaning of the attribute can be found from
+        <I>WarpIN Programmer's Guide and Reference</I>.
+
+    Member functions:
+        ScriptPackage           Constructor.
+        ~ScriptPackage          Destructor.
+        MakeScriptText          Returns pointer to script text.
+        BuildFromText
  ***************************************************************************/
 
 
-/***************************************************************************
- *@@ ScriptPackage::ScriptPackage
+/*
+ *@@ScriptPackage:
  *  Constructor for ScriptPackage class.
  */
-ScriptPackage::ScriptPackage(USHORT usIndex, BOOL bAllowIndexArrangement)
-    {
-    this->usIndex = usIndex;
-
-    this->bAllowIndexArrangement = bAllowIndexArrangement;
-
-    Index.SetIndexAttribute(0);
-
-    pszDescription = NULL;
-
-    pRequires = NULL;
-    usRequiresCount = 0;
-    pConfigSys = NULL;
-    usConfigSysCount = 0;
-    pRegisterClass = NULL;
-    usRegisterClassCount = 0;
-    pReplaceClass = NULL;
-    usReplaceClassCount = 0;
-    pCreateObject = NULL;
-    usCreateObjectCount = 0;
-    pExecute = NULL;
-    usExecuteCount = 0;
-    pProfile = NULL;
-    usProfileCount = 0;
-    pWriteProfile = NULL;
-    usWriteProfileCount = 0;
-    pKillProcess = NULL;
-    usKillProcessCount = 0;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ScriptPackage
+ScriptPackage::ScriptPackage(USHORT p_usIndex, BOOL p_bAllowIndexArrangement)
+    {
+    SetIndex(p_usIndex);
+
+    this->_bAllowIndexArrangement = p_bAllowIndexArrangement;
+
+    _Index.SetIndexAttribute(0);
+
+    _pszDescription = NULL;
+
+    _pRequires = NULL;
+    _usRequiresCount = 0;
+    _pConfigSys = NULL;
+    _usConfigSysCount = 0;
+    _pRegisterClass = NULL;
+    _usRegisterClassCount = 0;
+    _pReplaceClass = NULL;
+    _usReplaceClassCount = 0;
+    _pCreateObject = NULL;
+    _usCreateObjectCount = 0;
+    _pExecute = NULL;
+    _usExecuteCount = 0;
+    _pProfile = NULL;
+    _usProfileCount = 0;
+    _pWriteProfile = NULL;
+    _usWriteProfileCount = 0;
+    _pKillProcess = NULL;
+    _usKillProcessCount = 0;
+    }
+
+
+
+
+/*
+ *@@ScriptPackage:
  *  Copy constructor for ScriptPackage class.
  */
-ScriptPackage::ScriptPackage(ScriptPackage &package)
+ScriptPackage::ScriptPackage(ScriptPackage &p_package)
     {
     USHORT usIndex;
 
-    this->usIndex = package.usIndex;
-
-    pszDescription = NULL;
-
-    Index.SetIndexAttribute(0);
-
-    pRequires = NULL;
-    usRequiresCount = 0;
-    pConfigSys = NULL;
-    usConfigSysCount = 0;
-    pRegisterClass = NULL;
-    usRegisterClassCount = 0;
-    pReplaceClass = NULL;
-    usReplaceClassCount = 0;
-    pCreateObject = NULL;
-    usCreateObjectCount = 0;
-    pExecute = NULL;
-    usExecuteCount = 0;
-    pProfile = NULL;
-    usProfileCount = 0;
-    pWriteProfile = NULL;
-    usWriteProfileCount = 0;
-    pKillProcess = NULL;
-    usKillProcessCount = 0;
+    SetIndex(p_package.ReturnIndex());
+
+    _pszDescription = NULL;
+
+    _Index.SetIndexAttribute(0);
+
+    _pRequires = NULL;
+    _usRequiresCount = 0;
+    _pConfigSys = NULL;
+    _usConfigSysCount = 0;
+    _pRegisterClass = NULL;
+    _usRegisterClassCount = 0;
+    _pReplaceClass = NULL;
+    _usReplaceClassCount = 0;
+    _pCreateObject = NULL;
+    _usCreateObjectCount = 0;
+    _pExecute = NULL;
+    _usExecuteCount = 0;
+    _pProfile = NULL;
+    _usProfileCount = 0;
+    _pWriteProfile = NULL;
+    _usWriteProfileCount = 0;
+    _pKillProcess = NULL;
+    _usKillProcessCount = 0;
 
     // Copy pszDescription.
-    if (package.pszDescription)
-        pszDescription = strdup(package.pszDescription);
+    if (p_package._pszDescription)
+        _pszDescription = strdup(p_package._pszDescription);
 
     // Copy requires objects.
-    pRequires = new ScriptRequires[package.usRequiresCount];
-    usRequiresCount = package.usRequiresCount;
-    for (usIndex = 0; usIndex < usRequiresCount; usIndex++)
-        pRequires[usIndex] = package.pRequires[usIndex];
+    _pRequires = new ScriptRequires[p_package._usRequiresCount];
+    _usRequiresCount = p_package._usRequiresCount;
+    for (usIndex = 0; usIndex < _usRequiresCount; usIndex++)
+        _pRequires[usIndex] = p_package._pRequires[usIndex];
 
     // Copy configsys objects.
-    pConfigSys = new ScriptConfigSys[package.usConfigSysCount];
-    usConfigSysCount = package.usConfigSysCount;
-    for (usIndex = 0; usIndex < usConfigSysCount; usIndex++)
-        pConfigSys[usIndex] = package.pConfigSys[usIndex];
+    _pConfigSys = new ScriptConfigSys[p_package._usConfigSysCount];
+    _usConfigSysCount = p_package._usConfigSysCount;
+    for (usIndex = 0; usIndex < _usConfigSysCount; usIndex++)
+        _pConfigSys[usIndex] = p_package._pConfigSys[usIndex];
 
     // Copy registerclass objects.
-    pRegisterClass = new ScriptRegisterClass[package.usRegisterClassCount];
-    usRegisterClassCount = package.usRegisterClassCount;
-    for (usIndex = 0; usIndex < usRegisterClassCount; usIndex++)
-        pRegisterClass[usIndex] = package.pRegisterClass[usIndex];
+    _pRegisterClass = new ScriptRegisterClass[p_package._usRegisterClassCount];
+    _usRegisterClassCount = p_package._usRegisterClassCount;
+    for (usIndex = 0; usIndex < _usRegisterClassCount; usIndex++)
+        _pRegisterClass[usIndex] = p_package._pRegisterClass[usIndex];
 
     // Copy replaceclass objects.
-    pReplaceClass = new ScriptReplaceClass[package.usReplaceClassCount];
-    usReplaceClassCount = package.usReplaceClassCount;
-    for (usIndex = 0; usIndex < usReplaceClassCount; usIndex++)
-        pReplaceClass[usIndex] = package.pReplaceClass[usIndex];
+    _pReplaceClass = new ScriptReplaceClass[p_package._usReplaceClassCount];
+    _usReplaceClassCount = p_package._usReplaceClassCount;
+    for (usIndex = 0; usIndex < _usReplaceClassCount; usIndex++)
+        _pReplaceClass[usIndex] = p_package._pReplaceClass[usIndex];
 
     // Copy createobject objects.
-    pCreateObject = new ScriptCreateObject[package.usCreateObjectCount];
-    usCreateObjectCount = package.usCreateObjectCount;
-    for (usIndex = 0; usIndex < usCreateObjectCount; usIndex++)
-        pCreateObject[usIndex] = package.pCreateObject[usIndex];
+    _pCreateObject = new ScriptCreateObject[p_package._usCreateObjectCount];
+    _usCreateObjectCount = p_package._usCreateObjectCount;
+    for (usIndex = 0; usIndex < _usCreateObjectCount; usIndex++)
+        _pCreateObject[usIndex] = p_package._pCreateObject[usIndex];
 
     // Copy execute objects.
-    pExecute = new ScriptExecute[package.usExecuteCount];
-    usExecuteCount = package.usExecuteCount;
-    for (usIndex = 0; usIndex < usExecuteCount; usIndex++)
-        pExecute[usIndex] = package.pExecute[usIndex];
+    _pExecute = new ScriptExecute[p_package._usExecuteCount];
+    _usExecuteCount = p_package._usExecuteCount;
+    for (usIndex = 0; usIndex < _usExecuteCount; usIndex++)
+        _pExecute[usIndex] = p_package._pExecute[usIndex];
 
     // Copy profile objects.
-    pProfile = new ScriptClearProfile[package.usProfileCount];
-    usProfileCount = package.usProfileCount;
-    for (usIndex = 0; usIndex < usProfileCount; usIndex++)
-        pProfile[usIndex] = package.pProfile[usIndex];
+    _pProfile = new ScriptClearProfile[p_package._usProfileCount];
+    _usProfileCount = p_package._usProfileCount;
+    for (usIndex = 0; usIndex < _usProfileCount; usIndex++)
+        _pProfile[usIndex] = p_package._pProfile[usIndex];
 
     // Copy writeprofile objects.
-    pWriteProfile = new ScriptWriteProfile[package.usWriteProfileCount];
-    usWriteProfileCount = package.usWriteProfileCount;
-    for (usIndex = 0; usIndex < usWriteProfileCount; usIndex++)
-        pWriteProfile[usIndex] = package.pWriteProfile[usIndex];
+    _pWriteProfile = new ScriptWriteProfile[p_package._usWriteProfileCount];
+    _usWriteProfileCount = p_package._usWriteProfileCount;
+    for (usIndex = 0; usIndex < _usWriteProfileCount; usIndex++)
+        _pWriteProfile[usIndex] = p_package._pWriteProfile[usIndex];
 
     // Copy killprocess objects.
-    pKillProcess = new ScriptKillProcess[package.usKillProcessCount];
-    usKillProcessCount = package.usKillProcessCount;
-    for (usIndex = 0; usIndex < usKillProcessCount; usIndex++)
-        pKillProcess[usIndex] = package.pKillProcess[usIndex];
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ScriptPackage &operator=
+    _pKillProcess = new ScriptKillProcess[p_package._usKillProcessCount];
+    _usKillProcessCount = p_package._usKillProcessCount;
+    for (usIndex = 0; usIndex < _usKillProcessCount; usIndex++)
+        _pKillProcess[usIndex] = p_package._pKillProcess[usIndex];
+    }
+
+
+
+
+/*
+ *@@&operator=:
  *  Assignment operator for ScriptPackage class.
- */
-ScriptPackage &ScriptPackage::operator=(const ScriptPackage &package)
+ *
+ *@@changed V0.9.5 (2000-08-22) [tahola]: removed const
+ */
+ScriptPackage &ScriptPackage::operator=(ScriptPackage &p_package)
     {
     USHORT usIndex;
-    ScriptIndex PckIndex = package.Index;
-
-    this->usIndex = package.usIndex;
-
-    this->PckID = package.PckID;
-
-    this->Title = package.Title;
-
-    this->Target = package.Target;
-
-    this->KeyWords = package.KeyWords;
-
-    this->Index.SetIndexAttribute(PckIndex.ReturnIndexAttribute());
+    ScriptIndex PckIndex = p_package._Index;
+
+    SetIndex(p_package.ReturnIndex());
+
+    this->_PckID = p_package._PckID;
+
+    this->_Title = p_package._Title;
+
+    this->_Target = p_package._Target;
+
+    this->_KeyWords = p_package._KeyWords;
+
+    this->_Index.SetIndexAttribute(PckIndex.ReturnIndexAttribute());
 
     // Copy pszDescription.
-    if (package.pszDescription)
-        pszDescription = strdup(package.pszDescription);
+    if (p_package._pszDescription)
+        _pszDescription = strdup(p_package._pszDescription);
 
     // Copy requires objects.
-    if (package.pRequires)
-        {
-        pRequires = new ScriptRequires[package.usRequiresCount];
-        usRequiresCount = package.usRequiresCount;
-        for (usIndex = 0; usIndex < usRequiresCount; usIndex++)
-            pRequires[usIndex] = package.pRequires[usIndex];
+    if (p_package._pRequires)
+        {
+        _pRequires = new ScriptRequires[p_package._usRequiresCount];
+        _usRequiresCount = p_package._usRequiresCount;
+        for (usIndex = 0; usIndex < _usRequiresCount; usIndex++)
+            _pRequires[usIndex] = p_package._pRequires[usIndex];
         }
     // Copy configsys objects.
-    if (package.pConfigSys)
-        {
-        pConfigSys = new ScriptConfigSys[package.usConfigSysCount];
-        usConfigSysCount = package.usConfigSysCount;
-        for (usIndex = 0; usIndex < usConfigSysCount; usIndex++)
-            pConfigSys[usIndex] = package.pConfigSys[usIndex];
+    if (p_package._pConfigSys)
+        {
+        _pConfigSys = new ScriptConfigSys[p_package._usConfigSysCount];
+        _usConfigSysCount = p_package._usConfigSysCount;
+        for (usIndex = 0; usIndex < _usConfigSysCount; usIndex++)
+            _pConfigSys[usIndex] = p_package._pConfigSys[usIndex];
         }
     // Copy registerclass objects.
-    if (package.pRegisterClass)
-        {
-        pRegisterClass = new ScriptRegisterClass[package.usRegisterClassCount];
-        usRegisterClassCount = package.usRegisterClassCount;
-        for (usIndex = 0; usIndex < usRegisterClassCount; usIndex++)
-            pRegisterClass[usIndex] = package.pRegisterClass[usIndex];
+    if (p_package._pRegisterClass)
+        {
+        _pRegisterClass = new ScriptRegisterClass[p_package._usRegisterClassCount];
+        _usRegisterClassCount = p_package._usRegisterClassCount;
+        for (usIndex = 0; usIndex < _usRegisterClassCount; usIndex++)
+            _pRegisterClass[usIndex] = p_package._pRegisterClass[usIndex];
         }
     // Copy replaceclass objects.
-    if (package.pReplaceClass)
-        {
-        pReplaceClass = new ScriptReplaceClass[package.usReplaceClassCount];
-        usReplaceClassCount = package.usReplaceClassCount;
-        for (usIndex = 0; usIndex < usReplaceClassCount; usIndex++)
-            pReplaceClass[usIndex] = package.pReplaceClass[usIndex];
+    if (p_package._pReplaceClass)
+        {
+        _pReplaceClass = new ScriptReplaceClass[p_package._usReplaceClassCount];
+        _usReplaceClassCount = p_package._usReplaceClassCount;
+        for (usIndex = 0; usIndex < _usReplaceClassCount; usIndex++)
+            _pReplaceClass[usIndex] = p_package._pReplaceClass[usIndex];
         }
     // Copy createobject objects.
-    if (package.pCreateObject)
-        {
-        pCreateObject = new ScriptCreateObject[package.usCreateObjectCount];
-        usCreateObjectCount = package.usCreateObjectCount;
-        for (usIndex = 0; usIndex < usCreateObjectCount; usIndex++)
-            pCreateObject[usIndex] = package.pCreateObject[usIndex];
+    if (p_package._pCreateObject)
+        {
+        _pCreateObject = new ScriptCreateObject[p_package._usCreateObjectCount];
+        _usCreateObjectCount = p_package._usCreateObjectCount;
+        for (usIndex = 0; usIndex < _usCreateObjectCount; usIndex++)
+            _pCreateObject[usIndex] = p_package._pCreateObject[usIndex];
         }
     // Copy execute objects.
-    if (package.pExecute)
-        {
-        pExecute = new ScriptExecute[package.usExecuteCount];
-        usExecuteCount = package.usExecuteCount;
-        for (usIndex = 0; usIndex < usExecuteCount; usIndex++)
-            pExecute[usIndex] = package.pExecute[usIndex];
+    if (p_package._pExecute)
+        {
+        _pExecute = new ScriptExecute[p_package._usExecuteCount];
+        _usExecuteCount = p_package._usExecuteCount;
+        for (usIndex = 0; usIndex < _usExecuteCount; usIndex++)
+            _pExecute[usIndex] = p_package._pExecute[usIndex];
         }
     // Copy profile objects.
-    if (package.pProfile)
-        {
-        pProfile = new ScriptClearProfile[package.usProfileCount];
-        usProfileCount = package.usProfileCount;
-        for (usIndex = 0; usIndex < usProfileCount; usIndex++)
-            pProfile[usIndex] = package.pProfile[usIndex];
+    if (p_package._pProfile)
+        {
+        _pProfile = new ScriptClearProfile[p_package._usProfileCount];
+        _usProfileCount = p_package._usProfileCount;
+        for (usIndex = 0; usIndex < _usProfileCount; usIndex++)
+            _pProfile[usIndex] = p_package._pProfile[usIndex];
         }
     // Copy writeprofile objects.
-    if (package.pWriteProfile)
-        {
-        pWriteProfile = new ScriptWriteProfile[package.usWriteProfileCount];
-        usWriteProfileCount = package.usWriteProfileCount;
-        for (usIndex = 0; usIndex < usWriteProfileCount; usIndex++)
-            pWriteProfile[usIndex] = package.pWriteProfile[usIndex];
+    if (p_package._pWriteProfile)
+        {
+        _pWriteProfile = new ScriptWriteProfile[p_package._usWriteProfileCount];
+        _usWriteProfileCount = p_package._usWriteProfileCount;
+        for (usIndex = 0; usIndex < _usWriteProfileCount; usIndex++)
+            _pWriteProfile[usIndex] = p_package._pWriteProfile[usIndex];
         }
     // Copy killprocess objects.
-    if (package.pKillProcess)
-        {
-        pKillProcess = new ScriptKillProcess[package.usKillProcessCount];
-        usKillProcessCount = package.usKillProcessCount;
-        for (usIndex = 0; usIndex < usKillProcessCount; usIndex++)
-            pKillProcess[usIndex] = package.pKillProcess[usIndex];
+    if (p_package._pKillProcess)
+        {
+        _pKillProcess = new ScriptKillProcess[p_package._usKillProcessCount];
+        _usKillProcessCount = p_package._usKillProcessCount;
+        for (usIndex = 0; usIndex < _usKillProcessCount; usIndex++)
+            _pKillProcess[usIndex] = p_package._pKillProcess[usIndex];
         }
 
@@ -5066 +5762 @@
 
 
-/***************************************************************************
- *@@ ScriptPackage::~ScriptPackage
+/*
+ *@@~ScriptPackage:
  *  Destructor for ScriptPackage class.
  */
 ScriptPackage::~ScriptPackage()
     {
-    if (pszDescription)
-        delete [] pszDescription;
-    pszDescription = NULL;
-    if (pRequires)
-        delete [] pRequires;
-    pRequires = NULL;
-    usRequiresCount = 0;
-    if (pConfigSys)
-        delete [] pConfigSys;
-    pConfigSys = NULL;
-    usConfigSysCount = 0;
-    if (pRegisterClass)
-        delete [] pRegisterClass;
-    pRegisterClass = NULL;
-    usRegisterClassCount = 0;
-    if (pCreateObject)
-        delete [] pCreateObject;
-    pCreateObject = NULL;
-    usCreateObjectCount = 0;
-    if (pExecute)
-        delete [] pExecute;
-    pExecute = NULL;
-    usExecuteCount = 0;
-    if (pProfile)
-        delete [] pProfile;
-    pProfile = NULL;
-    usProfileCount = 0;
-    if (pWriteProfile)
-        delete [] pWriteProfile;
-    pProfile = NULL;
-    usProfileCount = 0;
-    if (pKillProcess)
-        delete [] pKillProcess;
-    pKillProcess = NULL;
-    usKillProcessCount = 0;
-    }
-
-
-
-
-/***************************************************************************
+    ClearAll;
+    }
+
+
+/*
+ *@@ClearAll:
+ *  Clears all fields.
+ *
+ *@@ added V0.9.5 (2000-08-22) [tahola]
+ */
+USHORT ScriptPackage::ClearAll()
+    {
+    if (_pszDescription)
+        delete [] _pszDescription;
+    _pszDescription = NULL;
+    if (_pRequires)
+        delete [] _pRequires;
+    _pRequires = NULL;
+    _usRequiresCount = 0;
+    if (_pConfigSys)
+        delete [] _pConfigSys;
+    _pConfigSys = NULL;
+    _usConfigSysCount = 0;
+    if (_pRegisterClass)
+        delete [] _pRegisterClass;
+    _pRegisterClass = NULL;
+    _usRegisterClassCount = 0;
+    if (_pCreateObject)
+        delete [] _pCreateObject;
+    _pCreateObject = NULL;
+    _usCreateObjectCount = 0;
+    if (_pExecute)
+        delete [] _pExecute;
+    _pExecute = NULL;
+    _usExecuteCount = 0;
+    if (_pProfile)
+        delete [] _pProfile;
+    _pProfile = NULL;
+    _usProfileCount = 0;
+    if (_pWriteProfile)
+        delete [] _pWriteProfile;
+    _pProfile = NULL;
+    _usProfileCount = 0;
+    if (_pKillProcess)
+        delete [] _pKillProcess;
+    _pKillProcess = NULL;
+    _usKillProcessCount = 0;
+
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@SetDescription:
+ *  Sets description string. If parameter is NULL, old pszDescription
+ *  will be deleted.
+ *
+ *  <B>Return values:</B>
+ *      NO_ERROR: No errors occurred.
+ *      MEM_ALLOC_ERROR: Error occurred during memory allocation.
+ */
+USHORT ScriptPackage::SetDescription(
+                        const PSZ p_pszDescription // in: a pointer to a string.
+                                    )
+    {
+    ULONG ulStringLength;
+    if (this->_pszDescription)
+        delete [] this->_pszDescription;
+    this->_pszDescription = NULL;
+
+    if (p_pszDescription)
+        {
+        ulStringLength = strlen(p_pszDescription);
+        if (!(this->_pszDescription = (PSZ)new CHAR[ulStringLength + 1]))
+            return MEM_ALLOC_ERROR;
+        strcpy(this->_pszDescription, p_pszDescription);
+        }
+    return NO_ERROR;
+    }
+
+
+/*
+ *@@ReturnDescription:
+ *  Returns constant pointer to description string.
+ */
+const PSZ ScriptPackage::ReturnDescription()
+    {
+    return _pszDescription;
+    }
+
+
+/*
  *@@ ScriptPackage::SetPackageIndex
  *  Sets object's index.
  */
-void ScriptPackage::SetPackageIndex(USHORT usPackageIndex)
-    {
-    this->Index.SetIndexAttribute(usPackageIndex);
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetDescription
- *  Sets description string. If parameter is NULL old pszDescription
- *  will be deleted.
- */
-USHORT ScriptPackage::SetDescription(const PSZ pszDescription)
-    {
-    ULONG ulStringLength;
-    if (this->pszDescription)
-        delete [] this->pszDescription;
-    this->pszDescription = NULL;
-
-    if (pszDescription)
-        {
-        ulStringLength = strlen(pszDescription);
-        this->pszDescription = new CHAR[ulStringLength + 1];
-        strcpy(this->pszDescription, pszDescription);
-        }
-    return 0;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetIndex
- *  Sets object's index.
- */
-void ScriptPackage::SetIndex(USHORT usIndex)
-    {
-    this->usIndex = usIndex;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnDescription
- *  Returns constant pointer to description string.
- */
-const PSZ ScriptPackage::ReturnDescription()
-    {
-    return pszDescription;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetPackageID
- */
-void ScriptPackage::SetPackageID(PACKAGEIDDATA packageIDData)
-    {
-    PckID.SetPackageID(packageIDData);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetTitle
- */
-void ScriptPackage::SetTitle(const PSZ pszTitle)
-    {
-    Title.SetTitle(pszTitle);
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnTitle
+USHORT ScriptPackage::SetPackageIndex(USHORT p_usPackageIndex)
+    {
+    return _Index.SetIndexAttribute(p_usPackageIndex);
+    }
+
+
+/*
+ *@@SetPackageID
+ */
+USHORT ScriptPackage::SetPackageID(PACKAGEIDDATA p_packageIDData)
+    {
+    return _PckID.SetPackageID(p_packageIDData);
+    }
+
+
+/*
+ *@@SetTitle:
+ */
+USHORT ScriptPackage::SetTitle(const PSZ p_pszTitle)
+    {
+    return _Title.SetTitle(p_pszTitle);
+    }
+
+
+/*
+ *@@ReturnTitle:
  */
 const PSZ ScriptPackage::ReturnTitleText()
     {
-    return Title.ReturnTitle();
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetTarget
- */
-void ScriptPackage::SetTarget(const PSZ pszTarget)
-    {
-    Target.SetTarget(pszTarget);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::SetKeyWords
- */
-void ScriptPackage::SetKeyWords(USHORT usKeyWords)
-    {
-    KeyWords.SetKeyWord(usKeyWords);
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnPackageIDObject
+    return _Title.ReturnTitle();
+    }
+
+
+/*
+ *@@SetTarget:
+ */
+USHORT ScriptPackage::SetTarget(const PSZ p_pszTarget)
+    {
+    return _Target.SetTarget(p_pszTarget);
+    }
+
+
+/*
+ *@@SetKeyWords:
+ */
+USHORT ScriptPackage::SetKeyWords(USHORT p_usKeyWords)
+    {
+    return _KeyWords.SetKeyWord(p_usKeyWords);
+    }
+
+
+/*
+ *@@ReturnPackageIDObject:
  *  Returns pointer to PackageID object.
  */
 ScriptPackageID *ScriptPackage::ReturnPackageIDObject()
     {
-    return &PckID;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnTitleObject
+    return &_PckID;
+    }
+
+
+/*
+ *@@ReturnTitleObject:
  *  Returns pointer to PackageID object.
  */
 ScriptTitle *ScriptPackage::ReturnTitleObject()
     {
-    return &Title;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnTargetObject
+    return &_Title;
+    }
+
+
+/*
+ *@@ReturnTargetObject:
  *  Returns pointer to Target object.
  */
 ScriptTarget *ScriptPackage::ReturnTargetObject()
     {
-    return &Target;
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnTargetText
+    return &_Target;
+    }
+
+
+/*
+ *@@ReturnTargetText:
  *  Returns pointer to title text.
  */
 const PSZ ScriptPackage::ReturnTargetText()
     {
-    return Target.ReturnTarget();
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnKeyWordObject
+    return _Target.ReturnTarget();
+    }
+
+
+/*
+ *@@ReturnKeyWordObject:
  *  Returns pointer to PackageID object.
  */
 ScriptKeyWord *ScriptPackage::ReturnKeyWordObject()
     {
-    return &KeyWords;
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnIndex
- *  Returns index number.
- */
-USHORT ScriptPackage::ReturnIndex()
-    {
-    return usIndex;
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnPackageIndex
+    return &_KeyWords;
+    }
+
+
+/*
+ *@@ReturnPackageIndex:
  *  Returns package index number.
  */
 ScriptIndex *ScriptPackage::ReturnPackageIndex()
     {
-    return &Index;
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnPackageIndex
+    return &_Index;
+    }
+
+
+/*
+ *@@ReturnPackageIndex:
  *  Returns package index number.
  */
 USHORT ScriptPackage::ReturnPackageIndexNumber()
     {
-    return Index.ReturnIndexAttribute();
-    }
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::MakeScriptText
+    return _Index.ReturnIndexAttribute();
+    }
+
+
+/*
+ *@@MakeScriptText:
  *  Returns pointer to script text.
  */
-PSZ ScriptPackage::MakeScriptText(BOOL bAttribute)
+PSZ ScriptPackage::MakeScriptText(BOOL p_bAttribute)
     {
     XSTRING strScript;
@@ -5321 +5997 @@
     USHORT usIndex;
 
-    if (bAttribute)
+    if (p_bAttribute)
         {
         sprintf(szTag, "<%s ", SZ_TAG_PACKAGE);
@@ -5328 +6004 @@
     //sprintf(szAttribute, "%s=%i\n", SZ_ATTRIBUTE_INDEX, Index.ReturnIndexAttribute());
     xstrcat(&strScript, "\t", 0);
-    pszTemp = Index.MakeScriptText(bAttribute);
+    pszTemp = _Index.MakeScriptText(p_bAttribute);
     xstrcat(&strScript, pszTemp, 0);
     delete [] pszTemp;
@@ -5334 +6010 @@
 
     xstrcat(&strScript, "\t", 0);
-    pszTemp = PckID.MakeScriptText(bAttribute);
+    pszTemp = _PckID.MakeScriptText(p_bAttribute);
     xstrcat(&strScript, pszTemp, 0);
     delete [] pszTemp;
@@ -5340 +6016 @@
 
     xstrcat(&strScript, "\t", 0);
-    pszTemp = Title.MakeScriptText(bAttribute);
+    pszTemp = _Title.MakeScriptText(p_bAttribute);
     xstrcat(&strScript, pszTemp, 0);
     delete [] pszTemp;
@@ -5346 +6022 @@
 
     xstrcat(&strScript, "\t", 0);
-    pszTemp = Target.MakeScriptText(bAttribute);
+    pszTemp = _Target.MakeScriptText(p_bAttribute);
     xstrcat(&strScript, pszTemp, 0);
     delete [] pszTemp;
@@ -5352 +6028 @@
 
     xstrcat(&strScript, "\t", 0);
-    pszTemp = KeyWords.MakeScriptText(bAttribute);
+    pszTemp = _KeyWords.MakeScriptText(p_bAttribute);
     xstrcat(&strScript, pszTemp, 0);
     delete [] pszTemp;
     xstrcat(&strScript, "\n", 0);
 
-    for (usIndex = 0; usIndex < usRequiresCount; usIndex ++)
-        {
-        pszTemp = pRequires[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usRequiresCount; usIndex ++)
+        {
+        pszTemp = _pRequires[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5366 +6042 @@
         }
 
-    for (usIndex = 0; usIndex < usConfigSysCount; usIndex ++)
-        {
-        pszTemp = pConfigSys[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usConfigSysCount; usIndex ++)
+        {
+        pszTemp = _pConfigSys[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5375 +6051 @@
         }
 
-    for (usIndex = 0; usIndex < usRegisterClassCount; usIndex ++)
-        {
-        pszTemp = pRegisterClass[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usRegisterClassCount; usIndex ++)
+        {
+        pszTemp = _pRegisterClass[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5385 +6061 @@
 
 
-    for (usIndex = 0; usIndex < usReplaceClassCount; usIndex ++)
-        {
-        pszTemp = pReplaceClass[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usReplaceClassCount; usIndex ++)
+        {
+        pszTemp = _pReplaceClass[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5395 +6071 @@
 
 
-    for (usIndex = 0; usIndex < usCreateObjectCount; usIndex ++)
-        {
-        pszTemp = pCreateObject[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usCreateObjectCount; usIndex ++)
+        {
+        pszTemp = _pCreateObject[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5404 +6080 @@
         }
 
-    for (usIndex = 0; usIndex < usExecuteCount; usIndex ++)
-        {
-        pszTemp = pExecute[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usExecuteCount; usIndex ++)
+        {
+        pszTemp = _pExecute[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5414 +6090 @@
 
 
-    for (usIndex = 0; usIndex < usProfileCount; usIndex ++)
-        {
-        pszTemp = pProfile[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usProfileCount; usIndex ++)
+        {
+        pszTemp = _pProfile[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5423 +6099 @@
         }
 
-    for (usIndex = 0; usIndex < usWriteProfileCount; usIndex ++)
-        {
-        pszTemp = pWriteProfile[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usWriteProfileCount; usIndex ++)
+        {
+        pszTemp = _pWriteProfile[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5432 +6108 @@
         }
 
-    for (usIndex = 0; usIndex < usKillProcessCount; usIndex ++)
-        {
-        pszTemp = pKillProcess[usIndex].MakeScriptText(bAttribute);
+    for (usIndex = 0; usIndex < _usKillProcessCount; usIndex ++)
+        {
+        pszTemp = _pKillProcess[usIndex].MakeScriptText(p_bAttribute);
         xstrcat(&strScript, "\t", 0);
         xstrcat(&strScript, pszTemp, 0);
@@ -5442 +6118 @@
 
 
-    if (bAttribute)
+    if (p_bAttribute)
         xstrcat(&strScript, ">", 0);
-    if (pszDescription)
-        xstrcat(&strScript, pszDescription, 0);
-
-    if (bAttribute)
+    if (_pszDescription)
+        xstrcat(&strScript, _pszDescription, 0);
+
+    if (p_bAttribute)
         {
         sprintf(szTag, "<%s>", SZ_TAG_ENDPACKAGE);
@@ -5457 +6133 @@
 
 
-
-
-/***********************************
- *  ScriptRequires object handling.
- ***********************************
- * Here are functions when handling ScriptRequires objects. These functions
- * are only way to add, remove or find desired ScriptRequire object.
- */
-
-/***************************************************************************
- *@@ ScriptPackage::CopyTable
- *  Copies source table to destination table.
- */
-ScriptRequires *ScriptPackage::CopyTable(ScriptRequires *DestTable,//in: Pointer to destination table.
-                                        ScriptRequires *SrcTable,//in: Pointer to source table.
-                                        USHORT usSize,//in: Size of source table.
-                                        USHORT usSkipIndex)//in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+/*
+ *@@CreateRequiresObject:
+ *  Creates new requires object and returns pointer to it.
+ */
+ScriptRequires *ScriptPackage::CreateRequiresObject()
+    {
+    ScriptRequires *requires, *pNewRequires, *pTemp;
+
+    // Create new table for ScriptRequires objects.
+    if (!(requires = new ScriptRequires[++_usRequiresCount]))
+        {
+        _usRequiresCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptRequires *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found, dec 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptRequires *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateRequiresObject
- *  Creates new requires object and returns pointer to it.
- */
-ScriptRequires *ScriptPackage::CreateRequiresObject()
-    {
-    ScriptRequires *requires, *pNewRequires;
-
-    // Create new table for ScriptRequires objects.
-    if (!(requires = new ScriptRequires[++usRequiresCount]))
-        {
-        usRequiresCount --;
-        return NULL;
         }
 
     // Set new object's index to first unused index.
-    requires[usRequiresCount - 1].SetIndex(FindUnusedIndex(this->pRequires,
-        usRequiresCount - 1));
-
-    CopyTable(requires, this->pRequires, usRequiresCount - 1);
-    delete [] this->pRequires;
-    this->pRequires = requires;
-    pNewRequires = &this->pRequires[usRequiresCount - 1];
+    requires[_usRequiresCount - 1].SetIndex(FindUnusedIndex(this->_pRequires,
+        (USHORT)(_usRequiresCount - 1)));
+
+    CopyTable(requires, this->_pRequires, (USHORT)(_usRequiresCount - 1), (USHORT)0);
+    delete [] this->_pRequires;
+    this->_pRequires = requires;
+    pNewRequires = &this->_pRequires[_usRequiresCount - 1];
     return pNewRequires;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateRequiresObject
+/*
+ *@@CreateRequiresObject
  *  Creates requires object and sets datas and returns pointer to it.
  *  Also sets datas according to requiresData.
  */
-ScriptRequires *ScriptPackage::CreateRequiresObject(REQUIRESDATA requiresData)
+ScriptRequires *ScriptPackage::CreateRequiresObject(REQUIRESDATA p_requiresData)
     {
     ScriptRequires *RequiresObject = CreateRequiresObject();
 
-    RequiresObject->SetRequires(requiresData);
+    RequiresObject->SetRequires(p_requiresData);
     return RequiresObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnRequiresObject
+/*
+ *@@ReturnRequiresObject
  *  Returns object which index is given usIndex.
  */
-ScriptRequires *ScriptPackage::ReturnRequiresObject(USHORT usIndex)
+ScriptRequires *ScriptPackage::ReturnRequiresObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usRequiresCount; Index ++)
-        if (pRequires[Index].ReturnIndex() == usIndex)
-            return &pRequires[Index];
+    for (Index = 0; Index < this->_usRequiresCount; Index ++)
+        if (_pRequires[Index].ReturnIndex() == p_usIndex)
+            return &_pRequires[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteRequiresObject
+/*
+ *@@DeleteRequiresObject:
  *  Deletes object which index is given in usIndex.
  */
-USHORT ScriptPackage::DeleteRequiresObject(USHORT usIndex)
+USHORT ScriptPackage::DeleteRequiresObject(USHORT p_usIndex)
     {
     ScriptRequires *TempRequires = NULL;
 
-    if (usRequiresCount > 1)
-        {
-        TempRequires = new ScriptRequires[usRequiresCount - 1];
-        CopyTable(TempRequires, pRequires, usRequiresCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempRequires, usRequiresCount - 1);
-        }
-    delete [] pRequires;
-    pRequires = TempRequires;
-    usRequiresCount --;
+    if (_usRequiresCount > 1)
+        {
+        TempRequires = new ScriptRequires[_usRequiresCount - 1];
+        CopyTable(TempRequires, _pRequires, _usRequiresCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempRequires, (USHORT)(_usRequiresCount - 1));
+        }
+    delete [] _pRequires;
+    _pRequires = TempRequires;
+    _usRequiresCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteRequiresObject
+/*
+ *@@DeleteRequiresObject:
  *  Deletes object which address is *ScriptRequiresObject.
  */
-USHORT ScriptPackage::DeleteRequiresObject(ScriptRequires *ScriptRequiresObject)
+USHORT ScriptPackage::DeleteRequiresObject(ScriptRequires *p_pScriptRequiresObject)
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptRequiresObject)
+    if (!p_pScriptRequiresObject)
         return 1;
 
@@ -5677 +6226 @@
     while (TRUE)
         {
-        if (&pRequires[Index] == ScriptRequiresObject)
+        if (&_pRequires[Index] == p_pScriptRequiresObject)
             break;
         Index ++;
-        if (Index >= usRequiresCount)
+        if (Index >= _usRequiresCount)
             return 2;
         }
 
-    usDelete = pRequires[Index].ReturnIndex();
+    usDelete = _pRequires[Index].ReturnIndex();
     rc = DeleteRequiresObject(usDelete);
 
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnRequiresObjectCount
+/*
+ *@@ReturnRequiresObjectCount:
  *  Returns count number of ScriptRequiresObjects.
  */
 USHORT ScriptPackage::ReturnRequiresObjectCount()
     {
-    return usRequiresCount;
-    }
-
-
-
-
-
-/***********************************
- *  ScriptConfigSys object handling.
- ***********************************
- * Here are functions when handling ScriptConfigSys objects. These functions
- * are only way to add, remove or find desired ScriptConfigSys object.
- */
-
-/***************************************************************************
- *@@ ScriptConfigSys::CopyTable
- *  Copies source table to destination table.
- */
-ScriptConfigSys *ScriptPackage::CopyTable(ScriptConfigSys *DestTable,
-                                        ScriptConfigSys *SrcTable,
-                                        USHORT usSize, USHORT usSkipIndex)
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usRequiresCount;
+    }
+
+
+/*
+ *@@CreateConfigSysObject:
+ *  Creates new ConfigSys object and returns pointer to it.
+ */
+ScriptConfigSys *ScriptPackage::CreateConfigSysObject()
+    {
+    ScriptConfigSys *Object, *NewObject;
+
+    if (!(Object = new ScriptConfigSys[++_usConfigSysCount]))
+        {
+        _usConfigSysCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptConfigSys::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptConfigSys *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptConfigSys *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateConfigSysObject
- *  Creates new ConfigSys object and returns pointer to it.
- */
-ScriptConfigSys *ScriptPackage::CreateConfigSysObject()
-    {
-    ScriptConfigSys *Object, *NewObject;
-
-    if (!(Object = new ScriptConfigSys[++usConfigSysCount]))
-        {
-        usConfigSysCount --;
-        return NULL;
-        }
-
-    Object[usConfigSysCount - 1].SetIndex(FindUnusedIndex(this->pConfigSys,
-        usConfigSysCount - 1));
-
-    CopyTable(Object, this->pConfigSys, usConfigSysCount - 1);
-    delete [] this->pConfigSys;
-    this->pConfigSys = Object;
-    NewObject = &this->pConfigSys[usConfigSysCount - 1];
+        }
+
+    Object[_usConfigSysCount - 1].SetIndex(FindUnusedIndex(this->_pConfigSys,
+        (USHORT)(_usConfigSysCount - 1)));
+
+    CopyTable(Object, this->_pConfigSys, (USHORT)(_usConfigSysCount - 1), (USHORT)0);
+    delete [] this->_pConfigSys;
+    this->_pConfigSys = Object;
+    NewObject = &this->_pConfigSys[_usConfigSysCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateConfigSysObject
+/*
+ *@@CreateConfigSysObject:
  *  Creates ConfigSys object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptConfigSys *ScriptPackage::CreateConfigSysObject(CONFIGSYSDATA data)
+ScriptConfigSys *ScriptPackage::CreateConfigSysObject(CONFIGSYSDATA p_data)
     {
     ScriptConfigSys *ConfigSysObject = CreateConfigSysObject();
 
-    ConfigSysObject->SetConfigSys(data);
+    ConfigSysObject->SetConfigSys(p_data);
     return ConfigSysObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnConfigSysObject
+/*
+ *@@ReturnConfigSysObject:
  *  Returns object which index is given usIndex.
  */
-ScriptConfigSys *ScriptPackage::ReturnConfigSysObject(USHORT usIndex)
+ScriptConfigSys *ScriptPackage::ReturnConfigSysObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usConfigSysCount; Index ++)
-        if (pConfigSys[Index].ReturnIndex() == usIndex)
-            return &pConfigSys[Index];
+    for (Index = 0; Index < this->_usConfigSysCount; Index ++)
+        if (_pConfigSys[Index].ReturnIndex() == p_usIndex)
+            return &_pConfigSys[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteConfigSysObject
+/*
+ *@@DeleteConfigSysObject:
  *  Deletes object which index is given in usIndex.
  */
-USHORT ScriptPackage::DeleteConfigSysObject(USHORT usIndex)
+USHORT ScriptPackage::DeleteConfigSysObject(USHORT p_usIndex)
     {
     ScriptConfigSys *TempConfigSys = NULL;
 
-    if (usConfigSysCount > 1)
-        {
-        TempConfigSys = new ScriptConfigSys[usConfigSysCount - 1];
-        CopyTable(TempConfigSys, pConfigSys, usConfigSysCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempConfigSys, usConfigSysCount - 1);
-        }
-    delete [] pConfigSys;
-    pConfigSys = TempConfigSys;
-    usConfigSysCount --;
+    if (_usConfigSysCount > 1)
+        {
+        TempConfigSys = new ScriptConfigSys[_usConfigSysCount - 1];
+        CopyTable(TempConfigSys, _pConfigSys, _usConfigSysCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempConfigSys, (USHORT)(_usConfigSysCount - 1));
+        }
+    delete [] _pConfigSys;
+    _pConfigSys = TempConfigSys;
+    _usConfigSysCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteConfigSysObject
+/*
+ *@@DeleteConfigSysObject:
  *  Deletes object which address is *ScriptConfigSysObject.
  */
-USHORT ScriptPackage::DeleteConfigSysObject(ScriptConfigSys *ScriptConfigSysObject)
+USHORT ScriptPackage::DeleteConfigSysObject(ScriptConfigSys *p_pScriptConfigSysObject)
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptConfigSysObject)
+    if (!p_pScriptConfigSysObject)
         return 1;
 
@@ -5922 +6341 @@
     while (TRUE)
         {
-        if (&pConfigSys[Index] == ScriptConfigSysObject)
+        if (&_pConfigSys[Index] == p_pScriptConfigSysObject)
             break;
         Index ++;
-        if (Index >= usConfigSysCount)
+        if (Index >= _usConfigSysCount)
             return 2;
         }
 
-    usDelete = pConfigSys[Index].ReturnIndex();
+    usDelete = _pConfigSys[Index].ReturnIndex();
     rc = DeleteConfigSysObject(usDelete);
 
@@ -5937 +6356 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnConfigSysObjectCount
+/*
+ *@@ReturnConfigSysObjectCount:
  *  Returns count number of ScriptConfigSysObjects.
  */
 USHORT ScriptPackage::ReturnConfigSysObjectCount()
     {
-    return usConfigSysCount;
-    }
-
-
-
-
-
-/****************************************
- *  ScriptRegisterClass object handling.
- ****************************************
- * Here are functions when handling ScriptRegisterClass objects. These functions
- * are only way to add, remove or find desired ScriptRegisterClass object.
- */
-
-/***************************************************************************
- *@@ ScriptRegisterClass::CopyTable
- *  Copies source table to destination table.
- */
-ScriptRegisterClass *ScriptPackage::CopyTable(ScriptRegisterClass *DestTable, // in: Pointer to destination table.
-                                             ScriptRegisterClass *SrcTable, // in: Pointer to source table.
-                                             USHORT usSize, // in: Size of source table.
-                                             USHORT usSkipIndex) // in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usConfigSysCount;
+    }
+
+
+/*
+ *@@CreateRegisterClassObject:
+ *  Creates new RegisterClass object and returns pointer to it.
+ */
+ScriptRegisterClass *ScriptPackage::CreateRegisterClassObject()
+    {
+    ScriptRegisterClass *Object, *NewObject;
+
+    if (!(Object = new ScriptRegisterClass[++_usRegisterClassCount]))
+        {
+        _usRegisterClassCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptRegisterClass::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptRegisterClass *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptRegisterClass *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateRegisterClassObject
- *  Creates new RegisterClass object and returns pointer to it.
- */
-ScriptRegisterClass *ScriptPackage::CreateRegisterClassObject()
-    {
-    ScriptRegisterClass *Object, *NewObject;
-
-    if (!(Object = new ScriptRegisterClass[++usRegisterClassCount]))
-        {
-        usRegisterClassCount --;
-        return NULL;
-        }
-
-    Object[usRegisterClassCount - 1].SetIndex(FindUnusedIndex(this->pRegisterClass,
-        usRegisterClassCount - 1));
-
-    CopyTable(Object, this->pRegisterClass, usRegisterClassCount - 1);
-    delete [] this->pRegisterClass;
-    this->pRegisterClass = Object;
-    NewObject = &this->pRegisterClass[usRegisterClassCount - 1];
+        }
+
+    Object[_usRegisterClassCount - 1].SetIndex(FindUnusedIndex(this->_pRegisterClass,
+        (USHORT)(_usRegisterClassCount - 1)));
+
+    CopyTable(Object, this->_pRegisterClass, (USHORT)(_usRegisterClassCount - 1),
+              (USHORT)0);
+    delete [] this->_pRegisterClass;
+    this->_pRegisterClass = Object;
+    NewObject = &this->_pRegisterClass[_usRegisterClassCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateRegisterClassObject
+/*
+ *@@CreateRegisterClassObject:
  *  Creates RegisterClass object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptRegisterClass *ScriptPackage::CreateRegisterClassObject(REGISTERCLASSDATA data)
+ScriptRegisterClass *ScriptPackage::CreateRegisterClassObject(REGISTERCLASSDATA p_data)
     {
     ScriptRegisterClass *RegisterClassObject = CreateRegisterClassObject();
 
-    RegisterClassObject->SetRegisterClass(data);
+    RegisterClassObject->SetRegisterClass(p_data);
     return RegisterClassObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnRegisterClassObject
- *  Returns object which index is given usIndex.
- */
-ScriptRegisterClass *ScriptPackage::ReturnRegisterClassObject(USHORT usIndex)
+/*
+ *@@ReturnRegisterClassObject:
+ *  Returns object which index is given p_usIndex.
+ */
+ScriptRegisterClass *ScriptPackage::ReturnRegisterClassObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usRegisterClassCount; Index ++)
-        if (pRegisterClass[Index].ReturnIndex() == usIndex)
-            return &pRegisterClass[Index];
+    for (Index = 0; Index < this->_usRegisterClassCount; Index ++)
+        if (_pRegisterClass[Index].ReturnIndex() == p_usIndex)
+            return &_pRegisterClass[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteRegisterClassObject
- *  Deletes object which index is given in usIndex.
- */
-USHORT ScriptPackage::DeleteRegisterClassObject(USHORT usIndex)
+/*
+ *@@DeleteRegisterClassObject:
+ *  Deletes object which index is given in p_usIndex.
+ */
+USHORT ScriptPackage::DeleteRegisterClassObject(USHORT p_usIndex)
     {
     ScriptRegisterClass *TempRegisterClass = NULL;
 
-    if (usRegisterClassCount > 1)
-        {
-        TempRegisterClass = new ScriptRegisterClass[usRegisterClassCount - 1];
-        CopyTable(TempRegisterClass, pRegisterClass, usRegisterClassCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempRegisterClass, usRegisterClassCount - 1);
-        }
-    delete [] pRegisterClass;
-    pRegisterClass = TempRegisterClass;
-    usRegisterClassCount --;
+    if (_usRegisterClassCount > 1)
+        {
+        TempRegisterClass = new ScriptRegisterClass[_usRegisterClassCount - 1];
+        CopyTable(TempRegisterClass, _pRegisterClass, _usRegisterClassCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempRegisterClass, (USHORT)(_usRegisterClassCount - 1));
+        }
+    delete [] _pRegisterClass;
+    _pRegisterClass = TempRegisterClass;
+    _usRegisterClassCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteRegisterClassObject
+/*
+ *@@DeleteRegisterClassObject:
  *  Deletes object which address is *ScriptRegisterClassObject.
  */
-USHORT ScriptPackage::DeleteRegisterClassObject(ScriptRegisterClass *ScriptRegisterClassObject)
+USHORT ScriptPackage::DeleteRegisterClassObject(
+                      ScriptRegisterClass *p_pScriptRegisterClassObject
+                                               )
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptRegisterClassObject)
+    if (!p_pScriptRegisterClassObject)
         return 1;
 
@@ -6168 +6460 @@
     while (TRUE)
         {
-        if (&pRegisterClass[Index] == ScriptRegisterClassObject)
+        if (&_pRegisterClass[Index] == p_pScriptRegisterClassObject)
             break;
         Index ++;
-        if (Index >= usRegisterClassCount)
+        if (Index >= _usRegisterClassCount)
             return 2;
         }
 
-    usDelete = pRegisterClass[Index].ReturnIndex();
+    usDelete = _pRegisterClass[Index].ReturnIndex();
     rc = DeleteRegisterClassObject(usDelete);
 
@@ -6183 +6475 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnRegisterClassObjectCount
+/*
+ *@@ReturnRegisterClassObjectCount:
  *  Returns count number of ScriptRegisterClassObjects.
  */
 USHORT ScriptPackage::ReturnRegisterClassObjectCount()
     {
-    return usRegisterClassCount;
-    }
-
-
-
-
-
-/****************************************
- *  ScriptReplaceClass object handling.
- ****************************************
- * Here are functions when handling ScriptReplaceClass objects. These functions
- * are only way to add, remove or find desired ScriptReplaceClass object.
- */
-
-/***************************************************************************
- *@@ ScriptReplaceClass::CopyTable
- *  Copies source table to destination table.
- */
-ScriptReplaceClass *ScriptPackage::CopyTable(ScriptReplaceClass *DestTable, // in: Pointer to destination table.
-                                             ScriptReplaceClass *SrcTable, // in: Pointer to source table.
-                                             USHORT usSize, // in: Size of source table.
-                                             USHORT usSkipIndex) // in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usRegisterClassCount;
+    }
+
+
+/*
+ *@@CreateReplaceClassObject:
+ *  Creates new ReplaceClass object and returns pointer to it.
+ */
+ScriptReplaceClass *ScriptPackage::CreateReplaceClassObject()
+    {
+    ScriptReplaceClass *Object, *NewObject;
+
+    if (!(Object = new ScriptReplaceClass[++_usReplaceClassCount]))
+        {
+        _usReplaceClassCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptReplaceClass::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptReplaceClass *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptReplaceClass *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateReplaceClassObject
- *  Creates new ReplaceClass object and returns pointer to it.
- */
-ScriptReplaceClass *ScriptPackage::CreateReplaceClassObject()
-    {
-    ScriptReplaceClass *Object, *NewObject;
-
-    if (!(Object = new ScriptReplaceClass[++usReplaceClassCount]))
-        {
-        usReplaceClassCount --;
-        return NULL;
-        }
-
-    Object[usReplaceClassCount - 1].SetIndex(FindUnusedIndex(this->pReplaceClass,
-        usReplaceClassCount - 1));
-
-    CopyTable(Object, this->pReplaceClass, usReplaceClassCount - 1);
-    delete [] this->pReplaceClass;
-    this->pReplaceClass = Object;
-    NewObject = &this->pReplaceClass[usReplaceClassCount - 1];
+        }
+
+    Object[_usReplaceClassCount - 1].SetIndex(FindUnusedIndex(this->_pReplaceClass,
+        (USHORT)(_usReplaceClassCount - 1)));
+
+    CopyTable(Object, this->_pReplaceClass, (USHORT)(_usReplaceClassCount - 1),
+              (USHORT)0);
+    delete [] this->_pReplaceClass;
+    this->_pReplaceClass = Object;
+    NewObject = &this->_pReplaceClass[_usReplaceClassCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateReplaceClassObject
+/*
+ *@@CreateReplaceClassObject:
  *  Creates ReplaceClass object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptReplaceClass *ScriptPackage::CreateReplaceClassObject(REPLACECLASSDATA data)
+ScriptReplaceClass *ScriptPackage::CreateReplaceClassObject(REPLACECLASSDATA p_data)
     {
     ScriptReplaceClass *ReplaceClassObject = CreateReplaceClassObject();
 
-    ReplaceClassObject->SetReplaceClass(data);
+    ReplaceClassObject->SetReplaceClass(p_data);
     return ReplaceClassObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnReplaceClassObject
+/*
+ *@@ReturnReplaceClassObject:
  *  Returns object which index is given usIndex.
  */
-ScriptReplaceClass *ScriptPackage::ReturnReplaceClassObject(USHORT usIndex)
+ScriptReplaceClass *ScriptPackage::ReturnReplaceClassObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usReplaceClassCount; Index ++)
-        if (pReplaceClass[Index].ReturnIndex() == usIndex)
-            return &pReplaceClass[Index];
+    for (Index = 0; Index < this->_usReplaceClassCount; Index ++)
+        if (_pReplaceClass[Index].ReturnIndex() == p_usIndex)
+            return &_pReplaceClass[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteReplaceClassObject
+/*
+ *@@DeleteReplaceClassObject:
  *  Deletes object which index is given in usIndex.
  */
-USHORT ScriptPackage::DeleteReplaceClassObject(USHORT usIndex)
+USHORT ScriptPackage::DeleteReplaceClassObject(USHORT p_usIndex)
     {
     ScriptReplaceClass *TempReplaceClass = NULL;
 
-    if (usReplaceClassCount > 1)
-        {
-        TempReplaceClass = new ScriptReplaceClass[usReplaceClassCount - 1];
-        CopyTable(TempReplaceClass, pReplaceClass, usReplaceClassCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempReplaceClass, usReplaceClassCount - 1);
-        }
-    delete [] pReplaceClass;
-    pReplaceClass = TempReplaceClass;
-    usReplaceClassCount --;
+    if (_usReplaceClassCount > 1)
+        {
+        TempReplaceClass = new ScriptReplaceClass[_usReplaceClassCount - 1];
+        CopyTable(TempReplaceClass, _pReplaceClass, _usReplaceClassCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempReplaceClass, (USHORT)(_usReplaceClassCount - 1));
+        }
+    delete [] _pReplaceClass;
+    _pReplaceClass = TempReplaceClass;
+    _usReplaceClassCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteReplaceClassObject
+/*
+ *@@DeleteReplaceClassObject:
  *  Deletes object which address is *ScriptReplaceClassObject.
  */
-USHORT ScriptPackage::DeleteReplaceClassObject(ScriptReplaceClass *ScriptReplaceClassObject)
+USHORT ScriptPackage::DeleteReplaceClassObject(
+                      ScriptReplaceClass *p_pScriptReplaceClassObject
+                                              )
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptReplaceClassObject)
+    if (!p_pScriptReplaceClassObject)
         return 1;
 
@@ -6414 +6579 @@
     while (TRUE)
         {
-        if (&pReplaceClass[Index] == ScriptReplaceClassObject)
+        if (&_pReplaceClass[Index] == p_pScriptReplaceClassObject)
             break;
         Index ++;
-        if (Index >= usReplaceClassCount)
+        if (Index >= _usReplaceClassCount)
             return 2;
         }
 
-    usDelete = pReplaceClass[Index].ReturnIndex();
+    usDelete = _pReplaceClass[Index].ReturnIndex();
     rc = DeleteReplaceClassObject(usDelete);
 
@@ -6429 +6594 @@
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnReplaceClassObjectCount
+/*
+ *@@ReturnReplaceClassObjectCount:
  *  Returns count number of ScriptReplaceClassObjects.
  */
 USHORT ScriptPackage::ReturnReplaceClassObjectCount()
     {
-    return usReplaceClassCount;
-    }
-
-
-
-
-
-/****************************************
- *  ScriptCreateObject object handling.
- ****************************************
- * Here are functions when handling ScriptCreateObject objects. These functions
- * are only way to add, remove or find desired ScriptCreateObject object.
- */
-
-/***************************************************************************
- *@@ ScriptCreateObject::CopyTable
- *  Copies source table to destination table.
- */
-ScriptCreateObject *ScriptPackage::CopyTable(ScriptCreateObject *DestTable, // in: Pointer to destination table.
-                                             ScriptCreateObject *SrcTable, // in: Pointer to source table.
-                                             USHORT usSize, // in: Size of source table.
-                                             USHORT usSkipIndex) // in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usReplaceClassCount;
+    }
+
+
+/*
+ *@@CreateCreateObjectObject:
+ *  Creates new CreateObject object and returns pointer to it.
+ */
+ScriptCreateObject *ScriptPackage::CreateCreateObjectObject()
+    {
+    ScriptCreateObject *Object, *NewObject;
+
+    if (!(Object = new ScriptCreateObject[++_usCreateObjectCount]))
+        {
+        _usCreateObjectCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptCreateObject::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptCreateObject *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptCreateObject *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateCreateObjectObject
- *  Creates new CreateObject object and returns pointer to it.
- */
-ScriptCreateObject *ScriptPackage::CreateCreateObjectObject()
-    {
-    ScriptCreateObject *Object, *NewObject;
-
-    if (!(Object = new ScriptCreateObject[++usCreateObjectCount]))
-        {
-        usCreateObjectCount --;
-        return NULL;
-        }
-
-    Object[usCreateObjectCount - 1].SetIndex(FindUnusedIndex(this->pCreateObject,
-        usCreateObjectCount - 1));
-
-    CopyTable(Object, this->pCreateObject, usCreateObjectCount - 1);
-    delete [] this->pCreateObject;
-    this->pCreateObject = Object;
-    NewObject = &this->pCreateObject[usCreateObjectCount - 1];
+        }
+
+    Object[_usCreateObjectCount - 1].SetIndex(FindUnusedIndex(this->_pCreateObject,
+        (USHORT)(_usCreateObjectCount - 1)));
+
+    CopyTable(Object, this->_pCreateObject, (USHORT)(_usCreateObjectCount - 1), (USHORT)0);
+    delete [] this->_pCreateObject;
+    this->_pCreateObject = Object;
+    NewObject = &this->_pCreateObject[_usCreateObjectCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateCreateObjectObject
+/*
+ *@@CreateCreateObjectObject:
  *  Creates CreateObject object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptCreateObject *ScriptPackage::CreateCreateObjectObject(CREATEOBJECTDATA data)
+ScriptCreateObject *ScriptPackage::CreateCreateObjectObject(CREATEOBJECTDATA p_data)
     {
     ScriptCreateObject *CreateObjectObject = CreateCreateObjectObject();
 
-    CreateObjectObject->SetCreateObject(data);
+    CreateObjectObject->SetCreateObject(p_data);
     return CreateObjectObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnCreateObjectObject
+/*
+ *@@ReturnCreateObjectObject:
  *  Returns object which index is given usIndex.
  */
-ScriptCreateObject *ScriptPackage::ReturnCreateObjectObject(USHORT usIndex)
+ScriptCreateObject *ScriptPackage::ReturnCreateObjectObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usCreateObjectCount; Index ++)
-        if (pCreateObject[Index].ReturnIndex() == usIndex)
-            return &pCreateObject[Index];
+    for (Index = 0; Index < this->_usCreateObjectCount; Index ++)
+        if (_pCreateObject[Index].ReturnIndex() == p_usIndex)
+            return &_pCreateObject[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
+/*
  *@@ ScriptPackage::DeleteCreateObjectObject
  *  Deletes object which index is given in usIndex.
  */
-USHORT ScriptPackage::DeleteCreateObjectObject(USHORT usIndex)
+USHORT ScriptPackage::DeleteCreateObjectObject(USHORT p_usIndex)
     {
     ScriptCreateObject *TempCreateObject = NULL;
 
-    if (usCreateObjectCount > 1)
-        {
-        TempCreateObject = new ScriptCreateObject[usCreateObjectCount - 1];
-        CopyTable(TempCreateObject, pCreateObject, usCreateObjectCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempCreateObject, usCreateObjectCount - 1);
-        }
-    delete [] pCreateObject;
-    pCreateObject = TempCreateObject;
-    usCreateObjectCount --;
+    if (_usCreateObjectCount > 1)
+        {
+        TempCreateObject = new ScriptCreateObject[_usCreateObjectCount - 1];
+        CopyTable(TempCreateObject, _pCreateObject, _usCreateObjectCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempCreateObject, (USHORT)(_usCreateObjectCount - 1));
+        }
+    delete [] _pCreateObject;
+    _pCreateObject = TempCreateObject;
+    _usCreateObjectCount --;
     return 0;
     }
@@ -6645 +6681 @@
 
 
-/***************************************************************************
- *@@ ScriptPackage::DeleteCreateObjectObject
- *  Deletes object which address is *ScriptCreateObjectObject.
- */
-USHORT ScriptPackage::DeleteCreateObjectObject(ScriptCreateObject *ScriptCreateObjectObject)
+/*
+ *@@DeleteCreateObjectObject:
+ *  Deletes object which address is given as an attribute.
+ */
+USHORT ScriptPackage::DeleteCreateObjectObject(
+                      ScriptCreateObject *p_pScriptCreateObjectObject
+                                              )
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptCreateObjectObject)
+    if (!p_pScriptCreateObjectObject)
         return 1;
 
@@ -6660 +6698 @@
     while (TRUE)
         {
-        if (&pCreateObject[Index] == ScriptCreateObjectObject)
+        if (&_pCreateObject[Index] == p_pScriptCreateObjectObject)
             break;
         Index ++;
-        if (Index >= usCreateObjectCount)
+        if (Index >= _usCreateObjectCount)
             return 2;
         }
 
-    usDelete = pCreateObject[Index].ReturnIndex();
+    usDelete = _pCreateObject[Index].ReturnIndex();
     rc = DeleteCreateObjectObject(usDelete);
 
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnCreateObjectObjectCount
+/*
+ *@@ReturnCreateObjectObjectCount:
  *  Returns count number of ScriptCreateObjectObjects.
  */
 USHORT ScriptPackage::ReturnCreateObjectObjectCount()
     {
-    return usCreateObjectCount;
-    }
-
-
-
-
-
-
-/****************************************
- *  ScriptClearProfile object handling.
- ****************************************
- * Here are functions when handling ScriptClearProfile objects. These functions
- * are only way to add, remove or find desired ScriptClearProfile object.
- */
-
-/***************************************************************************
- *@@ ScriptClearProfile::CopyTable
- *  Copies source table to destination table.
- */
-ScriptClearProfile *ScriptPackage::CopyTable(ScriptClearProfile *DestTable, // in: Pointer to destination table.
-                                             ScriptClearProfile *SrcTable, // in: Pointer to source table.
-                                             USHORT usSize, // in: Size of source table.
-                                             USHORT usSkipIndex) // in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usCreateObjectCount;
+    }
+
+
+/*
+ *@@CreateClearProfileObject:
+ *  Creates new ClearProfile object and returns pointer to it.
+ */
+ScriptClearProfile *ScriptPackage::CreateClearProfileObject()
+    {
+    ScriptClearProfile *Object, *NewObject;
+
+    if (!(Object = new ScriptClearProfile[++_usProfileCount]))
+        {
+        _usProfileCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptClearProfile::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptClearProfile *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptClearProfile *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateClearProfileObject
- *  Creates new ClearProfile object and returns pointer to it.
- */
-ScriptClearProfile *ScriptPackage::CreateClearProfileObject()
-    {
-    ScriptClearProfile *Object, *NewObject;
-
-    if (!(Object = new ScriptClearProfile[++usProfileCount]))
-        {
-        usProfileCount --;
-        return NULL;
-        }
-
-    Object[usProfileCount - 1].SetIndex(FindUnusedIndex(this->pProfile,
-        usProfileCount - 1));
-
-    CopyTable(Object, this->pProfile, usProfileCount - 1);
-    delete [] this->pProfile;
-    this->pProfile = Object;
-    NewObject = &this->pProfile[usProfileCount - 1];
+        }
+
+    Object[_usProfileCount - 1].SetIndex(FindUnusedIndex(this->_pProfile,
+        (USHORT)(_usProfileCount - 1)));
+
+    CopyTable(Object, this->_pProfile, (USHORT)(_usProfileCount - 1), (USHORT)0);
+    delete [] this->_pProfile;
+    this->_pProfile = Object;
+    NewObject = &this->_pProfile[_usProfileCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateClearProfileObject
+/*
+ *@@CreateClearProfileObject:
  *  Creates Profile object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptClearProfile *ScriptPackage::CreateClearProfileObject(PROFILEDATA data)
+ScriptClearProfile *ScriptPackage::CreateClearProfileObject(PROFILEDATA p_data)
     {
     ScriptClearProfile *ProfileObject = CreateClearProfileObject();
 
-    ProfileObject->SetProfile(data);
+    ProfileObject->SetProfile(p_data);
     return ProfileObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnClearProfileObject
- *  Returns object which index is given usIndex.
- */
-ScriptClearProfile *ScriptPackage::ReturnClearProfileObject(USHORT usIndex)
+/*
+ *@@ReturnClearProfileObject:
+ *  Returns object which index is given as a parameter.
+ */
+ScriptClearProfile *ScriptPackage::ReturnClearProfileObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usProfileCount; Index ++)
-        if (pProfile[Index].ReturnIndex() == usIndex)
-            return &pProfile[Index];
+    for (Index = 0; Index < this->_usProfileCount; Index ++)
+        if (_pProfile[Index].ReturnIndex() == p_usIndex)
+            return &_pProfile[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteClearProfileObject
- *  Deletes object which index is given in usIndex.
- */
-USHORT ScriptPackage::DeleteClearProfileObject(USHORT usIndex)
+/*
+ *@@DeleteClearProfileObject:
+ *  Deletes object which index is given.
+ */
+USHORT ScriptPackage::DeleteClearProfileObject(USHORT p_usIndex)
     {
     ScriptClearProfile *TempProfile = NULL;
 
-    if (usProfileCount > 1)
-        {
-        TempProfile = new ScriptClearProfile[usProfileCount - 1];
-        CopyTable(TempProfile, pProfile, usProfileCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempProfile, usProfileCount - 1);
-        }
-    delete [] pProfile;
-    pProfile = TempProfile;
-    usProfileCount --;
+    if (_usProfileCount > 1)
+        {
+        TempProfile = new ScriptClearProfile[_usProfileCount - 1];
+        CopyTable(TempProfile, _pProfile, _usProfileCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempProfile, (USHORT)(_usProfileCount - 1));
+        }
+    delete [] _pProfile;
+    _pProfile = TempProfile;
+    _usProfileCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteClearProfileObject
- *  Deletes object which address is *ScriptClearProfileObject.
+/*
+ *@@DeleteClearProfileObject:
+ *  Deletes object which address is given.
  */
 USHORT ScriptPackage::DeleteClearProfileObject(ScriptClearProfile
-                                               *ScriptClearProfileObject)
+                                               *p_pScriptClearProfileObject)
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptClearProfileObject)
+    if (!p_pScriptClearProfileObject)
         return 1;
 
@@ -6908 +6814 @@
     while (TRUE)
         {
-        if (&pProfile[Index] == ScriptClearProfileObject)
+        if (&_pProfile[Index] == p_pScriptClearProfileObject)
             break;
         Index ++;
-        if (Index >= usProfileCount)
+        if (Index >= _usProfileCount)
             return 2;
         }
 
-    usDelete = pProfile[Index].ReturnIndex();
+    usDelete = _pProfile[Index].ReturnIndex();
     rc = DeleteClearProfileObject(usDelete);
 
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnClearProfileObjectCount
+/*
+ *@@ReturnClearProfileObjectCount:
  *  Returns count number of ScriptClearProfileObjects.
  */
 USHORT ScriptPackage::ReturnClearProfileObjectCount()
     {
-    return usProfileCount;
-    }
-
-
-
-
-/***********************************
- *  ScriptWriteProfile object handling.
- ***********************************
- * Here are functions when handling ScriptWriteProfile objects. These functions
- * are only way to add, remove or find desired ScriptWriteProfile object.
- */
-
-/***************************************************************************
- *@@ ScriptWriteProfile::CopyTable
- *  Copies source table to destination table.
- */
-ScriptWriteProfile *ScriptPackage::CopyTable(ScriptWriteProfile *DestTable,
-                                        ScriptWriteProfile *SrcTable,
-                                        USHORT usSize, USHORT usSkipIndex)
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usProfileCount;
+    }
+
+
+/*
+ *@@CreateWriteProfileObject:
+ *  Creates new WriteProfile object and returns pointer to it.
+ */
+ScriptWriteProfile *ScriptPackage::CreateWriteProfileObject()
+    {
+    ScriptWriteProfile *Object, *NewObject;
+
+    if (!(Object = new ScriptWriteProfile[++_usWriteProfileCount]))
+        {
+        _usWriteProfileCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-        for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptWriteProfile::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptWriteProfile *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptWriteProfile *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateWriteProfileObject
- *  Creates new WriteProfile object and returns pointer to it.
- */
-ScriptWriteProfile *ScriptPackage::CreateWriteProfileObject()
-    {
-    ScriptWriteProfile *Object, *NewObject;
-
-    if (!(Object = new ScriptWriteProfile[++usWriteProfileCount]))
-        {
-        usWriteProfileCount --;
-        return NULL;
-        }
-
-    Object[usWriteProfileCount - 1].SetIndex(FindUnusedIndex(this->pWriteProfile,
-        usWriteProfileCount - 1));
-
-    CopyTable(Object, this->pWriteProfile, usWriteProfileCount - 1);
-    delete [] this->pWriteProfile;
-    this->pWriteProfile = Object;
-    NewObject = &this->pWriteProfile[usWriteProfileCount - 1];
+        }
+
+    Object[_usWriteProfileCount - 1].SetIndex(FindUnusedIndex(this->_pWriteProfile,
+        (USHORT)(_usWriteProfileCount - 1)));
+
+    CopyTable(Object, this->_pWriteProfile, (USHORT)(_usWriteProfileCount - 1),
+             (USHORT)0);
+    delete [] this->_pWriteProfile;
+    this->_pWriteProfile = Object;
+    NewObject = &this->_pWriteProfile[_usWriteProfileCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateWriteProfileObject
+/*
+ *@@CreateWriteProfileObject:
  *  Creates WriteProfile object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptWriteProfile *ScriptPackage::CreateWriteProfileObject(PROFILEDATA data)
+ScriptWriteProfile *ScriptPackage::CreateWriteProfileObject(PROFILEDATA p_data)
     {
     ScriptWriteProfile *WriteProfileObject = CreateWriteProfileObject();
 
-    WriteProfileObject->SetProfile(data);
+    WriteProfileObject->SetProfile(p_data);
     return WriteProfileObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnWriteProfileObject
+/*
+ *@@ReturnWriteProfileObject:
  *  Returns object which index is given usIndex.
  */
-ScriptWriteProfile *ScriptPackage::ReturnWriteProfileObject(USHORT usIndex)
+ScriptWriteProfile *ScriptPackage::ReturnWriteProfileObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usWriteProfileCount; Index ++)
-        if (pWriteProfile[Index].ReturnIndex() == usIndex)
-            return &pWriteProfile[Index];
+    for (Index = 0; Index < this->_usWriteProfileCount; Index ++)
+        if (_pWriteProfile[Index].ReturnIndex() == p_usIndex)
+            return &_pWriteProfile[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteWriteProfileObject
- *  Deletes object which index is given in usIndex.
- */
-USHORT ScriptPackage::DeleteWriteProfileObject(USHORT usIndex)
+/*
+ *@@DeleteWriteProfileObject:
+ *  Deletes object which index is given in as a parameter.
+ */
+USHORT ScriptPackage::DeleteWriteProfileObject(USHORT p_usIndex)
     {
     ScriptWriteProfile *TempWriteProfile = NULL;
 
-    if (usWriteProfileCount > 1)
-        {
-        TempWriteProfile = new ScriptWriteProfile[usWriteProfileCount - 1];
-        CopyTable(TempWriteProfile, pWriteProfile, usWriteProfileCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempWriteProfile, usWriteProfileCount - 1);
-        }
-    delete [] pWriteProfile;
-    pWriteProfile = TempWriteProfile;
-    usWriteProfileCount --;
+    if (_usWriteProfileCount > 1)
+        {
+        TempWriteProfile = new ScriptWriteProfile[_usWriteProfileCount - 1];
+        CopyTable(TempWriteProfile, _pWriteProfile, _usWriteProfileCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempWriteProfile, (USHORT)(_usWriteProfileCount - 1));
+        }
+    delete [] _pWriteProfile;
+    _pWriteProfile = TempWriteProfile;
+    _usWriteProfileCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteWriteProfileObject
- *  Deletes object which address is *ScriptWriteProfileObject.
- */
-USHORT ScriptPackage::DeleteWriteProfileObject(ScriptWriteProfile *ScriptWriteProfileObject)
+/*
+ *@@DeleteWriteProfileObject:
+ *  Deletes object which address is given as a parameter.
+ */
+USHORT ScriptPackage::DeleteWriteProfileObject(
+                      ScriptWriteProfile *p_pScriptWriteProfileObject
+                                              )
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptWriteProfileObject)
+    if (!p_pScriptWriteProfileObject)
         return 1;
 
@@ -7152 +6932 @@
     while (TRUE)
         {
-        if (&pWriteProfile[Index] == ScriptWriteProfileObject)
+        if (&_pWriteProfile[Index] == p_pScriptWriteProfileObject)
             break;
         Index ++;
-        if (Index >= usWriteProfileCount)
+        if (Index >= _usWriteProfileCount)
             return 2;
         }
 
-    usDelete = pWriteProfile[Index].ReturnIndex();
+    usDelete = _pWriteProfile[Index].ReturnIndex();
     rc = DeleteWriteProfileObject(usDelete);
-
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnWriteProfileObjectCount
+/*
+ *@@ReturnWriteProfileObjectCount:
  *  Returns count number of ScriptWriteProfileObjects.
  */
 USHORT ScriptPackage::ReturnWriteProfileObjectCount()
     {
-    return usWriteProfileCount;
-    }
-
-
-
-
-
-
-/****************************************
- *  ScriptExecute object handling.
- ****************************************
- * Here are functions when handling ScriptExecute objects. These functions
- * are only way to add, remove or find desired ScriptExecute object.
- */
-
-/***************************************************************************
- *@@ ScriptExecute::CopyTable
- *  Copies source table to destination table.
- */
-ScriptExecute *ScriptPackage::CopyTable(ScriptExecute *DestTable, // in: Pointer to destination table.
-                                             ScriptExecute *SrcTable, // in: Pointer to source table.
-                                             USHORT usSize, // in: Size of source table.
-                                             USHORT usSkipIndex) // in: Index to be skipped. If 0 no skipping.
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usWriteProfileCount;
+    }
+
+
+/*
+ *@@CreateExecuteObject:
+ *  Creates new Execute object and returns pointer to it.
+ */
+ScriptExecute *ScriptPackage::CreateExecuteObject()
+    {
+    ScriptExecute *Object, *NewObject;
+
+    if (!(Object = new ScriptExecute[++_usExecuteCount]))
+        {
+        _usExecuteCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-        for (SrcIndex = 0, DestIndex = 0; SrcIndex < usSize; SrcIndex ++, DestIndex ++)
-        {
-        if (SrcTable[SrcIndex].ReturnIndex() == usSkipIndex)
-            if (SrcIndex < usSize - 1)
-                SrcIndex ++;
-            else
-                break;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptExecute::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptExecute *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptExecute *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateExecuteObject
- *  Creates new Execute object and returns pointer to it.
- */
-ScriptExecute *ScriptPackage::CreateExecuteObject()
-    {
-    ScriptExecute *Object, *NewObject;
-
-    if (!(Object = new ScriptExecute[++usExecuteCount]))
-        {
-        usExecuteCount --;
-        return NULL;
-        }
-
-    Object[usExecuteCount - 1].SetIndex(FindUnusedIndex(this->pExecute,
-        usExecuteCount - 1));
-
-    CopyTable(Object, this->pExecute, usExecuteCount - 1);
-    delete [] this->pExecute;
-    this->pExecute = Object;
-    NewObject = &this->pExecute[usExecuteCount - 1];
+        }
+
+    Object[_usExecuteCount - 1].SetIndex(FindUnusedIndex(this->_pExecute,
+        (USHORT)(_usExecuteCount - 1)));
+
+    CopyTable(Object, this->_pExecute, (USHORT)(_usExecuteCount - 1), (USHORT)0);
+    delete [] this->_pExecute;
+    this->_pExecute = Object;
+    NewObject = &this->_pExecute[_usExecuteCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateExecuteObject
+/*
+ *@@CreateExecuteObject:
  *  Creates Execute object and sets datas and returns pointer to it.
  */
-ScriptExecute *ScriptPackage::CreateExecuteObject(PSZ pszExecute)
+ScriptExecute *ScriptPackage::CreateExecuteObject(PSZ p_pszExecute)
     {
     ScriptExecute *ExecuteObject = CreateExecuteObject();
 
-    ExecuteObject->SetExecFileParams(pszExecute);
+    ExecuteObject->SetExecFileParams(p_pszExecute);
     return ExecuteObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnExecuteObject
+/*
+ *@@ReturnExecuteObject:
  *  Returns object which index is given usIndex.
  */
-ScriptExecute *ScriptPackage::ReturnExecuteObject(USHORT usIndex)
+ScriptExecute *ScriptPackage::ReturnExecuteObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usExecuteCount; Index ++)
-        if (pExecute[Index].ReturnIndex() == usIndex)
-            return &pExecute[Index];
+    for (Index = 0; Index < this->_usExecuteCount; Index ++)
+        if (_pExecute[Index].ReturnIndex() == p_usIndex)
+            return &_pExecute[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteExecuteObject
- *  Deletes object which index is given in usIndex.
- */
-USHORT ScriptPackage::DeleteExecuteObject(USHORT usIndex)
+/*
+ *@@DeleteExecuteObject:
+ *  Deletes object which index is given as a parameter.
+ */
+USHORT ScriptPackage::DeleteExecuteObject(USHORT p_usIndex)
     {
     ScriptExecute *TempExecute = NULL;
 
-    if (usExecuteCount > 1)
-        {
-        TempExecute = new ScriptExecute[usExecuteCount - 1];
-        CopyTable(TempExecute, pExecute, usExecuteCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempExecute, usExecuteCount - 1);
-        }
-    delete [] pExecute;
-    pExecute = TempExecute;
-    usExecuteCount --;
+    if (_usExecuteCount > 1)
+        {
+        TempExecute = new ScriptExecute[_usExecuteCount - 1];
+        CopyTable(TempExecute, _pExecute, _usExecuteCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempExecute, (USHORT)(_usExecuteCount - 1));
+        }
+    delete [] _pExecute;
+    _pExecute = TempExecute;
+    _usExecuteCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteExecuteObject
- *  Deletes object which address is *ScriptExecuteObject.
- */
-USHORT ScriptPackage::DeleteExecuteObject(ScriptExecute *ScriptExecuteObject)
+/*
+ *@@DeleteExecuteObject:
+ *  Deletes object which address is given as a parameter.
+ */
+USHORT ScriptPackage::DeleteExecuteObject(ScriptExecute *p_pScriptExecuteObject)
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptExecuteObject)
+    if (!p_pScriptExecuteObject)
         return 1;
 
@@ -7398 +7045 @@
     while (TRUE)
         {
-        if (&pExecute[Index] == ScriptExecuteObject)
+        if (&_pExecute[Index] == p_pScriptExecuteObject)
             break;
         Index ++;
-        if (Index >= usExecuteCount)
+        if (Index >= _usExecuteCount)
             return 2;
         }
 
-    usDelete = pExecute[Index].ReturnIndex();
+    usDelete = _pExecute[Index].ReturnIndex();
     rc = DeleteExecuteObject(usDelete);
 
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnExecuteObjectCount
+/*
+ *@@ReturnExecuteObjectCount:
  *  Returns count number of ScriptExecuteObjects.
  */
 USHORT ScriptPackage::ReturnExecuteObjectCount()
     {
-    return usExecuteCount;
-    }
-
-
-
-
-/***********************************
- *  ScriptKillProcess object handling.
- ***********************************
- * Here are functions when handling ScriptKillProcess objects. These functions
- * are only way to add, remove or find desired ScriptKillProcess object.
- */
-
-/***************************************************************************
- *@@ ScriptKillProcess::CopyTable
- *  Copies source table to destination table.
- */
-ScriptKillProcess *ScriptPackage::CopyTable(ScriptKillProcess *DestTable,
-                                        ScriptKillProcess *SrcTable,
-                                        USHORT usSize, USHORT usSkipIndex)
-    {
-    USHORT SrcIndex, DestIndex;
-    if (!DestTable)
+    return _usExecuteCount;
+    }
+
+
+/*
+ *@@CreateKillProcessObject:
+ *  Creates new KillProcess object and returns pointer to it.
+ */
+ScriptKillProcess *ScriptPackage::CreateKillProcessObject()
+    {
+    ScriptKillProcess *Object, *NewObject;
+
+    if (!(Object = new ScriptKillProcess[++_usKillProcessCount]))
+        {
+        _usKillProcessCount --;
         return NULL;
-    if (!SrcTable)
-        return DestTable;
-    for (SrcIndex = 0, DestIndex = 0; DestIndex < usSize - 1; SrcIndex ++, DestIndex ++)
-        {
-        if ((SrcTable[SrcIndex].ReturnIndex() == usSkipIndex) && (SrcIndex < usSize - 1))
-            SrcIndex ++;
-        DestTable[DestIndex] = SrcTable[SrcIndex];
-        }
-
-    return DestTable;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptKillProcess::ReBuildIndexes
- *  Rebuilds indexes after deletion. The order of the indexes does not matter.
- *  Example:
- *      Old indexing: 1, 4, 3, 5
- *      New indexing: 1, 3, 2, 4
- */
-void ScriptPackage::ReBuildIndexes(ScriptKillProcess *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, Index3, usMissing, usMax = 0, i;
-    BOOL bFinded = FALSE, bReady = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    // Do this until it is sure that there is no skipped indexes left.
-    while (!bReady)
-        {
-        bReady = TRUE;
-        // Go through all index values from 1 to usMax.
-        for (Index = 1; Index <= usMax; Index ++)
-            {
-            // Check that Index number will be found.
-            for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                if (Index == Table[Index2].ReturnIndex())
-                    bFinded = TRUE;
-            // If did not found sub 1 from every index number above the index number
-            // which did not found.
-            if (bFinded == FALSE)
-                {
-                for (Index3 = Index + 1; Index3 <= usMax; Index3 ++)
-                    for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-                        if (Index3 == Table[Index2].ReturnIndex())
-                            Table[Index2].SetIndex(Index3 - 1);
-                usMax --;
-                }
-            if (bFinded == FALSE)
-                bReady = FALSE;
-            bFinded = FALSE;
-            }
-        }
-    }
-
-
-/***************************************************************************
- *@@ ScriptPackage::FindUnusedIndex
- *  Returns first unused index number.
- */
-USHORT ScriptPackage::FindUnusedIndex(ScriptKillProcess *Table, USHORT usTableSize)
-    {
-    USHORT Index, Index2, usMax = 0;
-    BOOL bFinded = FALSE;
-
-    // First find largest index number.
-    for (Index = 0; Index < usTableSize; Index ++)
-        if (Table[Index].ReturnIndex() > usMax)
-            usMax = Table[Index].ReturnIndex();
-
-    for (Index = 1; Index <= usMax; Index ++)
-        {
-        // Go through all the indexes of the table.
-        for (Index2 = 0; Index2 < usTableSize; Index2 ++)
-            if (Index == Table[Index2].ReturnIndex())
-                {
-                bFinded = TRUE;
-                break;
-                }
-        // If Index found from the table continue.
-        if (bFinded == TRUE)
-            bFinded = FALSE;
-        // If not break.
-        else
-            break;
-        }
-
-    return Index;
-    }
-
-
-
-
-/***************************************************************************
- *@@ ScriptPackage::CreateKillProcessObject
- *  Creates new KillProcess object and returns pointer to it.
- */
-ScriptKillProcess *ScriptPackage::CreateKillProcessObject()
-    {
-    ScriptKillProcess *Object, *NewObject;
-
-    if (!(Object = new ScriptKillProcess[++usKillProcessCount]))
-        {
-        usKillProcessCount --;
-        return NULL;
-        }
-
-    Object[usKillProcessCount - 1].SetIndex(FindUnusedIndex(this->pKillProcess,
-        usKillProcessCount - 1));
-
-    CopyTable(Object, this->pKillProcess, usKillProcessCount - 1);
-    delete [] this->pKillProcess;
-    this->pKillProcess = Object;
-    NewObject = &this->pKillProcess[usKillProcessCount - 1];
+        }
+
+    Object[_usKillProcessCount - 1].SetIndex(FindUnusedIndex(this->_pKillProcess,
+        (USHORT)(_usKillProcessCount - 1)));
+
+    CopyTable(Object, this->_pKillProcess, (USHORT)(_usKillProcessCount - 1), (USHORT)0);
+    delete [] this->_pKillProcess;
+    this->_pKillProcess = Object;
+    NewObject = &this->_pKillProcess[_usKillProcessCount - 1];
     return NewObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::CreateKillProcessObject
+/*
+ *@@CreateKillProcessObject:
  *  Creates KillProcess object and sets datas and returns pointer to it.
  *  Also sets datas according to data.
  */
-ScriptKillProcess *ScriptPackage::CreateKillProcessObject(const PSZ pszFileName)
+ScriptKillProcess *ScriptPackage::CreateKillProcessObject(const PSZ p_pszFileName)
     {
     ScriptKillProcess *KillProcessObject = CreateKillProcessObject();
 
-    KillProcessObject->SetFileName(pszFileName);
+    KillProcessObject->SetFileName(p_pszFileName);
     return KillProcessObject;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::ReturnKillProcessObject
+/*
+ *@@ReturnKillProcessObject:
  *  Returns object which index is given usIndex.
  */
-ScriptKillProcess *ScriptPackage::ReturnKillProcessObject(USHORT usIndex)
+ScriptKillProcess *ScriptPackage::ReturnKillProcessObject(USHORT p_usIndex)
     {
     USHORT Index;
 
-    for (Index = 0; Index < this->usKillProcessCount; Index ++)
-        if (pKillProcess[Index].ReturnIndex() == usIndex)
-            return &pKillProcess[Index];
+    for (Index = 0; Index < this->_usKillProcessCount; Index ++)
+        if (_pKillProcess[Index].ReturnIndex() == p_usIndex)
+            return &_pKillProcess[Index];
     return NULL;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteKillProcessObject
+/*
+ *@@DeleteKillProcessObject:
  *  Deletes object which index is given in usIndex.
  */
-USHORT ScriptPackage::DeleteKillProcessObject(USHORT usIndex)
+USHORT ScriptPackage::DeleteKillProcessObject(USHORT p_usIndex)
     {
     ScriptKillProcess *TempKillProcess = NULL;
 
-    if (usKillProcessCount > 1)
-        {
-        TempKillProcess = new ScriptKillProcess[usKillProcessCount - 1];
-        CopyTable(TempKillProcess, pKillProcess, usKillProcessCount, usIndex);
-        if (bAllowIndexArrangement)
-            ReBuildIndexes(TempKillProcess, usKillProcessCount - 1);
-        }
-    delete [] pKillProcess;
-    pKillProcess = TempKillProcess;
-    usKillProcessCount --;
+    if (_usKillProcessCount > 1)
+        {
+        TempKillProcess = new ScriptKillProcess[_usKillProcessCount - 1];
+        CopyTable(TempKillProcess, _pKillProcess, _usKillProcessCount, p_usIndex);
+        if (_bAllowIndexArrangement)
+            RebuildIndexes(TempKillProcess, (USHORT)(_usKillProcessCount - 1));
+        }
+    delete [] _pKillProcess;
+    _pKillProcess = TempKillProcess;
+    _usKillProcessCount --;
     return 0;
     }
 
 
-
-/***************************************************************************
- *@@ ScriptPackage::DeleteKillProcessObject
+/*
+ *@@DeleteKillProcessObject:
  *  Deletes object which address is *ScriptKillProcessObject.
  */
-USHORT ScriptPackage::DeleteKillProcessObject(ScriptKillProcess *ScriptKillProcessObject)
+USHORT ScriptPackage::DeleteKillProcessObject(
+                      ScriptKillProcess *p_pScriptKillProcessObject
+                                             )
     {
     USHORT Index = 0, usDelete;
     USHORT rc;
 
-    if (!ScriptKillProcessObject)
+    if (!p_pScriptKillProcessObject)
         return 1;
 
@@ -7639 +7162 @@
     while (TRUE)
         {
-        if (&pKillProcess[Index] == ScriptKillProcessObject)
+        if (&_pKillProcess[Index] == p_pScriptKillProcessObject)
             break;
         Index ++;
-        if (Index >= usKillProcessCount)
+        if (Index >= _usKillProcessCount)
             return 2;
         }
 
-    usDelete = pKillProcess[Index].ReturnIndex();
+    usDelete = _pKillProcess[Index].ReturnIndex();
     rc = DeleteKillProcessObject(usDelete);
-
-
     return rc;
     }
 
 
-
-
-/***************************************************************************
- *@@ ScriptPackage:: ReturnKillProcessObjectCount
+/*
+ *@@ReturnKillProcessObjectCount:
  *  Returns count number of ScriptKillProcessObjects.
  */
 USHORT ScriptPackage::ReturnKillProcessObjectCount()
     {
-    return usKillProcessCount;
-    }
-
-
-
-
-
-/***************************************************************************
+    return _usKillProcessCount;
+    }
+
+
+/*
  *@@ ScriptPackage:: BuildFromText
- *  Builds package accordingly to script text. If any errors is found in script
- *  text, error informations are returned in table where to *pScriptError
- *  points. Pointer to after end of tag is returned so multiple searches can be
- *  done.
- */
-PSZ ScriptPackage::BuildFromText(PSZ pszScriptText,
-                                 SCRIPTERROR **ppScriptError,
-                                 USHORT *pusErrorTableSize,
-                                 ULONG ulLineNumber)
-    {
-    SCRIPTERROR Error;
+ *  Builds package accordingly to script text.
+ */
+PSZ ScriptPackage::BuildFromText(PSZ p_pszScriptText,
+                                 ULONG p_ulLineNumber)
+    {
+    Message msg;
     PSZ pszEnd = NULL;
     ULONG ulRc = 0;
@@ -7687 +7198 @@
     ULONG ulOffsetBeginBlock = 0;
     ULONG ulSearchOffset = 0;
-    PSZ pszText = pszScriptText;
+    PSZ pszText = p_pszScriptText;
     PSZ pszBlock = NULL;
     PSZ pszAttrs = NULL;
@@ -7706 +7217 @@
 
 
-    // Check that pointers are not NULL.
-    if (!pszScriptText)
-        {
-        /*if (pScriptError)
-            {
-            *pScriptError = new SCRIPTERROR;
-            *pScriptError->usErrorCode = ERR_PARSE_NULLPOINTER;
-            *pScriptError->ulLineNumber = ulLineNumber;
-            *pScriptError->pszStart = NULL;
-            *pScriptError->ulLength = 0;
-            }*/
-        return NULL;
-        }
-
-
     ulRc = strhGetBlock(pszText, &ulSearchOffset, SZ_TAG_PACKAGE, &pszBlock,
                         &pszAttrs, &ulOffsetBeginTag, &ulOffsetBeginBlock);
@@ -7729 +7225 @@
     if (ulRc != 0)
         {
-        Error.usErrorCode = ERR_PARSE_PCK_NOTFOUND;
-        Error.ulLineNumber = ulLineNumber;
-        Error.pszStart = strhdup(pszScriptText);
-        Error.ulLength = 0;
-        if (ppScriptError)
-            *pusErrorTableSize =
-                AddErrorToTable(Error, ppScriptError, *pusErrorTableSize);
+        msg.SetType(MSG_TYPE_INFO);
+        msg.SetMessageValue(MSG_TAG_PCK_NOTFOUND);
+        msg.SetLineNumber(p_ulLineNumber);
+        _messageLogger.LogMessage(msg);
         return NULL;
         }
@@ -7743 +7236 @@
 
     pszTemp = pszAttrs;
-    pszTemp = Index.BuildFromText(pszTemp, ppScriptError, pusErrorTableSize, 0);
-    pszTemp = pszAttrs;
-    pszTemp = PckID.BuildFromText(pszTemp, ppScriptError, pusErrorTableSize, 0);
-    pszTemp = pszAttrs;
-    pszTemp = Title.BuildFromText(pszTemp, ppScriptError, pusErrorTableSize, 0);
-    pszTemp = pszAttrs;
-    pszTemp = Target.BuildFromText(pszTemp, ppScriptError, pusErrorTableSize, 0);
-    pszTemp = pszAttrs;
-    pszTemp = KeyWords.BuildFromText(pszTemp, ppScriptError, pusErrorTableSize, 0);
+    _Index.BuildFromText(pszTemp, 0);
+    _PckID.BuildFromText(pszTemp, 0);
+    _Title.BuildFromText(pszTemp, 0);
+    _Target.BuildFromText(pszTemp, 0);
+    _KeyWords.BuildFromText(pszTemp, 0);
 
 
@@ -7759 +7248 @@
         {
         // Try to build object from text.
-        pszTemp = TmpRequires.BuildFromText(pszTemp, ppScriptError,
-                                            pusErrorTableSize, 0);
+        pszTemp = TmpRequires.BuildFromText(pszTemp, 0);
         // If it succeded, create new object and copy temp object to
         // created object.
@@ -7768 +7256 @@
             TmpRequires.SetIndex(pRequires->ReturnIndex());
             *pRequires = TmpRequires;
+            pRequires->_messageLogger.SetParentLogger(_messageLogger);
+            TmpRequires._messageLogger.DeleteLogs();
             }
 
@@ -7777 +7267 @@
     do
         {
-        pszTemp = TmpExecute.BuildFromText(pszTemp, ppScriptError,
-                                           pusErrorTableSize, 0);
+        pszTemp = TmpExecute.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7784 +7273 @@
             TmpExecute.SetIndex(pExecute->ReturnIndex());
             *pExecute = TmpExecute;
+            pExecute->_messageLogger.SetParentLogger(_messageLogger);
+            TmpExecute._messageLogger.DeleteLogs();
             }
 
@@ -7793 +7284 @@
     do
         {
-        pszTemp = TmpClearProfile.BuildFromText(pszTemp, ppScriptError,
-                                               pusErrorTableSize, 0);
+        pszTemp = TmpClearProfile.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7800 +7290 @@
             TmpClearProfile.SetIndex(pClearProfile->ReturnIndex());
             *pClearProfile = TmpClearProfile;
+            pClearProfile->_messageLogger.SetParentLogger(_messageLogger);
+            TmpClearProfile._messageLogger.DeleteLogs();
             }
 
@@ -7809 +7301 @@
     do
         {
-        pszTemp = TmpWriteProfile.BuildFromText(pszTemp, ppScriptError,
-                                               pusErrorTableSize, 0);
+        pszTemp = TmpWriteProfile.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7816 +7307 @@
             TmpWriteProfile.SetIndex(pWriteProfile->ReturnIndex());
             *pWriteProfile = TmpWriteProfile;
+            pWriteProfile->_messageLogger.SetParentLogger(_messageLogger);
+            TmpWriteProfile._messageLogger.DeleteLogs();
             }
 
@@ -7825 +7318 @@
     do
         {
-        pszTemp = TmpConfigSys.BuildFromText(pszTemp, ppScriptError,
-                                             pusErrorTableSize, 0);
+        pszTemp = TmpConfigSys.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7832 +7324 @@
             TmpConfigSys.SetIndex(pConfigSys->ReturnIndex());
             *pConfigSys = TmpConfigSys;
+            pConfigSys->_messageLogger.SetParentLogger(_messageLogger);
+            TmpConfigSys._messageLogger.DeleteLogs();
             }
 
@@ -7841 +7335 @@
     do
         {
-        pszTemp = TmpKillProcess.BuildFromText(pszTemp, ppScriptError,
-                                             pusErrorTableSize, 0);
+        pszTemp = TmpKillProcess.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7848 +7341 @@
             TmpKillProcess.SetIndex(pKillProcess->ReturnIndex());
             *pKillProcess = TmpKillProcess;
+            pKillProcess->_messageLogger.SetParentLogger(_messageLogger);
+            TmpKillProcess._messageLogger.DeleteLogs();
             }
 
@@ -7856 +7351 @@
     do
         {
-        pszTemp = TmpCreateObject.BuildFromText(pszTemp, ppScriptError,
-                                                pusErrorTableSize, 0);
+        pszTemp = TmpCreateObject.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7863 +7357 @@
             TmpCreateObject.SetIndex(pCreateObject->ReturnIndex());
             *pCreateObject = TmpCreateObject;
+            pCreateObject->_messageLogger.SetParentLogger(_messageLogger);
+            TmpCreateObject._messageLogger.DeleteLogs();
             }
 
@@ -7871 +7367 @@
     do
         {
-        pszTemp = TmpRegClass.BuildFromText(pszTemp, ppScriptError,
-                                            pusErrorTableSize, 0);
+        pszTemp = TmpRegClass.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7878 +7373 @@
             TmpRegClass.SetIndex(pRegClass->ReturnIndex());
             *pRegClass = TmpRegClass;
+            pRegClass->_messageLogger.SetParentLogger(_messageLogger);
+            TmpRegClass._messageLogger.DeleteLogs();
             }
 
@@ -7886 +7383 @@
     do
         {
-        pszTemp = TmpRepClass.BuildFromText(pszTemp, ppScriptError,
-                                            pusErrorTableSize, 0);
+        pszTemp = TmpRepClass.BuildFromText(pszTemp, 0);
         if (pszTemp)
             {
@@ -7893 +7389 @@
             TmpRepClass.SetIndex(pRepClass->ReturnIndex());
             *pRepClass = TmpRepClass;
+            pRepClass->_messageLogger.SetParentLogger(_messageLogger);
+            TmpRepClass._messageLogger.DeleteLogs();
             }
 
         } while (pszTemp != NULL);
+
+
+    BSString message = _messageLogger.ReturnComposedMessageString();
 
 
@@ -8099 +7600 @@
  *  Constructor for ScriptGroup class.
  */
-ScriptGroup::ScriptGroup(const ScriptGroup &Group)
+ScriptGroup::ScriptGroup(ScriptGroup &Group)
     {
     (*this) = Group;
@@ -8108 +7609 @@
  *@@ ScriptGroup::~ScriptGroup
  *  Destructor for ScriptGroup class.
+ *
+ *@@ changed v0.9.5 (2000-08-22) [tahola]: clearning of the fields are moved
+ *                                         to ClearAll() function.
  */
 ScriptGroup::~ScriptGroup()
+    {
+    ClearAll();
+    }
+
+
+/*
+ *@@ ClearAll
+ *  Clears all fields.
+ *
+ *@@added v.0.9.5 (2000-08-22) [tahola]
+ */
+USHORT ScriptGroup::ClearAll()
     {
     this->usIndex = 1;
@@ -8130 +7646 @@
 
 
-
 /***************************************************************************
  *@@ ScriptGroup::ScriptGroup &operator=
  *  Assignment operator for ScriptGroup class.
  */
-ScriptGroup &ScriptGroup::operator=(const ScriptGroup &Group)
+ScriptGroup &ScriptGroup::operator=(ScriptGroup &Group)
     {
     USHORT usIndex = 0;
@@ -8686 +8201 @@
  *  changed.
  */
-ScriptPackage *ScriptGroup::CreatePackageObject(const ScriptPackage *pPck)
+ScriptPackage *ScriptGroup::CreatePackageObject(ScriptPackage *pPck)
     {
     ScriptPackage *pTempPck = CreatePackageObject();
@@ -8867 +8382 @@
         ulRc = strhGetBlock(pszText, &ulSearchOffset, SZ_TAG_GROUP, &pszBlock,
                             &pszAttrs, &ulOffsetBeginTag, &ulOffsetBeginBlock);
-        pszTemp = Title.BuildFromText(pszAttrs, NULL, NULL, 0);
+        pszTemp = Title.BuildFromText(pszAttrs, 0);
         pszTemp = Expanded.BuildFromText(pszAttrs, NULL, NULL, 0);
         }
@@ -8881 +8396 @@
             {
             // Clear TmpGroup before build it from the text.
-            TmpGroup.ScriptGroup::~ScriptGroup();
+            TmpGroup.ClearAll();
             pszBlock = TmpGroup.BuildFromText(pszBlock, NULL, NULL, 0);
             if (pszBlock)
@@ -8895 +8410 @@
             // Clear TmpPackage before build it from the text by calling
             // destructor.
-            TmpPackage.ScriptPackage::~ScriptPackage();
-            pszBlock = TmpPackage.BuildFromText(pszBlock, NULL, NULL, 0);
+            TmpPackage.ClearAll();
+            pszBlock = TmpPackage.BuildFromText(pszBlock, 0);
             if (pszBlock)
                 {
@@ -8902 +8417 @@
                 TmpPackage.SetIndex(pPackage->ReturnIndex());
                 *pPackage = TmpPackage;
+                TmpPackage._messageLogger.DeleteLogs();
                 }
             }
@@ -10558 +10074 @@
     {
     XSTRING strScript;
-    xstrInit(&strScript, 0);
+    xstrInit(&strScript, 0);;
     PSZ pszTemp = NULL;
     CHAR szTag[MAXTAGLENGTH];

trunk/src/wicpm/trad_arc_thread.cpp ¶

@@ +1 @@
+/*
+ *              WicPM - WarpIN Archive Creator for PM
+ *                  (c) Copyright Teemu Ahola 2000
+ *
+ *@@sourcefile:trad_arc_thread.cpp
+ *  This file contains thread related stuff used during archive creating in
+ *  traditional mode.
+ */
+
+
+
 #define INCL_PM
 #define INCL_WIN
@@ -13 +24 @@
 #include "helpers\dosh.h"
 #include "helpers\linklist.h"
+#include <list>
 #include "helpers\cnrh.h"
+#include "helpers\stringh.h"
+#include "helpers\xstring.h"
+#include "base\bs_string.h"
 
 #include "wicpm\script.hpp"
@@ -31 +46 @@
 
 // Globals.
-HWND hwndStatusDlg = NULLHANDLE;
-
-
-/****************************************************************************
- *@@ WICallback:
- *      this is the callback function which is
+HWND g_hwndStatusDlg = NULLHANDLE;
+HEV g_hevStatusDlgReady = 0;
+
+/*
+ *@@WICallback:
+ *      This is the callback function which is
  *      given to the WIArchive class.
  *          in:
@@ -43 +58 @@
  *              file header of current file
  */
-int WICallback(short mode,         /* in: CBM_* flags defined in wiarchive.h */
-               short s,            /* percentage of current file */
-               WIFileHeader* pwifh, /* file header of current file */
-               void *pvUser)        // added V0.9.9 (2001-04-04) [umoeller]
+int WICallback(short mode,         // In: CBM_* flags defined in wiarchive.h.
+               short s,            // Percentage of current file.
+               WIFileHeader* pwifh,// File header of current file.
+               PVOID pvData)       // User defined data?
     {
     int rc = CBRC_ABORT;
@@ -53 +68 @@
         case CBM_PERCENTAGE:
             {
-            WinPostMsg(hwndStatusDlg, USER_ARCTM_FILE_PRECENTAGE,
+            WinPostMsg(g_hwndStatusDlg, USER_ARCTM_FILE_PRECENTAGE,
                        MPFROMSHORT(s), MPFROMP(pwifh->name));
+            // Wait main thread to set the semaphore.
+            DosWaitEventSem(g_hevStatusDlgReady, SEM_INDEFINITE_WAIT);
             break;
             }
         case CBM_UPDATING:
             {
-            WinPostMsg(hwndStatusDlg, USER_ARCTM_FILE_UPDATING,
+            WinPostMsg(g_hwndStatusDlg, USER_ARCTM_FILE_UPDATING,
                        MPFROMSHORT(s), MPFROMP(pwifh->name));
+            // Wait main thread to set the semaphore.
+            DosWaitEventSem(g_hevStatusDlgReady, SEM_INDEFINITE_WAIT);
             break;
             }
@@ -69 +88 @@
 
 
-
+/*
+ *@@thTradArcThread:
+ *  This function is used as a parameter in _beginthread function in gui_wicpm.cpp
+ *  file. This function does the actuall archive creating with assist of WIArchive
+ *  object being based of ScriptWarpIN object and list of packages. ScriptWarpIN
+ *  contains the script of the packages and pages. List of packages contains mainly
+ *  information about the files to be added. Also file name for the archive is
+ *  included in pThreadArg parameter. This function posts results while archive
+ *  creating to status dialog window and syncronization between this thread and
+ *  the status window is organized by using event semaphore. Now message queue
+ *  will not overflow.
+ */
 VOID _Optlink thTradArcThread (PVOID pThreadArg)
     {
@@ -76 +106 @@
     TradArcThreadInfo* pThreadInfo = (TradArcThreadInfo*)pThreadArg;
 
-    hwndStatusDlg = pThreadInfo->hwndStatusDlg;
+    g_hwndStatusDlg = pThreadInfo->hwndStatusDlg;
+    g_hevStatusDlgReady = pThreadInfo->hevStatusDlgReady;
 
     pThreadInfo->bThreadBusy = TRUE;
@@ -121 +152 @@
         // Post message to the status dialog so it can show some information about
         // package to being set.
-        //WinPostMsg(pThreadInfo->hwndStatusDlg, USER_ARCTM_SET_PCK,
-        //    MPFROMP(pDBPackageThis), NULL);
+        WinPostMsg(pThreadInfo->hwndStatusDlg, USER_ARCTM_SET_PCK,
+            MPFROMP(pDBPackageThis), NULL);
         // Wait until the status dialog is ready.
-        //DosWaitEventSem(pThreadInfo->hevStatusDlgReady, SEM_INDEFINITE_WAIT);
+        DosWaitEventSem(pThreadInfo->hevStatusDlgReady, SEM_INDEFINITE_WAIT);
 
         Arc.setPackage((LONG)pDBPackageThis->usPckIndexAttr, szPackageName);
 
-        // For future compatibility.
+        // For future compatibility. We transfer old style C based list system to
+        // STL list template which is more handy. At some point I will change all
+        // lists to STL list template. That's why there is this converting system
+        // now.
         list<DBFile*> listFiles;
         DBFile *pDBFile = NULL;
@@ -161 +195 @@
     PSZ pszScript = pThreadInfo->pWarpIN->MakeScriptText();
 
-    // Show information about the script.
+    // Show information about the script. I don't think that there is a need for
+    // waiting of event semaphore because at this point there is not many messages
+    // sended by this thread in the main thread message queue because all message
+    // posting in this thread before this posting was organized with semaphore.
     WinPostMsg(pThreadInfo->hwndStatusDlg, USER_ARCTM_SET_SCRIPT,
                MPFROMLONG(strlen(pszScript)), 0);
@@ -174 +211 @@
     //DosWaitEventSem(pThreadInfo->hevStatusDlgReady, SEM_INDEFINITE_WAIT);
 
+    // Now the real file processing starts. We will get a lot of callbacks to
+    // WICallback function from WIArchive object.
     Arc.close();
 

trunk/src/wicpm/wicpm.def ¶

@@ -6 +6 @@
 NAME   WICPM WINDOWAPI
 
-Description '@#OS/2 Netlabs:0.9.12#@ WarpIN PM archive builder'
+Description '@#OS/2 Netlabs:0.9.11#@ WarpIN PM archive builder'
 PROTMODE
-STACKSIZE   65536
+STACKSIZE  40480
 

trunk/src/wicpm/wicpm.dlg ¶

@@ -2 +2 @@
    #include <os2.h>
 #endif
-DLGINCLUDE 1 "E:\PROJECTS\Netlabs\WarpIN\include\wicpm\wicpmres.h"
+DLGINCLUDE 1 "E:\PROJECTS\Netlabs\warpin\include\wicpm\wicpmres.h"
 
 DLGTEMPLATE IDD_NB_BROWSER_DIALOG LOADONCALL MOVEABLE DISCARDABLE
@@ -79 +79 @@
 END
 
-DLGTEMPLATE IDD_NB_REQUIRES_DIALOG LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "Requires", IDD_NB_REQUIRES_DIALOG, 12, 6, 249, 99, NOT
-            FS_DLGBORDER | FS_BORDER | WS_VISIBLE | NOT WS_SAVEBITS
-    BEGIN
-        RTEXT           "Vendor:", -1, 2, 87, 58, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Application:", -1, 2, 73, 58, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Package ID:", -1, 2, 59, 58, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Version:", -1, 3, 45, 57, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        ENTRYFIELD      "", IDD_NB_REQUIRES_VENDOR, 64, 87, 113, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_REQUIRES_APPLICATION, 64, 73, 113, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_REQUIRES_PACKAGE, 64, 59, 113, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_REQUIRES_VERSIONMAJOR, 92, 45, 32, 8,
-                        ES_MARGIN
-        LISTBOX         IDD_NB_REQUIRES_LIST, 184, 3, 61, 94, LS_NOADJUSTPOS |
-                        LS_HORZSCROLL
-        PUSHBUTTON      "~Add", IDD_NB_REQUIRES_ADD, 6, 4, 40, 14
-        PUSHBUTTON      "~Remove", IDD_NB_REQUIRES_REMOVE, 49, 4, 40, 14,
-                        WS_DISABLED
-        RTEXT           "Major:", -1, 63, 45, 26, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Minor:", -1, 52, 31, 37, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        ENTRYFIELD      "", IDD_NB_REQUIRES_VERSIONMINOR, 92, 31, 32, 8,
-                        ES_MARGIN
-    END
-END
-
 DLGTEMPLATE IDD_ASNB_PAGE_DIALOG LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
@@ -121 +86 @@
         CONTAINER       IDD_ASNB_PAGE_CONTAINER, 2, 22, 245, 75,
                         CCS_SINGLESEL | CCS_READONLY | WS_GROUP
-        PUSHBUTTON      "~Add", IDD_ASNB_PAGE_ADD, 6, 4, 40, 14
+        PUSHBUTTON      "~Add 
+", IDD_ASNB_PAGE_ADD, 6, 4, 40, 14
         PUSHBUTTON      "~Remove", IDD_ASNB_PAGE_REMOVE, 49, 4, 41, 14
     END
@@ -250 +216 @@
         NOTEBOOK        IDD_ADDPCK_NOTEBOOK, 0, 19, 318, 145,
                         BKS_BACKPAGESBR | BKS_TABTEXTCENTER | WS_GROUP | 0x800
-    END
-END
-
-DLGTEMPLATE IDD_NB_GENERAL_DIALOG LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "General", IDD_NB_GENERAL_DIALOG, 69, 30, 249, 99, NOT
-            FS_DLGBORDER | FS_BORDER | WS_VISIBLE | NOT WS_SAVEBITS
-    BEGIN
-        RTEXT           "Package ID:", -1, 2, 73, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Author:", -1, 2, 60, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Application name:", -1, 2, 47, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Version number:", -1, 2, 34, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Target path:", -1, 2, 21, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Title:", -1, 2, 8, 77, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        ENTRYFIELD      "", IDD_NB_GENERAL_PCKNAME, 82, 73, 161, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_AUTHORNAME, 82, 60, 161, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_APPNAME, 82, 47, 161, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONMAJOR, 108, 34, 15, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONMINOR, 156, 34, 15, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_TARGETPATH, 82, 21, 161, 8,
-                        ES_MARGIN
-        ENTRYFIELD      "", IDD_NB_GENERAL_TITLE, 82, 8, 161, 8, ES_MARGIN
-        RTEXT           "Major:", -1, 80, 34, 25, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Minor:", -1, 126, 34, 27, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        RTEXT           "Index:", -1, 6, 86, 73, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        ENTRYFIELD      "", IDD_NB_GENERAL_INDEX, 82, 86, 32, 8, ES_MARGIN |
-                        ES_READONLY
-        RTEXT           "Revision:", -1, 175, 34, 40, 8
-                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONREVISION, 218, 34, 15, 8,
-                        ES_MARGIN
     END
 END
@@ -583 +504 @@
                         "6-2000 Julian R Seward.", -1, 2, 39, 241, 8
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
-        LTEXT           "WicPM front end (C) 1999-00 Teemu Ahola.", -1, 2,
-                        30, 242, 8
+        LTEXT           "WicPM front and back ends (C) 1999-00 Teemu Ahola.",
+                        -1, 2, 30, 242, 8
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
         ICON            IDM_MAIN, -1, 13, 66, 21, 16, WS_GROUP
@@ -786 +707 @@
     END
 END
+
+DLGTEMPLATE IDD_NB_GENERAL_DIALOG LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "General", IDD_NB_GENERAL_DIALOG, 69, 30, 249, 99, NOT
+            FS_DLGBORDER | FS_BORDER | WS_VISIBLE | NOT WS_SAVEBITS
+    BEGIN
+        RTEXT           "Package ID:", -1, 2, 73, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Author:", -1, 2, 60, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Application name:", -1, 2, 47, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Version number:", -1, 2, 34, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Target path:", -1, 2, 21, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Title:", -1, 2, 8, 77, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_GENERAL_PCKNAME, 82, 73, 161, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_GENERAL_AUTHORNAME, 82, 60, 161, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_GENERAL_APPNAME, 82, 47, 161, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONMAJOR, 108, 34, 15, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONMINOR, 156, 34, 15, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_GENERAL_TITLE, 82, 8, 161, 8, ES_MARGIN
+        RTEXT           "Major:", -1, 80, 34, 25, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Minor:", -1, 126, 34, 27, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Index:", -1, 6, 86, 73, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_GENERAL_INDEX, 82, 86, 32, 8, ES_MARGIN |
+                        ES_READONLY
+        RTEXT           "Revision:", -1, 175, 34, 40, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_GENERAL_VERSIONREVISION, 218, 34, 15, 8,
+                        ES_MARGIN
+        CONTROL         "", IDD_NB_GENERAL_TARGETPATH, 80, 2, 165, 29,
+                        WC_COMBOBOX, CBS_DROPDOWN | WS_GROUP | WS_TABSTOP |
+                        WS_VISIBLE
+    END
+END
+
+DLGTEMPLATE IDD_NB_REQUIRES_DIALOG LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Requires", IDD_NB_REQUIRES_DIALOG, 12, 6, 249, 99, NOT
+            FS_DLGBORDER | FS_BORDER | WS_VISIBLE | NOT WS_SAVEBITS
+    BEGIN
+        RTEXT           "Vendor:", -1, 2, 87, 58, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Application:", -1, 2, 73, 58, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Package ID:", -1, 2, 59, 58, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Version:", -1, 3, 45, 57, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_REQUIRES_VENDOR, 64, 87, 113, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_REQUIRES_APPLICATION, 64, 73, 113, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_REQUIRES_PACKAGE, 64, 59, 113, 8,
+                        ES_MARGIN
+        ENTRYFIELD      "", IDD_NB_REQUIRES_VERSIONMAJOR, 92, 45, 12, 8,
+                        ES_MARGIN
+        LISTBOX         IDD_NB_REQUIRES_LIST, 184, 3, 61, 94, LS_NOADJUSTPOS |
+                        LS_HORZSCROLL
+        PUSHBUTTON      "~Add", IDD_NB_REQUIRES_ADD, 6, 4, 40, 14
+        PUSHBUTTON      "~Remove", IDD_NB_REQUIRES_REMOVE, 49, 4, 40, 14,
+                        WS_DISABLED
+        RTEXT           "Major:", -1, 63, 45, 26, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Minor:", -1, 108, 45, 26, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_REQUIRES_VERSIONMINOR, 138, 45, 12, 8,
+                        ES_MARGIN
+        RTEXT           "Revision *:", -1, 26, 32, 63, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_REQUIRES_VERSIONREVISION, 92, 32, 12, 8,
+                        ES_MARGIN
+        AUTOCHECKBOX    "~Use shortcut", IDD_NB_REQUIRES_SHORTCUT, 21, 19,
+                        69, 10, BS_AUTOSIZE
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        LTEXT           "* Optional", -1, 104, 7, 58, 8
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        RTEXT           "Index:", -1, 103, 19, 32, 8, WS_DISABLED
+                        PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
+        ENTRYFIELD      "", IDD_NB_REQUIRES_SHORTCUT_INDEX, 138, 19, 18, 8,
+                        ES_MARGIN | WS_DISABLED
+    END
+END

trunk/src/wicpm/wicpm.rc ¶

@@ -24 +24 @@
         MENUITEM    "Open s~cript...",          IDM_MAIN_FILE_OPENSCRIPT
         MENUITEM    "S~ave script as...",       IDM_MAIN_FILE_SAVESCRIPT
-      /*MENUITEM    SEPARATOR
+        MENUITEM    SEPARATOR
+        MENUITEM    "Make EXE...",              IDM_MAIN_FILE_MAKEEXE, ,MIA_DISABLED
+        /*MENUITEM    SEPARATOR
         MENUITEM    "~Print...",                IDM_MAIN_FILE_PRINT
         MENUITEM    "P~rinter setup...",        IDM_MAIN_FILE_PRINTERSETUP*/
@@ -89 +91 @@
 END
 
+STRINGTABLE
+BEGIN
+    WPMSI_MAINWND_TITLE             "WarpIN Archive Creator"
+END
+
 
 rcinclude "wicpm.dlg"