diff -r f50f4094acd7 -r 8ef833fbf5aa smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions
--- a/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions	Tue Jul 06 15:36:38 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions	Wed Aug 18 10:57:47 2010 +0300
@@ -1,51 +1,51 @@
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_BORDER=0x84
 [GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x5f
+[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x133
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x132
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x135
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x121
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x122
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x123
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x124
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x125
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x126
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x127
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x128
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x129
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x134
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x136
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x137
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x139
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x141
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x138
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x142
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x140
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x34
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x33
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x2d
@@ -54,50 +54,3 @@
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x32
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x2e
 [TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x2f
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x1
-[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPTHDRBASE_PANIC_1=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CTESTLOGGEROVERFLOW_DOTESTSTEPL_1=0x35
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x19
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x18
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x1d
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x1c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x17
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x15
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x16
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x1a
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x1b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x1f
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x14
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x1
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0xa
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0xb
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0xc
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0xd
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0xe
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0xf
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x10
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x11
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x12
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x13
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x2
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x3
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x4
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x5
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x6
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x7
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x8
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x9
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x1e
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x20
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x21
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x23
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x26
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x2b
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x29
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x25
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x24
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x28
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x22
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x2c
-[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x2a