[ActiveLock-Development] CVS: activelock2/src ActiveLock.cls,1.12,1.13 ActiveLock2.dll,1.6,1.7 ActiveLock2.vbp,1.11,1.12 modComputerName.bas,1.1,1.2

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

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

Modified Files:
	ActiveLock.cls ActiveLock2.dll ActiveLock2.vbp 
	modComputerName.bas 
Log Message:
Added TrimNulls to modComputerName and added vbLf's to LockTo string for easy separation later on.

- Dan

Index: ActiveLock.cls
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock.cls,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ActiveLock.cls	3 Aug 2003 08:38:11 -0000	1.12
+++ ActiveLock.cls	4 Aug 2003 01:34:01 -0000	1.13
@@ -110,9 +110,9 @@
 Private Sub IActiveLock_Init(Arg1 As Variant, ParamArray OtherArgs() As Variant)
     ' Checksum ALCrypto.dll
     Const ALCRYPTO_MD5$ = "ac0dd6351905e6d688199146165170c4"
-    Dim strData As String, strMD5 As String
-    Call modActiveLock.ReadFile(App.Path & "\ALCrypto.Dll", strData)
-    strMD5 = modMD5.Hash(strData) ' use our own MD5 hashing routine instead of ALCrypto's md5_hash() function.
+    Dim strdata As String, strMD5 As String
+    Call modActiveLock.ReadFile(App.path & "\ALCrypto.Dll", strdata)
+    strMD5 = modMD5.Hash(strdata) ' use our own MD5 hashing routine instead of ALCrypto's md5_hash() function.
     If strMD5 <> ALCRYPTO_MD5 Then
         Err.Raise ActiveLockErrCodeConstants.alerrFileTampered, "IActiveLock_Acquire", "ALCrypto.dll has been tampered."
     End If
@@ -309,17 +309,20 @@
     Dim strLock As String
 
     If (mLockTypes And lockMAC) = lockMAC Then
-        strLock = strLock & modMACAddress.GetMACAddress()
+        strLock = strLock & vbLf & modMACAddress.GetMACAddress()
     End If
     If mLockTypes And lockComp Then
-        strLock = strLock & modComputerName.GetComputerName()
+        strLock = strLock & vbLf & modComputerName.GetComputerName()
     End If
     If mLockTypes And lockHD Then
-        strLock = strLock & modHDSerial.GetHDSerial()
+        strLock = strLock & vbLf & modHDSerial.GetHDSerial()
     End If
     If mLockTypes And lockWindows Then
-        strLock = strLock & modWindowsSerial.GetWindowsSerial()
+        strLock = strLock & vbLf & modWindowsSerial.GetWindowsSerial()
     End If
+    
+    If Left(strLock, 1) = vbLf Then strLock = Mid(strLock, 2)
+    
     If Lic Is Nothing Then
         IActiveLock_LockCode = strLock
     Else

Index: ActiveLock2.dll
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock2.dll,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
Binary files /tmp/cvsISBwEp and /tmp/cvsqI6J9F differ

Index: ActiveLock2.vbp
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock2.vbp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ActiveLock2.vbp	3 Aug 2003 08:33:35 -0000	1.11
+++ ActiveLock2.vbp	4 Aug 2003 01:34:02 -0000	1.12
@@ -1,5 +1,5 @@
 Type=OleDll
-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
 Class=ActiveLock; ActiveLock.cls
 Class=IActiveLock; IActiveLock.cls
 Class=Globals; Globals.cls

Index: modComputerName.bas
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/modComputerName.bas,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- modComputerName.bas	29 Jul 2003 18:58:16 -0000	1.1
+++ modComputerName.bas	4 Aug 2003 01:34:02 -0000	1.2
@@ -69,5 +69,5 @@
   maxSize = MAX_COMPUTERNAME_LENGTH + 1
   name = String(maxSize, 0)
   tmp = ComputerName(name, maxSize)
-  GetComputerName = name
+  GetComputerName = TrimNulls(name)
 End Function