[ActiveLock-Development] CVS: activelock2/src ActiveLock.cls,1.6,1.7 ActiveLock2.dll,1.2,1.3 ActiveLock2.vbp,1.7,1.8 Globals.cls,1.7,1.8

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

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

Modified Files:
	ActiveLock.cls ActiveLock2.dll ActiveLock2.vbp Globals.cls 
Log Message:
Added support for locks other than MAC. Hopefully a new test app will follow shortly.

- Dan

Index: ActiveLock.cls
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock.cls,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ActiveLock.cls	28 Jul 2003 06:35:30 -0000	1.6
+++ ActiveLock.cls	29 Jul 2003 18:49:42 -0000	1.7
@@ -55,7 +55,6 @@
 '  /                        MODULE TO DO LIST                            /
 '  ///////////////////////////////////////////////////////////////////////
 '
-'   [ ] Implement IActiveLock_GetLockString() for locktypes other than MAC
 '   [ ] IActiveLock_Acquire: Check if license has not expired
 '   [ ] Implement IActiveLock_Release
 '   [ ] Implement IActiveLock_Transfer
@@ -63,8 +62,9 @@
 '  /                        MODULE CHANGE LOG                            /
 '  ///////////////////////////////////////////////////////////////////////
 '
-'   07.07.03 - mcrute   - Updated the header comments for this file.
-'   07.28.03 - th2tran  - Using RSA signature for license key.
+'   07.07.03 - mcrute        - Updated the header comments for this file.
+'   07.28.03 - th2tran       - Using RSA signature for license key.
+'   07.28.03 - wizzardme2000 - Implemented lockComp, lockHD, and lockWindows
 '
 '  ///////////////////////////////////////////////////////////////////////
 '  /                MODULE CODE BEGINS BELOW THIS LINE                   /
@@ -286,13 +286,13 @@
         strLock = strLock & modMACAddress.GetMACAddress()
     End If
     If mLockTypes And lockComp Then
-        ' TODO: strLock = strLock & GetComputerName()
+        strLock = strLock & modComputerName.GetComputerName()
     End If
     If mLockTypes And lockHD Then
-        ' TODO: strLock = strLock & GetComputerName()
+        strLock = strLock & modHDSerial.GetHDSerial("C:\")
     End If
     If mLockTypes And lockWindows Then
-        ' TODO: strLock = strLock & GetWindowSerial()
+        strLock = strLock & modWindowsSerial.GetWindowsSerial()
     End If
     If Lic Is Nothing Then
         IActiveLock_LockCode = strLock

Index: ActiveLock2.dll
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock2.dll,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsEbKVXy and /tmp/cvsayEYT0 differ

Index: ActiveLock2.vbp
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/ActiveLock2.vbp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ActiveLock2.vbp	28 Jul 2003 06:35:30 -0000	1.7
+++ ActiveLock2.vbp	29 Jul 2003 18:49:42 -0000	1.8
@@ -1,5 +1,5 @@
 Type=OleDll
-Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\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
@@ -17,6 +17,9 @@
 Class=ActiveLockEventNotifier; ActiveLockEventNotifier.cls
 Module=modActiveLock; modActiveLock.bas
 Module=modBase64; modBase64.bas
+Module=modHDSerial; modHDSerial.bas
+Module=modWindowsSerial; modWindowsSerial.bas
+Module=modComputerName; modComputerName.bas
 Startup="(None)"
 HelpFile=""
 Title="ActiveLock2"

Index: Globals.cls
===================================================================
RCS file: /cvsroot/activelock/activelock2/src/Globals.cls,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Globals.cls	28 Jul 2003 06:35:30 -0000	1.7
+++ Globals.cls	29 Jul 2003 18:49:42 -0000	1.8
@@ -53,7 +53,6 @@
 '  /                        MODULE TO DO LIST                            /
 '  ///////////////////////////////////////////////////////////////////////
 '
-'   [ ] GetClassString() - handle the rest of the LockTypes
 '   [ ] GetLicTypeString() - implement this
 '
 '  ///////////////////////////////////////////////////////////////////////
@@ -63,6 +62,7 @@
 '   07.07.03 - mcrute   - Updated the header comments for this file.
 '   07.21.03 - th2tran  - Added ActiveLockErrCodeConstants to contain
 '                         a list of error code constants raised by ActiveLock.
+'   07.28.03 - wizzardme2000 - Implemented lockComp, lockHD, and lockWindows
 '
 '  ///////////////////////////////////////////////////////////////////////
 '  /                MODULE CODE BEGINS BELOW THIS LINE                   /
@@ -146,12 +146,17 @@
 End Function
 
 Private Function GetClassString(LockType As ActiveLock2.ALLockTypes) As String
+    'TODO: Decide the class numbers.
+    '   lockMAC should probably be last,
+    '   like it is in the enum. (IActivelock.cls)
     If LockType = lockMAC Then
         GetClassString = "Class1"
     ElseIf LockType = lockWindows Then
         GetClassString = "Class2"
-    Else
-        'TODO: Handle the rest
+    ElseIf LockType = lockComp Then
+        GetClassString = "Class3"
+    ElseIf LockType = lockHD Then
+        GetClassString = "Class4"
     End If
 End Function