diff --git a/LSL2/OIWIN/LOGON.json b/LSL2/OIWIN/LOGON.json index d3fea87..25c1d42 100644 --- a/LSL2/OIWIN/LOGON.json +++ b/LSL2/OIWIN/LOGON.json @@ -22,19 +22,19 @@ "<1,9>": "MES Logon", "<1,10>": { "<1,10,1>": "0x84C80000", - "<1,10,2>": "0x1" + "<1,10,2>": "0x109" }, "<1,11>": { - "<1,11,1>": "0x1", + "<1,11,1>": "0x8000", "<1,11,2>": "0x80000000" }, - "<1,12>": "0", + "<1,12>": "", "<1,13>": { "<1,13,1>": "15921906", "<1,13,2>": "16777215", "<1,13,3>": "1" }, - "<1,14>": "0", + "<1,14>": "", "<1,15>": "", "<1,16>": "", "<1,17>": "", @@ -54,51 +54,91 @@ "<1,18,1,4,8>": "@PARAM6" }, "<1,18,1,5>": "", - "<1,18,1,6>": "" + "<1,18,1,6>": "", + "<1,18,1,7>": "", + "<1,18,1,8>": "", + "<1,18,1,9>": "", + "<1,18,1,10>": "", + "<1,18,1,11>": "", + "<1,18,1,12>": "", + "<1,18,1,13>": "", + "<1,18,1,14>": "", + "<1,18,1,15>": "STPROC" }, - "<1,18,2>": "" + "<1,18,2>": { + "<1,18,2,1>": "X", + "<1,18,2,2>": "EXECUTE", + "<1,18,2,3>": "@WINDOW_EVENTS", + "<1,18,2,4>": { + "<1,18,2,4,1>": "@SELF", + "<1,18,2,4,2>": "@EVENT", + "<1,18,2,4,3>": "@PARAM1", + "<1,18,2,4,4>": "@PARAM2", + "<1,18,2,4,5>": "@PARAM3", + "<1,18,2,4,6>": "@PARAM4", + "<1,18,2,4,7>": "@PARAM5", + "<1,18,2,4,8>": "@PARAM6" + }, + "<1,18,2,5>": "", + "<1,18,2,6>": "", + "<1,18,2,7>": "", + "<1,18,2,8>": "", + "<1,18,2,9>": "", + "<1,18,2,10>": "", + "<1,18,2,11>": "", + "<1,18,2,12>": "", + "<1,18,2,13>": "", + "<1,18,2,14>": "", + "<1,18,2,15>": "COMMEVT", + "<1,18,2,16>": "0" + } }, "<1,19>": { "<1,19,1>": "CREATE", - "<1,19,2>": "" + "<1,19,2>": "INACTIVATED" }, "<1,20>": "", "<1,21>": "", "<1,22>": "", "<1,23>": "", "<1,24>": { - "<1,24,1>": "0", + "<1,24,1>": "", "<1,24,2>": "0", "<1,24,3>": "0", "<1,24,4>": "0", - "<1,24,5>": "0", - "<1,24,6>": "0" + "<1,24,5>": "", + "<1,24,6>": "0", + "<1,24,7>": "", + "<1,24,8>": "", + "<1,24,9>": "", + "<1,24,10>": "0", + "<1,24,11>": "0", + "<1,24,12>": "0", + "<1,24,13>": "0", + "<1,24,14>": "0", + "<1,24,15>": "0", + "<1,24,16>": "0", + "<1,24,17>": "0" }, - "<1,25>": "0", - "<1,26>": "0", + "<1,25>": "", + "<1,26>": "", "<1,27>": "", "<1,28>": "", "<1,29>": "", "<1,30>": "", "<1,31>": "", - "<1,32>": { - "<1,32,1>": "0x7FFFE", - "<1,32,2>": "0xF001E808" - }, + "<1,32>": "", "<1,33>": "", "<1,34>": "", "<1,35>": "", "<1,36>": "", "<1,37>": { - "<1,37,1>": "0x10001", - "<1,37,2>": "0x10001" - }, - "<1,38>": { - "<1,38,1>": "1", - "<1,38,2>": "1" + "<1,37,1>": "0X10001", + "<1,37,2>": "0X10001" }, + "<1,38>": "", "<1,39>": "", - "<1,40>": "0", + "<1,40>": "", "<1,41>": "", "<1,42>": "", "<1,43>": "", @@ -110,7 +150,74 @@ "<1,49>": "", "<1,50>": "", "<1,51>": "", - "<1,52>": "" + "<1,52>": "", + "<1,53>": "", + "<1,54>": "", + "<1,55>": "", + "<1,56>": "", + "<1,57>": "", + "<1,58>": "", + "<1,59>": "", + "<1,60>": "", + "<1,61>": "", + "<1,62>": { + "<1,62,1>": "0", + "<1,62,2>": "", + "<1,62,3>": "", + "<1,62,4>": "0", + "<1,62,5>": "0", + "<1,62,6>": "0", + "<1,62,7>": "", + "<1,62,8>": "0.50", + "<1,62,9>": "5.00", + "<1,62,10>": "0.00" + }, + "<1,63>": "", + "<1,64>": "", + "<1,65>": "", + "<1,66>": "", + "<1,67>": "", + "<1,68>": "", + "<1,69>": "", + "<1,70>": "", + "<1,71>": "", + "<1,72>": "", + "<1,73>": "", + "<1,74>": "", + "<1,75>": "", + "<1,76>": "", + "<1,77>": "", + "<1,78>": "", + "<1,79>": "", + "<1,80>": "", + "<1,81>": "", + "<1,82>": "", + "<1,83>": "", + "<1,84>": "", + "<1,85>": "", + "<1,86>": "", + "<1,87>": "", + "<1,88>": "", + "<1,89>": "", + "<1,90>": "", + "<1,91>": "", + "<1,92>": "", + "<1,93>": "", + "<1,94>": "", + "<1,95>": "", + "<1,96>": "", + "<1,97>": "", + "<1,98>": "", + "<1,99>": "", + "<1,100>": "", + "<1,101>": "", + "<1,102>": "", + "<1,103>": "", + "<1,104>": "", + "<1,105>": "", + "<1,106>": "0", + "<1,107>": "", + "<1,108>": "" } }, "record3": { @@ -129,11 +236,15 @@ "<1,10,2>": "0x0" }, "<1,11>": { - "<1,11,1>": "0x2000", + "<1,11,1>": "0x2004", "<1,11,2>": "0x80000000" }, "<1,12>": "1", - "<1,13>": "-1", + "<1,13>": { + "<1,13,1>": "-1", + "<1,13,2>": "-1", + "<1,13,3>": "" + }, "<1,14>": "0", "<1,15>": { "<1,15,1>": { @@ -162,17 +273,14 @@ "<1,22>": "", "<1,23>": "", "<1,24>": "", - "<1,25>": "0", - "<1,26>": "0", + "<1,25>": "", + "<1,26>": "", "<1,27>": "", - "<1,28>": "<>", - "<1,29>": "<>", - "<1,30>": "<>", - "<1,31>": "0", - "<1,32>": { - "<1,32,1>": "0x7fffe", - "<1,32,2>": "0xf0016508" - }, + "<1,28>": "", + "<1,29>": "", + "<1,30>": "", + "<1,31>": "", + "<1,32>": "", "<1,33>": "", "<1,34>": "", "<1,35>": "", @@ -192,7 +300,76 @@ "<1,49>": "", "<1,50>": "", "<1,51>": "", - "<1,52>": "" + "<1,52>": "", + "<1,53>": "", + "<1,54>": "", + "<1,55>": "", + "<1,56>": "", + "<1,57>": "", + "<1,58>": "", + "<1,59>": "", + "<1,60>": "", + "<1,61>": "", + "<1,62>": "0", + "<1,63>": { + "<1,63,1>": "", + "<1,63,2>": "", + "<1,63,3>": "", + "<1,63,4>": "", + "<1,63,5>": "", + "<1,63,6>": "", + "<1,63,7>": "", + "<1,63,8>": "" + }, + "<1,64>": { + "<1,64,1>": "", + "<1,64,2>": "", + "<1,64,3>": "" + }, + "<1,65>": "-2", + "<1,66>": "", + "<1,67>": "", + "<1,68>": "", + "<1,69>": "", + "<1,70>": "", + "<1,71>": "", + "<1,72>": "", + "<1,73>": "", + "<1,74>": "", + "<1,75>": "", + "<1,76>": "", + "<1,77>": "", + "<1,78>": "", + "<1,79>": "", + "<1,80>": "", + "<1,81>": "", + "<1,82>": "", + "<1,83>": "", + "<1,84>": "", + "<1,85>": "", + "<1,86>": "", + "<1,87>": "", + "<1,88>": "", + "<1,89>": "", + "<1,90>": "0", + "<1,91>": "0", + "<1,92>": "", + "<1,93>": "", + "<1,94>": "", + "<1,95>": "", + "<1,96>": "", + "<1,97>": "", + "<1,98>": "", + "<1,99>": "", + "<1,100>": "", + "<1,101>": "", + "<1,102>": "", + "<1,103>": "", + "<1,104>": "", + "<1,105>": "", + "<1,106>": "", + "<1,107>": "", + "<1,108>": "" }, "<2>": { "<2,1>": "EDL_USERNAME", @@ -209,11 +386,15 @@ "<2,10,2>": "0x200" }, "<2,11>": { - "<2,11,1>": "0x2004", + "<2,11,1>": "0x2000", "<2,11,2>": "0x80000000" }, "<2,12>": "2", - "<2,13>": "-2", + "<2,13>": { + "<2,13,1>": "-2", + "<2,13,2>": "-2", + "<2,13,3>": "" + }, "<2,14>": "0", "<2,15>": { "<2,15,1>": { @@ -251,7 +432,16 @@ "<2,18,1,4,8>": "@PARAM6" }, "<2,18,1,5>": "", - "<2,18,1,6>": "" + "<2,18,1,6>": "", + "<2,18,1,7>": "", + "<2,18,1,8>": "", + "<2,18,1,9>": "", + "<2,18,1,10>": "", + "<2,18,1,11>": "", + "<2,18,1,12>": "", + "<2,18,1,13>": "", + "<2,18,1,14>": "", + "<2,18,1,15>": "STPROC" }, "<2,18,2>": { "<2,18,2,1>": "R", @@ -268,7 +458,16 @@ "<2,18,2,4,8>": "@PARAM6" }, "<2,18,2,5>": "", - "<2,18,2,6>": "" + "<2,18,2,6>": "", + "<2,18,2,7>": "", + "<2,18,2,8>": "", + "<2,18,2,9>": "", + "<2,18,2,10>": "", + "<2,18,2,11>": "", + "<2,18,2,12>": "", + "<2,18,2,13>": "", + "<2,18,2,14>": "", + "<2,18,2,15>": "STPROC" }, "<2,18,3>": { "<2,18,3,1>": "R", @@ -285,36 +484,43 @@ "<2,18,3,4,8>": "@PARAM6" }, "<2,18,3,5>": "", - "<2,18,3,6>": "" - }, - "<2,18,4>": "" + "<2,18,3,6>": "", + "<2,18,3,7>": "", + "<2,18,3,8>": "", + "<2,18,3,9>": "", + "<2,18,3,10>": "", + "<2,18,3,11>": "", + "<2,18,3,12>": "", + "<2,18,3,13>": "", + "<2,18,3,14>": "", + "<2,18,3,15>": "STPROC" + } }, "<2,19>": { - "<2,19,1>": "CHAR", - "<2,19,2>": "GOTFOCUS", - "<2,19,3>": "LOSTFOCUS", - "<2,19,4>": "" + "<2,19,1>": "GOTFOCUS", + "<2,19,2>": "LOSTFOCUS", + "<2,19,3>": "CHAR" }, "<2,20>": "", "<2,21>": "", "<2,22>": "", "<2,23>": "", "<2,24>": "", - "<2,25>": "0", - "<2,26>": "0", + "<2,25>": "", + "<2,26>": "", "<2,27>": "", "<2,28>": "<>", "<2,29>": "<>", "<2,30>": "<>", "<2,31>": "0", - "<2,32>": { - "<2,32,1>": "0x7fffe", - "<2,32,2>": "0xf0016508" - }, + "<2,32>": "", "<2,33>": "", "<2,34>": "", "<2,35>": "", - "<2,36>": "", + "<2,36>": { + "<2,36,1>": "0", + "<2,36,2>": "0" + }, "<2,37>": "", "<2,38>": "", "<2,39>": "", @@ -330,7 +536,63 @@ "<2,49>": "", "<2,50>": "", "<2,51>": "", - "<2,52>": "" + "<2,52>": "", + "<2,53>": "", + "<2,54>": "", + "<2,55>": "", + "<2,56>": "", + "<2,57>": "", + "<2,58>": "", + "<2,59>": "", + "<2,60>": "", + "<2,61>": "", + "<2,62>": "0", + "<2,63>": "", + "<2,64>": "", + "<2,65>": "", + "<2,66>": "", + "<2,67>": "", + "<2,68>": "", + "<2,69>": "", + "<2,70>": "", + "<2,71>": "", + "<2,72>": "", + "<2,73>": "", + "<2,74>": "", + "<2,75>": "", + "<2,76>": "", + "<2,77>": "", + "<2,78>": "", + "<2,79>": "", + "<2,80>": "", + "<2,81>": "", + "<2,82>": "", + "<2,83>": "", + "<2,84>": "", + "<2,85>": "", + "<2,86>": "", + "<2,87>": "", + "<2,88>": "", + "<2,89>": "", + "<2,90>": "", + "<2,91>": "", + "<2,92>": "", + "<2,93>": "", + "<2,94>": "", + "<2,95>": "", + "<2,96>": "", + "<2,97>": "", + "<2,98>": "", + "<2,99>": "", + "<2,100>": "", + "<2,101>": "", + "<2,102>": "", + "<2,103>": "", + "<2,104>": "", + "<2,105>": "", + "<2,106>": "", + "<2,107>": "", + "<2,108>": "" }, "<3>": { "<3,1>": "STA_PASSWORD", @@ -351,7 +613,11 @@ "<3,11,2>": "0x80000000" }, "<3,12>": "3", - "<3,13>": "-1", + "<3,13>": { + "<3,13,1>": "-1", + "<3,13,2>": "-1", + "<3,13,3>": "" + }, "<3,14>": "0", "<3,15>": { "<3,15,1>": { @@ -380,17 +646,14 @@ "<3,22>": "", "<3,23>": "", "<3,24>": "", - "<3,25>": "0", - "<3,26>": "0", + "<3,25>": "", + "<3,26>": "", "<3,27>": "", - "<3,28>": "<>", - "<3,29>": "<>", - "<3,30>": "<>", - "<3,31>": "0", - "<3,32>": { - "<3,32,1>": "0x7fffe", - "<3,32,2>": "0xf0016508" - }, + "<3,28>": "", + "<3,29>": "", + "<3,30>": "", + "<3,31>": "", + "<3,32>": "", "<3,33>": "", "<3,34>": "", "<3,35>": "", @@ -410,7 +673,76 @@ "<3,49>": "", "<3,50>": "", "<3,51>": "", - "<3,52>": "" + "<3,52>": "", + "<3,53>": "", + "<3,54>": "", + "<3,55>": "", + "<3,56>": "", + "<3,57>": "", + "<3,58>": "", + "<3,59>": "", + "<3,60>": "", + "<3,61>": "", + "<3,62>": "0", + "<3,63>": { + "<3,63,1>": "", + "<3,63,2>": "", + "<3,63,3>": "", + "<3,63,4>": "", + "<3,63,5>": "", + "<3,63,6>": "", + "<3,63,7>": "", + "<3,63,8>": "" + }, + "<3,64>": { + "<3,64,1>": "", + "<3,64,2>": "", + "<3,64,3>": "" + }, + "<3,65>": "-2", + "<3,66>": "", + "<3,67>": "", + "<3,68>": "", + "<3,69>": "", + "<3,70>": "", + "<3,71>": "", + "<3,72>": "", + "<3,73>": "", + "<3,74>": "", + "<3,75>": "", + "<3,76>": "", + "<3,77>": "", + "<3,78>": "", + "<3,79>": "", + "<3,80>": "", + "<3,81>": "", + "<3,82>": "", + "<3,83>": "", + "<3,84>": "", + "<3,85>": "", + "<3,86>": "", + "<3,87>": "", + "<3,88>": "", + "<3,89>": "", + "<3,90>": "0", + "<3,91>": "0", + "<3,92>": "", + "<3,93>": "", + "<3,94>": "", + "<3,95>": "", + "<3,96>": "", + "<3,97>": "", + "<3,98>": "", + "<3,99>": "", + "<3,100>": "", + "<3,101>": "", + "<3,102>": "", + "<3,103>": "", + "<3,104>": "", + "<3,105>": "", + "<3,106>": "", + "<3,107>": "", + "<3,108>": "" }, "<4>": { "<4,1>": "EDL_PASSWORD", @@ -431,7 +763,11 @@ "<4,11,2>": "0x80000100" }, "<4,12>": "4", - "<4,13>": "-2", + "<4,13>": { + "<4,13,1>": "-2", + "<4,13,2>": "-2", + "<4,13,3>": "" + }, "<4,14>": "0", "<4,15>": { "<4,15,1>": { @@ -469,7 +805,16 @@ "<4,18,1,4,8>": "@PARAM6" }, "<4,18,1,5>": "", - "<4,18,1,6>": "" + "<4,18,1,6>": "", + "<4,18,1,7>": "", + "<4,18,1,8>": "", + "<4,18,1,9>": "", + "<4,18,1,10>": "", + "<4,18,1,11>": "", + "<4,18,1,12>": "", + "<4,18,1,13>": "", + "<4,18,1,14>": "", + "<4,18,1,15>": "STPROC" }, "<4,18,2>": { "<4,18,2,1>": "R", @@ -486,35 +831,42 @@ "<4,18,2,4,8>": "@PARAM6" }, "<4,18,2,5>": "", - "<4,18,2,6>": "" - }, - "<4,18,3>": "" + "<4,18,2,6>": "", + "<4,18,2,7>": "", + "<4,18,2,8>": "", + "<4,18,2,9>": "", + "<4,18,2,10>": "", + "<4,18,2,11>": "", + "<4,18,2,12>": "", + "<4,18,2,13>": "", + "<4,18,2,14>": "", + "<4,18,2,15>": "STPROC" + } }, "<4,19>": { - "<4,19,1>": "CHAR", - "<4,19,2>": "GOTFOCUS", - "<4,19,3>": "" + "<4,19,1>": "GOTFOCUS", + "<4,19,2>": "CHAR" }, "<4,20>": "", "<4,21>": "", "<4,22>": "", "<4,23>": "", "<4,24>": "", - "<4,25>": "0", - "<4,26>": "0", + "<4,25>": "", + "<4,26>": "", "<4,27>": "", "<4,28>": "<>", "<4,29>": "<>", "<4,30>": "<>", "<4,31>": "0", - "<4,32>": { - "<4,32,1>": "0x7fffe", - "<4,32,2>": "0xf0016108" - }, + "<4,32>": "", "<4,33>": "", "<4,34>": "", "<4,35>": "", - "<4,36>": "", + "<4,36>": { + "<4,36,1>": "-1", + "<4,36,2>": "0" + }, "<4,37>": "", "<4,38>": "", "<4,39>": "", @@ -530,7 +882,63 @@ "<4,49>": "", "<4,50>": "", "<4,51>": "", - "<4,52>": "" + "<4,52>": "", + "<4,53>": "", + "<4,54>": "", + "<4,55>": "", + "<4,56>": "", + "<4,57>": "", + "<4,58>": "", + "<4,59>": "", + "<4,60>": "", + "<4,61>": "", + "<4,62>": "0", + "<4,63>": "", + "<4,64>": "", + "<4,65>": "", + "<4,66>": "", + "<4,67>": "", + "<4,68>": "", + "<4,69>": "", + "<4,70>": "", + "<4,71>": "", + "<4,72>": "", + "<4,73>": "", + "<4,74>": "", + "<4,75>": "", + "<4,76>": "", + "<4,77>": "", + "<4,78>": "", + "<4,79>": "", + "<4,80>": "", + "<4,81>": "", + "<4,82>": "", + "<4,83>": "", + "<4,84>": "", + "<4,85>": "", + "<4,86>": "", + "<4,87>": "", + "<4,88>": "", + "<4,89>": "", + "<4,90>": "", + "<4,91>": "", + "<4,92>": "", + "<4,93>": "", + "<4,94>": "", + "<4,95>": "", + "<4,96>": "", + "<4,97>": "", + "<4,98>": "", + "<4,99>": "", + "<4,100>": "", + "<4,101>": "", + "<4,102>": "", + "<4,103>": "", + "<4,104>": "", + "<4,105>": "", + "<4,106>": "", + "<4,107>": "", + "<4,108>": "" }, "<5>": { "<5,1>": "PUB_OK", @@ -543,15 +951,19 @@ "<5,8>": "25", "<5,9>": "&OK", "<5,10>": { - "<5,10,1>": "0x5E002000", + "<5,10,1>": "0x5E002300", "<5,10,2>": "0x0" }, "<5,11>": { - "<5,11,1>": "0x3101", + "<5,11,1>": "0x3001", "<5,11,2>": "0x80000000" }, "<5,12>": "5", - "<5,13>": "15921906", + "<5,13>": { + "<5,13,1>": "15921906", + "<5,13,2>": "15921906", + "<5,13,3>": "0" + }, "<5,14>": "0", "<5,15>": { "<5,15,1>": { @@ -589,30 +1001,32 @@ "<5,18,1,4,8>": "@PARAM6" }, "<5,18,1,5>": "", - "<5,18,1,6>": "" - }, - "<5,18,2>": "" - }, - "<5,19>": { - "<5,19,1>": "CLICK", - "<5,19,2>": "" + "<5,18,1,6>": "", + "<5,18,1,7>": "", + "<5,18,1,8>": "", + "<5,18,1,9>": "", + "<5,18,1,10>": "", + "<5,18,1,11>": "", + "<5,18,1,12>": "", + "<5,18,1,13>": "", + "<5,18,1,14>": "", + "<5,18,1,15>": "STPROC" + } }, + "<5,19>": "CLICK", "<5,20>": "", "<5,21>": "", "<5,22>": "", "<5,23>": "", "<5,24>": "", - "<5,25>": "0", - "<5,26>": "0", + "<5,25>": "", + "<5,26>": "", "<5,27>": "", - "<5,28>": "<>", - "<5,29>": "<>", - "<5,30>": "<>", - "<5,31>": "0", - "<5,32>": { - "<5,32,1>": "0x7fffe", - "<5,32,2>": "0xf0014188" - }, + "<5,28>": "", + "<5,29>": "", + "<5,30>": "", + "<5,31>": "", + "<5,32>": "", "<5,33>": "", "<5,34>": "", "<5,35>": "", @@ -621,7 +1035,10 @@ "<5,38>": "", "<5,39>": "", "<5,40>": "1", - "<5,41>": "", + "<5,41>": { + "<5,41,1>": "", + "<5,41,2>": "-1" + }, "<5,42>": "", "<5,43>": "", "<5,44>": "", @@ -631,7 +1048,68 @@ "<5,48>": "", "<5,49>": "", "<5,50>": "", - "<5,51>": "" + "<5,51>": "", + "<5,52>": "", + "<5,53>": "", + "<5,54>": "", + "<5,55>": "", + "<5,56>": "", + "<5,57>": "", + "<5,58>": "", + "<5,59>": "", + "<5,60>": "", + "<5,61>": "", + "<5,62>": "0", + "<5,63>": "", + "<5,64>": { + "<5,64,1>": "-2", + "<5,64,2>": "-2", + "<5,64,3>": "0" + }, + "<5,65>": "-2", + "<5,66>": "", + "<5,67>": "", + "<5,68>": "", + "<5,69>": "", + "<5,70>": "", + "<5,71>": "", + "<5,72>": "", + "<5,73>": "", + "<5,74>": "", + "<5,75>": "", + "<5,76>": "", + "<5,77>": "", + "<5,78>": "", + "<5,79>": "", + "<5,80>": "", + "<5,81>": "", + "<5,82>": "", + "<5,83>": "", + "<5,84>": "", + "<5,85>": "", + "<5,86>": "", + "<5,87>": "", + "<5,88>": "", + "<5,89>": "", + "<5,90>": "0", + "<5,91>": "0", + "<5,92>": "", + "<5,93>": "", + "<5,94>": "", + "<5,95>": "", + "<5,96>": "", + "<5,97>": "", + "<5,98>": "", + "<5,99>": "", + "<5,100>": "", + "<5,101>": "", + "<5,102>": "", + "<5,103>": "", + "<5,104>": "", + "<5,105>": "", + "<5,106>": "", + "<5,107>": "", + "<5,108>": "" }, "<6>": { "<6,1>": "PUB_CANCEL", @@ -644,15 +1122,19 @@ "<6,8>": "25", "<6,9>": "&Cancel", "<6,10>": { - "<6,10,1>": "0x56002000", + "<6,10,1>": "0x56002300", "<6,10,2>": "0x0" }, "<6,11>": { - "<6,11,1>": "0x3102", + "<6,11,1>": "0x3002", "<6,11,2>": "0x80000000" }, "<6,12>": "6", - "<6,13>": "15921906", + "<6,13>": { + "<6,13,1>": "15921906", + "<6,13,2>": "15921906", + "<6,13,3>": "0" + }, "<6,14>": "0", "<6,15>": { "<6,15,1>": { @@ -681,30 +1163,32 @@ "<6,18,1,3>": "@WINDOW", "<6,18,1,4>": "", "<6,18,1,5>": "", - "<6,18,1,6>": "" - }, - "<6,18,2>": "" - }, - "<6,19>": { - "<6,19,1>": "CLICK", - "<6,19,2>": "" + "<6,18,1,6>": "", + "<6,18,1,7>": "", + "<6,18,1,8>": "", + "<6,18,1,9>": "", + "<6,18,1,10>": "", + "<6,18,1,11>": "", + "<6,18,1,12>": "", + "<6,18,1,13>": "", + "<6,18,1,14>": "", + "<6,18,1,15>": "GEN" + } }, + "<6,19>": "CLICK", "<6,20>": "", "<6,21>": "", "<6,22>": "", "<6,23>": "", "<6,24>": "", - "<6,25>": "0", - "<6,26>": "0", + "<6,25>": "", + "<6,26>": "", "<6,27>": "", - "<6,28>": "<>", - "<6,29>": "<>", - "<6,30>": "<>", - "<6,31>": "0", - "<6,32>": { - "<6,32,1>": "0x7fffe", - "<6,32,2>": "0xf0014188" - }, + "<6,28>": "", + "<6,29>": "", + "<6,30>": "", + "<6,31>": "", + "<6,32>": "", "<6,33>": "", "<6,34>": "", "<6,35>": "", @@ -713,7 +1197,10 @@ "<6,38>": "", "<6,39>": "", "<6,40>": "1", - "<6,41>": "", + "<6,41>": { + "<6,41,1>": "", + "<6,41,2>": "-1" + }, "<6,42>": "", "<6,43>": "", "<6,44>": "", @@ -723,7 +1210,68 @@ "<6,48>": "", "<6,49>": "", "<6,50>": "", - "<6,51>": "" + "<6,51>": "", + "<6,52>": "", + "<6,53>": "", + "<6,54>": "", + "<6,55>": "", + "<6,56>": "", + "<6,57>": "", + "<6,58>": "", + "<6,59>": "", + "<6,60>": "", + "<6,61>": "", + "<6,62>": "0", + "<6,63>": "", + "<6,64>": { + "<6,64,1>": "-2", + "<6,64,2>": "-2", + "<6,64,3>": "0" + }, + "<6,65>": "-2", + "<6,66>": "", + "<6,67>": "", + "<6,68>": "", + "<6,69>": "", + "<6,70>": "", + "<6,71>": "", + "<6,72>": "", + "<6,73>": "", + "<6,74>": "", + "<6,75>": "", + "<6,76>": "", + "<6,77>": "", + "<6,78>": "", + "<6,79>": "", + "<6,80>": "", + "<6,81>": "", + "<6,82>": "", + "<6,83>": "", + "<6,84>": "", + "<6,85>": "", + "<6,86>": "", + "<6,87>": "", + "<6,88>": "", + "<6,89>": "", + "<6,90>": "0", + "<6,91>": "0", + "<6,92>": "", + "<6,93>": "", + "<6,94>": "", + "<6,95>": "", + "<6,96>": "", + "<6,97>": "", + "<6,98>": "", + "<6,99>": "", + "<6,100>": "", + "<6,101>": "", + "<6,102>": "", + "<6,103>": "", + "<6,104>": "", + "<6,105>": "", + "<6,106>": "", + "<6,107>": "", + "<6,108>": "" }, "<7>": { "<7,1>": "OLE_PIC_LOGO", @@ -744,7 +1292,11 @@ "<7,11,2>": "0x80000000" }, "<7,12>": "7", - "<7,13>": "15921906", + "<7,13>": { + "<7,13,1>": "15921906", + "<7,13,2>": "15921906", + "<7,13,3>": "" + }, "<7,14>": "0", "<7,15>": { "<7,15,1>": { @@ -773,22 +1325,150 @@ "<7,22>": "", "<7,23>": "", "<7,24>": "", - "<7,25>": "0", - "<7,26>": "0", + "<7,25>": "", + "<7,26>": "", "<7,27>": "", - "<7,28>": "<>", - "<7,29>": "<>", - "<7,30>": "<>", - "<7,31>": "0", - "<7,32>": { - "<7,32,1>": "0x7fffe", - "<7,32,2>": "0xf0014400" - }, + "<7,28>": "", + "<7,29>": "", + "<7,30>": "", + "<7,31>": "", + "<7,32>": "", "<7,33>": "", "<7,34>": "", "<7,35>": "", "<7,36>": "05000000000000000000000032000000FFFEFF044E006F006E006500FFFEFF0341006C006C00FFFEFF044E006F006E006500FFFEFF044E006F006E0065000100000001000000FFFEFF0D430065006E00740065007200FEF0430065006E00740065007200FFFEFF142E005C0062006D00700073005C004D00450053005F004C004F0047004F004E002E0062006D007000FFFEFF095400680075006D0062006E00610069006C00FFFEFF044E006F006E006500FFFEFF00FFFEFF044E006F006E006500FFFEFF225300650067006F006500200055004900FCF02D0031003100FCF0340030003000FCF03000FCF03000FCF03000FCF03100FCF03000FCF03000FCF03000FCF03000FCF03000000000000000F03FFFFEFF0D430065006E00740065007200FEF0430065006E007400650072000000000000000000000000000000000001000000", - "<7,37>": "" + "<7,37>": "", + "<7,38>": "", + "<7,39>": "", + "<7,40>": "", + "<7,41>": "", + "<7,42>": "", + "<7,43>": "", + "<7,44>": "", + "<7,45>": "", + "<7,46>": "", + "<7,47>": "", + "<7,48>": "", + "<7,49>": "", + "<7,50>": "", + "<7,51>": "", + "<7,52>": "", + "<7,53>": "", + "<7,54>": "", + "<7,55>": { + "<7,55,1>": "OLE.Animated", + "<7,55,2>": "OLE.AnimationDelay", + "<7,55,3>": "OLE.AutoLoadDropFile", + "<7,55,4>": "OLE.BackgroundColor", + "<7,55,5>": "OLE.BorderAlignment", + "<7,55,6>": "OLE.BorderType", + "<7,55,7>": "OLE.Caption", + "<7,55,8>": "OLE.CaptionColor", + "<7,55,9>": "OLE.CaptionHorzAlign", + "<7,55,10>": "OLE.CaptionHorzOffset", + "<7,55,11>": "OLE.CaptionVertAlign", + "<7,55,12>": "OLE.CaptionVertOffset", + "<7,55,13>": "OLE.ControlPart", + "<7,55,14>": "OLE.FontBold", + "<7,55,15>": "OLE.FontItalic", + "<7,55,16>": "OLE.FontName", + "<7,55,17>": "OLE.FontSize", + "<7,55,18>": "OLE.FontUnderlined", + "<7,55,19>": "OLE.Frame", + "<7,55,20>": "OLE.FrameCount", + "<7,55,21>": "OLE.HorzAlign", + "<7,55,22>": "OLE.Image", + "<7,55,23>": "OLE.ImageHorzOffset", + "<7,55,24>": "OLE.ImageVertOffset", + "<7,55,25>": "OLE.Layout", + "<7,55,26>": "OLE.ResizeUsingGDIPlus", + "<7,55,27>": "OLE.TransparentColor", + "<7,55,28>": "OLE.VertAlign", + "<7,55,29>": "OLE.Zoom" + }, + "<7,56>": { + "<7,56,1>": "0", + "<7,56,2>": "50", + "<7,56,3>": "0", + "<7,56,4>": "None", + "<7,56,5>": "All", + "<7,56,6>": "None", + "<7,56,7>": "", + "<7,56,8>": "None", + "<7,56,9>": "Center", + "<7,56,10>": "0", + "<7,56,11>": "Center", + "<7,56,12>": "0", + "<7,56,13>": "None", + "<7,56,14>": "0", + "<7,56,15>": "0", + "<7,56,16>": "Segoe UI", + "<7,56,17>": "8", + "<7,56,18>": "0", + "<7,56,19>": "1", + "<7,56,20>": "1", + "<7,56,21>": "Center", + "<7,56,22>": ".\\bmps\\MES_LOGON.bmp", + "<7,56,23>": "0", + "<7,56,24>": "0", + "<7,56,25>": "Thumbnail", + "<7,56,26>": "1", + "<7,56,27>": "None", + "<7,56,28>": "Center", + "<7,56,29>": "1" + }, + "<7,57>": "", + "<7,58>": "", + "<7,59>": "", + "<7,60>": "", + "<7,61>": "", + "<7,62>": "", + "<7,63>": "", + "<7,64>": "", + "<7,65>": "", + "<7,66>": "", + "<7,67>": "", + "<7,68>": "", + "<7,69>": "", + "<7,70>": "", + "<7,71>": "", + "<7,72>": "", + "<7,73>": "", + "<7,74>": "", + "<7,75>": "", + "<7,76>": "", + "<7,77>": "", + "<7,78>": "", + "<7,79>": "", + "<7,80>": "", + "<7,81>": "", + "<7,82>": "", + "<7,83>": "", + "<7,84>": "", + "<7,85>": "", + "<7,86>": "", + "<7,87>": "", + "<7,88>": "", + "<7,89>": "", + "<7,90>": "", + "<7,91>": "", + "<7,92>": "", + "<7,93>": "", + "<7,94>": "", + "<7,95>": "", + "<7,96>": "", + "<7,97>": "", + "<7,98>": "", + "<7,99>": "", + "<7,100>": "", + "<7,101>": "", + "<7,102>": "", + "<7,103>": "", + "<7,104>": "", + "<7,105>": "", + "<7,106>": "", + "<7,107>": "", + "<7,108>": "" }, "<8>": { "<8,1>": "OLE_PIC_HDIV_1", @@ -809,7 +1489,11 @@ "<8,11,2>": "0x80000000" }, "<8,12>": "8", - "<8,13>": "15921906", + "<8,13>": { + "<8,13,1>": "15921906", + "<8,13,2>": "15921906", + "<8,13,3>": "" + }, "<8,14>": "0", "<8,15>": { "<8,15,1>": { @@ -838,22 +1522,150 @@ "<8,22>": "", "<8,23>": "", "<8,24>": "", - "<8,25>": "0", - "<8,26>": "0", + "<8,25>": "", + "<8,26>": "", "<8,27>": "", - "<8,28>": "<>", - "<8,29>": "<>", - "<8,30>": "<>", - "<8,31>": "0", - "<8,32>": { - "<8,32,1>": "0x7fffe", - "<8,32,2>": "0xf0014400" - }, + "<8,28>": "", + "<8,29>": "", + "<8,30>": "", + "<8,31>": "", + "<8,32>": "", "<8,33>": "", "<8,34>": "", "<8,35>": "", "<8,36>": "05000000000000000000000032000000FFFEFF044E006F006E006500FFFEFF0341006C006C00FFFEFF044E006F006E006500FFFEFF0F5400420020004D0065006E007500200044006900760069006400650072000100000001000000FFFEFF0D430065006E00740065007200FEF0430065006E00740065007200FFFEFF00FFFEFF095400680075006D0062006E00610069006C00FFFEFF044100750074006F00FFFEFF00FFFEFF044E006F006E006500FFFEFF225300650067006F006500200055004900FCF02D0031003100FCF0340030003000FCF03000FCF03000FCF03000FCF03100FCF03000FCF03000FCF03000FCF03000FCF03000000000000000F03FFFFEFF0D430065006E00740065007200FEF0430065006E007400650072000000000000000000000000000000000001000000", - "<8,37>": "" + "<8,37>": "", + "<8,38>": "", + "<8,39>": "", + "<8,40>": "", + "<8,41>": "", + "<8,42>": "", + "<8,43>": "", + "<8,44>": "", + "<8,45>": "", + "<8,46>": "", + "<8,47>": "", + "<8,48>": "", + "<8,49>": "", + "<8,50>": "", + "<8,51>": "", + "<8,52>": "", + "<8,53>": "", + "<8,54>": "", + "<8,55>": { + "<8,55,1>": "OLE.Animated", + "<8,55,2>": "OLE.AnimationDelay", + "<8,55,3>": "OLE.AutoLoadDropFile", + "<8,55,4>": "OLE.BackgroundColor", + "<8,55,5>": "OLE.BorderAlignment", + "<8,55,6>": "OLE.BorderType", + "<8,55,7>": "OLE.Caption", + "<8,55,8>": "OLE.CaptionColor", + "<8,55,9>": "OLE.CaptionHorzAlign", + "<8,55,10>": "OLE.CaptionHorzOffset", + "<8,55,11>": "OLE.CaptionVertAlign", + "<8,55,12>": "OLE.CaptionVertOffset", + "<8,55,13>": "OLE.ControlPart", + "<8,55,14>": "OLE.FontBold", + "<8,55,15>": "OLE.FontItalic", + "<8,55,16>": "OLE.FontName", + "<8,55,17>": "OLE.FontSize", + "<8,55,18>": "OLE.FontUnderlined", + "<8,55,19>": "OLE.Frame", + "<8,55,20>": "OLE.FrameCount", + "<8,55,21>": "OLE.HorzAlign", + "<8,55,22>": "OLE.Image", + "<8,55,23>": "OLE.ImageHorzOffset", + "<8,55,24>": "OLE.ImageVertOffset", + "<8,55,25>": "OLE.Layout", + "<8,55,26>": "OLE.ResizeUsingGDIPlus", + "<8,55,27>": "OLE.TransparentColor", + "<8,55,28>": "OLE.VertAlign", + "<8,55,29>": "OLE.Zoom" + }, + "<8,56>": { + "<8,56,1>": "0", + "<8,56,2>": "50", + "<8,56,3>": "0", + "<8,56,4>": "None", + "<8,56,5>": "All", + "<8,56,6>": "None", + "<8,56,7>": "", + "<8,56,8>": "None", + "<8,56,9>": "Center", + "<8,56,10>": "0", + "<8,56,11>": "Center", + "<8,56,12>": "0", + "<8,56,13>": "TB Menu Divider", + "<8,56,14>": "0", + "<8,56,15>": "0", + "<8,56,16>": "Segoe UI", + "<8,56,17>": "8", + "<8,56,18>": "0", + "<8,56,19>": "1", + "<8,56,20>": "1", + "<8,56,21>": "Center", + "<8,56,22>": "", + "<8,56,23>": "0", + "<8,56,24>": "0", + "<8,56,25>": "Thumbnail", + "<8,56,26>": "1", + "<8,56,27>": "Auto", + "<8,56,28>": "Center", + "<8,56,29>": "1" + }, + "<8,57>": "", + "<8,58>": "", + "<8,59>": "", + "<8,60>": "", + "<8,61>": "", + "<8,62>": "", + "<8,63>": "", + "<8,64>": "", + "<8,65>": "", + "<8,66>": "", + "<8,67>": "", + "<8,68>": "", + "<8,69>": "", + "<8,70>": "", + "<8,71>": "", + "<8,72>": "", + "<8,73>": "", + "<8,74>": "", + "<8,75>": "", + "<8,76>": "", + "<8,77>": "", + "<8,78>": "", + "<8,79>": "", + "<8,80>": "", + "<8,81>": "", + "<8,82>": "", + "<8,83>": "", + "<8,84>": "", + "<8,85>": "", + "<8,86>": "", + "<8,87>": "", + "<8,88>": "", + "<8,89>": "", + "<8,90>": "", + "<8,91>": "", + "<8,92>": "", + "<8,93>": "", + "<8,94>": "", + "<8,95>": "", + "<8,96>": "", + "<8,97>": "", + "<8,98>": "", + "<8,99>": "", + "<8,100>": "", + "<8,101>": "", + "<8,102>": "", + "<8,103>": "", + "<8,104>": "", + "<8,105>": "", + "<8,106>": "", + "<8,107>": "", + "<8,108>": "" }, "<9>": { "<9,1>": "OLE_PIC_HDIV_2", @@ -874,7 +1686,11 @@ "<9,11,2>": "0x80000000" }, "<9,12>": "9", - "<9,13>": "15921906", + "<9,13>": { + "<9,13,1>": "15921906", + "<9,13,2>": "15921906", + "<9,13,3>": "" + }, "<9,14>": "0", "<9,15>": { "<9,15,1>": { @@ -903,22 +1719,150 @@ "<9,22>": "", "<9,23>": "", "<9,24>": "", - "<9,25>": "0", - "<9,26>": "0", + "<9,25>": "", + "<9,26>": "", "<9,27>": "", - "<9,28>": "<>", - "<9,29>": "<>", - "<9,30>": "<>", - "<9,31>": "0", - "<9,32>": { - "<9,32,1>": "0x7fffe", - "<9,32,2>": "0xf0014400" - }, + "<9,28>": "", + "<9,29>": "", + "<9,30>": "", + "<9,31>": "", + "<9,32>": "", "<9,33>": "", "<9,34>": "", "<9,35>": "", "<9,36>": "05000000000000000000000032000000FFFEFF044E006F006E006500FFFEFF0341006C006C00FFFEFF044E006F006E006500FFFEFF0F5400420020004D0065006E007500200044006900760069006400650072000100000001000000FFFEFF0D430065006E00740065007200FEF0430065006E00740065007200FFFEFF00FFFEFF095400680075006D0062006E00610069006C00FFFEFF044100750074006F00FFFEFF00FFFEFF044E006F006E006500FFFEFF225300650067006F006500200055004900FCF02D0031003100FCF0340030003000FCF03000FCF03000FCF03000FCF03100FCF03000FCF03000FCF03000FCF03000FCF03000000000000000F03FFFFEFF0D430065006E00740065007200FEF0430065006E007400650072000000000000000000000000000000000001000000", - "<9,37>": "" + "<9,37>": "", + "<9,38>": "", + "<9,39>": "", + "<9,40>": "", + "<9,41>": "", + "<9,42>": "", + "<9,43>": "", + "<9,44>": "", + "<9,45>": "", + "<9,46>": "", + "<9,47>": "", + "<9,48>": "", + "<9,49>": "", + "<9,50>": "", + "<9,51>": "", + "<9,52>": "", + "<9,53>": "", + "<9,54>": "", + "<9,55>": { + "<9,55,1>": "OLE.Animated", + "<9,55,2>": "OLE.AnimationDelay", + "<9,55,3>": "OLE.AutoLoadDropFile", + "<9,55,4>": "OLE.BackgroundColor", + "<9,55,5>": "OLE.BorderAlignment", + "<9,55,6>": "OLE.BorderType", + "<9,55,7>": "OLE.Caption", + "<9,55,8>": "OLE.CaptionColor", + "<9,55,9>": "OLE.CaptionHorzAlign", + "<9,55,10>": "OLE.CaptionHorzOffset", + "<9,55,11>": "OLE.CaptionVertAlign", + "<9,55,12>": "OLE.CaptionVertOffset", + "<9,55,13>": "OLE.ControlPart", + "<9,55,14>": "OLE.FontBold", + "<9,55,15>": "OLE.FontItalic", + "<9,55,16>": "OLE.FontName", + "<9,55,17>": "OLE.FontSize", + "<9,55,18>": "OLE.FontUnderlined", + "<9,55,19>": "OLE.Frame", + "<9,55,20>": "OLE.FrameCount", + "<9,55,21>": "OLE.HorzAlign", + "<9,55,22>": "OLE.Image", + "<9,55,23>": "OLE.ImageHorzOffset", + "<9,55,24>": "OLE.ImageVertOffset", + "<9,55,25>": "OLE.Layout", + "<9,55,26>": "OLE.ResizeUsingGDIPlus", + "<9,55,27>": "OLE.TransparentColor", + "<9,55,28>": "OLE.VertAlign", + "<9,55,29>": "OLE.Zoom" + }, + "<9,56>": { + "<9,56,1>": "0", + "<9,56,2>": "50", + "<9,56,3>": "0", + "<9,56,4>": "None", + "<9,56,5>": "All", + "<9,56,6>": "None", + "<9,56,7>": "", + "<9,56,8>": "None", + "<9,56,9>": "Center", + "<9,56,10>": "0", + "<9,56,11>": "Center", + "<9,56,12>": "0", + "<9,56,13>": "TB Menu Divider", + "<9,56,14>": "0", + "<9,56,15>": "0", + "<9,56,16>": "Segoe UI", + "<9,56,17>": "8", + "<9,56,18>": "0", + "<9,56,19>": "1", + "<9,56,20>": "1", + "<9,56,21>": "Center", + "<9,56,22>": "", + "<9,56,23>": "0", + "<9,56,24>": "0", + "<9,56,25>": "Thumbnail", + "<9,56,26>": "1", + "<9,56,27>": "Auto", + "<9,56,28>": "Center", + "<9,56,29>": "1" + }, + "<9,57>": "", + "<9,58>": "", + "<9,59>": "", + "<9,60>": "", + "<9,61>": "", + "<9,62>": "", + "<9,63>": "", + "<9,64>": "", + "<9,65>": "", + "<9,66>": "", + "<9,67>": "", + "<9,68>": "", + "<9,69>": "", + "<9,70>": "", + "<9,71>": "", + "<9,72>": "", + "<9,73>": "", + "<9,74>": "", + "<9,75>": "", + "<9,76>": "", + "<9,77>": "", + "<9,78>": "", + "<9,79>": "", + "<9,80>": "", + "<9,81>": "", + "<9,82>": "", + "<9,83>": "", + "<9,84>": "", + "<9,85>": "", + "<9,86>": "", + "<9,87>": "", + "<9,88>": "", + "<9,89>": "", + "<9,90>": "", + "<9,91>": "", + "<9,92>": "", + "<9,93>": "", + "<9,94>": "", + "<9,95>": "", + "<9,96>": "", + "<9,97>": "", + "<9,98>": "", + "<9,99>": "", + "<9,100>": "", + "<9,101>": "", + "<9,102>": "", + "<9,103>": "", + "<9,104>": "", + "<9,105>": "", + "<9,106>": "", + "<9,107>": "", + "<9,108>": "" }, "<10>": { "<10,1>": "OLE_SUBCLASS", @@ -939,7 +1883,11 @@ "<10,11,2>": "0x80000000" }, "<10,12>": "10", - "<10,13>": "-2", + "<10,13>": { + "<10,13,1>": "-2", + "<10,13,2>": "-2", + "<10,13,3>": "" + }, "<10,14>": "0", "<10,15>": { "<10,15,1>": { @@ -968,22 +1916,90 @@ "<10,22>": "", "<10,23>": "", "<10,24>": "", - "<10,25>": "0", - "<10,26>": "0", + "<10,25>": "", + "<10,26>": "", "<10,27>": "", - "<10,28>": "<>", - "<10,29>": "<>", - "<10,30>": "<>", - "<10,31>": "0", - "<10,32>": { - "<10,32,1>": "0x7fffe", - "<10,32,2>": "0xf0016800" - }, + "<10,28>": "", + "<10,29>": "", + "<10,30>": "", + "<10,31>": "", + "<10,32>": "", "<10,33>": "", "<10,34>": "", "<10,35>": "", "<10,36>": "", - "<10,37>": "" + "<10,37>": "", + "<10,38>": "", + "<10,39>": "", + "<10,40>": "", + "<10,41>": "", + "<10,42>": "", + "<10,43>": "", + "<10,44>": "", + "<10,45>": "", + "<10,46>": "", + "<10,47>": "", + "<10,48>": "", + "<10,49>": "", + "<10,50>": "", + "<10,51>": "", + "<10,52>": "", + "<10,53>": "", + "<10,54>": "", + "<10,55>": "OLE.Border", + "<10,56>": "None", + "<10,57>": "", + "<10,58>": "", + "<10,59>": "", + "<10,60>": "", + "<10,61>": "", + "<10,62>": "", + "<10,63>": "", + "<10,64>": "", + "<10,65>": "", + "<10,66>": "", + "<10,67>": "", + "<10,68>": "", + "<10,69>": "", + "<10,70>": "", + "<10,71>": "", + "<10,72>": "", + "<10,73>": "", + "<10,74>": "", + "<10,75>": "", + "<10,76>": "", + "<10,77>": "", + "<10,78>": "", + "<10,79>": "", + "<10,80>": "", + "<10,81>": "", + "<10,82>": "", + "<10,83>": "", + "<10,84>": "", + "<10,85>": "", + "<10,86>": "", + "<10,87>": "", + "<10,88>": "", + "<10,89>": "", + "<10,90>": "", + "<10,91>": "", + "<10,92>": "", + "<10,93>": "", + "<10,94>": "", + "<10,95>": "", + "<10,96>": "", + "<10,97>": "", + "<10,98>": "", + "<10,99>": "", + "<10,100>": "", + "<10,101>": "", + "<10,102>": "", + "<10,103>": "", + "<10,104>": "", + "<10,105>": "", + "<10,106>": "", + "<10,107>": "", + "<10,108>": "" }, "<11>": { "<11,1>": "OLE_POPUP", @@ -1004,7 +2020,11 @@ "<11,11,2>": "0x80000000" }, "<11,12>": "11", - "<11,13>": "-2", + "<11,13>": { + "<11,13,1>": "-2", + "<11,13,2>": "-2", + "<11,13,3>": "" + }, "<11,14>": "0", "<11,15>": { "<11,15,1>": { @@ -1033,22 +2053,90 @@ "<11,22>": "", "<11,23>": "", "<11,24>": "", - "<11,25>": "0", - "<11,26>": "0", + "<11,25>": "", + "<11,26>": "", "<11,27>": "", - "<11,28>": "<>", - "<11,29>": "<>", - "<11,30>": "<>", - "<11,31>": "0", - "<11,32>": { - "<11,32,1>": "0x7fffe", - "<11,32,2>": "0xf0016800" - }, + "<11,28>": "", + "<11,29>": "", + "<11,30>": "", + "<11,31>": "", + "<11,32>": "", "<11,33>": "", "<11,34>": "", "<11,35>": "", "<11,36>": "", - "<11,37>": "" + "<11,37>": "", + "<11,38>": "", + "<11,39>": "", + "<11,40>": "", + "<11,41>": "", + "<11,42>": "", + "<11,43>": "", + "<11,44>": "", + "<11,45>": "", + "<11,46>": "", + "<11,47>": "", + "<11,48>": "", + "<11,49>": "", + "<11,50>": "", + "<11,51>": "", + "<11,52>": "", + "<11,53>": "", + "<11,54>": "", + "<11,55>": "OLE.Border", + "<11,56>": "None", + "<11,57>": "", + "<11,58>": "", + "<11,59>": "", + "<11,60>": "", + "<11,61>": "", + "<11,62>": "", + "<11,63>": "", + "<11,64>": "", + "<11,65>": "", + "<11,66>": "", + "<11,67>": "", + "<11,68>": "", + "<11,69>": "", + "<11,70>": "", + "<11,71>": "", + "<11,72>": "", + "<11,73>": "", + "<11,74>": "", + "<11,75>": "", + "<11,76>": "", + "<11,77>": "", + "<11,78>": "", + "<11,79>": "", + "<11,80>": "", + "<11,81>": "", + "<11,82>": "", + "<11,83>": "", + "<11,84>": "", + "<11,85>": "", + "<11,86>": "", + "<11,87>": "", + "<11,88>": "", + "<11,89>": "", + "<11,90>": "", + "<11,91>": "", + "<11,92>": "", + "<11,93>": "", + "<11,94>": "", + "<11,95>": "", + "<11,96>": "", + "<11,97>": "", + "<11,98>": "", + "<11,99>": "", + "<11,100>": "", + "<11,101>": "", + "<11,102>": "", + "<11,103>": "", + "<11,104>": "", + "<11,105>": "", + "<11,106>": "", + "<11,107>": "", + "<11,108>": "" }, "<12>": { "<12,1>": "STA_INSTRUCTIONS", @@ -1069,7 +2157,11 @@ "<12,11,2>": "0x80000000" }, "<12,12>": "12", - "<12,13>": "-1", + "<12,13>": { + "<12,13,1>": "-1", + "<12,13,2>": "-1", + "<12,13,3>": "" + }, "<12,14>": "0", "<12,15>": { "<12,15,1>": { @@ -1098,17 +2190,14 @@ "<12,22>": "", "<12,23>": "", "<12,24>": "", - "<12,25>": "0", - "<12,26>": "0", + "<12,25>": "", + "<12,26>": "", "<12,27>": "", - "<12,28>": "<>", - "<12,29>": "<>", - "<12,30>": "<>", - "<12,31>": "0", - "<12,32>": { - "<12,32,1>": "0x7fffe", - "<12,32,2>": "0xf0016508" - }, + "<12,28>": "", + "<12,29>": "", + "<12,30>": "", + "<12,31>": "", + "<12,32>": "", "<12,33>": "", "<12,34>": "", "<12,35>": "", @@ -1128,18 +2217,80 @@ "<12,49>": "", "<12,50>": "", "<12,51>": "", - "<12,52>": "" - }, - "<13>": "" + "<12,52>": "", + "<12,53>": "", + "<12,54>": "", + "<12,55>": "", + "<12,56>": "", + "<12,57>": "", + "<12,58>": "", + "<12,59>": "", + "<12,60>": "", + "<12,61>": "", + "<12,62>": "0", + "<12,63>": { + "<12,63,1>": "", + "<12,63,2>": "", + "<12,63,3>": "", + "<12,63,4>": "", + "<12,63,5>": "", + "<12,63,6>": "", + "<12,63,7>": "", + "<12,63,8>": "" + }, + "<12,64>": { + "<12,64,1>": "", + "<12,64,2>": "", + "<12,64,3>": "" + }, + "<12,65>": "-2", + "<12,66>": "", + "<12,67>": "", + "<12,68>": "", + "<12,69>": "", + "<12,70>": "", + "<12,71>": "", + "<12,72>": "", + "<12,73>": "", + "<12,74>": "", + "<12,75>": "", + "<12,76>": "", + "<12,77>": "", + "<12,78>": "", + "<12,79>": "", + "<12,80>": "", + "<12,81>": "", + "<12,82>": "", + "<12,83>": "", + "<12,84>": "", + "<12,85>": "", + "<12,86>": "", + "<12,87>": "", + "<12,88>": "", + "<12,89>": "", + "<12,90>": "0", + "<12,91>": "0", + "<12,92>": "", + "<12,93>": "", + "<12,94>": "", + "<12,95>": "", + "<12,96>": "", + "<12,97>": "", + "<12,98>": "", + "<12,99>": "", + "<12,100>": "", + "<12,101>": "", + "<12,102>": "", + "<12,103>": "", + "<12,104>": "", + "<12,105>": "", + "<12,106>": "", + "<12,107>": "", + "<12,108>": "" + } }, "record4": { - "<1>": "", - "<2>": { - "<2,1>": "", - "<2,2>": "", - "<2,3>": "", - "<2,4>": "0" - } + "<1>": "" } } } \ No newline at end of file diff --git a/LSL2/STPROC/LOGON_EVENTS.txt b/LSL2/STPROC/LOGON_EVENTS.txt index 92df68c..0a8bb38 100644 --- a/LSL2/STPROC/LOGON_EVENTS.txt +++ b/LSL2/STPROC/LOGON_EVENTS.txt @@ -44,7 +44,7 @@ Declare subroutine SRP_EditTable_Manager, SRP_Show_Window, Logging_Services, ob Declare subroutine Database_Services, End_Window, ShowWindow, SRP_Run_Command, Placedialog Declare function SRP_EditTable_Manager, Database_Services, Security_Services, Logging_Services, Environment_Services Declare function GetPrivateProfileString, WritePrivateProfileString, GetPrivateProfileSection, SRP_Get_FileVersion -Declare function Datetime, Rti_Getnetworkusername +Declare function Datetime LogPath = Environment_Services('GetApplicationRootPath') : '\LogFiles\Version' LogDate = Oconv(Date(), 'D4/') @@ -80,11 +80,6 @@ Return EventFlow else EVENT_CONTINUE$ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// Event WINDOW.CREATE(CreateParam) - - // Stopgap solution to kill SRP App launcher splash screen if it fails to close. - WindowsUser = Rti_Getnetworkusername() - KillCommand = 'taskkill /f /fi "USERNAME EQ ' : WindowsUser : '" /im MES.exe' - SRP_Run_Command(KillCommand, '', '', '') GoSub Setup_OLE_Controls @@ -156,6 +151,7 @@ Event WINDOW.CREATE(CreateParam) PlaceDialog(-2, -2) Set_Property(@Window, 'VISIBLE', 1) + Set_Property(@Window:'.EDL_USERNAME', 'FOCUS', True$) end event @@ -265,4 +261,3 @@ Setup_OLE_Controls: return -