[ActiveLock-Development] CVS: activelock2/test ALTestApp.vbp,1.6,1.7 frmMain.frm,1.8,1.9 modMain.bas,1.7,1.8

[Dan <wiz...@us...>]

Update of /cvsroot/activelock/activelock2/test
In directory sc8-pr-cvs1:/tmp/cvs-serv25946/test

Modified Files:
	ALTestApp.vbp frmMain.frm modMain.bas 
Log Message:
Added TrimNulls to modComputerName and added vbLf's to LockTo string for easy separation later on.

- Dan

Index: ALTestApp.vbp
===================================================================
RCS file: /cvsroot/activelock/activelock2/test/ALTestApp.vbp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ALTestApp.vbp	3 Aug 2003 09:26:21 -0000	1.6
+++ ALTestApp.vbp	4 Aug 2003 01:34:02 -0000	1.7
@@ -1,5 +1,5 @@
 Type=Exe
-Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#stdole2.tlb#OLE Automation
+Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\WINNT\system32\STDOLE2.TLB#OLE Automation
 Reference=*\G{AAED8AB4-AC83-4C51-93EE-64664DB96265}#7.0#0#..\src\ActiveLock2.dll#ActiveLock2
 Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX
 Form=frmMain.frm

Index: frmMain.frm
===================================================================
RCS file: /cvsroot/activelock/activelock2/test/frmMain.frm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- frmMain.frm	3 Aug 2003 09:26:21 -0000	1.8
+++ frmMain.frm	4 Aug 2003 01:34:02 -0000	1.9
@@ -66,15 +66,15 @@
       TabCaption(1)   =   "Registration"
       TabPicture(1)   =   "frmMain.frx":001C
       Tab(1).ControlEnabled=   0   'False
-      Tab(1).Control(0)=   "fraReg"
-      Tab(1).Control(1)=   "fraRegStatus"
+      Tab(1).Control(0)=   "fraRegStatus"
+      Tab(1).Control(1)=   "fraReg"
       Tab(1).ControlCount=   2
       TabCaption(2)   =   "Sample App"
       TabPicture(2)   =   "frmMain.frx":0038
       Tab(2).ControlEnabled=   0   'False
-      Tab(2).Control(0)=   "fraTicker"
+      Tab(2).Control(0)=   "Frame1"
       Tab(2).Control(1)=   "fraViewport"
-      Tab(2).Control(2)=   "Frame1"
+      Tab(2).Control(2)=   "fraTicker"
       Tab(2).ControlCount=   3
       Begin VB.TextBox txtChecksum 
          BackColor       =   &H80000011&
@@ -796,8 +796,15 @@
 End Function
 
 Private Sub GetLockAndUserFromRequestCode(ByVal strReq As String, strLock As String, strUser As String)
-    Dim Index%
+    Dim Index%, i
+    
+    For i = 1 To Len(strReq)
+        If Mid(strReq, i, 1) = vbLf Then Index = i
+    Next i
+    
     Index = InStr(1, strReq, vbLf)
+    
+    
     If Index <= 0 Then Exit Sub
 
     strLock = Left(strReq, Index - 1)
@@ -811,10 +818,10 @@
     On Error GoTo errHandler
     Dim arrBytes() As Byte
     arrBytes = StrConv(Str, vbFromUnicode)
-    Dim I%
-    For I = LBound(arrBytes) To UBound(arrBytes)
-        If arrBytes(I) = char Then
-            IndexOf = I
+    Dim i%
+    For i = LBound(arrBytes) To UBound(arrBytes)
+        If arrBytes(i) = char Then
+            IndexOf = i
             Exit Function
         End If
     Next

Index: modMain.bas
===================================================================
RCS file: /cvsroot/activelock/activelock2/test/modMain.bas,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- modMain.bas	2 Aug 2003 07:18:17 -0000	1.7
+++ modMain.bas	4 Aug 2003 01:34:02 -0000	1.8
@@ -207,7 +207,7 @@
 ' that you generate your own set of keys to use before deploying your app.
 Public Const PRIV_KEY$ = "AAAAgEPRFzhQEF7S91vt2K6kOcEdDDe5BfwNiEL30/+ozTFHc7cZctB8NIlS++ZR//D3AjSMqScjh7xUF/gwvUgGCjiExjj1DF/XWFWnPOCfF8UxYAizCLZ9fdqxb1FRpI5NoW0xxUmvxGjmxKwazIW4P4XVi/+i1Bvh2qQ6ri3whcsNAAAAQQCyWGsbJKO28H2QLYH+enb7ehzwBThqfAeke/Gv1Te95yIAWme71I9aCTTlLsmtIYSk9rNrp3sh9ItD2Re67SE7AAAAQQCAookH1nws1gS2XP9cZTPaZEmFLwuxlSVsLQ5RWmd9cuxpgw5y2gIskbL4c+4oBuj0IDwKtnMrZq7UfV9I5VfVAAAAQQCEnyAuO0ahXH3KhAboop9+tCmRzZInTrDYdMy23xf3PLCLd777dL/Y2Y+zmaH1VO03m6iOog7WLiN4dCL7m+Im"
 Public Const PUB_KEY$ = "AAAAB3NzaC1yc2EAAAABJQAAAIBZnXD4IKfrBH25ekwLWQMs5mJuNH7D7U99EKFIsVhKQv17GHxKWvxHv/FwWhI1Rmd8TCiqk4Wmk7H1rh6xdbIVBwDj+RSeiXs8mmQX4/XvaWZx9BIQr5wODWnQCH/tj6Y6In2Xjc2J3B7LSjD60cWDBY/u+z9cSheTHLyhb16zFw=="
-Private Const AL_CRC& = 308603 ' ActiveLock2.dll's CRC checksum to be used for comparison
+Private Const AL_CRC& = 183580 ' ActiveLock2.dll's CRC checksum to be used for comparison
 Public Function Encrypt(strData As String) As String
     Dim Key As RSAKey
     ' create the key from the key blobs