Menu
▾
▴
swebs-commits — SWEBS CVS Commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(21) |
Sep
(77) |
Oct
(25) |
Nov
(28) |
Dec
|
|---|
|
From: <ple...@us...> - 2003-11-22 16:06:05
|
Update of /cvsroot/swebs/swebswebserver/winui In directory sc8-pr-cvs1:/tmp/cvs-serv11048/swebswebserver/winui Modified Files: ChangeLog.txt WinUI.lvw WinUI.vbp WinUI.vbw frmMain.frm frmMain.frx frmNewISAPI.frm frmSplash.frm lang.xml swebscc.exe Added Files: frmNewVirtHost.frm frmNewVirtHost.frx Log Message: Release time :) http://swebs.sourceforge.net/html/index.php?name=PNphpBB2&file=viewtopic&t=65 --- NEW FILE: frmNewVirtHost.frm --- VERSION 5.00 Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX" Begin VB.Form frmNewVirtHost BackColor = &H00FFFFFF& BorderStyle = 4 'Fixed ToolWindow Caption = "Add New Virtual Host" ClientHeight = 3900 ClientLeft = 45 ClientTop = 315 ClientWidth = 6210 LinkTopic = "Form1" MaxButton = 0 'False MinButton = 0 'False ScaleHeight = 3900 ScaleWidth = 6210 ShowInTaskbar = 0 'False StartUpPosition = 2 'CenterScreen Begin VB.TextBox txtNewvHostName Height = 285 Left = 240 TabIndex = 4 Top = 1080 Width = 2055 End Begin VB.TextBox txtNewvHostDomain Height = 285 Left = 240 TabIndex = 3 Top = 1680 Width = 2055 End Begin VB.TextBox txtNewvHostRoot Height = 285 Left = 240 TabIndex = 2 Top = 2280 Width = 5055 End Begin VB.TextBox txtNewvHostLogs Height = 285 Left = 240 TabIndex = 1 Top = 2880 Width = 5055 End Begin MSComDlg.CommonDialog dlgMain Left = 5640 Top = 3360 _ExtentX = 847 _ExtentY = 847 _Version = 393216 End Begin VB.Label lblBrowseLog AutoSize = -1 'True BackStyle = 0 'Transparent Caption = "Browse" Enabled = 0 'False BeginProperty Font Name = "Arial" Size = 9 Charset = 0 Weight = 700 Underline = -1 'True Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 225 Left = 5400 MouseIcon = "frmNewVirtHost.frx":0000 MousePointer = 99 'Custom TabIndex = 12 Top = 2880 Width = 660 End Begin VB.Label lblBrowseRoot AutoSize = -1 'True BackStyle = 0 'Transparent Caption = "Browse" Enabled = 0 'False BeginProperty Font Name = "Arial" Size = 9 Charset = 0 Weight = 700 Underline = -1 'True Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 225 Left = 5400 MouseIcon = "frmNewVirtHost.frx":0152 MousePointer = 99 'Custom TabIndex = 11 Top = 2280 Width = 660 End Begin VB.Label lblCancel AutoSize = -1 'True BackStyle = 0 'Transparent Caption = "&Cancel" BeginProperty Font Name = "Arial" Size = 9 Charset = 0 Weight = 700 Underline = -1 'True Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 225 Left = 3319 MouseIcon = "frmNewVirtHost.frx":02A4 MousePointer = 99 'Custom TabIndex = 10 Top = 3480 Width = 585 End Begin VB.Label lblOK AutoSize = -1 'True BackStyle = 0 'Transparent Caption = "&OK" BeginProperty Font Name = "Arial" Size = 9 Charset = 0 Weight = 700 Underline = -1 'True Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 225 Left = 2306 MouseIcon = "frmNewVirtHost.frx":03F6 MousePointer = 99 'Custom TabIndex = 9 Top = 3480 Width = 255 End Begin VB.Label lblNewvHostName AutoSize = -1 'True BackColor = &H00FFFFFF& Caption = "What is the name of this Virtual Host?" Height = 195 Left = 120 TabIndex = 8 Top = 840 Width = 2655 End Begin VB.Label lblNewvHostRoot AutoSize = -1 'True BackColor = &H00FFFFFF& Caption = "Where is the root folder for this Virtual Host?" Height = 195 Left = 120 TabIndex = 7 Top = 2040 Width = 3105 End Begin VB.Label lblNewvHostDomain AutoSize = -1 'True BackColor = &H00FFFFFF& Caption = "What is the domain for this Virtual Host?" Height = 195 Left = 120 TabIndex = 6 Top = 1440 Width = 2820 End Begin VB.Label lblNewvHostLogs AutoSize = -1 'True BackColor = &H00FFFFFF& Caption = "Where do you want to keep the log for this Virtual Host?" Height = 195 Left = 120 TabIndex = 5 Top = 2640 Width = 3960 End Begin VB.Label lblTitle BackStyle = 0 'Transparent Caption = "Add New Virtual Host" BeginProperty Font Name = "Arial" Size = 14.25 Charset = 0 Weight = 400 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FFFFFF& Height = 330 Left = 120 TabIndex = 0 Top = 120 Width = 2850 End Begin VB.Shape shpTitle BackColor = &H00804008& BackStyle = 1 'Opaque BorderStyle = 0 'Transparent Height = 615 Left = 0 Top = 0 Width = 6330 End Begin VB.Line Line1 X1 = 6330 X2 = 0 Y1 = 600 Y2 = 600 End End Attribute VB_Name = "frmNewVirtHost" Attribute VB_GlobalNameSpace = False Attribute VB_Creatable = False Attribute VB_PredeclaredId = True Attribute VB_Exposed = False Option Explicit Private Sub Form_Load() lblOK.Caption = Translator.GetText("&OK") lblCancel.Caption = Translator.GetText("&Cancel") lblTitle.Caption = Translator.GetText("Add a new Virtual Host") lblNewvHostName.Caption = Translator.GetText("What is the name of this Virtual Host?") lblNewvHostDomain.Caption = Translator.GetText("What is the domain for this Virtual Host?") lblNewvHostRoot.Caption = Translator.GetText("Where is the root folder for this Virtual Host?") lblNewvHostLogs.Caption = Translator.GetText("Where do you want to keep the log for this Virtual Host?") End Sub Private Sub lblBrowseLog_Click() dlgMain.DialogTitle = Translator.GetText("Please select a file...") dlgMain.Filter = Translator.GetText("Log Files (*.log)|*.log|All Files (*.*)|*.*") dlgMain.InitDir = Core.Path dlgMain.ShowSave txtNewvHostLogs.Text = dlgMain.FileName End Sub Private Sub lblBrowseRoot_Click() Dim strPath As String strPath = Util.BrowseForFolder(, True, Core.Server.HTTP.Config.WebRoot) If strPath <> "" Then txtNewvHostRoot.Text = strPath End If End Sub Private Sub lblCancel_Click() Unload Me End Sub Private Sub lblOK_Click() If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then Core.Server.HTTP.Config.VirtHost.Add txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text, txtNewvHostName.Text Unload Me Else MsgBox Translator.GetText("Please fill all fields.") End If End Sub --- NEW FILE: frmNewVirtHost.frx --- (This appears to be a binary file; contents omitted.) Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ChangeLog.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ChangeLog.txt 17 Nov 2003 11:43:07 -0000 1.30 +++ ChangeLog.txt 22 Nov 2003 16:05:06 -0000 1.31 @@ -28,6 +28,7 @@ # Removed serveral external dependincies. # Added useless but cool form fading on the splash screen (Win2000+). # Redesigned user interface. +# Tip of The Day is disabled by default. 0.9.8 (09/22/2003) ------------------ Index: WinUI.lvw =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 Binary files /tmp/cvs63iJtm and /tmp/cvsGGMoyy differ Index: WinUI.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- WinUI.vbp 20 Nov 2003 15:51:51 -0000 1.72 +++ WinUI.vbp 22 Nov 2003 16:05:06 -0000 1.73 @@ -1,7 +1,7 @@ Type=Exe Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation -Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#5.0#0#ccCore\ccCore.dll# -Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#6.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll# +Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#7.0#0#..\..\swebswebserver\winui\ccCore\ccCore.dll# +Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#7.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll# Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll# Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX @@ -17,6 +17,7 @@ Module=basExceptionFilter; basExceptionFilter.bas Form=frmNewISAPI.frm Module=basTransparency; ..\..\swebswebserver\winui\basTransparency.bas +Form=..\..\swebswebserver\winui\frmNewVirtHost.frm IconForm="frmMain" Startup="Sub Main" HelpFile="" @@ -30,16 +31,16 @@ CompatibleMode="0" MajorVer=1 MinorVer=0 -RevisionVer=203 +RevisionVer=207 AutoIncrementVer=1 ServerSupportFiles=0 VersionCompanyName="SWEBS Development Team" VersionFileDescription="SWEBS Windows UI" VersionLegalCopyright="Copyright© 2003 Adam Caudill" VersionProductName="SWEBS Web Server" -CompilationType=-1 +CompilationType=0 OptimizationType=0 -FavorPentiumPro(tm)=-1 +FavorPentiumPro(tm)=0 CodeViewDebugInfo=0 NoAliasing=0 BoundsCheck=0 Index: WinUI.vbw =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- WinUI.vbw 17 Nov 2003 11:43:07 -0000 1.26 +++ WinUI.vbw 22 Nov 2003 16:05:06 -0000 1.27 @@ -1,11 +1,13 @@ basMain = 89, 133, 1146, 784, -frmMain = 117, 303, 1172, 956, , 94, 38, 955, 630, C +frmMain = 117, 303, 1172, 956, C, 94, 38, 955, 630, C frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C -frmAbout = 66, 87, 1068, 811, C, 88, 116, 506, 650, C -frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C -frmSplash = 198, 261, 1200, 985, C, 220, 290, 1222, 1014, C -frmUpdate = 154, 203, 1156, 927, C, 176, 232, 1178, 956, C +frmAbout = 66, 87, 1068, 811, C, 88, 116, 697, 650, C +frmRegistration = 176, 232, 1178, 956, C, 198, 261, 657, 661, C +frmSplash = 198, 261, 1200, 985, C, 220, 290, 834, 493, C +frmUpdate = 154, 203, 1156, 927, C, 176, 232, 833, 676, C cSysTray = 198, 261, 1200, 985, C -basExceptionFilter = 242, 319, 1244, 1043, -frmNewISAPI = 0, 0, 0, 0, C, 110, 145, 1112, 869, C +basExceptionFilter = 242, 319, 1244, 1043, C +frmNewISAPI = 44, 58, 1046, 782, C, 460, 428, 944, 755, C +basTransparency = 88, 116, 1090, 840, +frmNewVirtHost = 88, 116, 1090, 840, C, 22, 29, 504, 411, C Index: frmMain.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- frmMain.frm 20 Nov 2003 15:51:52 -0000 1.82 +++ frmMain.frm 22 Nov 2003 16:05:06 -0000 1.83 @@ -16,42 +16,6 @@ ScaleHeight = 7305 ScaleWidth = 12075 StartUpPosition = 2 'CenterScreen - Begin VB.Frame fraLogs - BackColor = &H00FFFFFF& - BorderStyle = 0 'None - Height = 5895 - Left = 2520 - TabIndex = 36 - Top = 840 - Width = 6975 - Begin RichTextLib.RichTextBox rtfViewLogFiles - Height = 5415 - Left = 120 - TabIndex = 70 - Top = 480 - Width = 6735 - _ExtentX = 11880 - _ExtentY = 9551 - _Version = 393217 - Enabled = -1 'True - ReadOnly = -1 'True - ScrollBars = 3 - Appearance = 0 - AutoVerbMenu = -1 'True - TextRTF = $"frmMain.frx":0CCA - End - Begin VB.ComboBox cmbViewLogFiles - Appearance = 0 'Flat - Height = 315 - ItemData = "frmMain.frx":0D4C - Left = 120 - List = "frmMain.frx":0D4E - Style = 2 'Dropdown List - TabIndex = 37 - Top = 120 - Width = 6735 - End - End Begin VB.Frame fraConfigvHost BackColor = &H00FFFFFF& BorderStyle = 0 'None @@ -62,9 +26,9 @@ Width = 6975 Begin VB.ListBox lstvHosts Height = 5130 - ItemData = "frmMain.frx":0D50 + ItemData = "frmMain.frx":0CCA Left = 120 - List = "frmMain.frx":0D52 + List = "frmMain.frx":0CCC TabIndex = 25 Top = 240 Width = 1815 @@ -118,9 +82,9 @@ ForeColor = &H00FF0000& Height = 225 Left = 2160 - MouseIcon = "frmMain.frx":0D54 + MouseIcon = "frmMain.frx":0CCE MousePointer = 99 'Custom - TabIndex = 107 + TabIndex = 91 Top = 5160 Width = 765 End @@ -142,9 +106,9 @@ ForeColor = &H00FF0000& Height = 225 Left = 3270 - MouseIcon = "frmMain.frx":0EA6 + MouseIcon = "frmMain.frx":0E20 MousePointer = 99 'Custom - TabIndex = 106 + TabIndex = 90 Top = 5160 Width = 705 End @@ -165,9 +129,9 @@ ForeColor = &H00FF0000& Height = 225 Left = 6240 - MouseIcon = "frmMain.frx":0FF8 + MouseIcon = "frmMain.frx":0F72 MousePointer = 99 'Custom - TabIndex = 105 + TabIndex = 89 Top = 1680 Width = 660 End @@ -188,9 +152,9 @@ ForeColor = &H00FF0000& Height = 225 Left = 6240 - MouseIcon = "frmMain.frx":114A + MouseIcon = "frmMain.frx":10C4 MousePointer = 99 'Custom - TabIndex = 104 + TabIndex = 88 Top = 2280 Width = 660 End @@ -231,6 +195,42 @@ Width = 4335 End End + Begin VB.Frame fraLogs + BackColor = &H00FFFFFF& + BorderStyle = 0 'None + Height = 5895 + Left = 2520 + TabIndex = 36 + Top = 840 + Width = 6975 + Begin RichTextLib.RichTextBox rtfViewLogFiles + Height = 5415 + Left = 120 + TabIndex = 54 + Top = 480 + Width = 6735 + _ExtentX = 11880 + _ExtentY = 9551 + _Version = 393217 + Enabled = -1 'True + ReadOnly = -1 'True + ScrollBars = 3 + Appearance = 0 + AutoVerbMenu = -1 'True + TextRTF = $"frmMain.frx":1216 + End + Begin VB.ComboBox cmbViewLogFiles + Appearance = 0 'Flat + Height = 315 + ItemData = "frmMain.frx":1298 + Left = 120 + List = "frmMain.frx":129A + Style = 2 'Dropdown List + TabIndex = 37 + Top = 120 + Width = 6735 + End + End Begin VB.Frame fraConfigISAPI BackColor = &H00FFFFFF& BorderStyle = 0 'None @@ -283,7 +283,7 @@ Left = 5880 MouseIcon = "frmMain.frx":12B1 MousePointer = 99 'Custom - TabIndex = 101 + TabIndex = 85 Top = 600 Width = 660 End @@ -307,7 +307,7 @@ Left = 3255 MouseIcon = "frmMain.frx":1403 MousePointer = 99 'Custom - TabIndex = 100 + TabIndex = 84 Top = 5160 Width = 705 End @@ -330,7 +330,7 @@ Left = 2145 MouseIcon = "frmMain.frx":1555 MousePointer = 99 'Custom - TabIndex = 99 + TabIndex = 83 Top = 5160 Width = 765 End @@ -369,7 +369,7 @@ Left = 120 ScaleHeight = 2295 ScaleWidth = 6615 - TabIndex = 54 + TabIndex = 38 Top = 120 Width = 6615 Begin VB.Frame fraBasicStats @@ -377,7 +377,7 @@ Caption = "Basic Stats:" Height = 1095 Left = 0 - TabIndex = 62 + TabIndex = 46 Top = 1200 Width = 3135 Begin VB.Label lblStatsBytesSent @@ -385,7 +385,7 @@ Caption = "Total Bytes Sent: 000,000,000,000,000" Height = 255 Left = 120 - TabIndex = 65 + TabIndex = 49 Top = 720 Width = 2895 End @@ -394,7 +394,7 @@ Caption = "Request Count: 000,000,000" Height = 255 Left = 120 - TabIndex = 64 + TabIndex = 48 Top = 480 Width = 2895 End @@ -403,7 +403,7 @@ Caption = "Last Restart: 00/00/0000 00:00:00PM" Height = 255 Left = 120 - TabIndex = 63 + TabIndex = 47 Top = 240 Width = 2775 End @@ -413,7 +413,7 @@ Caption = "Update Status:" Height = 1095 Left = 3240 - TabIndex = 55 + TabIndex = 39 Top = 0 Width = 3255 Begin VB.Label lblUpdateStatus @@ -435,7 +435,7 @@ Left = 660 MouseIcon = "frmMain.frx":16A7 MousePointer = 99 'Custom - TabIndex = 58 + TabIndex = 42 ToolTipText = "Click here for details." Top = 720 Width = 1935 @@ -445,7 +445,7 @@ Caption = "Update Version: 0.00.0000" Height = 255 Left = 120 - TabIndex = 57 + TabIndex = 41 Top = 480 Width = 2655 End @@ -454,7 +454,7 @@ Caption = "Current Version: 0.00.0000" Height = 255 Left = 120 - TabIndex = 56 + TabIndex = 40 Top = 240 Width = 2775 End @@ -464,7 +464,7 @@ Caption = "Current Service Status:" Height = 1095 Left = 0 - TabIndex = 59 + TabIndex = 43 Top = 0 Width = 3135 Begin VB.Label lblSrvRestart @@ -486,7 +486,7 @@ Left = 2145 MouseIcon = "frmMain.frx":17F9 MousePointer = 99 'Custom - TabIndex = 94 + TabIndex = 78 Top = 720 Width = 645 End @@ -509,7 +509,7 @@ Left = 1305 MouseIcon = "frmMain.frx":194B MousePointer = 99 'Custom - TabIndex = 93 + TabIndex = 77 Top = 720 Width = 405 End @@ -532,7 +532,7 @@ Left = 330 MouseIcon = "frmMain.frx":1A9D MousePointer = 99 'Custom - TabIndex = 92 + TabIndex = 76 Top = 720 Width = 435 End @@ -541,7 +541,7 @@ Caption = "<current-status>" Height = 255 Left = 720 - TabIndex = 61 + TabIndex = 45 Top = 240 Width = 2295 End @@ -550,7 +550,7 @@ Caption = "Status: " Height = 255 Left = 120 - TabIndex = 60 + TabIndex = 44 Top = 240 Width = 615 End @@ -568,7 +568,7 @@ Begin VB.TextBox txtConfigBasicErrorLog Height = 285 Left = 240 - TabIndex = 69 + TabIndex = 53 Top = 1440 Width = 5895 End @@ -618,7 +618,7 @@ Left = 6240 MouseIcon = "frmMain.frx":1BEF MousePointer = 99 'Custom - TabIndex = 98 + TabIndex = 82 Top = 3360 Width = 660 End @@ -640,7 +640,7 @@ Left = 6240 MouseIcon = "frmMain.frx":1D41 MousePointer = 99 'Custom - TabIndex = 97 + TabIndex = 81 Top = 2400 Width = 660 End @@ -662,7 +662,7 @@ Left = 6240 MouseIcon = "frmMain.frx":1E93 MousePointer = 99 'Custom - TabIndex = 96 + TabIndex = 80 Top = 1440 Width = 660 End @@ -671,7 +671,7 @@ Caption = "Where do you want to store the server error log?" Height = 255 Left = 120 - TabIndex = 68 + TabIndex = 52 Top = 1200 Width = 6015 End @@ -723,7 +723,7 @@ Begin VB.TextBox txtConfigAdvIPBind Height = 285 Left = 240 - TabIndex = 67 + TabIndex = 51 Top = 1560 Width = 2295 End @@ -773,7 +773,7 @@ Left = 6000 MouseIcon = "frmMain.frx":2089 MousePointer = 99 'Custom - TabIndex = 95 + TabIndex = 79 Top = 3240 Width = 660 End @@ -782,7 +782,7 @@ Caption = "What IP should the server listen to? (Default: Leave blank for all available)" Height = 255 Left = 120 - TabIndex = 66 + TabIndex = 50 Top = 1320 Width = 5775 End @@ -840,142 +840,12 @@ Left = 1080 Top = 6720 End - Begin VB.Frame fraNewvHost - BorderStyle = 0 'None - Height = 5895 - Left = 2520 - TabIndex = 38 - Top = 840 - Width = 6855 - Begin VB.PictureBox picButton - BorderStyle = 0 'None - Height = 375 - Index = 9 - Left = 2280 - ScaleHeight = 375 - ScaleWidth = 2175 - TabIndex = 51 - Top = 3240 - Width = 2175 - Begin VB.CommandButton cmdNewvHostOK - Caption = "OK" - Height = 375 - Left = 0 - TabIndex = 53 - Top = 0 - Width = 1095 - End - Begin VB.CommandButton cmdNewvHostCancel - Caption = "Cancel" - Height = 375 - Left = 1200 - TabIndex = 52 - Top = 0 - Width = 975 - End - End - Begin VB.CommandButton cmdBrowseNewvHostRoot - Caption = "..." - Height = 255 - Left = 5880 - TabIndex = 49 - Top = 2160 - Width = 255 - End - Begin VB.PictureBox picButton - BorderStyle = 0 'None - Height = 855 - Index = 6 - Left = 5880 - ScaleHeight = 855 - ScaleWidth = 255 - TabIndex = 48 - Top = 2160 - Width = 255 - Begin VB.CommandButton cmdBrowseNewvHostLogs - Caption = "..." - Height = 255 - Left = 0 - TabIndex = 50 - Top = 600 - Width = 255 - End - End - Begin VB.TextBox txtNewvHostLogs - Height = 285 - Left = 600 - TabIndex = 47 - Top = 2760 - Width = 5175 - End - Begin VB.TextBox txtNewvHostRoot - Height = 285 - Left = 600 - TabIndex = 45 - Top = 2160 - Width = 5175 - End - Begin VB.TextBox txtNewvHostDomain - Height = 285 - Left = 600 - TabIndex = 44 - Top = 1560 - Width = 2055 - End - Begin VB.TextBox txtNewvHostName - Height = 285 - Left = 600 - TabIndex = 41 - Top = 960 - Width = 2055 - End - Begin VB.Label lblNewvHostLogs - Caption = "Where do you want to keep the log for this Virtual Host?" - Height = 255 - Left = 480 - TabIndex = 46 - Top = 2520 - Width = 5295 - End - Begin VB.Label lblNewvHostDomain - Caption = "What is the domain for this Virtual Host?" - Height = 255 - Left = 480 - TabIndex = 43 - Top = 1320 - Width = 5775 - End - Begin VB.Label lblNewvHostRoot - Caption = "Where is the root folder for this Virtual Host?" - Height = 255 - Left = 480 - TabIndex = 42 - Top = 1920 - Width = 5535 - End - Begin VB.Label lblNewvHostName - Caption = "What is the name of this Virtual Host?" - Height = 255 - Left = 480 - TabIndex = 40 - Top = 720 - Width = 6015 - End - Begin VB.Label lblNewvHostTitle - Caption = "Add a new Virtual Host:" - Height = 255 - Left = 240 - TabIndex = 39 - Top = 240 - Width = 3855 - End - End Begin VB.Label lblMoreInfoData BackColor = &H00FFFFFF& ForeColor = &H00000000& Height = 2415 Left = 9840 - TabIndex = 103 + TabIndex = 87 Top = 4320 Width = 1935 End @@ -1030,7 +900,7 @@ ForeColor = &H00000000& Height = 225 Left = 9840 - TabIndex = 102 + TabIndex = 86 Top = 3960 Width = 840 End @@ -1052,7 +922,7 @@ ForeColor = &H00FFFFFF& Height = 360 Left = 8430 - TabIndex = 91 + TabIndex = 75 Top = 120 Width = 2805 End @@ -1081,7 +951,7 @@ Left = 9960 MouseIcon = "frmMain.frx":2F53 MousePointer = 99 'Custom - TabIndex = 90 + TabIndex = 74 Top = 3240 Width = 495 End @@ -1103,7 +973,7 @@ Left = 9960 MouseIcon = "frmMain.frx":30A5 MousePointer = 99 'Custom - TabIndex = 89 + TabIndex = 73 Top = 2880 Width = 720 End @@ -1125,7 +995,7 @@ Left = 9960 MouseIcon = "frmMain.frx":31F7 MousePointer = 99 'Custom - TabIndex = 88 + TabIndex = 72 Top = 2520 Width = 1500 End @@ -1147,7 +1017,7 @@ Left = 9960 MouseIcon = "frmMain.frx":3349 MousePointer = 99 'Custom - TabIndex = 87 + TabIndex = 71 Top = 2160 Width = 1230 End @@ -1169,7 +1039,7 @@ Left = 9960 MouseIcon = "frmMain.frx":349B MousePointer = 99 'Custom - TabIndex = 86 + TabIndex = 70 Top = 1800 Width = 1455 End @@ -1191,7 +1061,7 @@ Left = 9960 MouseIcon = "frmMain.frx":35ED MousePointer = 99 'Custom - TabIndex = 85 + TabIndex = 69 Top = 1440 Width = 1305 End @@ -1211,7 +1081,7 @@ ForeColor = &H00000000& Height = 225 Left = 9840 - TabIndex = 84 + TabIndex = 68 Top = 1080 Width = 510 End @@ -1273,7 +1143,7 @@ ForeColor = &H00FFFFFF& Height = 480 Left = 120 - TabIndex = 83 + TabIndex = 67 Top = 120 Width = 3750 End @@ -1305,7 +1175,7 @@ Left = 11535 MouseIcon = "frmMain.frx":373F MousePointer = 99 'Custom - TabIndex = 82 + TabIndex = 66 Top = 6960 Width = 345 End @@ -1328,7 +1198,7 @@ Left = 10560 MouseIcon = "frmMain.frx":3891 MousePointer = 99 'Custom - TabIndex = 81 + TabIndex = 65 Top = 6960 Width = 495 End @@ -1351,7 +1221,7 @@ Left = 9720 MouseIcon = "frmMain.frx":39E3 MousePointer = 99 'Custom - TabIndex = 80 + TabIndex = 64 Top = 6960 Width = 285 End @@ -1374,7 +1244,7 @@ Left = 1290 MouseIcon = "frmMain.frx":3B35 MousePointer = 99 'Custom - TabIndex = 79 + TabIndex = 63 Top = 3480 Width = 885 End @@ -1400,7 +1270,7 @@ EndProperty Height = 225 Left = 120 - TabIndex = 78 + TabIndex = 62 Top = 3120 Width = 1110 End @@ -1423,7 +1293,7 @@ Left = 1050 MouseIcon = "frmMain.frx":3C87 MousePointer = 99 'Custom - TabIndex = 77 + TabIndex = 61 Top = 2760 Width = 1125 End @@ -1446,7 +1316,7 @@ Left = 1080 MouseIcon = "frmMain.frx":3DD9 MousePointer = 99 'Custom - TabIndex = 76 + TabIndex = 60 Top = 2520 Width = 1095 End @@ -1469,7 +1339,7 @@ Left = 1335 MouseIcon = "frmMain.frx":3F2B MousePointer = 99 'Custom - TabIndex = 75 + TabIndex = 59 Top = 2280 Width = 840 End @@ -1492,7 +1362,7 @@ Left = 1695 MouseIcon = "frmMain.frx":407D MousePointer = 99 'Custom - TabIndex = 74 + TabIndex = 58 Top = 2040 Width = 480 End @@ -1519,7 +1389,7 @@ ForeColor = &H00000000& Height = 225 Left = 120 - TabIndex = 73 + TabIndex = 57 Top = 1680 Width = 1800 End @@ -1542,7 +1412,7 @@ Left = 960 MouseIcon = "frmMain.frx":41CF MousePointer = 99 'Custom - TabIndex = 72 + TabIndex = 56 Top = 1320 Width = 1245 End @@ -1569,7 +1439,7 @@ ForeColor = &H00000000& Height = 225 Left = 120 - TabIndex = 71 + TabIndex = 55 Top = 960 Width = 1290 End @@ -1687,57 +1557,6 @@ SetStatus "Ready..." End Sub -Private Sub cmdBrowseNewvHostLogs_Click() - blnDirty = True - dlgMain.DialogTitle = Translator.GetText("Please select a file...") - dlgMain.Filter = Translator.GetText("Log Files (*.log)|*.log|All Files (*.*)|*.*") - dlgMain.InitDir = Core.Path - dlgMain.ShowSave - txtvHostLog.Text = dlgMain.FileName -End Sub - -Private Sub cmdBrowseNewvHostRoot_Click() -Dim strPath As String - strPath = Util.BrowseForFolder(, True, Core.Server.HTTP.Config.WebRoot) - If strPath <> "" Then - txtNewvHostRoot.Text = strPath - End If -End Sub - -Private Sub cmdNewvHostCancel_Click() - fraNewvHost.ZOrder 1 - txtNewvHostName.Text = "" - txtNewvHostDomain.Text = "" - txtNewvHostRoot.Text = "" - txtNewvHostLogs.Text = "" -End Sub - -Private Sub cmdNewvHostOK_Click() -Dim vItem As Variant -Dim i As Long - - If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then - blnDirty = True - Core.Server.HTTP.Config.VirtHost.Add txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text, txtNewvHostName.Text - lstvHosts.Clear - If Core.Server.HTTP.Config.VirtHost.Count > 0 Then - For Each vItem In Core.Server.HTTP.Config.VirtHost - lstvHosts.AddItem vItem.HostName - Next - lstvHosts.Enabled = True - Else - lstvHosts.Enabled = False - End If - fraNewvHost.ZOrder 1 - txtNewvHostName.Text = "" - txtNewvHostDomain.Text = "" - txtNewvHostRoot.Text = "" - txtNewvHostLogs.Text = "" - Else - MsgBox Translator.GetText("Please fill all fields.") - End If -End Sub - Private Sub Form_Load() Dim RetVal As Long @@ -1778,13 +1597,6 @@ lblvHostDomain.Caption = Translator.GetText("What is it's domain name?") lblvHostRoot.Caption = Translator.GetText("This is the root directory where files are kept for this Virtual Host.") lblvHostLog.Caption = Translator.GetText("Where do you want to keep the log file for this Virtual Host?") - lblNewvHostTitle.Caption = Translator.GetText("Add a new Virtual Host:") - lblNewvHostName.Caption = Translator.GetText("What is the name of this Virtual Host?") - lblNewvHostDomain.Caption = Translator.GetText("What is the domain for this Virtual Host?") - lblNewvHostRoot.Caption = Translator.GetText("Where is the root folder for this Virtual Host?") - lblNewvHostLogs.Caption = Translator.GetText("Where do you want to keep the log for this Virtual Host?") - cmdNewvHostOK.Caption = Translator.GetText("&OK") - cmdNewvHostCancel.Caption = Translator.GetText("&Cancel") lblConfigAdvIPBind.Caption = Translator.GetText("What IP should the server listen to? (Default: Leave blank for all available)") lblConfigBasicErrorLog.Caption = Translator.GetText("Where do you want to store the server error log?") @@ -2147,7 +1959,19 @@ End Sub Private Sub lblvHostNew_Click() - fraNewvHost.ZOrder 0 +Dim vItem As Variant + + Load frmNewVirtHost + frmNewVirtHost.Show vbModal + lstvHosts.Clear + If Core.Server.HTTP.Config.VirtHost.Count > 0 Then + For Each vItem In Core.Server.HTTP.Config.VirtHost + lstvHosts.AddItem vItem.HostName + Next + lstvHosts.Enabled = True + Else + lstvHosts.Enabled = False + End If End Sub Private Sub lblvHostRemove_Click() Index: frmMain.frx =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 Binary files /tmp/cvsG5tZuv and /tmp/cvsmUnyIQ differ Index: frmNewISAPI.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmNewISAPI.frm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- frmNewISAPI.frm 17 Nov 2003 11:43:08 -0000 1.2 +++ frmNewISAPI.frm 22 Nov 2003 16:05:07 -0000 1.3 @@ -145,7 +145,7 @@ Italic = 0 'False Strikethrough = 0 'False EndProperty - ForeColor = &H00000000& + ForeColor = &H00FFFFFF& Height = 330 Left = 120 TabIndex = 0 @@ -159,7 +159,7 @@ Y2 = 600 End Begin VB.Shape shpTitle - BackColor = &H0062D0F4& + BackColor = &H00804008& BackStyle = 1 'Opaque BorderStyle = 0 'Transparent Height = 615 Index: frmSplash.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmSplash.frm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- frmSplash.frm 20 Nov 2003 15:51:52 -0000 1.16 +++ frmSplash.frm 22 Nov 2003 16:05:07 -0000 1.17 @@ -32,7 +32,7 @@ Italic = 0 'False Strikethrough = 0 'False EndProperty - ForeColor = &H00FFFFFF& + ForeColor = &H00FEFEFE& Height = 210 Left = 3000 TabIndex = 0 Index: lang.xml =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- lang.xml 17 Nov 2003 11:43:08 -0000 1.13 +++ lang.xml 22 Nov 2003 16:05:07 -0000 1.14 @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="yes"?> <!--This file generated by: --> -<!--TransExtract 1.0 Build: Oct. 14, 2003 --> +<!--TransExtract 1.0 Build: Nov. 16, 2003 --> <!--**************************************--> <!--*SWEBS Lang.xml *--> <!--*Version 2.0 *--> @@ -11,7 +11,7 @@ <SWEBS-WinUI-Lang> <lang-code id="1033"> <Lang-Maintainer> - Adam Caudill <ad...@im...> + Adam Caudill (ad...@im...) </Lang-Maintainer> <lang-obj name="frmAbout"> <lang base="&Close"> @@ -24,66 +24,6 @@ Control Center Build </lang> </lang-obj> - <lang-obj name="frmRegistration"> - <lang base="You must provide a e-mail address."> - You must provide a e-mail address. - </lang> - <lang base="You have already registered, you only need to register once."> - You have already registered, you only need to register once. - </lang> - <lang base="There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r"> - There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r - </lang> - <lang base="How Many Computers Do You Own?"> - How Many Computers Do You Own? - </lang> - <lang base="Where are you using this?"> - Where are you using this? - </lang> - <lang base="How did you find out about us?"> - How did you find out about us? - </lang> - <lang base="How much computer experience do you have?"> - How much computer experience do you have? - </lang> - <lang base="What will you use this software for?"> - What will you use this software for? - </lang> - </lang-obj> - <lang-obj name="frmTip"> - <lang base="TOD XML Data File Not Found."> - TOD XML Data File Not Found. - </lang> - </lang-obj> - <lang-obj name="frmUpdate"> - <lang base="There is an update available for this software, it may have additional features, bug fixes and security updates. To maintain security and performance we recommend you always use the latest version available."> - There is an update available for this software, it may have additional features, bug fixes and security updates. To maintain security and performance we recommend you always use the latest version available. - </lang> - <lang base="Description:"> - Description: - </lang> - <lang base="Download Upgrade..."> - Download Upgrade... - </lang> - <lang base="More Information..."> - More Information... - </lang> - <lang base="&Cancel"> - &Cancel - </lang> - <lang base="Date"> - Date - </lang> - <lang base="Version"> - Version - </lang> - <lang base="Update Level"> - Update Level - </lang> - <lang base="File Size"> - File Size - </lang> - </lang-obj> <lang-obj name="frmMain"> <lang base="Loading Log File"> Loading Log File @@ -91,12 +31,6 @@ <lang base="File not found, it may not have been created yet."> File not found, it may not have been created yet. </lang> - <lang base="Please select a file..."> - Please select a file... - </lang> - <lang base="Please fill all fields."> - Please fill all fields. - </lang> <lang base="Export Setings"> Export Setings </lang> @@ -199,27 +133,6 @@ <lang base="Where do you want to keep the log file for this Virtual Host?"> Where do you want to keep the log file for this Virtual Host? </lang> - <lang base="Add a new Virtual Host:"> - Add a new Virtual Host: - </lang> - <lang base="What is the name of this Virtual Host?"> - What is the name of this Virtual Host? - </lang> - <lang base="What is the domain for this Virtual Host?"> - What is the domain for this Virtual Host? - </lang> - <lang base="Where is the root folder for this Virtual Host?"> - Where is the root folder for this Virtual Host? - </lang> - <lang base="Where do you want to keep the log for this Virtual Host?"> - Where do you want to keep the log for this Virtual Host? - </lang> - <lang base="&OK"> - &OK - </lang> - <lang base="&Cancel"> - &Cancel - </lang> <lang base="What IP should the server listen to? (Default: Leave blank for all available)"> What IP should the server listen to? (Default: Leave blank for all available) </lang> @@ -341,6 +254,66 @@ Update Version </lang> </lang-obj> + <lang-obj name="frmRegistration"> + <lang base="You must provide a e-mail address."> + You must provide a e-mail address. + </lang> + <lang base="You have already registered, you only need to register once."> + You have already registered, you only need to register once. + </lang> + <lang base="There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r"> + There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r + </lang> + <lang base="How Many Computers Do You Own?"> + How Many Computers Do You Own? + </lang> + <lang base="Where are you using this?"> + Where are you using this? + </lang> + <lang base="How did you find out about us?"> + How did you find out about us? + </lang> + <lang base="How much computer experience do you have?"> + How much computer experience do you have? + </lang> + <lang base="What will you use this software for?"> + What will you use this software for? + </lang> + </lang-obj> + <lang-obj name="frmTip"> + <lang base="TOD XML Data File Not Found."> + TOD XML Data File Not Found. + </lang> + </lang-obj> + <lang-obj name="frmUpdate"> + <lang base="There is an update available for this software, it may have additional features, bug fixes and security updates. To maintain security and performance we recommend you always use the latest version available."> + There is an update available for this software, it may have additional features, bug fixes and security updates. To maintain security and performance we recommend you always use the latest version available. + </lang> + <lang base="Description:"> + Description: + </lang> + <lang base="Download Upgrade..."> + Download Upgrade... + </lang> + <lang base="More Information..."> + More Information... + </lang> + <lang base="&Cancel"> + &Cancel + </lang> + <lang base="Date"> + Date + </lang> + <lang base="Version"> + Version + </lang> + <lang base="Update Level"> + Update Level + </lang> + <lang base="File Size"> + File Size + </lang> + </lang-obj> <lang-obj name="frmNewISAPI"> <lang base="Add a new CGI interpreter:"> Add a new CGI interpreter: @@ -367,58 +340,33 @@ Please fill all fields. </lang> </lang-obj> - <lang-obj name="cDebug"> - <lang base="WinUI Bug Report - Version:"> - WinUI Bug Report - Version: - </lang> - <lang base="Time:"> - Time: - </lang> - <lang base="Message:"> - Message: - </lang> - <lang base="Call Stack:"> - Call Stack: - </lang> - <lang base="Please see http://swebs.sf.net for information on this error."> - Please see http://swebs.sf.net for information on this error. - </lang> - </lang-obj> - <lang-obj name="cHTTPConfig"> - <lang base="Date"> - Date - </lang> - <lang base="Server Name"> - Server Name - </lang> - <lang base="Port"> - Port + <lang-obj name="frmNewVirtHost"> + <lang base="&OK"> + &OK </lang> - <lang base="Web Root"> - Web Root + <lang base="&Cancel"> + &Cancel </lang> - <lang base="Error Pages"> - Error Pages + <lang base="Add a new Virtual Host"> + Add a new Virtual Host </lang> - <lang base="Max Connections"> - Max Connections + <lang base="What is the name of this Virtual Host?"> + What is the name of this Virtual Host? </lang> - <lang base="Primary Log File"> - Primary Log File + <lang base="What is the domain for this Virtual Host?"> + What is the domain for this Virtual Host? </lang> - <lang base="Allow Index"> - Allow Index + <lang base="Where is the root folder for this Virtual Host?"> + Where is the root folder for this Virtual Host? </lang> - <lang base="ISAPI: Extension"> - ISAPI: Extension + <lang base="Where do you want to keep the log for this Virtual Host?"> + Where do you want to keep the log for this Virtual Host? </lang> - <lang base="vHost: Name"> - vHost: Name + <lang base="Please select a file..."> + Please select a file... </lang> - </lang-obj> - <lang-obj name="cRegistration"> - <lang base="Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?"> - Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now? + <lang base="Please fill all fields."> + Please fill all fields. </lang> </lang-obj> <lang-obj name="basMain"> Index: swebscc.exe =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 Binary files /tmp/cvsxZZRXD and /tmp/cvsq3u7v8 differ |
|
From: <ple...@us...> - 2003-11-22 16:06:05
|
Update of /cvsroot/swebs/swebswebserver/winui/ccUtil In directory sc8-pr-cvs1:/tmp/cvs-serv11048/swebswebserver/winui/ccUtil Modified Files: ccUtil.csi ccUtil.dll ccUtil.exp ccUtil.lib ccUtil.vbp Log Message: Release time :) http://swebs.sourceforge.net/html/index.php?name=PNphpBB2&file=viewtopic&t=65 Index: ccUtil.csi =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccUtil/ccUtil.csi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccUtil.csi 17 Nov 2003 11:43:17 -0000 1.1 +++ ccUtil.csi 22 Nov 2003 16:05:22 -0000 1.2 @@ -1,3 +1,2 @@ [History] B0=ccUtil/cUtil -B2=ccUtil/basMain Index: ccUtil.dll =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccUtil/ccUtil.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvszPZV6T and /tmp/cvsGlJaGF differ Index: ccUtil.exp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccUtil/ccUtil.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsm4xNkW and /tmp/cvsovdutI differ Index: ccUtil.lib =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccUtil/ccUtil.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsYbtMuZ and /tmp/cvssPUULO differ Index: ccUtil.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccUtil/ccUtil.vbp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccUtil.vbp 17 Nov 2003 11:43:17 -0000 1.1 +++ ccUtil.vbp 22 Nov 2003 16:05:22 -0000 1.2 @@ -13,11 +13,11 @@ CompatibleEXE32="..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll" MajorVer=1 MinorVer=0 -RevisionVer=4 +RevisionVer=6 AutoIncrementVer=1 ServerSupportFiles=0 VersionCompanyName="Imspire.com" -CompilationType=-1 +CompilationType=0 OptimizationType=0 FavorPentiumPro(tm)=0 CodeViewDebugInfo=0 |
|
From: <ple...@us...> - 2003-11-22 16:06:00
|
Update of /cvsroot/swebs/swebswebserver/winui/ccCore In directory sc8-pr-cvs1:/tmp/cvs-serv11048/swebswebserver/winui/ccCore Modified Files: cUpdate.cls ccCore.dll ccCore.exp ccCore.lib ccCore.vbp Log Message: Release time :) http://swebs.sourceforge.net/html/index.php?name=PNphpBB2&file=viewtopic&t=65 Index: cUpdate.cls =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccCore/cUpdate.cls,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cUpdate.cls 17 Nov 2003 11:43:17 -0000 1.1 +++ cUpdate.cls 22 Nov 2003 16:05:22 -0000 1.2 @@ -70,11 +70,17 @@ 'check to see if this is newer 'this is a bad way to do things, needs to be fixed, again strNewVer() = Split(mvarVersion, ".") + ReDim Preserve strNewVer(0 To 6) strCurVer() = Split(gCore.Version, ".") + ReDim Preserve strCurVer(0 To 6) For i = 0 To UBound(strNewVer) + Debug.Print "New: " & Val(strNewVer(i)) & " Old: " & Val(strCurVer(i)) If Val(strNewVer(i)) > Val(strCurVer(i)) Then mvarIsAvailable = True gCore.EventLog.AddEvent "SWEBS_WinUI_DLL.cUpdate.Check", "Update Available. Old Version: " & gCore.Version & "; New Version: " & gCore.Update.Version + Exit For + ElseIf Val(strNewVer(i)) < Val(strCurVer(i)) Then + Exit For End If Next ElseIf mvarIsAvailable = True Then Index: ccCore.dll =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccCore/ccCore.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsrRKxjv and /tmp/cvsSBEDmS differ Index: ccCore.exp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccCore/ccCore.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsppVmYx and /tmp/cvsE20BLV differ Index: ccCore.lib =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccCore/ccCore.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsptwnVA and /tmp/cvsqF2dE1 differ Index: ccCore.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccCore/ccCore.vbp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccCore.vbp 17 Nov 2003 11:43:17 -0000 1.1 +++ ccCore.vbp 22 Nov 2003 16:05:22 -0000 1.2 @@ -1,7 +1,7 @@ Type=OleDll Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation -Reference=*\G{09964172-0145-439E-9EA3-8CE311269AF1}#6.0#0#..\..\..\swebswebserver\winui\ccHTTP\ccHTTP.dll# -Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll# +Reference=*\G{09964172-0145-439E-9EA3-8CE311269AF1}#8.0#0#..\..\..\swebswebserver\winui\ccHTTP\ccHTTP.dll# +Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#7.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll# Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll# Module=basMain; basMain.bas Class=cUpdate; cUpdate.cls @@ -19,6 +19,7 @@ HelpFile="" Title="ccCore" ExeName32="ccCore.dll" +Path32="..\..\..\swebswebserver\winui\ccCore" Command32="" Name="ccCore" HelpContextID="0" @@ -26,11 +27,11 @@ CompatibleEXE32="ccCore.dll" MajorVer=1 MinorVer=0 -RevisionVer=3 +RevisionVer=6 AutoIncrementVer=1 ServerSupportFiles=0 VersionCompanyName="Imspire.com" -CompilationType=-1 +CompilationType=0 OptimizationType=0 FavorPentiumPro(tm)=0 CodeViewDebugInfo=0 |
|
From: <ple...@us...> - 2003-11-22 16:06:00
|
Update of /cvsroot/swebs/swebswebserver/winui/ccHTTP In directory sc8-pr-cvs1:/tmp/cvs-serv11048/swebswebserver/winui/ccHTTP Modified Files: ccHTTP.dll ccHTTP.exp ccHTTP.lib ccHTTP.vbp Log Message: Release time :) http://swebs.sourceforge.net/html/index.php?name=PNphpBB2&file=viewtopic&t=65 Index: ccHTTP.dll =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccHTTP/ccHTTP.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsI1Ce0A and /tmp/cvs2dods1 differ Index: ccHTTP.exp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccHTTP/ccHTTP.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvskJu8EC and /tmp/cvss5iJ84 differ Index: ccHTTP.lib =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccHTTP/ccHTTP.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsmfDWCD and /tmp/cvsSAvQ36 differ Index: ccHTTP.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccHTTP/ccHTTP.vbp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccHTTP.vbp 17 Nov 2003 11:43:17 -0000 1.1 +++ ccHTTP.vbp 22 Nov 2003 16:05:22 -0000 1.2 @@ -1,7 +1,7 @@ Type=OleDll Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2 -Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll# +Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#7.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll# Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll# Class=cHTTP; cHTTP.cls Class=cHTTPISAPI; cHTTPCGI.cls @@ -25,11 +25,11 @@ CompatibleEXE32="ccHTTP.dll" MajorVer=1 MinorVer=0 -RevisionVer=5 +RevisionVer=7 AutoIncrementVer=1 ServerSupportFiles=0 VersionCompanyName="Imspire.com" -CompilationType=-1 +CompilationType=0 OptimizationType=0 FavorPentiumPro(tm)=0 CodeViewDebugInfo=0 |
|
From: <ple...@us...> - 2003-11-22 16:06:00
|
Update of /cvsroot/swebs/swebswebserver/winui/ccTranslator In directory sc8-pr-cvs1:/tmp/cvs-serv11048/swebswebserver/winui/ccTranslator Modified Files: ccTranslator.dll ccTranslator.exp ccTranslator.lib ccTranslator.vbp Log Message: Release time :) http://swebs.sourceforge.net/html/index.php?name=PNphpBB2&file=viewtopic&t=65 Index: ccTranslator.dll =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccTranslator/ccTranslator.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsRJrxyJ and /tmp/cvs49H0Oi differ Index: ccTranslator.exp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccTranslator/ccTranslator.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsoEMHLN and /tmp/cvsOiRamr differ Index: ccTranslator.lib =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccTranslator/ccTranslator.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsdqSW0O and /tmp/cvsgYLWPt differ Index: ccTranslator.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/ccTranslator/ccTranslator.vbp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ccTranslator.vbp 17 Nov 2003 11:43:17 -0000 1.1 +++ ccTranslator.vbp 22 Nov 2003 16:05:22 -0000 1.2 @@ -1,6 +1,6 @@ Type=OleDll Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation -Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\ccUtil\ccUtil.dll# +Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#7.0#0#..\ccUtil\ccUtil.dll# Class=cTranslate; cText.cls Module=basMain; basMain.bas Startup="Sub Main" |
Update of /cvsroot/swebs/swebswebserver/winui In directory sc8-pr-cvs1:/tmp/cvs-serv2477/swebswebserver/winui Modified Files: .cvsignore WinUI.vbp basTransparency.bas frmAbout.frm frmMain.frm frmMain.frx frmRegistration.frm frmRegistration.frx frmSplash.frm frmSplash.frx frmTip.frm frmTip.frx frmUpdate.frm swebscc.exe Added Files: Splash-1.gif Removed Files: Title.jpg Log Message: Yesterday was the new about box, today, the new, updated, uber cool splash screen:) --- NEW FILE: Splash-1.gif --- (This appears to be a binary file; contents omitted.) Index: .cvsignore =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- .cvsignore 19 Nov 2003 12:07:10 -0000 1.8 +++ .cvsignore 20 Nov 2003 15:51:51 -0000 1.9 @@ -1,8 +1,8 @@ upgrade.xml installer -swebscc.DEP -WinUI.PDM -WinUI.csi TransExtract.exe sHTTP.dll -About-1.ai +*.DEP +*.PDM +*.csi +*.ai Index: WinUI.vbp =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- WinUI.vbp 19 Nov 2003 15:55:19 -0000 1.71 +++ WinUI.vbp 20 Nov 2003 15:51:51 -0000 1.72 @@ -30,7 +30,7 @@ CompatibleMode="0" MajorVer=1 MinorVer=0 -RevisionVer=200 +RevisionVer=203 AutoIncrementVer=1 ServerSupportFiles=0 VersionCompanyName="SWEBS Development Team" Index: basTransparency.bas =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/basTransparency.bas,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- basTransparency.bas 19 Nov 2003 15:55:19 -0000 1.2 +++ basTransparency.bas 20 Nov 2003 15:51:51 -0000 1.3 @@ -117,10 +117,10 @@ CombineRgn lngPicRegion, lngPicRegion, lngPixelRegion, RGN_XOR DeleteObject lngPixelRegion Else - If ii + 50 < lngPicWidth Then - lngPixelColor = GetPixel(lngPicDC, ii + 50, i) + If ii + 200 < lngPicWidth Then + lngPixelColor = GetPixel(lngPicDC, ii + 200, i) If lngPixelColor <> lngPicTransColor Then - ii = ii + 50 + ii = ii + 200 End If End If End If Index: frmAbout.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- frmAbout.frm 19 Nov 2003 15:55:19 -0000 1.39 +++ frmAbout.frm 20 Nov 2003 15:51:51 -0000 1.40 @@ -19,7 +19,7 @@ StartUpPosition = 2 'CenterScreen Begin VB.Timer tmrCreditsScroll Interval = 50 - Left = 7560 + Left = 5160 Top = 0 End Begin VB.PictureBox picCreditsScroll @@ -47,6 +47,7 @@ BorderStyle = 0 Enabled = -1 'True ReadOnly = -1 'True + MousePointer = 1 Appearance = 0 FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf" TextRTF = $"frmAbout.frx":6960 Index: frmMain.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- frmMain.frm 19 Nov 2003 15:55:19 -0000 1.81 +++ frmMain.frm 20 Nov 2003 15:51:52 -0000 1.82 @@ -16,19 +16,55 @@ ScaleHeight = 7305 ScaleWidth = 12075 StartUpPosition = 2 'CenterScreen + Begin VB.Frame fraLogs + BackColor = &H00FFFFFF& + BorderStyle = 0 'None + Height = 5895 + Left = 2520 + TabIndex = 36 + Top = 840 + Width = 6975 + Begin RichTextLib.RichTextBox rtfViewLogFiles + Height = 5415 + Left = 120 + TabIndex = 70 + Top = 480 + Width = 6735 + _ExtentX = 11880 + _ExtentY = 9551 + _Version = 393217 + Enabled = -1 'True + ReadOnly = -1 'True + ScrollBars = 3 + Appearance = 0 + AutoVerbMenu = -1 'True + TextRTF = $"frmMain.frx":0CCA + End + Begin VB.ComboBox cmbViewLogFiles + Appearance = 0 'Flat + Height = 315 + ItemData = "frmMain.frx":0D4C + Left = 120 + List = "frmMain.frx":0D4E + Style = 2 'Dropdown List + TabIndex = 37 + Top = 120 + Width = 6735 + End + End Begin VB.Frame fraConfigvHost BackColor = &H00FFFFFF& BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 20 Top = 840 Width = 6975 Begin VB.ListBox lstvHosts Height = 5130 - ItemData = "frmMain.frx":0CCA + ItemData = "frmMain.frx":0D50 Left = 120 - List = "frmMain.frx":0CCC + List = "frmMain.frx":0D52 TabIndex = 25 Top = 240 Width = 1815 @@ -82,7 +118,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 2160 - MouseIcon = "frmMain.frx":0CCE + MouseIcon = "frmMain.frx":0D54 MousePointer = 99 'Custom TabIndex = 107 Top = 5160 @@ -106,7 +142,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 3270 - MouseIcon = "frmMain.frx":0E20 + MouseIcon = "frmMain.frx":0EA6 MousePointer = 99 'Custom TabIndex = 106 Top = 5160 @@ -129,7 +165,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 6240 - MouseIcon = "frmMain.frx":0F72 + MouseIcon = "frmMain.frx":0FF8 MousePointer = 99 'Custom TabIndex = 105 Top = 1680 @@ -152,7 +188,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 6240 - MouseIcon = "frmMain.frx":10C4 + MouseIcon = "frmMain.frx":114A MousePointer = 99 'Custom TabIndex = 104 Top = 2280 @@ -198,16 +234,16 @@ Begin VB.Frame fraConfigISAPI BackColor = &H00FFFFFF& BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 30 Top = 840 Width = 6975 Begin VB.ListBox lstISAPI Height = 5130 - ItemData = "frmMain.frx":1216 + ItemData = "frmMain.frx":129C Left = 120 - List = "frmMain.frx":121D + List = "frmMain.frx":12A3 TabIndex = 33 Top = 240 Width = 1815 @@ -245,7 +281,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 5880 - MouseIcon = "frmMain.frx":122B + MouseIcon = "frmMain.frx":12B1 MousePointer = 99 'Custom TabIndex = 101 Top = 600 @@ -269,7 +305,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 3255 - MouseIcon = "frmMain.frx":137D + MouseIcon = "frmMain.frx":1403 MousePointer = 99 'Custom TabIndex = 100 Top = 5160 @@ -292,7 +328,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 2145 - MouseIcon = "frmMain.frx":14CF + MouseIcon = "frmMain.frx":1555 MousePointer = 99 'Custom TabIndex = 99 Top = 5160 @@ -320,7 +356,7 @@ Begin VB.Frame fraStatus BackColor = &H00FFFFFF& BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 1 Top = 840 @@ -397,7 +433,7 @@ ForeColor = &H00FF0000& Height = 195 Left = 660 - MouseIcon = "frmMain.frx":1621 + MouseIcon = "frmMain.frx":16A7 MousePointer = 99 'Custom TabIndex = 58 ToolTipText = "Click here for details." @@ -448,7 +484,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 2145 - MouseIcon = "frmMain.frx":1773 + MouseIcon = "frmMain.frx":17F9 MousePointer = 99 'Custom TabIndex = 94 Top = 720 @@ -471,7 +507,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 1305 - MouseIcon = "frmMain.frx":18C5 + MouseIcon = "frmMain.frx":194B MousePointer = 99 'Custom TabIndex = 93 Top = 720 @@ -494,7 +530,7 @@ ForeColor = &H00FF0000& Height = 225 Left = 330 - MouseIcon = "frmMain.frx":1A17 + MouseIcon = "frmMain.frx":1A9D MousePointer = 99 'Custom TabIndex = 92 Top = 720 @@ -521,44 +557,10 @@ End End End - Begin VB.Frame fraLogs - BackColor = &H00FFFFFF& - BorderStyle = 0 'None - Height = 5535 - Left = 2520 - TabIndex = 36 - Top = 840 - Width = 6975 - Begin RichTextLib.RichTextBox rtfViewLogFiles - Height = 5055 - Left = 120 - TabIndex = 70 - Top = 480 - Width = 6735 - _ExtentX = 11880 - _ExtentY = 8916 - _Version = 393217 - BorderStyle = 0 - ReadOnly = -1 'True - ScrollBars = 3 - AutoVerbMenu = -1 'True - TextRTF = $"frmMain.frx":1B69 - End - Begin VB.ComboBox cmbViewLogFiles - Height = 315 - ItemData = "frmMain.frx":1BEB - Left = 120 - List = "frmMain.frx":1BED - Style = 2 'Dropdown List - TabIndex = 37 - Top = 120 - Width = 6735 - End - End Begin VB.Frame fraConfigBasic BackColor = &H00FFFFFF& BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 2 Top = 840 @@ -713,7 +715,7 @@ Begin VB.Frame fraConfigAdv BackColor = &H00FFFFFF& BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 11 Top = 840 @@ -840,7 +842,7 @@ End Begin VB.Frame fraNewvHost BorderStyle = 0 'None - Height = 5535 + Height = 5895 Left = 2520 TabIndex = 38 Top = 840 Index: frmMain.frx =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 Binary files /tmp/cvsC5abKR and /tmp/cvsq6g8bz differ Index: frmRegistration.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmRegistration.frm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- frmRegistration.frm 17 Nov 2003 11:43:08 -0000 1.17 +++ frmRegistration.frm 20 Nov 2003 15:51:52 -0000 1.18 @@ -1,5 +1,6 @@ VERSION 5.00 Begin VB.Form frmRegistration + BackColor = &H00FFFFFF& BorderStyle = 4 'Fixed ToolWindow Caption = " SWEBS Web Server - Registration" ClientHeight = 4395 @@ -13,14 +14,6 @@ ScaleWidth = 6120 ShowInTaskbar = 0 'False StartUpPosition = 1 'CenterOwner - Begin VB.CommandButton cmdSubmit - Caption = "&Submit" - Height = 375 - Left = 2513 - TabIndex = 12 - Top = 3960 - Width = 1095 - End Begin VB.ComboBox cmbUse Height = 315 ItemData = "frmRegistration.frx":0000 @@ -77,7 +70,31 @@ Top = 600 Width = 3015 End + Begin VB.Label lblSubmit + Alignment = 2 'Center + AutoSize = -1 'True + BackStyle = 0 'Transparent + Caption = "&Submit" + BeginProperty Font + Name = "Arial" + Size = 9 + Charset = 0 + Weight = 700 + Underline = -1 'True + Italic = 0 'False + Strikethrough = 0 'False + EndProperty + ForeColor = &H00FF0000& + Height = 225 + Left = 2753 + MouseIcon = "frmRegistration.frx":0101 + MousePointer = 99 'Custom + TabIndex = 12 + Top = 4080 + Width = 615 + End Begin VB.Label lblUse + BackColor = &H00FFFFFF& Caption = "What will you use this software for?" Height = 255 Left = 120 @@ -86,6 +103,7 @@ Width = 2535 End Begin VB.Label lblExpiriance + BackColor = &H00FFFFFF& Caption = "How much computer experience do you have?" Height = 255 Left = 120 @@ -94,6 +112,7 @@ Width = 3375 End Begin VB.Label lblFindUs + BackColor = &H00FFFFFF& Caption = "How did you find out about us?" Height = 255 Left = 120 @@ -102,6 +121,7 @@ Width = 2535 End Begin VB.Label lblWhere + BackColor = &H00FFFFFF& Caption = "Where are you using this?" Height = 255 Left = 120 @@ -110,6 +130,7 @@ Width = 2055 End Begin VB.Label lblComputers + BackColor = &H00FFFFFF& Caption = "How Many Computers Do You Own?" Height = 255 Left = 120 @@ -118,6 +139,7 @@ Width = 2895 End Begin VB.Label lblEMail + BackColor = &H00FFFFFF& Caption = "What is your e-mail address? (We will not contact you, this is simply used to track installations)." Height = 375 Left = 120 @@ -155,19 +177,19 @@ Option Explicit -Private Sub cmdSubmit_Click() +Private Sub lblSubmit_Click() Dim strResult As String Dim strQuery As String If txtEmail.Text = "" Then MsgBox Translator.GetText("You must provide a e-mail address."), vbInformation + vbApplicationModal + vbOKOnly txtEmail.SetFocus - Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "User did not enter email address." + Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.lblSubmit_Click", "User did not enter email address." Exit Sub End If Me.MousePointer = vbHourglass - cmdSubmit.Enabled = False + lblSubmit.Enabled = False txtEmail.Enabled = False cmbComputers.Enabled = False cmbWhere.Enabled = False @@ -182,14 +204,14 @@ Select Case strResult Case "Completed" Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text) - Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration completed." + Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.lblSubmit_Click", "Registration completed." Case "Duplicate" MsgBox Translator.GetText("You have already registered, you only need to register once."), vbApplicationModal + vbInformation + vbOKOnly Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text) - Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration duplicate." + Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.lblSubmit_Click", "Registration duplicate." Case Else MsgBox Translator.GetText("There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r") & strResult - Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration failed." + Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.lblSubmit_Click", "Registration failed." End Select Unload Me End Sub Index: frmRegistration.frx =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmRegistration.frx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsTuGLgV and /tmp/cvsuvUfmG differ Index: frmSplash.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmSplash.frm,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- frmSplash.frm 17 Nov 2003 11:43:08 -0000 1.15 +++ frmSplash.frm 20 Nov 2003 15:51:52 -0000 1.16 @@ -21,7 +21,6 @@ StartUpPosition = 2 'CenterScreen Begin VB.Label lblStatus Alignment = 1 'Right Justify - AutoSize = -1 'True BackStyle = 0 'Transparent Caption = "Loading..." BeginProperty Font @@ -33,12 +32,12 @@ Italic = 0 'False Strikethrough = 0 'False EndProperty - ForeColor = &H00404040& + ForeColor = &H00FFFFFF& Height = 210 - Left = 7740 + Left = 3000 TabIndex = 0 - Top = 1560 - Width = 795 + Top = 1440 + Width = 4995 End End Attribute VB_Name = "frmSplash" @@ -70,6 +69,8 @@ Option Explicit +Dim lngOriginalRgn As Long + Private Sub Form_Click() Me.Hide End Sub @@ -80,8 +81,12 @@ Private Sub Form_Load() Me.MousePointer = vbHourglass + Me.Width = Me.ScaleX(Me.Picture.Width, vbHimetric, vbTwips) + Me.Height = Me.ScaleY(Me.Picture.Height, vbHimetric, vbTwips) + lngOriginalRgn = FormRegion(Me) End Sub Private Sub Form_Unload(Cancel As Integer) + FormRemoveRegion Me.hWnd, lngOriginalRgn Me.MousePointer = vbDefault End Sub Index: frmSplash.frx =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmSplash.frx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsuWPqwZ and /tmp/cvsya2eAO differ Index: frmTip.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmTip.frm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- frmTip.frm 17 Nov 2003 11:43:08 -0000 1.17 +++ frmTip.frm 20 Nov 2003 15:51:52 -0000 1.18 @@ -1,5 +1,6 @@ VERSION 5.00 Begin VB.Form frmTip + BackColor = &H00FFFFFF& Caption = "Tip of the Day" ClientHeight = 3720 ClientLeft = 2370 @@ -16,30 +17,25 @@ WhatsThisButton = -1 'True WhatsThisHelp = -1 'True Begin VB.CheckBox chkLoadTipsAtStartup + BackColor = &H00FFFFFF& Caption = "&Show Tips at Startup" Height = 315 Left = 120 - TabIndex = 3 + TabIndex = 1 Top = 3360 Value = 1 'Checked Width = 2055 End - Begin VB.CommandButton cmdNextTip - Caption = "&Next Tip" - Height = 375 - Left = 4080 - TabIndex = 2 - Top = 600 - Width = 1215 - End - Begin VB.PictureBox Picture1 - BackColor = &H00FFFFFF& + Begin VB.PictureBox picTip + Appearance = 0 'Flat + BackColor = &H80000005& + ForeColor = &H80000008& Height = 3075 Left = 120 Picture = "frmTip.frx":0CCA - ScaleHeight = 3015 - ScaleWidth = 3675 - TabIndex = 1 + ScaleHeight = 3045 + ScaleWidth = 3705 + TabIndex = 0 Top = 120 Width = 3735 Begin VB.Label lblTitle @@ -55,7 +51,7 @@ EndProperty Height = 375 Left = 240 - TabIndex = 6 + TabIndex = 4 Top = 600 Width = 3135 End @@ -64,7 +60,7 @@ Caption = "Did you know..." Height = 255 Left = 540 - TabIndex = 5 + TabIndex = 3 Top = 180 Width = 2655 End @@ -72,20 +68,56 @@ BackColor = &H00FFFFFF& Height = 1995 Left = 180 - TabIndex = 4 + TabIndex = 2 Top = 960 Width = 3375 End End - Begin VB.CommandButton cmdOK - Cancel = -1 'True - Caption = "OK" - Default = -1 'True - Height = 375 - Left = 4080 - TabIndex = 0 - Top = 120 - Width = 1215 + Begin VB.Label lblNextTip + Alignment = 2 'Center + AutoSize = -1 'True + BackStyle = 0 'Transparent + Caption = "&Next Tip" + BeginProperty Font + Name = "Arial" + Size = 9 + Charset = 0 + Weight = 700 + Underline = -1 'True + Italic = 0 'False + Strikethrough = 0 'False + EndProperty + ForeColor = &H00FF0000& + Height = 225 + Left = 4335 + MouseIcon = "frmTip.frx":0FD4 + MousePointer = 99 'Custom + TabIndex = 6 + Top = 720 + Width = 705 + End + Begin VB.Label lblOK + Alignment = 2 'Center + AutoSize = -1 'True + BackStyle = 0 'Transparent + Caption = "&OK" + BeginProperty Font + Name = "Arial" + Size = 9 + Charset = 0 + Weight = 700 + Underline = -1 'True + Italic = 0 'False + Strikethrough = 0 'False + EndProperty + ForeColor = &H00FF0000& + Height = 225 + Left = 4545 + MouseIcon = "frmTip.frx":1126 + MousePointer = 99 'Custom + TabIndex = 5 + Top = 240 + Width = 285 End End Attribute VB_Name = "frmTip" @@ -127,11 +159,11 @@ End If End Sub -Private Sub cmdNextTip_Click() +Private Sub lblNextTip_Click() GetTip End Sub -Private Sub cmdOK_Click() +Private Sub lblOK_Click() Unload Me End Sub Index: frmTip.frx =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmTip.frx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsYqk0c3 and /tmp/cvsABScdW differ Index: frmUpdate.frm =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/frmUpdate.frm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- frmUpdate.frm 17 Nov 2003 11:43:08 -0000 1.16 +++ frmUpdate.frm 20 Nov 2003 15:51:52 -0000 1.17 @@ -1,5 +1,6 @@ VERSION 5.00 Begin VB.Form frmUpdate + BackColor = &H00FFFFFF& BorderStyle = 4 'Fixed ToolWindow Caption = " SWEBS Web Server - Control Center Update" ClientHeight = 5280 @@ -38,12 +39,14 @@ Width = 1815 End Begin VB.Frame fraDetails + BackColor = &H00FFFFFF& Height = 3975 Left = 120 TabIndex = 1 Top = 720 Width = 8775 Begin VB.TextBox txtDesc + Appearance = 0 'Flat BeginProperty Font Name = "Lucida Console" Size = 9 @@ -62,6 +65,7 @@ Width = 8535 End Begin VB.Label lblFileSize + BackColor = &H00FFFFFF& Caption = "File Size: 0,000,000" Height = 255 Left = 7080 @@ -70,6 +74,7 @@ Width = 1575 End Begin VB.Label lblDesc + BackColor = &H00FFFFFF& Caption = "Description:" Height = 255 Left = 120 @@ -78,6 +83,7 @@ Width = 855 End Begin VB.Label lblUpdateLevel + BackColor = &H00FFFFFF& Caption = "Update Level: 0000" Height = 255 Left = 4800 @@ -86,6 +92,7 @@ Width = 1575 End Begin VB.Label lblVersion + BackColor = &H00FFFFFF& Caption = "Version: 00.00.0000" Height = 255 Left = 2400 @@ -94,6 +101,7 @@ Width = 1575 End Begin VB.Label lblDate + BackColor = &H00FFFFFF& Caption = "Date: 00/00/0000" Height = 255 Left = 120 @@ -103,6 +111,7 @@ End End Begin VB.Label lblTitle + BackColor = &H00FFFFFF& Caption = $"frmUpdate.frx":0000 Height = 495 Left = 120 Index: swebscc.exe =================================================================== RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 Binary files /tmp/cvswBxD4a and /tmp/cvsIHKFRc differ --- Title.jpg DELETED --- |
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv24409/swebswebserver/winui
Modified Files:
About-1.gif WinUI.vbp basTransparency.bas frmAbout.frm
frmAbout.frx frmMain.frm swebscc.exe
Log Message:
Lori thinks this text is easier to read, this is also faster, I've still got some tweaking to do, but it's a whole lot better than it was.
Index: About-1.gif
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/About-1.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsfxx9w5 and /tmp/cvsavMdK0 differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- WinUI.vbp 19 Nov 2003 12:07:10 -0000 1.70
+++ WinUI.vbp 19 Nov 2003 15:55:19 -0000 1.71
@@ -1,7 +1,7 @@
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
-Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#4.0#0#ccCore\ccCore.dll#
-Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
+Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#5.0#0#ccCore\ccCore.dll#
+Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#6.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll#
Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
@@ -30,7 +30,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=195
+RevisionVer=200
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: basTransparency.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basTransparency.bas,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basTransparency.bas 19 Nov 2003 12:07:24 -0000 1.1
+++ basTransparency.bas 19 Nov 2003 15:55:19 -0000 1.2
@@ -89,10 +89,10 @@
Dim i As Long, ii As Long, lngPicWidth As Long, lngPicHeight As Long, lngTitleHeight As Long
Dim lngBorderWidth As Long, lngPicRegion As Long, lngPixelRegion As Long, lngPixelColor As Long
Dim lngPicDC As Long, lngPicTempBMP As Long, lngPicTransColor As Long, lngOriginalRgn As Long
-Dim lngRetVal As Long
+Dim lngPixelRegionX As Long
- lngPicWidth = frmForm.ScaleX(frmForm.Picture.Width, vbTwips, vbPixels)
- lngPicHeight = frmForm.ScaleY(frmForm.Picture.Height, vbTwips, vbPixels)
+ lngPicWidth = frmForm.ScaleX(frmForm.Picture.Width, vbHimetric, vbPixels)
+ lngPicHeight = frmForm.ScaleY(frmForm.Picture.Height, vbHimetric, vbPixels)
lngPicRegion = CreateRectRgn(0, 0, lngPicWidth, lngPicHeight)
@@ -100,16 +100,33 @@
lngPicTempBMP = SelectObject(lngPicDC, frmForm.Picture.Handle)
lngPicTransColor = GetPixel(lngPicDC, 0, 0)
+
For i = 0 To lngPicHeight
- For ii = 0 To lngPicWidth
- lngPixelColor = GetPixel(lngPicDC, i, ii)
+ ii = 0
+ Do Until ii >= lngPicWidth
+ lngPixelColor = GetPixel(lngPicDC, ii, i)
If lngPixelColor = lngPicTransColor Then
- lngPixelRegion = CreateRectRgn(i, ii, i + 1, ii + 1)
+ lngPixelRegionX = 0
+ lngPixelColor = GetPixel(lngPicDC, ii, i)
+ Do While lngPixelColor = lngPicTransColor
+ lngPixelRegionX = lngPixelRegionX + 1
+ lngPixelColor = GetPixel(lngPicDC, ii + lngPixelRegionX, i)
+ Loop
+ lngPixelRegion = CreateRectRgn(ii, i, ii + lngPixelRegionX, i + 1)
+ ii = ii + lngPixelRegionX - 1
CombineRgn lngPicRegion, lngPicRegion, lngPixelRegion, RGN_XOR
DeleteObject lngPixelRegion
+ Else
+ If ii + 50 < lngPicWidth Then
+ lngPixelColor = GetPixel(lngPicDC, ii + 50, i)
+ If lngPixelColor <> lngPicTransColor Then
+ ii = ii + 50
+ End If
+ End If
End If
- Next ii
- Next i
+ ii = ii + 1
+ Loop
+ Next
SelectObject lngPicDC, lngPicTempBMP
DeleteDC lngPicDC
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- frmAbout.frm 19 Nov 2003 12:07:10 -0000 1.38
+++ frmAbout.frm 19 Nov 2003 15:55:19 -0000 1.39
@@ -19,8 +19,8 @@
StartUpPosition = 2 'CenterScreen
Begin VB.Timer tmrCreditsScroll
Interval = 50
- Left = 5040
- Top = 240
+ Left = 7560
+ Top = 0
End
Begin VB.PictureBox picCreditsScroll
Appearance = 0 'Flat
@@ -45,10 +45,11 @@
_ExtentY = 13573
_Version = 393217
BorderStyle = 0
+ Enabled = -1 'True
ReadOnly = -1 'True
Appearance = 0
FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
- TextRTF = $"frmAbout.frx":5EB5
+ TextRTF = $"frmAbout.frx":6960
End
End
Begin VB.Label lblClose
@@ -67,8 +68,8 @@
EndProperty
ForeColor = &H00FF0000&
Height = 225
- Left = 7200
- MouseIcon = "frmAbout.frx":62F9
+ Left = 7225
+ MouseIcon = "frmAbout.frx":6DA4
MousePointer = 99 'Custom
TabIndex = 3
Top = 6120
@@ -90,8 +91,8 @@
EndProperty
ForeColor = &H00FF0000&
Height = 195
- Left = 5160
- MouseIcon = "frmAbout.frx":644B
+ Left = 5140
+ MouseIcon = "frmAbout.frx":6EF6
MousePointer = 99 'Custom
TabIndex = 2
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
@@ -117,7 +118,7 @@
Left = 960
TabIndex = 1
Top = 1560
- Width = 3615
+ Width = 3735
End
Begin VB.Label lblSrvVersion
Alignment = 2 'Center
@@ -138,7 +139,7 @@
Left = 960
TabIndex = 0
Top = 1320
- Width = 3615
+ Width = 3735
End
End
Attribute VB_Name = "frmAbout"
@@ -196,7 +197,7 @@
End Sub
Private Sub tmrCreditsScroll_Timer()
- rtfCredits.Top = rtfCredits.Top - 5
+ rtfCredits.Top = rtfCredits.Top - 12
If rtfCredits.Top < rtfCredits.Height * -1 Then
rtfCredits.Top = picCreditsScroll.Height + 10
End If
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
Binary files /tmp/cvsDPZNL9 and /tmp/cvsUWgHc9 differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- frmMain.frm 19 Nov 2003 12:07:11 -0000 1.80
+++ frmMain.frm 19 Nov 2003 15:55:19 -0000 1.81
@@ -539,7 +539,6 @@
_ExtentY = 8916
_Version = 393217
BorderStyle = 0
- Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1626,7 +1625,6 @@
End
Begin VB.Menu mnuSysTrayPopupExit
Caption = "E&xit..."
- Enabled = 0 'False
End
End
End
@@ -1659,8 +1657,8 @@
Option Explicit
-Private Declare Function SetForegroundWindow Lib "user32" (ByVal hwnd As Long) As Long
-Private Declare Function PostMessage Lib "user32" Alias "PostMessageA" (ByVal hwnd As Long, ByVal wMsg As Long, ByVal wParam As Long, ByVal lParam As Long) As Long
+Private Declare Function SetForegroundWindow Lib "user32" (ByVal hWnd As Long) As Long
+Private Declare Function PostMessage Lib "user32" Alias "PostMessageA" (ByVal hWnd As Long, ByVal wMsg As Long, ByVal wParam As Long, ByVal lParam As Long) As Long
Private WithEvents SysTray As cSysTray
Attribute SysTray.VB_VarHelpID = -1
@@ -1848,7 +1846,7 @@
Dim i As Long
Me.Hide
- PostMessage Me.hwnd, 0&, 0&, 0&
+ PostMessage Me.hWnd, 0&, 0&, 0&
DoEvents
SysTray.RemoveFromSysTray
Set SysTray = Nothing
@@ -1863,7 +1861,10 @@
End Sub
Private Sub lblAbout_Click()
+ Me.MousePointer = 11
+ DoEvents
Load frmAbout
+ Me.MousePointer = 0
frmAbout.Show
End Sub
@@ -2212,7 +2213,10 @@
End Sub
Private Sub mnuSysTrayPopupAbout_Click()
+ Me.MousePointer = 11
+ DoEvents
Load frmAbout
+ Me.MousePointer = 0
frmAbout.Show
End Sub
@@ -2255,9 +2259,9 @@
End Sub
Private Sub SysTray_RButtonUp()
- SetForegroundWindow Me.hwnd
+ SetForegroundWindow Me.hWnd
PopupMenu mnuSysTrayPopup, , , , mnuSysTrayPopupOpenCC
- PostMessage Me.hwnd, 0&, 0&, 0&
+ PostMessage Me.hWnd, 0&, 0&, 0&
End Sub
Private Sub tmrStats_Timer()
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
Binary files /tmp/cvsXmHKpd and /tmp/cvsYy0NMh differ
|
|
From: <ple...@us...> - 2003-11-19 12:07:28
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv16381/swebswebserver/winui
Modified Files:
.cvsignore WinUI.lvw WinUI.vbp credits.rtf frmAbout.frm
frmAbout.frx frmMain.frm swebscc.exe
Added Files:
About-1.gif basTransparency.bas
Log Message:
Uber-cool new about box...
--- NEW FILE: About-1.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: basTransparency.bas ---
Attribute VB_Name = "basTransparency"
'CSEH: Core - Custom
'***************************************************************************
'
' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Private Declare Function CreateRectRgn Lib "gdi32" ( _
ByVal X1 As Long, _
ByVal Y1 As Long, _
ByVal X2 As Long, _
ByVal Y2 As Long _
) As Long
Private Declare Function CombineRgn Lib "gdi32" ( _
ByVal hDestRgn As Long, _
ByVal hSrcRgn1 As Long, _
ByVal hSrcRgn2 As Long, _
ByVal nCombineMode As Long _
) As Long
Private Declare Function OffsetRgn Lib "gdi32" ( _
ByVal hRgn As Long, _
ByVal X As Long, _
ByVal Y As Long _
) As Long
Private Declare Function SetWindowRgn Lib "user32" ( _
ByVal hWnd As Long, _
ByVal hRgn As Long, _
ByVal bRedraw As Boolean _
) As Long
Private Declare Function CreateCompatibleDC Lib "gdi32" ( _
ByVal hdc As Long _
) As Long
Private Declare Function GetPixel Lib "gdi32" ( _
ByVal hdc As Long, _
ByVal X As Long, _
ByVal Y As Long _
) As Long
Private Declare Function GetSystemMetrics Lib "user32" ( _
ByVal nIndex As Long _
) As Long
Private Declare Function SelectObject Lib "gdi32" ( _
ByVal hdc As Long, _
ByVal hObject As Long _
) As Long
Private Declare Function DeleteObject Lib "gdi32" ( _
ByVal hObject As Long _
) As Long
Private Declare Function DeleteDC Lib "gdi32" ( _
ByVal hdc As Long _
) As Long
Private Const RGN_AND = 1
Private Const RGN_COPY = 5
Private Const RGN_OR = 2
Private Const RGN_XOR = 3
Private Const RGN_DIFF = 4
Private Const SM_CYCAPTION = 4
Private Const SM_CXBORDER = 5
Private Const SM_CYBORDER = 6
Private Const SM_CXDLGFRAME = 7
Private Const SM_CYDLGFRAME = 8
Public Function FormRegion(frmForm As Form) As Long
Dim i As Long, ii As Long, lngPicWidth As Long, lngPicHeight As Long, lngTitleHeight As Long
Dim lngBorderWidth As Long, lngPicRegion As Long, lngPixelRegion As Long, lngPixelColor As Long
Dim lngPicDC As Long, lngPicTempBMP As Long, lngPicTransColor As Long, lngOriginalRgn As Long
Dim lngRetVal As Long
lngPicWidth = frmForm.ScaleX(frmForm.Picture.Width, vbTwips, vbPixels)
lngPicHeight = frmForm.ScaleY(frmForm.Picture.Height, vbTwips, vbPixels)
lngPicRegion = CreateRectRgn(0, 0, lngPicWidth, lngPicHeight)
lngPicDC = CreateCompatibleDC(frmForm.hdc)
lngPicTempBMP = SelectObject(lngPicDC, frmForm.Picture.Handle)
lngPicTransColor = GetPixel(lngPicDC, 0, 0)
For i = 0 To lngPicHeight
For ii = 0 To lngPicWidth
lngPixelColor = GetPixel(lngPicDC, i, ii)
If lngPixelColor = lngPicTransColor Then
lngPixelRegion = CreateRectRgn(i, ii, i + 1, ii + 1)
CombineRgn lngPicRegion, lngPicRegion, lngPixelRegion, RGN_XOR
DeleteObject lngPixelRegion
End If
Next ii
Next i
SelectObject lngPicDC, lngPicTempBMP
DeleteDC lngPicDC
DeleteObject lngPicTempBMP
lngOriginalRgn = SetWindowRgn(frmForm.hWnd, lngPicRegion, True)
FormRegion = lngOriginalRgn
End Function
Public Sub FormRemoveRegion(hWnd As Long, lngOriginalRgn As Long)
DeleteObject SetWindowRgn(hWnd, lngOriginalRgn, True)
End Sub
Index: .cvsignore
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- .cvsignore 17 Nov 2003 11:43:07 -0000 1.7
+++ .cvsignore 19 Nov 2003 12:07:10 -0000 1.8
@@ -5,3 +5,4 @@
WinUI.csi
TransExtract.exe
sHTTP.dll
+About-1.ai
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
Binary files /tmp/cvsYg4cbb and /tmp/cvsCIbSVb differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- WinUI.vbp 17 Nov 2003 11:43:07 -0000 1.69
+++ WinUI.vbp 19 Nov 2003 12:07:10 -0000 1.70
@@ -16,6 +16,7 @@
Class=cSysTray; cSysTray.cls
Module=basExceptionFilter; basExceptionFilter.bas
Form=frmNewISAPI.frm
+Module=basTransparency; ..\..\swebswebserver\winui\basTransparency.bas
IconForm="frmMain"
Startup="Sub Main"
HelpFile=""
@@ -29,7 +30,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=192
+RevisionVer=195
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvskjTnoi and /tmp/cvs44WoVs differ
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- frmAbout.frm 17 Nov 2003 11:43:07 -0000 1.37
+++ frmAbout.frm 19 Nov 2003 12:07:10 -0000 1.38
@@ -1,36 +1,55 @@
VERSION 5.00
Object = "{3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0"; "RICHTX32.OCX"
Begin VB.Form frmAbout
- BackColor = &H00FFFFFF&
- BorderStyle = 3 'Fixed Dialog
+ BorderStyle = 0 'None
Caption = "About SWEBS Web Server"
- ClientHeight = 5985
- ClientLeft = 45
- ClientTop = 435
- ClientWidth = 5280
+ ClientHeight = 6795
+ ClientLeft = 0
+ ClientTop = 0
+ ClientWidth = 8370
ForeColor = &H00000000&
Icon = "frmAbout.frx":0000
LinkTopic = "Form1"
MaxButton = 0 'False
MinButton = 0 'False
- ScaleHeight = 5985
- ScaleWidth = 5280
+ Picture = "frmAbout.frx":0CCA
+ ScaleHeight = 6795
+ ScaleWidth = 8370
ShowInTaskbar = 0 'False
StartUpPosition = 2 'CenterScreen
- Begin RichTextLib.RichTextBox rtfCredits
- Height = 3735
- Left = 120
+ Begin VB.Timer tmrCreditsScroll
+ Interval = 50
+ Left = 5040
+ Top = 240
+ End
+ Begin VB.PictureBox picCreditsScroll
+ Appearance = 0 'Flat
+ AutoRedraw = -1 'True
+ BackColor = &H80000005&
+ BorderStyle = 0 'None
+ ForeColor = &H80000008&
+ Height = 5775
+ Left = 5640
+ ScaleHeight = 5775
+ ScaleWidth = 2175
TabIndex = 4
- Top = 1680
- Width = 5055
- _ExtentX = 8916
- _ExtentY = 6588
- _Version = 393217
- BorderStyle = 0
- ReadOnly = -1 'True
- ScrollBars = 2
- FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
- TextRTF = $"frmAbout.frx":0CCA
+ Top = 120
+ Width = 2175
+ Begin RichTextLib.RichTextBox rtfCredits
+ Height = 7695
+ Left = 0
+ TabIndex = 5
+ Top = 0
+ Width = 2175
+ _ExtentX = 3836
+ _ExtentY = 13573
+ _Version = 393217
+ BorderStyle = 0
+ ReadOnly = -1 'True
+ Appearance = 0
+ FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
+ TextRTF = $"frmAbout.frx":5EB5
+ End
End
Begin VB.Label lblClose
Alignment = 2 'Center
@@ -48,16 +67,17 @@
EndProperty
ForeColor = &H00FF0000&
Height = 225
- Left = 4455
- MouseIcon = "frmAbout.frx":16CD
+ Left = 7200
+ MouseIcon = "frmAbout.frx":62F9
MousePointer = 99 'Custom
- TabIndex = 5
- Top = 5640
+ TabIndex = 3
+ Top = 6120
Width = 495
End
Begin VB.Label lblHomePage
AutoSize = -1 'True
BackColor = &H00FFFFFF&
+ BackStyle = 0 'Transparent
Caption = "swebs.sourceforge.net"
BeginProperty Font
Name = "MS Sans Serif"
@@ -70,24 +90,18 @@
EndProperty
ForeColor = &H00FF0000&
Height = 195
- Left = 120
- MouseIcon = "frmAbout.frx":181F
+ Left = 5160
+ MouseIcon = "frmAbout.frx":644B
MousePointer = 99 'Custom
- TabIndex = 3
+ TabIndex = 2
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
- Top = 5640
+ Top = 6120
Width = 1605
End
- Begin VB.Image imgLogo
- Height = 480
- Left = 600
- Picture = "frmAbout.frx":1971
- Top = 120
- Width = 480
- End
Begin VB.Label lblUIBuild
Alignment = 2 'Center
BackColor = &H00FFFFFF&
+ BackStyle = 0 'Transparent
Caption = "Control Center Build: XXXX"
BeginProperty Font
Name = "Tahoma"
@@ -98,15 +112,17 @@
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
+ ForeColor = &H00FFFFFF&
Height = 255
Left = 960
- TabIndex = 2
- Top = 1200
- Width = 3015
+ TabIndex = 1
+ Top = 1560
+ Width = 3615
End
Begin VB.Label lblSrvVersion
Alignment = 2 'Center
BackColor = &H00FFFFFF&
+ BackStyle = 0 'Transparent
Caption = "Server Version: X.XX.XX"
BeginProperty Font
Name = "Tahoma"
@@ -117,38 +133,12 @@
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
+ ForeColor = &H00FFFFFF&
Height = 255
Left = 960
- TabIndex = 1
- Top = 840
- Width = 3015
- End
- Begin VB.Line lneUI
- Index = 1
- X1 = 600
- X2 = 4200
- Y1 = 600
- Y2 = 600
- End
- Begin VB.Label lblTitle
- Alignment = 2 'Center
- AutoSize = -1 'True
- BackColor = &H00FFFFFF&
- Caption = "SWEBS Web Server"
- BeginProperty Font
- Name = "Tahoma"
- Size = 15.75
- Charset = 0
- Weight = 700
- Underline = 0 'False
- Italic = 0 'False
- Strikethrough = 0 'False
- EndProperty
- Height = 375
- Left = 1118
TabIndex = 0
- Top = 240
- Width = 3045
+ Top = 1320
+ Width = 3615
End
End
Attribute VB_Name = "frmAbout"
@@ -180,17 +170,35 @@
Option Explicit
+Dim lngOriginalRgn As Long
+
+Private Sub Form_Unload(Cancel As Integer)
+ FormRemoveRegion Me.hWnd, lngOriginalRgn
+End Sub
+
Private Sub lblClose_Click()
Unload Me
End Sub
Private Sub Form_Load()
+ Me.Width = Me.ScaleX(Me.Picture.Width, vbHimetric, vbTwips)
+ Me.Height = Me.ScaleY(Me.Picture.Height, vbHimetric, vbTwips)
+ lngOriginalRgn = FormRegion(Me)
lblClose.Caption = Translator.GetText("&Close")
lblSrvVersion.Caption = Translator.GetText("Server Version") & ": " & Core.Version
lblUIBuild.Caption = Translator.GetText("Control Center Build") & ": " & App.Revision
rtfCredits.TextRTF = Replace(rtfCredits.TextRTF, "Lang-Maintainer", Translator.GetText("Lang-Maintainer"))
+ rtfCredits.Top = rtfCredits.Height * -1
End Sub
Private Sub lblHomePage_Click()
Core.Net.LaunchURL "http://swebs.sourceforge.net/html/index.php"
+End Sub
+
+Private Sub tmrCreditsScroll_Timer()
+ rtfCredits.Top = rtfCredits.Top - 5
+ If rtfCredits.Top < rtfCredits.Height * -1 Then
+ rtfCredits.Top = picCreditsScroll.Height + 10
+ End If
+ picCreditsScroll.Refresh
End Sub
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
Binary files /tmp/cvs8VVPfy and /tmp/cvsC8iieW differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- frmMain.frm 17 Nov 2003 11:43:08 -0000 1.79
+++ frmMain.frm 19 Nov 2003 12:07:11 -0000 1.80
@@ -539,6 +539,7 @@
_ExtentY = 8916
_Version = 393217
BorderStyle = 0
+ Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1275,7 +1276,7 @@
Top = 120
Width = 3750
End
- Begin VB.Shape Shape1
+ Begin VB.Shape shpMain
BackColor = &H00804008&
BackStyle = 1 'Opaque
BorderStyle = 0 'Transparent
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
Binary files /tmp/cvsM0e6eN and /tmp/cvsmEFAkr differ
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui
Modified Files:
.cvsignore ChangeLog.txt WinUI.lvw WinUI.vbp WinUI.vbw
basExceptionFilter.bas basMain.bas cSysTray.cls credits.rtf
frmAbout.frm frmAbout.frx frmEventView.frm frmMain.frm
frmNewISAPI.frm frmRegistration.frm frmSplash.frm frmTip.frm
frmUpdate.frm lang.xml swebscc.exe
Added Files:
ControlCenter.vbg
Removed Files:
cCallStack.cls cDebug.cls cEventLog.cls cHTTP.cls cHTTPCGI.cls
cHTTPCGICol.cls cHTTPConfig.cls cHTTPIndex.cls
cHTTPIndexCol.cls cHTTPStats.cls cHTTPVirtHost.cls
cHTTPVirtHostCol.cls cNet.cls cPerfMon.cls cPerfMonData.cls
cRegistration.cls cServer.cls cUpdate.cls cUtil.cls cWinUI.cls
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: ControlCenter.vbg ---
VBGROUP 5.0
StartupProject=WinUI.vbp
Project=ccCore\ccCore.vbp
Project=ccHTTP\ccHTTP.vbp
Project=ccUtil\ccUtil.vbp
Project=..\..\swebswebserver\winui\ccTranslator\ccTranslator.vbp
Index: .cvsignore
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore 5 Nov 2003 21:39:20 -0000 1.6
+++ .cvsignore 17 Nov 2003 11:43:07 -0000 1.7
@@ -4,5 +4,4 @@
WinUI.PDM
WinUI.csi
TransExtract.exe
-SWEBS.dll
-
+sHTTP.dll
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/ChangeLog.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog.txt 15 Nov 2003 14:15:01 -0000 1.29
+++ ChangeLog.txt 17 Nov 2003 11:43:07 -0000 1.30
@@ -1,5 +1,5 @@
-ChangeLog for WinUI
--------------------
+ChangeLog for SWEBS - Control Center
+------------------------------------
Legend:
! Bug fix
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
Binary files /tmp/cvsvauRVm and /tmp/cvsOZippz differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- WinUI.vbp 15 Nov 2003 14:15:05 -0000 1.68
+++ WinUI.vbp 17 Nov 2003 11:43:07 -0000 1.69
@@ -1,7 +1,8 @@
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
-Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
-Reference=*\G{7D521758-175B-48CB-AB02-4973824A3241}#1.0#0#C:\WINDOWS\System32\MSINET.oca#Microsoft Internet Transfer Control 6.0 (SP4)
+Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#4.0#0#ccCore\ccCore.dll#
+Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
+Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll#
Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
Module=basMain; basMain.bas
@@ -12,42 +13,23 @@
Form=frmRegistration.frm
Form=frmSplash.frm
Form=frmUpdate.frm
-Class=cWinUI; cWinUI.cls
-Class=cUtil; cUtil.cls
-Class=cUpdate; cUpdate.cls
-Class=cRegistration; cRegistration.cls
-Class=cNet; cNet.cls
-Class=cEventLog; cEventLog.cls
-Class=cDebug; cDebug.cls
-Class=cServer; cServer.cls
-Class=cHTTP; cHTTP.cls
-Class=cHTTPStats; cHTTPStats.cls
-Class=cHTTPConfig; cHTTPConfig.cls
-Class=cHTTPISAPI; cHTTPCGI.cls
-Class=cHTTPISAPICol; cHTTPCGICol.cls
-Class=cHTTPIndex; cHTTPIndex.cls
-Class=cHTTPIndexCol; cHTTPIndexCol.cls
-Class=cHTTPVirtHost; cHTTPVirtHost.cls
-Class=cHTTPVirtHostCol; cHTTPVirtHostCol.cls
Class=cSysTray; cSysTray.cls
Module=basExceptionFilter; basExceptionFilter.bas
-Class=cCallStack; cCallStack.cls
Form=frmNewISAPI.frm
-Class=cPerfMon; cPerfMon.cls
-Class=cPerfMonData; cPerfMonData.cls
IconForm="frmMain"
Startup="Sub Main"
HelpFile=""
Title="WinUI"
ExeName32="swebscc.exe"
+Path32="..\..\swebswebserver\winui"
Command32=""
-Name="SWEBS_WinUI"
+Name="ccUI"
HelpContextID="0"
Description="SWEBS Windows UI"
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=187
+RevisionVer=192
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- WinUI.vbw 15 Nov 2003 14:15:05 -0000 1.25
+++ WinUI.vbw 17 Nov 2003 11:43:07 -0000 1.26
@@ -1,4 +1,4 @@
-basMain = 89, 133, 1146, 784, C
+basMain = 89, 133, 1146, 784,
frmMain = 117, 303, 1172, 956, , 94, 38, 955, 630, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
@@ -6,26 +6,6 @@
frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C
frmSplash = 198, 261, 1200, 985, C, 220, 290, 1222, 1014, C
frmUpdate = 154, 203, 1156, 927, C, 176, 232, 1178, 956, C
-cWinUI = 84, 172, 1086, 896, C
-cUtil = 44, 58, 1046, 782, C
-cUpdate = 44, 58, 1046, 782, C
-cRegistration = 154, 203, 1156, 927, C
-cNet = 22, 29, 1024, 753, C
-cEventLog = 132, 174, 1134, 898, C
-cDebug = 77, 164, 1079, 888, C
-cServer = 0, 0, 1002, 724, C
-cHTTP = 72, 102, 1074, 826, C
-cHTTPStats = 88, 116, 1090, 840, C
-cHTTPConfig = 44, 58, 1046, 782, C
-cHTTPISAPI = 241, 157, 1243, 881, C
-cHTTPISAPICol = 176, 232, 1178, 956, C
-cHTTPIndex = 44, 58, 1046, 782, C
-cHTTPIndexCol = 32, 54, 1034, 778, C
-cHTTPVirtHost = 110, 145, 1112, 869, C
-cHTTPVirtHostCol = 132, 174, 1134, 898, C
cSysTray = 198, 261, 1200, 985, C
basExceptionFilter = 242, 319, 1244, 1043,
-cCallStack = 22, 29, 1024, 753, C
-frmNewISAPI = 0, 0, 0, 0, C, 0, 0, 0, 0, C
-cPerfMon = 183, 286, 1185, 1010, C
-cPerfMonData = 44, 58, 1046, 782, C
+frmNewISAPI = 0, 0, 0, 0, C, 110, 145, 1112, 869, C
Index: basExceptionFilter.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basExceptionFilter.bas,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- basExceptionFilter.bas 18 Oct 2003 15:35:27 -0000 1.7
+++ basExceptionFilter.bas 17 Nov 2003 11:43:07 -0000 1.8
@@ -1,8 +1,8 @@
Attribute VB_Name = "basExceptionFilter"
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -153,69 +153,59 @@
Private Const EXCEPTION_CONTROL_C_EXIT = &HC000013A
Private Function GetExceptionText(ByVal ExceptionCode As Long) As String
- '<EhHeader>
- On Error GoTo GetExceptionText_Err
- '</EhHeader>
- Dim strExceptionString As String
-
-100 Select Case ExceptionCode
- Case EXCEPTION_ACCESS_VIOLATION
-104 strExceptionString = "Access Violation"
-108 Case EXCEPTION_DATATYPE_MISALIGNMENT
-112 strExceptionString = "Data Type Misalignment"
-116 Case EXCEPTION_BREAKPOINT
-120 strExceptionString = "Breakpoint"
-124 Case EXCEPTION_SINGLE_STEP
-128 strExceptionString = "Single Step"
-132 Case EXCEPTION_ARRAY_BOUNDS_EXCEEDED
-136 strExceptionString = "Array Bounds Exceeded"
-140 Case EXCEPTION_FLT_DENORMAL_OPERAND
-144 strExceptionString = "Float Denormal Operand"
-148 Case EXCEPTION_FLT_DIVIDE_BY_ZERO
-152 strExceptionString = "Divide By Zero"
-156 Case EXCEPTION_FLT_INEXACT_RESULT
-160 strExceptionString = "Floating Point Inexact Result"
-164 Case EXCEPTION_FLT_INVALID_OPERATION
-168 strExceptionString = "Invalid Operation"
-172 Case EXCEPTION_FLT_OVERFLOW
-176 strExceptionString = "Float Overflow"
-180 Case EXCEPTION_FLT_STACK_CHECK
-184 strExceptionString = "Float Stack Check"
-188 Case EXCEPTION_FLT_UNDERFLOW
-192 strExceptionString = "Float Underflow"
-196 Case EXCEPTION_INT_DIVIDE_BY_ZERO
-200 strExceptionString = "Integer Divide By Zero"
-204 Case EXCEPTION_INT_OVERFLOW
-208 strExceptionString = "Integer Overflow"
-212 Case EXCEPTION_PRIVILEGED_INSTRUCTION
-216 strExceptionString = "Privileged Instruction"
-220 Case EXCEPTION_IN_PAGE_ERROR
-224 strExceptionString = "In Page Error"
-228 Case EXCEPTION_ILLEGAL_INSTRUCTION
-232 strExceptionString = "Illegal Instruction"
-236 Case EXCEPTION_NONCONTINUABLE_EXCEPTION
-240 strExceptionString = "Non Continuable Exception"
-244 Case EXCEPTION_STACK_OVERFLOW
-248 strExceptionString = "Stack Overflow"
-252 Case EXCEPTION_INVALID_DISPOSITION
-256 strExceptionString = "Invalid Disposition"
-260 Case EXCEPTION_GUARD_PAGE_VIOLATION
-264 strExceptionString = "Guard Page Violation"
-268 Case EXCEPTION_INVALID_HANDLE
-272 strExceptionString = "Invalid Handle"
-276 Case EXCEPTION_CONTROL_C_EXIT
-280 strExceptionString = "Control-C Exit"
-284 Case Else
-288 strExceptionString = "Unknown (&H" & Right$("00000000" & Hex$(ExceptionCode), 8) & ")"
- End Select
-292 GetExceptionText = strExceptionString
- '<EhFooter>
- Exit Function
+Dim strExceptionString As String
-GetExceptionText_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basExceptionFilter.GetExceptionText", Erl, False
- Resume Next
- '</EhFooter>
+ Select Case ExceptionCode
+ Case EXCEPTION_ACCESS_VIOLATION
+ strExceptionString = "Access Violation"
+ Case EXCEPTION_DATATYPE_MISALIGNMENT
+ strExceptionString = "Data Type Misalignment"
+ Case EXCEPTION_BREAKPOINT
+ strExceptionString = "Breakpoint"
+ Case EXCEPTION_SINGLE_STEP
+ strExceptionString = "Single Step"
+ Case EXCEPTION_ARRAY_BOUNDS_EXCEEDED
+ strExceptionString = "Array Bounds Exceeded"
+ Case EXCEPTION_FLT_DENORMAL_OPERAND
+ strExceptionString = "Float Denormal Operand"
+ Case EXCEPTION_FLT_DIVIDE_BY_ZERO
+ strExceptionString = "Divide By Zero"
+ Case EXCEPTION_FLT_INEXACT_RESULT
+ strExceptionString = "Floating Point Inexact Result"
+ Case EXCEPTION_FLT_INVALID_OPERATION
+ strExceptionString = "Invalid Operation"
+ Case EXCEPTION_FLT_OVERFLOW
+ strExceptionString = "Float Overflow"
+ Case EXCEPTION_FLT_STACK_CHECK
+ strExceptionString = "Float Stack Check"
+ Case EXCEPTION_FLT_UNDERFLOW
+ strExceptionString = "Float Underflow"
+ Case EXCEPTION_INT_DIVIDE_BY_ZERO
+ strExceptionString = "Integer Divide By Zero"
+ Case EXCEPTION_INT_OVERFLOW
+ strExceptionString = "Integer Overflow"
+ Case EXCEPTION_PRIVILEGED_INSTRUCTION
+ strExceptionString = "Privileged Instruction"
+ Case EXCEPTION_IN_PAGE_ERROR
+ strExceptionString = "In Page Error"
+ Case EXCEPTION_ILLEGAL_INSTRUCTION
+ strExceptionString = "Illegal Instruction"
+ Case EXCEPTION_NONCONTINUABLE_EXCEPTION
+ strExceptionString = "Non Continuable Exception"
+ Case EXCEPTION_STACK_OVERFLOW
+ strExceptionString = "Stack Overflow"
+ Case EXCEPTION_INVALID_DISPOSITION
+ strExceptionString = "Invalid Disposition"
+ Case EXCEPTION_GUARD_PAGE_VIOLATION
+ strExceptionString = "Guard Page Violation"
+ Case EXCEPTION_INVALID_HANDLE
+ strExceptionString = "Invalid Handle"
+ Case EXCEPTION_CONTROL_C_EXIT
+ strExceptionString = "Control-C Exit"
+ Case Else
+ strExceptionString = "Unknown (&H" & Right$("00000000" & Hex$(ExceptionCode), 8) & ")"
+ End Select
+ GetExceptionText = strExceptionString
End Function
'CSEH: Skip
@@ -232,20 +222,10 @@
End Function
Public Sub SetExceptionFilter(blnEnable As Boolean)
- '<EhHeader>
- On Error GoTo SetExceptionFilter_Err
- '</EhHeader>
-100 If blnEnable = True Then
-104 Call SetUnhandledExceptionFilter(AddressOf ExceptionFilter)
- Else
-108 Call SetUnhandledExceptionFilter(0)
- End If
- '<EhFooter>
- Exit Sub
-
-SetExceptionFilter_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basExceptionFilter.SetExceptionFilter", Erl, False
- Resume Next
- '</EhFooter>
+ If blnEnable = True Then
+ Call SetUnhandledExceptionFilter(AddressOf ExceptionFilter)
+ Else
+ Call SetUnhandledExceptionFilter(0)
+ End If
End Sub
Index: basMain.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basMain.bas,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- basMain.bas 15 Nov 2003 14:15:05 -0000 1.57
+++ basMain.bas 17 Nov 2003 11:43:07 -0000 1.58
@@ -1,8 +1,8 @@
Attribute VB_Name = "basMain"
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -23,7 +23,19 @@
Option Explicit
-Public WinUI As cWinUI
+'FadeForm
+Private Declare Function SetLayeredWindowAttributes Lib "user32" (ByVal hwnd As Long, ByVal crKey As Long, ByVal bAlpha As Byte, ByVal dwFlags As Long) As Long
+Private Declare Function GetWindowLong Lib "user32" Alias "GetWindowLongA" (ByVal hwnd As Long, ByVal nIndex As Long) As Long
+Private Declare Function SetWindowLong Lib "user32" Alias "SetWindowLongA" (ByVal hwnd As Long, ByVal nIndex As Long, ByVal dwNewLong As Long) As Long
+
+'FadeForm
+Private Const GWL_EXSTYLE = (-20)
+Private Const LWA_ALPHA = &H2
+Private Const WS_EX_LAYERED = &H80000
+
+Public Core As cCore
+Public Util As cUtil
+Public Translator As cTranslate
'CLI Option variables
Dim blnNoSplash As Boolean
@@ -35,192 +47,155 @@
Dim blnDebugMode As Boolean
Dim blnPerfMon As Boolean
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
Public Sub Main()
- '<EhHeader>
- On Error GoTo Main_Err
- '</EhHeader>
-100 SetExceptionFilter True
-104 GetArgs Command$()
-108 Set WinUI = New cWinUI
-112 WinUI.Setup
-116 If blnDebugLang = True Then WinUI.Debuger.DebugLang = True
-120 If blnNoSplash = True Then WinUI.Debuger.DisableSplash = True
-124 If blnNoTips = True Then WinUI.Debuger.DisableTips = True
-128 If blnNoUpdate = True Then WinUI.Debuger.DisableUpdate = True
-132 If blnKillUpdate = True Then WinUI.Debuger.KillUpdate
-136 If blnDebugMode = True Then WinUI.Debuger.DebugMode = True
-140 If blnPerfMon = True Then WinUI.Debuger.PerfMon.Enabled = True
+Dim UIInt As cUIInterface
+
+ SetExceptionFilter True
-144 If WinUI.Debuger.DisableSplash <> True Then
-148 Load frmSplash
-152 WinUI.Util.FormFade frmSplash, False
- End If
-156 If App.PrevInstance = True Then
-160 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
-164 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
-168 End
- End If
-172 End
+ 'Create a Core from the default instance
+ Set UIInt = New cUIInterface
+ Set Core = UIInt.DefInstance
+ Set UIInt = Nothing
+
+ 'create a instance of the util class
+ Set Util = New cUtil
+
+ 'create a new instance of the translator
+ Set Translator = New cTranslate
+
+ GetArgs Command$()
+ If blnDebugLang = True Then Core.Debuger.DebugLang = True
+ If blnNoUpdate = True Then Core.Debuger.DisableUpdate = True
+ If blnKillUpdate = True Then Core.Debuger.KillUpdate
+ If blnDebugMode = True Then Core.Debuger.DebugMode = True
+ If blnPerfMon = True Then Core.Debuger.PerfMon.Enabled = True
+
+ If blnNoSplash <> True Then
+ Load frmSplash
+ FormFade frmSplash, False
+ End If
+ If App.PrevInstance = True Then
+ If Util.SetFocusByCaption(Translator.GetText("SWEBS Web Server - Control Center")) = False Then
+ MsgBox Translator.GetText("There is already a instance of this application running."), vbApplicationModal + vbCritical
+ End
End If
-176 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
-180 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
-184 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
-188 End
- End If
-192 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
-196 If WinUI.Net.IsOnline = True Then
-200 If WinUI.Registration.IsRegistered = False Then
-204 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
-208 WinUI.Registration.Start
- End If
+ End
+ End If
+ App.Title = Translator.GetText("SWEBS Web Server - Control Center")
+ If Dir$(Core.Server.HTTP.Config.File) = "" Then
+ MsgBox Translator.GetText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
+ End
+ End If
+ SetStatus Translator.GetText("Checking For Registration Data") & "..."
+ If Core.Net.IsOnline = True Then
+ If Core.Registration.IsRegistered = False Then
+ SetStatus Translator.GetText("Starting Registration") & "..."
+ Core.Registration.Start '<- This is not UI split
End If
-212 Load frmMain
-216 If WinUI.Debuger.DisableSplash <> True Then
-220 WinUI.Util.FormFade frmSplash, True
-224 Unload frmSplash
-228 DoEvents
- End If
-232 If blnTrayOnly <> True Then
-236 frmMain.Show
- End If
-240 If WinUI.Debuger.DisableTips <> True Then
-244 If LCase$(WinUI.Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
-248 Load frmTip
-252 frmTip.Show vbModal
- End If
+ End If
+ Load frmMain
+ If blnNoSplash <> True Then
+ FormFade frmSplash, True
+ Unload frmSplash
+ DoEvents
+ End If
+ If blnTrayOnly <> True Then
+ frmMain.Show
+ End If
+ If blnNoTips <> True Then
+ If LCase$(Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
+ Load frmTip
+ frmTip.Show vbModal
End If
- '<EhFooter>
- Exit Sub
-
-Main_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.Main", Erl, False
- Resume Next
- '</EhFooter>
+ End If
End Sub
Public Sub SetStatus(strStatus As String, Optional blnBusy As Boolean = False)
- '<EhHeader>
- On Error GoTo SetStatus_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.basMain.SetStatus")
- '</EhHeader>
-100 If IsLoaded("SWEBS-Splash") = True Then
-104 If frmSplash.lblStatus.Caption <> strStatus Then
-108 frmSplash.lblStatus.Caption = strStatus
-112 frmSplash.Refresh
- End If
-116 ElseIf IsLoaded(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = True Then
-120 If frmMain.lblAppStatus.Caption <> strStatus Then
-124 If blnBusy = True Then
-128 Screen.MousePointer = vbArrowHourglass '13 arrow + hourglass
- Else
-132 Screen.MousePointer = vbNormal '0 default
- End If
-136 frmMain.lblAppStatus.Caption = strStatus
-140 frmMain.Refresh
+ If IsLoaded("SWEBS-Splash") = True Then
+ If frmSplash.lblStatus.Caption <> strStatus Then
+ frmSplash.lblStatus.Caption = strStatus
+ frmSplash.Refresh
+ End If
+ ElseIf IsLoaded(Translator.GetText("SWEBS Web Server - Control Center")) = True Then
+ If frmMain.lblAppStatus.Caption <> strStatus Then
+ If blnBusy = True Then
+ Screen.MousePointer = vbArrowHourglass '13 arrow + hourglass
+ Else
+ Screen.MousePointer = vbNormal '0 default
End If
+ frmMain.lblAppStatus.Caption = strStatus
+ frmMain.Refresh
End If
-144 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.cDialog.SetStatus", "App Status Message: " & strStatus
-148 DoEvents
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-SetStatus_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.SetStatus", Erl, False
- Resume Next
- '</EhFooter>
+ End If
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.cDialog.SetStatus", "App Status Message: " & strStatus
+ DoEvents
End Sub
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
Private Sub GetArgs(strCommand As String)
- '<EhHeader>
- On Error GoTo GetArgs_Err
- '</EhHeader>
- Dim strArgs() As String
- Dim i As Long
-
-100 strArgs = Split(strCommand, " ")
-104 For i = 0 To UBound(strArgs)
-108 Select Case strArgs(i)
- Case "--nosplash"
-112 blnNoSplash = True
-116 Case "--debuglang"
-120 blnDebugLang = True
-124 Case "--tray"
-128 blnTrayOnly = True
-132 Case "--notips"
-136 blnNoTips = True
-140 Case "--noupdate"
-144 blnNoUpdate = True
-148 Case "--killupdate"
-152 blnKillUpdate = True
-156 Case "--debug"
-160 blnDebugMode = True
-164 Case "--perfmon"
-168 blnPerfMon = True
-172 Case Else
-176 MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug" & vbCrLf & "--perfmon", vbApplicationModal + vbCritical
-180 End
- End Select
- Next
- '<EhFooter>
- Exit Sub
+Dim strArgs() As String
+Dim i As Long
-GetArgs_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.GetArgs", Erl, False
- Resume Next
- '</EhFooter>
+ strArgs = Split(strCommand, " ")
+ For i = 0 To UBound(strArgs)
+ Select Case strArgs(i)
+ Case "--nosplash" 'Disables the splash screen
+ blnNoSplash = True
+ Case "--debuglang" 'should set a flag to show a message box is a string is not found
+ blnDebugLang = True
+ Case "--tray" 'shows tray icon only, does not show frmMain
+ blnTrayOnly = True
+ Case "--notips" 'doesn't show the TOD window, also disables the feature for the future.
+ blnNoTips = True
+ Case "--noupdate" 'doesn't run the updated check on start up.
+ blnNoUpdate = True
+ Case "--killupdate" 'permenently disables the update feature
+ blnKillUpdate = True
+ Case "--debug" '???
+ blnDebugMode = True
+ Case "--perfmon" 'enables a speed log for all functions
+ blnPerfMon = True
+ Case Else
+ MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug" & vbCrLf & "--perfmon", vbApplicationModal + vbCritical
+ End
+ End Select
+ Next
End Sub
Public Function IsLoaded(strCaption As String) As Boolean
- '<EhHeader>
- On Error GoTo IsLoaded_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.basMain.IsLoaded")
- '</EhHeader>
- Dim i As Long
-
-100 For i = 0 To Forms.Count - 1
-104 If Forms(i).Caption = strCaption Then
-108 IsLoaded = True
- End If
- Next
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Function
+Dim i As Long
-IsLoaded_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.IsLoaded", Erl, False
- Resume Next
- '</EhFooter>
+ For i = 0 To Forms.Count - 1
+ If Forms(i).Caption = strCaption Then
+ IsLoaded = True
+ End If
+ Next
End Function
'CSEH: ErrResumeNext
Public Sub DisplayErrMsg(strMessage As String, strLocation As String, Optional strLine As String = "(Unknown)", Optional blnFatal As Boolean = False)
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
Dim strErrMsg As String
Dim strErrReport As String
Dim lngRetVal As Long
If strMessage = "" Then
- strMessage = WinUI.GetTranslatedText("There was an unknown error.")
+ strMessage = Translator.GetText("There was an unknown error.")
End If
- If WinUI Is Nothing Then
+ If Core Is Nothing Then
strErrMsg = "This application has encountered a error:" & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "")
MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, "SWEBS System Error"
Else
- If WinUI.Debuger.DebugMode = True Then
- strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport
- MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, WinUI.GetTranslatedText("SWEBS System Error")
+ If Core.Debuger.DebugMode = True Then
+ strErrReport = Core.Debuger.ErrorReport(strMessage, strLine, strLocation)
+ strErrMsg = Translator.GetText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & Translator.GetText("Location:") & " " & strLocation & " " & Translator.GetText("at line:") & " " & strLine & vbCrLf & vbCrLf & Translator.GetText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & Translator.GetText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & Translator.GetText("An error log has been written to:") & vbCrLf & strErrReport
+ MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, Translator.GetText("SWEBS System Error")
Else
- strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Would you like to create an error log?")
- lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, WinUI.GetTranslatedText("SWEBS System Error"))
+ strErrMsg = Translator.GetText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & Translator.GetText("Location:") & " " & strLocation & " " & Translator.GetText("at line:") & " " & strLine & vbCrLf & vbCrLf & Translator.GetText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & Translator.GetText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & Translator.GetText("Would you like to create an error log?")
+ lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, Translator.GetText("SWEBS System Error"))
If lngRetVal = vbYes Then
- strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- MsgBox WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
+ strErrReport = Core.Debuger.ErrorReport(strMessage, strLine, strLocation)
+ MsgBox Translator.GetText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
End If
End If
End If
@@ -228,3 +203,31 @@
End
End If
End Sub
+
+Public Function FormFade(ByRef frmForm As Form, blnHide As Boolean) As Long
+Dim MSG As Long
+Dim i As Long
+
+ If blnHide = True Then
+ For i = 255 To 0 Step -5
+ 'Set window style to layered
+ MSG = GetWindowLong(frmForm.hwnd, GWL_EXSTYLE)
+ MSG = MSG Or WS_EX_LAYERED
+ SetWindowLong frmForm.hwnd, GWL_EXSTYLE, MSG
+ 'Set the opacity of the layer according the the parameters
+ SetLayeredWindowAttributes frmForm.hwnd, 0, i, LWA_ALPHA
+ frmForm.Refresh
+ Next
+ Else
+ frmForm.Show
+ For i = 0 To 255 Step 5
+ 'Set window style to layered
+ MSG = GetWindowLong(frmForm.hwnd, GWL_EXSTYLE)
+ MSG = MSG Or WS_EX_LAYERED
+ SetWindowLong frmForm.hwnd, GWL_EXSTYLE, MSG
+ 'Set the opacity of the layer according the the parameters
+ SetLayeredWindowAttributes frmForm.hwnd, 0, i, LWA_ALPHA
+ frmForm.Refresh
+ Next
+ End If
+End Function
Index: cSysTray.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cSysTray.cls,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cSysTray.cls 8 Nov 2003 09:01:40 -0000 1.5
+++ cSysTray.cls 17 Nov 2003 11:43:07 -0000 1.6
@@ -13,10 +13,10 @@
Attribute VB_Exposed = False
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) Martin Richardson.
' Portions Copyright (c) 2003 Adam Caudill.
@@ -72,210 +72,78 @@
Private mvarSourceWindow As Form 'local copy
Public Property Let ToolTip(ByVal vData As String)
- '<EhHeader>
- On Error GoTo ToolTip_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ToolTip")
- '</EhHeader>
-100 ChangeToolTip vData
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-ToolTip_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ToolTip", Erl, False
- Resume Next
- '</EhFooter>
+ ChangeToolTip vData
End Property
Public Property Let Icon(ByVal vData As Variant)
- '<EhHeader>
- On Error GoTo Icon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Icon")
- '</EhHeader>
-100 ChangeIcon vData
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-Icon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Icon", Erl, False
- Resume Next
- '</EhFooter>
+ ChangeIcon vData
End Property
Public Property Get Icon() As Variant
- '<EhHeader>
- On Error GoTo Icon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Icon")
- '</EhHeader>
-100 Icon = t.hIcon 'pichook.Picture
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-Icon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Icon", Erl, False
- Resume Next
- '</EhFooter>
+ Icon = t.hIcon 'pichook.Picture
End Property
Public Property Set SourceWindow(ByVal vData As Form)
- '<EhHeader>
- On Error GoTo SourceWindow_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.SourceWindow")
- '</EhHeader>
-100 Set mvarSourceWindow = vData
-104 SetPicHook
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-SourceWindow_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.SourceWindow", Erl, False
- Resume Next
- '</EhFooter>
+ Set mvarSourceWindow = vData
+ SetPicHook
End Property
Private Sub Class_Initialize()
- '<EhHeader>
- On Error GoTo Class_Initialize_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Class_Initialize")
- '</EhHeader>
-100 t.cbSize = Len(t)
-104 t.uID = 1&
-108 t.uFlags = NIF_ICON Or NIF_TIP Or NIF_MESSAGE
-112 t.uCallbackMessage = WM_MOUSEMOVE
-116 t.hIcon = Me.Icon
-120 t.szTip = Chr$(0)
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Class_Initialize_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Class_Initialize", Erl, False
- Resume Next
- '</EhFooter>
+ t.cbSize = Len(t)
+ t.uID = 1&
+ t.uFlags = NIF_ICON Or NIF_TIP Or NIF_MESSAGE
+ t.uCallbackMessage = WM_MOUSEMOVE
+ t.hIcon = Me.Icon
+ t.szTip = Chr$(0)
End Sub
Private Sub pichook_MouseMove(Button As Integer, Shift As Integer, X As Single, Y As Single)
- '<EhHeader>
- On Error GoTo pichook_MouseMove_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.pichook_MouseMove")
- '</EhHeader>
- Static Rec As Boolean, MSG As Long, oldmsg As Long
+Static Rec As Boolean, MSG As Long, oldmsg As Long
-100 oldmsg = MSG
-104 MSG = X / Screen.TwipsPerPixelX
+ oldmsg = MSG
+ MSG = X / Screen.TwipsPerPixelX
-108 If Rec = False Then
-112 Rec = True
-116 Select Case MSG
- Case WM_LBUTTONDBLCLK:
-120 RaiseEvent LButtonDblClk
- Case WM_RBUTTONUP:
-124 RaiseEvent RButtonUp
- End Select
-128 Rec = False
- End If
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-pichook_MouseMove_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.pichook_MouseMove", Erl, False
- Resume Next
- '</EhFooter>
+ If Rec = False Then
+ Rec = True
+ Select Case MSG
+ Case WM_LBUTTONDBLCLK:
+ RaiseEvent LButtonDblClk
+ Case WM_RBUTTONUP:
+ RaiseEvent RButtonUp
+ End Select
+ Rec = False
+ End If
End Sub
Public Sub RemoveFromSysTray()
- '<EhHeader>
- On Error GoTo RemoveFromSysTray_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.RemoveFromSysTray")
- '</EhHeader>
-100 t.cbSize = Len(t)
-104 t.hwnd = pichook.hwnd
-108 t.uID = 1&
-112 Shell_NotifyIcon NIM_DELETE, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-RemoveFromSysTray_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.RemoveFromSysTray", Erl, False
- Resume Next
- '</EhFooter>
+ t.cbSize = Len(t)
+ t.hwnd = pichook.hwnd
+ t.uID = 1&
+ Shell_NotifyIcon NIM_DELETE, t
End Sub
Public Sub IconInSysTray()
- '<EhHeader>
- On Error GoTo IconInSysTray_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.IconInSysTray")
- '</EhHeader>
-100 Shell_NotifyIcon NIM_ADD, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-IconInSysTray_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.IconInSysTray", Erl, False
- Resume Next
- '</EhFooter>
+ Shell_NotifyIcon NIM_ADD, t
End Sub
Private Sub SetPicHook()
- '<EhHeader>
- On Error GoTo SetPicHook_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.SetPicHook")
- '</EhHeader>
-100 Set pichook = mvarSourceWindow.Controls.Add("VB.PictureBox", "pichook")
-
-104 pichook.Visible = False
-108 pichook.Picture = mvarSourceWindow.Icon
-112 t.hwnd = pichook.hwnd
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
+ Set pichook = mvarSourceWindow.Controls.Add("VB.PictureBox", "pichook")
-SetPicHook_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.SetPicHook", Erl, False
- Resume Next
- '</EhFooter>
+ pichook.Visible = False
+ pichook.Picture = mvarSourceWindow.Icon
+ t.hwnd = pichook.hwnd
End Sub
Public Sub ChangeIcon(toNewIcon)
- '<EhHeader>
- On Error GoTo ChangeIcon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ChangeIcon")
- '</EhHeader>
-100 Set pichook.Picture = toNewIcon
-104 t.hIcon = pichook.Picture
-108 Shell_NotifyIcon NIM_MODIFY, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-ChangeIcon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ChangeIcon", Erl, False
- Resume Next
- '</EhFooter>
+ Set pichook.Picture = toNewIcon
+ t.hIcon = pichook.Picture
+ Shell_NotifyIcon NIM_MODIFY, t
End Sub
Public Sub ChangeToolTip(ByVal cNewTip As String)
- '<EhHeader>
- On Error GoTo ChangeToolTip_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ChangeToolTip")
- '</EhHeader>
-100 mvarToolTip = cNewTip
-104 t.szTip = cNewTip & Chr$(0)
-108 Shell_NotifyIcon NIM_MODIFY, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-ChangeToolTip_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ChangeToolTip", Erl, False
- Resume Next
- '</EhFooter>
+ mvarToolTip = cNewTip
+ t.szTip = cNewTip & Chr$(0)
+ Shell_NotifyIcon NIM_MODIFY, t
End Sub
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
Binary files /tmp/cvsUQvtDu and /tmp/cvs6dsA2O differ
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- frmAbout.frm 15 Nov 2003 14:15:06 -0000 1.36
+++ frmAbout.frm 17 Nov 2003 11:43:07 -0000 1.37
@@ -1,12 +1,14 @@
VERSION 5.00
Object = "{3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0"; "RICHTX32.OCX"
Begin VB.Form frmAbout
+ BackColor = &H00FFFFFF&
BorderStyle = 3 'Fixed Dialog
Caption = "About SWEBS Web Server"
ClientHeight = 5985
ClientLeft = 45
ClientTop = 435
ClientWidth = 5280
+ ForeColor = &H00000000&
Icon = "frmAbout.frx":0000
LinkTopic = "Form1"
MaxButton = 0 'False
@@ -18,7 +20,7 @@
Begin RichTextLib.RichTextBox rtfCredits
Height = 3735
Left = 120
- TabIndex = 5
+ TabIndex = 4
Top = 1680
Width = 5055
_ExtentX = 8916
@@ -30,16 +32,32 @@
FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
TextRTF = $"frmAbout.frx":0CCA
End
- Begin VB.CommandButton cmdClose
+ Begin VB.Label lblClose
+ Alignment = 2 'Center
+ AutoSize = -1 'True
+ BackStyle = 0 'Transparent
Caption = "&Close"
- Height = 375
- Left = 4080
- TabIndex = 3
- Top = 5520
- Width = 1095
+ BeginProperty Font
+ Name = "Arial"
+ Size = 9
+ Charset = 0
+ Weight = 700
+ Underline = -1 'True
+ Italic = 0 'False
+ Strikethrough = 0 'False
+ EndProperty
+ ForeColor = &H00FF0000&
+ Height = 225
+ Left = 4455
+ MouseIcon = "frmAbout.frx":16CD
+ MousePointer = 99 'Custom
+ TabIndex = 5
+ Top = 5640
+ Width = 495
End
Begin VB.Label lblHomePage
AutoSize = -1 'True
+ BackColor = &H00FFFFFF&
Caption = "swebs.sourceforge.net"
BeginProperty Font
Name = "MS Sans Serif"
@@ -53,9 +71,9 @@
ForeColor = &H00FF0000&
Height = 195
Left = 120
- MouseIcon = "frmAbout.frx":1632
+ MouseIcon = "frmAbout.frx":181F
MousePointer = 99 'Custom
- TabIndex = 4
+ TabIndex = 3
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
Top = 5640
Width = 1605
@@ -63,12 +81,13 @@
Begin VB.Image imgLogo
Height = 480
Left = 600
- Picture = "frmAbout.frx":193C
+ Picture = "frmAbout.frx":1971
Top = 120
Width = 480
End
Begin VB.Label lblUIBuild
Alignment = 2 'Center
+ BackColor = &H00FFFFFF&
Caption = "Control Center Build: XXXX"
BeginProperty Font
Name = "Tahoma"
@@ -87,6 +106,7 @@
End
Begin VB.Label lblSrvVersion
Alignment = 2 'Center
+ BackColor = &H00FFFFFF&
Caption = "Server Version: X.XX.XX"
BeginProperty Font
Name = "Tahoma"
@@ -113,6 +133,7 @@
Begin VB.Label lblTitle
Alignment = 2 'Center
AutoSize = -1 'True
+ BackColor = &H00FFFFFF&
Caption = "SWEBS Web Server"
BeginProperty Font
Name = "Tahoma"
@@ -135,10 +156,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -159,53 +180,17 @@
Option Explicit
-Private Sub cmdClose_Click()
- '<EhHeader>
- On Error GoTo cmdClose_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.cmdClose_Click")
- '</EhHeader>
-100 Unload Me
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-cmdClose_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.cmdClose_Click", Erl, False
- Resume Next
- '</EhFooter>
+Private Sub lblClose_Click()
+ Unload Me
End Sub
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.Form_Load")
- '</EhHeader>
-100 cmdClose.Caption = WinUI.GetTranslatedText("&Close")
-104 lblSrvVersion.Caption = WinUI.GetTranslatedText("Server Version") & ": " & WinUI.Version
-108 lblUIBuild.Caption = WinUI.GetTranslatedText("Control Center Build") & ": " & App.Revision
-112 rtfCredits.TextRTF = Replace(rtfCredits.TextRTF, "Lang-Maintainer", WinUI.GetTranslatedText("Lang-Maintainer"))
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ lblClose.Caption = Translator.GetText("&Close")
+ lblSrvVersion.Caption = Translator.GetText("Server Version") & ": " & Core.Version
+ lblUIBuild.Caption = Translator.GetText("Control Center Build") & ": " & App.Revision
+ rtfCredits.TextRTF = Replace(rtfCredits.TextRTF, "Lang-Maintainer", Translator.GetText("Lang-Maintainer"))
End Sub
Private Sub lblHomePage_Click()
- '<EhHeader>
- On Error GoTo lblHomePage_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.lblHomePage_Click")
- '</EhHeader>
-100 WinUI.Net.LaunchURL "http://swebs.sourceforge.net/html/index.php"
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-lblHomePage_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.lblHomePage_Click", Erl, False
- Resume Next
- '</EhFooter>
+ Core.Net.LaunchURL "http://swebs.sourceforge.net/html/index.php"
End Sub
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvsqAwkCw and /tmp/cvsGkRIYS differ
Index: frmEventView.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmEventView.frm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- frmEventView.frm 25 Oct 2003 00:38:57 -0000 1.10
+++ frmEventView.frm 17 Nov 2003 11:43:08 -0000 1.11
@@ -45,10 +45,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -70,62 +70,32 @@
Option Explicit
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmEventView.Form_Load")
- '</EhHeader>
-100 WinUI.EventLog.Enabled = True
-104 WinUI.EventLog.AddEvent "SWEBS_WinUI_Main.frmEventView.Form_Load", "Event Viewer Loaded"
-108 Form_Resize
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmEventView.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ Core.EventLog.Enabled = True
+ Core.EventLog.AddEvent "SWEBS_Core_Main.frmEventView.Form_Load", "Event Viewer Loaded"
+ Form_Resize
End Sub
Private Sub Form_Resize()
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
txtEvents.Move 0, 0, (Me.ScaleWidth), (Me.ScaleHeight) - 1500
txtCallStack.Move 0, (Me.ScaleHeight - 1400), Me.ScaleWidth, 1400
End Sub
Private Sub Form_Unload(Cancel As Integer)
- '<EhHeader>
- On Error GoTo Form_Unload_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmEventView.Form_Unload")
- '</EhHeader>
-100 WinUI.EventLog.Enabled = False
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Unload_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmEventView.Form_Unload", Erl, False
- Resume Next
- '</EhFooter>
+ Core.EventLog.Enabled = False
End Sub
Private Sub tmrEvents_Timer()
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
Dim strCallStack As String
Dim i As Long
- If WinUI.EventLog.Changed = True Then
- txtEvents.Text = WinUI.EventLog.Log
+ If Core.EventLog.Changed = True Then
+ txtEvents.Text = Core.EventLog.Log
txtEvents.SelStart = Len(txtEvents.Text)
End If
strCallStack = "Current Call Stack:" & vbCrLf
- If WinUI.Debuger.CallStack.Count >= 1 Then
- For i = 1 To WinUI.Debuger.CallStack.Count
- strCallStack = strCallStack & Chr(9) & WinUI.Debuger.CallStack.Peek(i) & vbCrLf
+ If Core.Debuger.CallStack.Count >= 1 Then
+ For i = 1 To Core.Debuger.CallStack.Count
+ strCallStack = strCallStack & Chr(9) & Core.Debuger.CallStack.Peek(i) & vbCrLf
Next
Else
strCallStack = strCallStack & Chr(9) & "(None)"
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- frmMain.frm 15 Nov 2003 14:15:06 -0000 1.78
+++ frmMain.frm 17 Nov 2003 11:43:08 -0000 1.79
@@ -539,7 +539,6 @@
_ExtentY = 8916
_Version = 393217
BorderStyle = 0
- Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1594,7 +1593,7 @@
Height = 255
Left = 2760
TabIndex = 0
[...2331 lines suppressed...]
-104 lblStatsLastRestart.Caption = WinUI.GetTranslatedText("Last Restart") & ": " & WinUI.Server.HTTP.Stats.LastRestart
-108 lblStatsRequestCount.Caption = WinUI.GetTranslatedText("Request Count") & ": " & WinUI.Server.HTTP.Stats.RequestCount
-112 lblStatsBytesSent.Caption = WinUI.GetTranslatedText("Total Bytes Sent") & ": " & Format$(WinUI.Server.HTTP.Stats.TotalBytesSent, "###,###,###,###,##0")
-116 lblCurVersion.Caption = WinUI.GetTranslatedText("Current Version") & ": " & WinUI.Version
-120 lblUpdateVersion.Caption = WinUI.GetTranslatedText("Update Version") & ": " & IIf(WinUI.Update.Version <> "", WinUI.Update.Version, WinUI.Version)
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-UpdateStats_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.UpdateStats", Erl, False
- Resume Next
- '</EhFooter>
+ Core.Server.HTTP.Stats.Reload
+ lblStatsLastRestart.Caption = Translator.GetText("Last Restart") & ": " & Core.Server.HTTP.Stats.LastRestart
+ lblStatsRequestCount.Caption = Translator.GetText("Request Count") & ": " & Core.Server.HTTP.Stats.RequestCount
+ lblStatsBytesSent.Caption = Translator.GetText("Total Bytes Sent") & ": " & Format$(Core.Server.HTTP.Stats.TotalBytesSent, "###,###,###,###,##0")
+ lblCurVersion.Caption = Translator.GetText("Current Version") & ": " & Core.Version
+ lblUpdateVersion.Caption = Translator.GetText("Update Version") & ": " & IIf(Core.Update.Version <> "", Core.Update.Version, Core.Version)
End Sub
Index: frmNewISAPI.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmNewISAPI.frm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- frmNewISAPI.frm 15 Nov 2003 14:15:30 -0000 1.1
+++ frmNewISAPI.frm 17 Nov 2003 11:43:08 -0000 1.2
@@ -173,10 +173,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -198,17 +198,17 @@
Option Explicit
Private Sub Form_Load()
- lblNewISAPITitle.Caption = WinUI.GetTranslatedText("Add a new CGI interpreter:")
- lblNewISAPIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret this script type?")
- lblNewISAPIIExt.Caption = WinUI.GetTranslatedText("What is the file extension for this file type?")
- lblBrowse.Caption = WinUI.GetTranslatedText("&Browse")
- lblOK.Caption = WinUI.GetTranslatedText("&OK")
- lblCancel.Caption = WinUI.GetTranslatedText("&Cancel")
+ lblNewISAPITitle.Caption = Translator.GetText("Add a new CGI interpreter:")
+ lblNewISAPIInterp.Caption = Translator.GetText("Where is the executable that will interpret this script type?")
+ lblNewISAPIIExt.Caption = Translator.GetText("What is the file extension for this file type?")
+ lblBrowse.Caption = Translator.GetText("&Browse")
+ lblOK.Caption = Translator.GetText("&OK")
+ lblCancel.Caption = Translator.GetText("&Cancel")
End Sub
Private Sub lblBrowse_Click()
- dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
- dlgMain.Filter = WinUI.GetTranslatedText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
+ dlgMain.DialogTitle = Translator.GetText("Please select a file...")
+ dlgMain.Filter = Translator.GetText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
dlgMain.ShowSave
If dlgMain.FileName <> "" Then
txtNewISAPIInterp.Text = dlgMain.FileName
@@ -221,9 +221,9 @@
Private Sub lblOK_Click()
If txtNewISAPIInterp.Text <> "" And txtNewISAPIExt.Text <> "" Then
- WinUI.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
+ Core.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
Unload Me
Else
- MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+ MsgBox Translator.GetText("Please fill all fields.")
End If
End Sub
Index: frmRegistration.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmRegistration.frm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- frmRegistration.frm 18 Oct 2003 15:35:28 -0000 1.16
+++ frmRegistration.frm 17 Nov 2003 11:43:08 -0000 1.17
@@ -131,10 +131,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -156,73 +156,49 @@
Option Explicit
Private Sub cmdSubmit_Click()
- '<EhHeader>
- On Error GoTo cmdSubmit_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmRegistration.cmdSubmit_Click")
- '</EhHeader>
- Dim strResult As String
- Dim strQuery As String
+Dim strResult As String
+Dim strQuery As String
-100 If txtEmail.Text = "" Then
-104 MsgBox WinUI.GetTranslatedText("You must provide a e-mail address."), vbInformation + vbApplicationModal + vbOKOnly
-108 txtEmail.SetFocus
-112 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "User did not enter email address."
- Exit Sub
- End If
+ If txtEmail.Text = "" Then
+ MsgBox Translator.GetText("You must provide a e-mail address."), vbInformation + vbApplicationModal + vbOKOnly
+ txtEmail.SetFocus
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "User did not enter email address."
+ Exit Sub
+ End If
-116 Me.MousePointer = vbHourglass
-120 cmdSubmit.Enabled = False
-124 txtEmail.Enabled = False
-128 cmbComputers.Enabled = False
-132 cmbWhere.Enabled = False
-136 txtFindUs.Enabled = False
-140 cmbExpiriance.Enabled = False
-144 cmbUse.Enabled = False
+ Me.MousePointer = vbHourglass
+ cmdSubmit.Enabled = False
+ txtEmail.Enabled = False
+ cmbComputers.Enabled = False
+ cmbWhere.Enabled = False
+ txtFindUs.Enabled = False
+ cmbExpiriance.Enabled = False
+ cmbUse.Enabled = False
-148 strQuery = "?email=" & WinUI.Util.UrlEncode(txtEmail.Text) & "&ccount=" & WinUI.Util.UrlEncode(cmbComputers.Text) & "&where=" & WinUI.Util.UrlEncode(cmbWhere.Text) & "&find=" & WinUI.Util.UrlEncode(txtFindUs.Text) & "&exp=" & WinUI.Util.UrlEncode(cmbExpiriance.Text) & "&use=" & WinUI.Util.UrlEncode(cmbUse.Text) & "&ver=" & WinUI.Util.UrlEncode(WinUI.Version)
-152 strResult = WinUI.Net.PageSource("http://swebs.sf.net/register/reginit.php" & strQuery)
+ strQuery = "?email=" & Util.UrlEncode(txtEmail.Text) & "&ccount=" & Util.UrlEncode(cmbComputers.Text) & "&where=" & Util.UrlEncode(cmbWhere.Text) & "&find=" & Util.UrlEncode(txtFindUs.Text) & "&exp=" & Util.UrlEncode(cmbExpiriance.Text) & "&use=" & Util.UrlEncode(cmbUse.Text) & "&ver=" & Util.UrlEncode(Core.Version)
+ strResult = Core.Net.PageSource("http://swebs.sf.net/register/reginit.php" & strQuery)
-156 Me.Hide
-160 Select Case strResult
- Case "Completed"
-164 Call WinUI.Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
-168 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration completed."
-172 Case "Duplicate"
-176 MsgBox WinUI.GetTranslatedText("You have already registered, you only need to register once."), vbApplicationModal + vbInformation + vbOKOnly
-180 Call WinUI.Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
-184 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration duplicate."
-188 Case Else
-192 MsgBox WinUI.GetTranslatedText("There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r") & strResult
-196 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration failed."
- End Select
-200 Unload Me
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-cmdSubmit_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmRegistration.cmdSubmit_Click", Erl, False
- Resume Next
- '</EhFooter>
+ Me.Hide
+ Select Case strResult
+ Case "Completed"
+ Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration completed."
+ Case "Duplicate"
+ MsgBox Translator.GetText("You have already registered, you only need to register once."), vbApplicationModal + vbInformation + vbOKOnly
+ Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration duplicate."
+ Case Else
+ MsgBox Translator.GetText("There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r") & strResult
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration failed."
+ End Select
+ Unload Me
End Sub
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmRegistration.Form_Load")
- '</EhHeader>
-100 lblEMail.Caption = WinUI.GetTranslatedText("What is your e-mail address? (We will not contact you, this is simply used to track installations).")
-104 lblComputers.Caption = WinUI.GetTranslatedText("How Many Computers Do You Own?")
-108 lblWhere.Caption = WinUI.GetTranslatedText("Where are you using this?")
-112 lblFindUs.Caption = WinUI.GetTranslatedText("How did you find out about us?")
-116 lblExpiriance.Caption = WinUI.GetTranslatedText("How much computer experience do you have?")
-120 lblUse.Caption = WinUI.GetTranslatedText("What will you use this software for?")
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmRegistration.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ lblEMail.Caption = Translator.GetText("What is your e-mail address? (We will not contact you, this is simply used to track installations).")
+ lblComputers.Caption = Translator.GetText("How Many Computers Do You Own?")
+ lblWhere.Caption = Translator.GetText("Where are you using this?")
+ lblFindUs.Caption = Translator.GetText("How did you find out about us?")
+ lblExpiriance.Caption = Translator.GetText("How much computer experience do you have?")
+ lblUse.Caption = Translator.GetText("What will you use this software for?")
End Sub
Index: frmSplash.frm
=================================...
[truncated message content] |
Update of /cvsroot/swebs/swebswebserver/winui/ccHTTP
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui/ccHTTP
Added Files:
basMain.bas cHTTP.cls cHTTPCGI.cls cHTTPCGICol.cls
cHTTPConfig.cls cHTTPIndex.cls cHTTPIndexCol.cls
cHTTPStats.cls cHTTPVirtHost.cls cHTTPVirtHostCol.cls
ccHTTP.csi ccHTTP.dll ccHTTP.exp ccHTTP.lib ccHTTP.lvw
ccHTTP.vbp ccHTTP.vbw
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: basMain.bas ---
Attribute VB_Name = "basMain"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Util As cUtil
Public Translator As cTranslate
Public Sub Main()
Set Util = New cUtil
Set Translator = New cTranslate
End Sub
--- NEW FILE: cHTTP.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTP"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Stats As cHTTPStats
Public Config As cHTTPConfig
Private Declare Function WebStart Lib "sHTTP.dll" Alias "SWEBSStart" () As Long
Private Declare Function WebStop Lib "sHTTP.dll" Alias "SWEBSStop" () As Long
Private blnRunning As Boolean
'swebs.dll error codes
Private Const SWEBS_RETURN_UNKNOWN = &H0 '// Unknown error occured
Private Const SWEBS_RETURN_SUCCESS = &H1 '// Server ran fine
Private Const SWEBS_RETURN_COULDNOTBIND = &H2 '// Could not bind() to port
Private Const SWEBS_RETURN_CONFIGNOTLOADED = &H3 '// Could not load config file
Private Const SWEBS_RETURN_COULDNOTLISTEN = &H4 '// Could not listen()
Private Const SWEBS_RETURN_COULDNOTACCEPT = &H5 '// Could not accept()
Public Function StopServer() As Boolean
Dim lngRetVal As Long
lngRetVal = WebStop
blnRunning = False
End Function
Public Function StartServer() As Boolean
Dim lngRetVal As Long
lngRetVal = WebStart
If lngRetVal = SWEBS_RETURN_SUCCESS Then
blnRunning = True
Else
MsgBox "Server Failed to start. Error code is: 0x" & lngRetVal
End If
End Function
Public Property Get Status() As String
If blnRunning = True Then
Status = "Running"
Else
Status = "Stopped"
End If
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
Set Stats = New cHTTPStats
Set Config = New cHTTPConfig
End Sub
Private Sub Class_Terminate()
Set Stats = Nothing
Set Config = Nothing
End Sub
--- NEW FILE: cHTTPCGI.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPISAPI"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarInterpreter As String 'local copy
Private mvarExtension As String 'local copy
Public Property Let Extension(ByVal vData As String)
'used when assigning a value to the property, on the left side of an assignment.
'Syntax: X.Extention = 5
mvarExtension = vData
End Property
Public Property Get Extension() As String
'used when retrieving value of a property, on the right side of an assignment.
'Syntax: Debug.Print X.Extention
Extension = mvarExtension
End Property
Public Property Let Interpreter(ByVal vData As String)
'used when assigning a value to the property, on the left side of an assignment.
'Syntax: X.Interpreter = 5
mvarInterpreter = vData
End Property
Public Property Get Interpreter() As String
'used when retrieving value of a property, on the right side of an assignment.
'Syntax: Debug.Print X.Interpreter
Interpreter = mvarInterpreter
End Property
--- NEW FILE: cHTTPCGICol.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPISAPICol"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Collection" ,"cCGI"
Attribute VB_Ext_KEY = "Member0" ,"cCGI"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable to hold collection
Private mCol As Collection
Public Function Add(Interpreter As String, Extension As String, Optional sKey As String) As cHTTPISAPI
'create a new object
Dim objNewMember As cHTTPISAPI
Set objNewMember = New cHTTPISAPI
'set the properties passed into the method
objNewMember.Interpreter = Interpreter
objNewMember.Extension = Extension
If Len(sKey) = 0 Then
mCol.Add objNewMember
Else
mCol.Add objNewMember, sKey
End If
'return the object created
Set Add = objNewMember
Set objNewMember = Nothing
End Function
Public Property Get Item(vntIndexKey As Variant) As cHTTPISAPI
Attribute Item.VB_UserMemId = 0
'used when referencing an element in the collection
'vntIndexKey contains either the Index or Key to the collection,
'this is why it is declared as a Variant
'Syntax: Set foo = x.Item(xyz) or Set foo = x.Item(5)
Set Item = mCol(vntIndexKey)
End Property
Public Property Get Count() As Long
'used when retrieving the number of elements in the
'collection. Syntax: Debug.Print x.Count
Count = mCol.Count
End Property
Public Sub Remove(vntIndexKey As Variant)
'used when removing an element from the collection
'vntIndexKey contains either the Index or Key, which is why
'it is declared as a Variant
'Syntax: x.Remove(xyz)
mCol.Remove vntIndexKey
End Sub
Public Property Get NewEnum() As IUnknown
Attribute NewEnum.VB_UserMemId = -4
Attribute NewEnum.VB_MemberFlags = "40"
'this property allows you to enumerate
'this collection with the For...Each syntax
Set NewEnum = mCol.[_NewEnum]
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
'creates the collection when this class is created
Set mCol = New Collection
End Sub
Private Sub Class_Terminate()
'destroys collection when this class is terminated
Set mCol = Nothing
End Sub
Public Function Clear()
'destroys collection
Set mCol = Nothing
'creates the collection
Set mCol = New Collection
End Function
--- NEW FILE: cHTTPConfig.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPConfig"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
Attribute VB_Ext_KEY = "Member0" ,"colvHost"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public VirtHost As cHTTPVirtHostCol
Public ISAPI As cHTTPISAPICol
Public Index As cHTTPIndexCol
'local variable(s) to hold property value(s)
Private mvarServerName As String
Private mvarPort As Integer
Private mvarWebRoot As String
Private mvarMaxConnections As Long
Private mvarLogFile As String
Private mvarAllowIndex As String
Private mvarErrorPages As String
Private mvarListeningAddress As String
Private mvarErrorLog As String
Private mvarFile As String
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
Set VirtHost = New cHTTPVirtHostCol
Set ISAPI = New cHTTPISAPICol
Set Index = New cHTTPIndexCol
End Sub
Private Sub Class_Terminate()
Set VirtHost = Nothing
Set ISAPI = Nothing
Set Index = Nothing
End Sub
Public Sub Setup()
mvarFile = Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "ConfigFile")
End Sub
Public Function LoadData() As Boolean
Dim XML As CHILKATXMLLib.XmlFactory
Dim ConfigXML As CHILKATXMLLib.IChilkatXml
Dim Node As CHILKATXMLLib.IChilkatXml
Dim strTemp As String
Set XML = New XmlFactory
Set ConfigXML = XML.NewXml
ConfigXML.LoadXmlFile mvarFile
'<ServerName>
Set Node = ConfigXML.SearchForTag(Nothing, "ServerName")
If Node Is Nothing Then
mvarServerName = "SWEBS Server"
Else
mvarServerName = Trim$(Node.Content)
End If
'<Port>
Set Node = ConfigXML.SearchForTag(Nothing, "Port")
If Node Is Nothing Then
mvarPort = 80
Else
mvarPort = IIf(Int(Val(Node.Content)) <= 0, 80, Int(Val(Node.Content)))
End If
'<Webroot>
Set Node = ConfigXML.SearchForTag(Nothing, "Webroot")
If Node Is Nothing Then
strTemp = "C:\SWS\Webroot" 'TODO: Fix Me!
Else
strTemp = Trim$(Node.Content)
End If
mvarWebRoot = IIf(Right$(strTemp, 1) = "\", Left$(strTemp, (Len(strTemp) - 1)), strTemp)
'<MaxConnections>
Set Node = ConfigXML.SearchForTag(Nothing, "MaxConnections")
If Node Is Nothing Then
mvarMaxConnections = 20
Else
mvarMaxConnections = IIf(Int(Val(Node.Content)) <= 0, 20, Int(Val(Node.Content)))
End If
'<LogFile>
Set Node = ConfigXML.SearchForTag(Nothing, "LogFile")
If Node Is Nothing Then
mvarLogFile = "C:\SWS\SWS.log" 'TODO: Fix Me!
Else
mvarLogFile = Trim$(Node.Content)
End If
'<AllowIndex>
Set Node = ConfigXML.SearchForTag(Nothing, "AllowIndex")
If Node Is Nothing Then
mvarAllowIndex = "false"
Else
mvarAllowIndex = IIf(LCase$(Node.Content) = "true", "true", "false")
End If
'<ErrorPages>
Set Node = ConfigXML.SearchForTag(Nothing, "ErrorPages")
If Node Is Nothing Then
strTemp = "C:\SWS\Errors" 'TODO: Fix Me!
Else
strTemp = Trim$(Node.Content)
End If
mvarErrorPages = IIf(Right$(strTemp, 1) = "\", Left$(strTemp, (Len(strTemp) - 1)), strTemp)
'<ErrorLog>
Set Node = ConfigXML.SearchForTag(Nothing, "ErrorLog")
If Node Is Nothing Then
mvarErrorLog = "C:\SWS\ErrorLog.log" 'TODO: Fix Me!
Else
mvarErrorLog = Trim$(Node.Content)
End If
'<IndexFile>
Set Node = ConfigXML.SearchForTag(Nothing, "IndexFile")
If Node Is Nothing Then
Index.Add "index.html"
Else
Do While Not (Node Is Nothing)
If Trim$(Node.Content) <> "" Then
Index.Add Trim$(Node.Content)
End If
Set Node = ConfigXML.SearchForTag(Node, "IndexFile")
Loop
End If
'<VirtualHost>
Set Node = ConfigXML.FindChild("VirtualHost")
If Not (Node Is Nothing) Then
Do While Not (Node Is Nothing)
If Node.GetChildContent("vhName") <> "" Then
VirtHost.Add Trim$(Node.GetChildContent("vhName")), Trim$(Node.GetChildContent("vhHostName")), Trim$(Node.GetChildContent("vhRoot")), Trim$(Node.GetChildContent("vhLogFile")), Trim$(Node.GetChildContent("vhName"))
End If
Set Node = ConfigXML.SearchForTag(Node, "VirtualHost")
Loop
End If
'<CGI>
Set Node = ConfigXML.FindChild("ISAPI")
If Not (Node Is Nothing) Then
Do While Not (Node Is Nothing)
If Node.GetChildContent("Interpreter") <> "" Then
ISAPI.Add Trim$(Node.GetChildContent("Interpreter")), Trim$(Node.GetChildContent("Extension")), Trim$(Node.GetChildContent("Extension"))
End If
Set Node = ConfigXML.SearchForTag(Node, "ISAPI")
Loop
End If
'<ListeningAddress>
Set Node = ConfigXML.SearchForTag(Nothing, "ListeningAddress")
If Node Is Nothing Then
mvarListeningAddress = ""
Else
mvarListeningAddress = Node.Content
End If
'clean up
Set XML = Nothing
Set ConfigXML = Nothing
Set Node = Nothing
LoadData = True
End Function
Public Property Get File() As String
File = mvarFile
End Property
Public Property Let ErrorLog(ByVal vData As String)
mvarErrorLog = vData
End Property
Public Property Get ErrorLog() As String
ErrorLog = mvarErrorLog
End Property
Public Property Let ListeningAddress(ByVal vData As String)
mvarListeningAddress = vData
End Property
Public Property Get ListeningAddress() As String
ListeningAddress = mvarListeningAddress
End Property
Public Property Let ErrorPages(ByVal vData As String)
mvarErrorPages = vData
End Property
Public Property Get ErrorPages() As String
ErrorPages = mvarErrorPages
End Property
Public Property Let AllowIndex(ByVal vData As String)
mvarAllowIndex = vData
End Property
Public Property Get AllowIndex() As String
AllowIndex = mvarAllowIndex
End Property
Public Property Let LogFile(ByVal vData As String)
mvarLogFile = vData
End Property
Public Property Get LogFile() As String
LogFile = mvarLogFile
End Property
Public Property Let MaxConnections(ByVal vData As Long)
mvarMaxConnections = vData
End Property
Public Property Get MaxConnections() As Long
MaxConnections = mvarMaxConnections
End Property
Public Property Let WebRoot(ByVal vData As String)
mvarWebRoot = vData
End Property
Public Property Get WebRoot() As String
WebRoot = mvarWebRoot
End Property
Public Property Let Port(ByVal vData As Integer)
mvarPort = vData
End Property
Public Property Get Port() As Integer
Port = mvarPort
End Property
Public Property Let ServerName(ByVal vData As String)
mvarServerName = vData
End Property
Public Property Get ServerName() As String
ServerName = mvarServerName
End Property
Public Function Report() As String
Dim strReport As String
Dim strTemp As String
Dim vItem As Variant
strReport = "SWEBS Configuration Report"
strReport = strReport & vbCrLf & Translator.GetText("Date") & ": " & Now
strReport = strReport & vbCrLf & vbCrLf & String$(30, "-") & vbCrLf & vbCrLf
strReport = strReport & Translator.GetText("Server Name") & ": " & mvarServerName & vbCrLf
strReport = strReport & Translator.GetText("Port") & ": & mvarPort & vbCrLf"
strReport = strReport & Translator.GetText("Web Root") & ": " & mvarWebRoot & vbCrLf
strReport = strReport & Translator.GetText("Error Pages") & ": " & mvarErrorPages & vbCrLf
strReport = strReport & Translator.GetText("Max Connections") & ": " & mvarMaxConnections & vbCrLf
strReport = strReport & Translator.GetText("Primary Log File") & ": " & mvarLogFile & vbCrLf
strReport = strReport & Translator.GetText("Allow Index") & ": " & mvarAllowIndex & vbCrLf
strReport = strReport & "Listening Address" & ": " & mvarListeningAddress & vbCrLf
strReport = strReport & "Error Log" & ": " & mvarErrorLog & vbCrLf
For Each vItem In Index
strTemp = strTemp & vItem.FileName & " "
Next
strReport = strReport & "Index Files: " & Trim$(strTemp) & vbCrLf
strReport = strReport & vbCrLf & String$(30, "-") & vbCrLf
For Each vItem In ISAPI
strReport = strReport & Translator.GetText("ISAPI: Extension") & ": " & vItem.Extension & " " & Translator.GetText("Interpreter") & ": " & vItem.Interpreter & vbCrLf
Next
strReport = strReport & vbCrLf & String$(30, "-") & vbCrLf
For Each vItem In VirtHost
strReport = strReport & Translator.GetText("vHost: Name") & ": " & vItem.HostName & " " & Translator.GetText("Host Name") & ": " & vItem.Domain & " " & Translator.GetText("Root Directory") & ": " & vItem.Root & " " & Translator.GetText("Log File") & ": " & vItem.Log & vbCrLf
Next
Report = strReport
End Function
Public Function Save(strCurConfigFile As String) As Boolean
'<CSCM>
'--------------------------------------------------------------------------------
'Project: WinUI
'Procedure: SaveConfigData
' Description: this is where we save the changes to the config data.
'
' returns true on sucess
' Created By: Adam
' Date-Time : 8/25/2003-1:12:28 AM
' Parameters : strCurConfigFile (String)
'--------------------------------------------------------------------------------
'</CSCM>
Dim XML As CHILKATXMLLib.XmlFactory
Dim ConfigXML As CHILKATXMLLib.IChilkatXml
Dim ConfigXML2 As CHILKATXMLLib.IChilkatXml
Dim vItem As Variant
Set XML = New XmlFactory
Set ConfigXML = XML.NewXml
Set ConfigXML2 = XML.NewXml
Set ConfigXML = ConfigXML.NewChild("sws", "")
ConfigXML.NewChild2 "ServerName", mvarServerName
ConfigXML.NewChild2 "Port", mvarPort
ConfigXML.NewChild2 "Webroot", IIf(Right$(mvarWebRoot, 1) = "\", Left$(mvarWebRoot, (Len(mvarWebRoot) - 1)), mvarWebRoot)
ConfigXML.NewChild2 "ErrorPages", IIf(Right$(mvarErrorPages, 1) = "\", Left$(mvarErrorPages, (Len(mvarErrorPages) - 1)), mvarErrorPages)
ConfigXML.NewChild2 "MaxConnections", mvarMaxConnections
ConfigXML.NewChild2 "LogFile", mvarLogFile
ConfigXML.NewChild2 "ErrorLog", mvarErrorLog
If mvarListeningAddress <> "" Then
ConfigXML.NewChild2 "ListeningAddress", mvarListeningAddress
End If
ConfigXML.NewChild2 "AllowIndex", mvarAllowIndex
For Each vItem In Index
ConfigXML.NewChild2 "IndexFile", vItem.FileName
Next
For Each vItem In ISAPI
Set ConfigXML2 = ConfigXML2.NewChild("ISAPI", "")
ConfigXML2.NewChild2 "Interpreter", vItem.Interpreter
ConfigXML2.NewChild2 "Extension", vItem.Extension
ConfigXML.AddChildTree ConfigXML2
Next
For Each vItem In VirtHost
Set ConfigXML2 = ConfigXML2.NewChild("VirtualHost", "")
ConfigXML2.NewChild2 "vhName", vItem.HostName
ConfigXML2.NewChild2 "vhHostName", vItem.Domain
ConfigXML2.NewChild2 "vhRoot", vItem.Root
ConfigXML2.NewChild2 "vhLogFile", vItem.Log
ConfigXML.AddChildTree ConfigXML2
Next
ConfigXML.SaveXml strCurConfigFile
Save = True
End Function
--- NEW FILE: cHTTPIndex.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPIndex"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarFileName As String 'local copy
Public Property Let FileName(ByVal vData As String)
mvarFileName = vData
End Property
Public Property Get FileName() As String
FileName = mvarFileName
End Property
--- NEW FILE: cHTTPIndexCol.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPIndexCol"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Collection" ,"cIndex"
Attribute VB_Ext_KEY = "Member0" ,"cIndex"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable to hold collection
Private mCol As Collection
Public Function Add(FileName As String, Optional sKey As String) As cHTTPIndex
'create a new object
Dim objNewMember As cHTTPIndex
Set objNewMember = New cHTTPIndex
'set the properties passed into the method
objNewMember.FileName = FileName
If Len(sKey) = 0 Then
mCol.Add objNewMember
Else
mCol.Add objNewMember, sKey
End If
'return the object created
Set Add = objNewMember
Set objNewMember = Nothing
End Function
Public Property Get Item(vntIndexKey As Variant) As cHTTPIndex
Attribute Item.VB_UserMemId = 0
'used when referencing an element in the collection
'vntIndexKey contains either the Index or Key to the collection,
'this is why it is declared as a Variant
'Syntax: Set foo = x.Item(xyz) or Set foo = x.Item(5)
Set Item = mCol(vntIndexKey)
End Property
Public Property Get Count() As Long
'used when retrieving the number of elements in the
'collection. Syntax: Debug.Print x.Count
Count = mCol.Count
End Property
Public Sub Remove(vntIndexKey As Variant)
'used when removing an element from the collection
'vntIndexKey contains either the Index or Key, which is why
'it is declared as a Variant
'Syntax: x.Remove(xyz)
mCol.Remove vntIndexKey
End Sub
Public Property Get NewEnum() As IUnknown
Attribute NewEnum.VB_UserMemId = -4
Attribute NewEnum.VB_MemberFlags = "40"
'this property allows you to enumerate
'this collection with the For...Each syntax
Set NewEnum = mCol.[_NewEnum]
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
'creates the collection when this class is created
Set mCol = New Collection
End Sub
Private Sub Class_Terminate()
'destroys collection when this class is terminated
Set mCol = Nothing
End Sub
Public Function Clear()
'destroys collection
Set mCol = Nothing
'creates the collection
Set mCol = New Collection
End Function
--- NEW FILE: cHTTPStats.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPStats"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarLastRestart As Date
Private mvarRequestCount As Long
Private mvarTotalBytesSent As Double
Private mvarFile As String
Public Sub Setup()
mvarFile = Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "StatsFile")
End Sub
Public Property Get File() As String
File = mvarFile
End Property
Public Sub Reload()
Dim XML As CHILKATXMLLib.XmlFactory
Dim StatsXML As CHILKATXMLLib.IChilkatXml
Dim Node As CHILKATXMLLib.IChilkatXml
Set XML = New XmlFactory
Set StatsXML = XML.NewXml
If Dir$(mvarFile) <> "" Then
StatsXML.LoadXmlFile mvarFile
Else
Exit Sub
End If
'<TotalBytesSent>
Set Node = StatsXML.SearchForTag(Nothing, "TotalBytesSent")
If Node Is Nothing Then
mvarTotalBytesSent = 0
Else
mvarTotalBytesSent = Node.Content
End If
'<LastRestart>
Set Node = StatsXML.SearchForTag(Nothing, "LastRestart")
If Node Is Nothing Then
mvarLastRestart = CDate(Now)
Else
mvarLastRestart = CDate(Node.Content)
End If
'<RequestCount>
Set Node = StatsXML.SearchForTag(Nothing, "RequestCount")
If Node Is Nothing Then
mvarRequestCount = 0
Else
mvarRequestCount = Val(Node.Content)
End If
'clean up
Set XML = Nothing
Set StatsXML = Nothing
Set Node = Nothing
End Sub
Public Property Get TotalBytesSent() As Double
TotalBytesSent = mvarTotalBytesSent
End Property
Public Property Get RequestCount() As Long
RequestCount = mvarRequestCount
End Property
Public Property Get LastRestart() As Date
LastRestart = mvarLastRestart
End Property
--- NEW FILE: cHTTPVirtHost.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPVirtHost"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarHostName As String 'local copy
Private mvarDomain As String 'local copy
Private mvarRoot As String 'local copy
Private mvarLog As String 'local copy
Public Property Let Log(ByVal vData As String)
mvarLog = vData
End Property
Public Property Get Log() As String
Log = mvarLog
End Property
Public Property Let Root(ByVal vData As String)
mvarRoot = vData
End Property
Public Property Get Root() As String
Root = mvarRoot
End Property
Public Property Let Domain(ByVal vData As String)
mvarDomain = vData
End Property
Public Property Get Domain() As String
Domain = mvarDomain
End Property
Public Property Let HostName(ByVal vData As String)
mvarHostName = vData
End Property
Public Property Get HostName() As String
HostName = mvarHostName
End Property
--- NEW FILE: cHTTPVirtHostCol.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cHTTPVirtHostCol"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Collection" ,"cvHost"
Attribute VB_Ext_KEY = "Member0" ,"cvHost"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable to hold collection
Private mCol As Collection
Public Function Add(HostName As String, Domain As String, Root As String, Log As String, Optional sKey As String) As cHTTPVirtHost
'create a new object
Dim objNewMember As cHTTPVirtHost
Set objNewMember = New cHTTPVirtHost
'set the properties passed into the method
objNewMember.HostName = HostName
objNewMember.Domain = Domain
objNewMember.Root = Root
objNewMember.Log = Log
If Len(sKey) = 0 Then
mCol.Add objNewMember
Else
mCol.Add objNewMember, sKey
End If
'return the object created
Set Add = objNewMember
Set objNewMember = Nothing
End Function
Public Property Get Item(vntIndexKey As Variant) As cHTTPVirtHost
Attribute Item.VB_UserMemId = 0
'used when referencing an element in the collection
'vntIndexKey contains either the Index or Key to the collection,
'this is why it is declared as a Variant
'Syntax: Set foo = x.Item(xyz) or Set foo = x.Item(5)
Set Item = mCol(vntIndexKey)
End Property
Public Property Get Count() As Long
'used when retrieving the number of elements in the
'collection. Syntax: Debug.Print x.Count
Count = mCol.Count
End Property
Public Sub Remove(vntIndexKey As Variant)
'used when removing an element from the collection
'vntIndexKey contains either the Index or Key, which is why
'it is declared as a Variant
'Syntax: x.Remove(xyz)
mCol.Remove vntIndexKey
End Sub
Public Property Get NewEnum() As IUnknown
Attribute NewEnum.VB_UserMemId = -4
Attribute NewEnum.VB_MemberFlags = "40"
'this property allows you to enumerate
'this collection with the For...Each syntax
Set NewEnum = mCol.[_NewEnum]
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
'creates the collection when this class is created
Set mCol = New Collection
End Sub
Private Sub Class_Terminate()
'destroys collection when this class is terminated
Set mCol = Nothing
End Sub
Public Function Clear()
'destroys collection
Set mCol = Nothing
'creates the collection
Set mCol = New Collection
End Function
--- NEW FILE: ccHTTP.csi ---
[History]
B0=ccHTTP/cHTTPConfig/LoadData
B1=ccHTTP/cHTTPConfig
--- NEW FILE: ccHTTP.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccHTTP.exp ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccHTTP.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccHTTP.lvw ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccHTTP.vbp ---
Type=OleDll
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll#
Class=cHTTP; cHTTP.cls
Class=cHTTPISAPI; cHTTPCGI.cls
Class=cHTTPISAPICol; cHTTPCGICol.cls
Class=cHTTPConfig; cHTTPConfig.cls
Class=cHTTPIndex; cHTTPIndex.cls
Class=cHTTPIndexCol; cHTTPIndexCol.cls
Class=cHTTPStats; cHTTPStats.cls
Class=cHTTPVirtHost; cHTTPVirtHost.cls
Class=cHTTPVirtHostCol; cHTTPVirtHostCol.cls
Module=basMain; basMain.bas
Startup="Sub Main"
HelpFile=""
Title="ccHTTP"
ExeName32="ccHTTP.dll"
Path32="..\..\..\swebswebserver\winui\ccHTTP"
Command32=""
Name="ccHTTP"
HelpContextID="0"
CompatibleMode="1"
CompatibleEXE32="ccHTTP.dll"
MajorVer=1
MinorVer=0
RevisionVer=5
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="Imspire.com"
CompilationType=-1
OptimizationType=0
FavorPentiumPro(tm)=0
CodeViewDebugInfo=0
NoAliasing=0
BoundsCheck=0
OverflowCheck=0
FlPointCheck=0
FDIVCheck=0
UnroundedFP=0
StartMode=1
Unattended=0
Retained=0
ThreadPerObject=0
MaxNumberOfThreads=1
DebugStartupOption=0
[MS Transaction Server]
AutoRefresh=1
--- NEW FILE: ccHTTP.vbw ---
cHTTP = 0, 0, 0, 0, C
cHTTPISAPI = 0, 0, 0, 0, C
cHTTPISAPICol = 0, 0, 0, 0, C
cHTTPConfig = 0, 0, 0, 0, C
cHTTPIndex = 0, 0, 0, 0, C
cHTTPIndexCol = 0, 0, 0, 0, C
cHTTPStats = 0, 0, 0, 0, C
cHTTPVirtHost = 0, 0, 0, 0, C
cHTTPVirtHostCol = 0, 0, 0, 0, C
basMain = 0, 0, 0, 0, C
|
Update of /cvsroot/swebs/swebswebserver/winui/ccUtil
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui/ccUtil
Added Files:
cUtil.cls ccUtil.csi ccUtil.dll ccUtil.exp ccUtil.lib
ccUtil.lvw ccUtil.vbp ccUtil.vbw
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: cUtil.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cUtil"
Attribute VB_GlobalNameSpace = True
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'Registry API's
Private Declare Function RegOpenKey Lib "advapi32.dll" Alias "RegOpenKeyA" (ByVal hKey As Long, ByVal lpSubKey As String, phkResult As Long) As Long
Private Declare Function RegQueryValueEx Lib "advapi32.dll" Alias "RegQueryValueExA" (ByVal hKey As Long, ByVal lpValueName As String, ByVal lpReserved As Long, lpType As Long, lpData As Any, lpcbData As Long) As Long
Private Declare Function RegCreateKey Lib "advapi32.dll" Alias "RegCreateKeyA" (ByVal hKey As Long, ByVal lpSubKey As String, phkResult As Long) As Long
Private Declare Function RegSetValueEx Lib "advapi32.dll" Alias "RegSetValueExA" (ByVal hKey As Long, ByVal lpValueName As String, ByVal Reserved As Long, ByVal dwType As Long, lpData As Any, ByVal cbData As Long) As Long
Private Declare Function RegCloseKey Lib "advapi32.dll" (ByVal hKey As Long) As Long
'Browse For Folder API's
Private Declare Function SHBrowseForFolder Lib "shell32" (ByRef lpbi As BrowseInfo) As Long
Private Declare Function SHGetPathFromIDList Lib "shell32" (ByVal pidList As Long, ByVal lpBuffer As String) As Long
'Set foreground window by caption
Private Declare Function SetForegroundWindow Lib "user32" (ByVal hWnd As Long) As Long
Private Declare Function FindWindow Lib "user32" Alias "FindWindowA" (ByVal lpClassName As Any, ByVal lpWindowName As Any) As Long
'xp theme
Private Declare Function InitCommonControlsEx Lib "comctl32.dll" (iccex As tagInitCommonControlsEx) As Boolean
'stop window from updating
Private Declare Function LockWindowUpdate Lib "user32" (ByVal hwndLock As Long) As Long
'prevent xp app shutdown crash. see Q309366
Private Declare Function LoadLibrary Lib "kernel32" Alias "LoadLibraryA" (ByVal lpLibFileName As String) As Long
Private Declare Function FreeLibrary Lib "kernel32" (ByVal hLibModule As Long) As Long
'Registry
Private Const REG_SZ = 1
Private Const ERROR_SUCCESS = 0&
'Browse For Folder
Private Const MAX_PATH As Integer = 260
'xp themed
Private Const ICC_USEREX_CLASSES = &H200
'Browse For Folder
Private Type BrowseInfo
hWndOwner As Long
pIDLRoot As Long
pszDisplayName As String
lpszTitle As String
ulFlags As Long
lpfnCallback As Long
lParam As Long
iImage As Long
End Type
'Browse For Folder
Private Enum FolderFlags
BIF_RETURNONLYFSDIRS = 1
BIF_EDITBOX = &H10
BIF_USENEWUI = &H40
End Enum
'XP themed
Private Type tagInitCommonControlsEx
lngSize As Long
lngICC As Long
End Type
Public Function GetRegistryString(hKey As Long, strPath As String, strValue As String) As String
Dim keyhand As Long
Dim lresult As Long
Dim strBuf As String
Dim lDataBufSize As Long
Dim intZeroPos As Integer
Dim R As Long
Dim lValueType As Long
R = RegOpenKey(hKey, strPath, keyhand)
lresult = RegQueryValueEx(keyhand, strValue, 0&, lValueType, ByVal 0&, lDataBufSize)
If lValueType = REG_SZ Then
strBuf = String$(lDataBufSize, " ")
lresult = RegQueryValueEx(keyhand, strValue, 0&, 0&, ByVal strBuf, lDataBufSize)
If lresult = ERROR_SUCCESS Then
intZeroPos = InStr(strBuf, Chr$(0))
If intZeroPos > 0 Then
GetRegistryString = Left$(strBuf, intZeroPos - 1)
Else
GetRegistryString = strBuf
End If
End If
End If
End Function
Public Function BrowseForFolder(Optional ByRef psTitle As String = "Select A Directory", Optional ByVal flAllowNewFolder As Boolean = False, Optional psStartDir As String = "C:\") As String
''this has a bug, I know, i'll fix it some day, just not today.
''***this needs to get replaced for the upgrade...
Dim lpIDList As Long
Dim szTitle As String, sBuffer As String
Dim tBrowseInfo As BrowseInfo
Dim m_CurrentDirectory As String
m_CurrentDirectory = psStartDir & vbNullChar
szTitle = psTitle
With tBrowseInfo
.hWndOwner = 0
'.pIDLRoot = &H11
.lpszTitle = szTitle
.ulFlags = FolderFlags.BIF_RETURNONLYFSDIRS + FolderFlags.BIF_EDITBOX
If flAllowNewFolder Then
.ulFlags = .ulFlags + FolderFlags.BIF_USENEWUI
End If
End With
lpIDList = SHBrowseForFolder(tBrowseInfo)
If (lpIDList) Then
sBuffer = Space$(MAX_PATH)
SHGetPathFromIDList lpIDList, sBuffer
sBuffer = Mid$(sBuffer, 1, InStr(sBuffer, vbNullChar) - 1)
BrowseForFolder = sBuffer
Else
BrowseForFolder = ""
End If
End Function
Public Function GetTaggedData(strData As String, strTag As String, Optional strEndTag As String = "") As String
Dim lngStart As Long
Dim lngEnd As Long
lngStart = InStr(1, strData, "<" & strTag & ">")
If lngStart > 0 Then
lngStart = lngStart + Len(strTag) + 2
If strEndTag = "" Then
lngEnd = InStr(lngStart, strData, "</" & strTag & ">")
Else
lngEnd = InStr(lngStart, strData, "</" & strEndTag & ">")
End If
End If
If lngStart = 0 Or lngEnd = 0 Then
GetTaggedData = ""
Else
GetTaggedData = Mid$(strData, lngStart, lngEnd - lngStart)
End If
End Function
Public Function SetFocusByCaption(strCaption As String) As Boolean
Dim lngHandle As Long
Dim lngResult As Long
lngHandle = FindWindow(vbNullString, strCaption)
If lngHandle <> 0 Then
lngResult = SetForegroundWindow(lngHandle)
If lngResult = 0 Then
SetFocusByCaption = False
Else
SetFocusByCaption = True
End If
Else
SetFocusByCaption = False
End If
End Function
Public Function InitCommonControlsVB() As Boolean
Dim iccex As tagInitCommonControlsEx
With iccex
.lngSize = LenB(iccex)
.lngICC = ICC_USEREX_CLASSES
End With
InitCommonControlsEx iccex
InitCommonControlsVB = (Err.Number = 0)
End Function
Public Sub StopWinUpdate(Optional hWnd As Long = 0)
Call LockWindowUpdate(hWnd)
End Sub
Public Sub LoadUser32(Optional blnLoad As Boolean = False)
Static lngUser32 As Long
If blnLoad = True Then
lngUser32 = LoadLibrary("shell32.dll")
Else
FreeLibrary lngUser32
End If
End Sub
Public Function UrlEncode(sText As String) As String
Dim sResult As String
Dim sFinal As String
Dim sChar As String
Dim i As Long
For i = 1 To Len(sText)
sChar = Mid$(sText, i, 1)
If InStr(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.@", sChar) <> 0 Then
sResult = sResult & sChar
ElseIf sChar = " " Then
sResult = sResult & "+"
ElseIf True Then
sResult = sResult & "%" & Right$("0" & Hex$(Asc(sChar)), 2)
End If
If Len(sResult) > 1000 Then
sFinal = sFinal & sResult
sResult = ""
End If
Next
UrlEncode = sFinal & sResult
End Function
Public Sub SaveRegistryString(hKey As Long, strPath As String, strValue As String, strData As String)
Dim keyhand As Long
Dim lngResult As Long
lngResult = RegCreateKey(hKey, strPath, keyhand)
lngResult = RegSetValueEx(keyhand, strValue, 0, REG_SZ, ByVal strData, Len(strData))
lngResult = RegCloseKey(keyhand)
End Sub
Public Function CUnescape(Source As String, Optional ForceDoubleQuote As Boolean = False) As String
' Supported escape sequences:
'
' \b Character 0x08 (backspace)
' \\ Backslash
' \n Newline (Cr+Lf)
' \r Carriage return
' \l Line feed
' \t Tab
' \" Double-quote
' \' Single-quote*
' \hnn Hexadecimal character 0xnn
Dim lngIndex As Long
Dim strChar As String * 1
Dim strEsc As String * 1
Dim strHex As String * 2
Dim strReplace As String * 1
Dim strOutput As String
lngIndex = 1&
Do While lngIndex <= Len(Source)
strChar = Mid$(Source, lngIndex, 1&)
If (strChar <> "\") Or (lngIndex > Len(Source) - 2&) Then
strOutput = strOutput + strChar
lngIndex = lngIndex + 1&
Else
strEsc = Mid$(Source, lngIndex + 1&, 1&)
Select Case strEsc
Case "\"
strReplace = "\": lngIndex = lngIndex + 2&
Case "b"
strReplace = Chr$(8&): lngIndex = lngIndex + 2&
Case "n"
strReplace = vbCrLf: lngIndex = lngIndex + 2&
Case "r"
strReplace = vbCr: lngIndex = lngIndex + 2&
Case "l"
strReplace = vbLf: lngIndex = lngIndex + 2&
Case "t"
strReplace = vbTab: lngIndex = lngIndex + 2&
Case Chr$(34)
strReplace = Chr$(34): lngIndex = lngIndex + 2&
Case "'"
If ForceDoubleQuote Then
strReplace = Chr$(34): lngIndex = lngIndex + 2&
Else
strReplace = "'": lngIndex = lngIndex + 2&
End If
Case "h"
If lngIndex + 3& > Len(Source) Then
strReplace = "h"
lngIndex = lngIndex + 2&
Else
strHex = Mid$(Source, lngIndex + 2&, 2&)
If Not IsNumeric("&h" & strHex) Then
strReplace = "h"
lngIndex = lngIndex + 2&
Else
strReplace = Chr$(CLng("&h" & strHex))
lngIndex = lngIndex + 4&
End If
End If
Case Else
strReplace = strEsc
End Select
strOutput = strOutput & strReplace
End If
Loop
CUnescape = strOutput
End Function
--- NEW FILE: ccUtil.csi ---
[History]
B0=ccUtil/cUtil
B2=ccUtil/basMain
--- NEW FILE: ccUtil.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccUtil.exp ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccUtil.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccUtil.lvw ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccUtil.vbp ---
Type=OleDll
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
Class=cUtil; cUtil.cls
Startup="(None)"
HelpFile=""
Title="ccUtil"
ExeName32="ccUtil.dll"
Path32="..\..\..\swebswebserver\winui\ccUtil"
Command32=""
Name="ccUtil"
HelpContextID="0"
CompatibleMode="1"
CompatibleEXE32="..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll"
MajorVer=1
MinorVer=0
RevisionVer=4
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="Imspire.com"
CompilationType=-1
OptimizationType=0
FavorPentiumPro(tm)=0
CodeViewDebugInfo=0
NoAliasing=0
BoundsCheck=0
OverflowCheck=0
FlPointCheck=0
FDIVCheck=0
UnroundedFP=0
StartMode=1
Unattended=0
Retained=0
ThreadPerObject=0
MaxNumberOfThreads=1
ThreadingModel=1
DebugStartupOption=0
[MS Transaction Server]
AutoRefresh=1
--- NEW FILE: ccUtil.vbw ---
cUtil = 0, 0, 0, 0, C
|
Update of /cvsroot/swebs/swebswebserver/winui/ccCore
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui/ccCore
Added Files:
basMain.bas cCallStack.cls cCore.cls cDebug.cls cEventLog.cls
cNet.cls cPerfMon.cls cPerfMonData.cls cRegistration.cls
cServer.cls cUIInterface.cls cUpdate.cls ccCore.csi ccCore.dll
ccCore.exp ccCore.lib ccCore.lvw ccCore.vbp ccCore.vbw
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: basMain.bas ---
Attribute VB_Name = "basMain"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Util As cUtil
Public Translator As cTranslate
Public gCore As cCore
Public Sub Main()
Set Util = New cUtil
Set Translator = New cTranslate
Set gCore = New cCore
gCore.Setup
End Sub
--- NEW FILE: cCallStack.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cCallStack"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Option Base 1
Private Const BUFFER_SIZE As Long = 25
Private Items() As String
Private Index As Long
Public Property Get Count() As Long
Count = Index
End Property
Public Sub Clear()
ReDim Items(BUFFER_SIZE)
Index = 0
End Sub
Public Sub Push(Item As String)
If UBound(Items) = Index + 1 Then
ReDim Preserve Items(Index + BUFFER_SIZE)
End If
Index = Index + 1
Items(Index) = Item
If gCore.Debuger.PerfMon.Enabled = True Then
gCore.Debuger.PerfMon.Add Item
End If
End Sub
Public Function Pop() As String
Dim l As Long
If Index > 0 Then
Pop = Items(Index)
If gCore.Debuger.PerfMon.Enabled = True Then
gCore.Debuger.PerfMon.Remove Items(Index)
End If
Index = Index - 1
End If
If (UBound(Items) - Index) \ BUFFER_SIZE > 1 Then
ReDim Preserve Items(UBound(Items) - BUFFER_SIZE)
End If
End Function
Public Function Peek(lngIndex As Long) As String
If Index > 0 And lngIndex > 0 And lngIndex <= Index Then
Peek = Items(lngIndex)
End If
End Function
Private Sub Class_Initialize()
Clear
End Sub
Private Sub Class_Terminate()
Erase Items
End Sub
--- NEW FILE: cCore.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cCore"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarPath As String
Private mvarVersion As String
Private strLang As String
Public EventLog As cEventLog
Public Registration As cRegistration
Public Update As cUpdate
Public Net As cNet
Public Util As cUtil
Public Debuger As cDebug
Public Server As cServer
Public Property Get Version() As String
Version = mvarVersion
End Property
Public Property Get Path() As String
Path = mvarPath
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
Set Util = New cUtil
Set Debuger = New cDebug
Set EventLog = New cEventLog
Set Registration = New cRegistration
Set Update = New cUpdate
Set Net = New cNet
Set Server = New cServer
End Sub
Private Sub Class_Terminate()
If Debuger.PerfMon.Enabled = True Then
Debuger.PerfMon.Save mvarPath & "ccperfmon.log"
End If
Set EventLog = Nothing
Set Registration = Nothing
Set Update = Nothing
Set Net = Nothing
Set Util = Nothing
Set Debuger = Nothing
Set Server = Nothing
End Sub
Public Sub Setup()
mvarVersion = Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "Version")
mvarPath = Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "AppPath")
mvarPath = IIf(Right$(mvarPath, 1) <> "\", mvarPath & "\", mvarPath)
Debuger.Setup
Server.HTTP.Config.Setup
Server.HTTP.Stats.Setup
Translator.LoadLang "1033", mvarPath & "lang.xml"
Util.LoadUser32 True
Util.InitCommonControlsVB
End Sub
--- NEW FILE: cDebug.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cDebug"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public CallStack As cCallStack
Public PerfMon As cPerfMon
'local variable(s) to hold property value(s)
Private mvarEnabled As Boolean 'local copy
Private mvarDebugLang As Boolean 'local copy
Private mvarDisableSplash As Boolean 'local copy
Private mvarDisableFade As Boolean 'local copy
Private mvarDisableUpdate As Boolean 'local copy
Private mvarDisableTips As Boolean 'local copy
Private mvarDebugMode As Boolean 'local copy
'CSEH: WinUI - Custom(No Stack)
Public Function ErrorReport(strErrMsg As String, strLine As String, strLocation As String) As String
Dim strMessage As String
Dim i As Long
strMessage = String(30, "*") & vbCrLf
strMessage = strMessage & Translator.GetText("WinUI Bug Report - Version:") & " " & gCore.Version & vbCrLf & vbCrLf
strMessage = strMessage & Translator.GetText("Time:") & " (" & Now & ") " & Translator.GetText("Location:") & " (" & strLocation & ") " & Translator.GetText("Line:") & " (" & strLine & ")" & vbCrLf
strMessage = strMessage & Translator.GetText("Message:") & " (" & strErrMsg & ")" & vbCrLf
strMessage = strMessage & Translator.GetText("Call Stack:") & vbCrLf
For i = 1 To CallStack.Count
strMessage = strMessage & Chr(9) & CallStack.Peek(i) & vbCrLf
Next
strMessage = strMessage & vbCrLf & Translator.GetText("Please see http://swebs.sf.net for information on this error.") & vbCrLf
strMessage = strMessage & String(30, "*") & vbCrLf
Open gCore.Path & "WinUI_ErrLog.log" For Append As 1
Print #1, strMessage
Close 1
ErrorReport = gCore.Path & "WinUI_ErrLog.log"
End Function
Public Property Let DebugMode(ByVal vData As Boolean)
mvarDebugMode = vData
End Property
Public Property Get DebugMode() As Boolean
DebugMode = mvarDebugMode
End Property
Public Sub KillUpdate()
Util.SaveRegistryString &H80000002, "SOFTWARE\SWS", "UpdateEnabled", "False"
mvarDisableUpdate = True
End Sub
Public Property Let DisableUpdate(ByVal vData As Boolean)
mvarDisableUpdate = vData
End Property
Public Property Get DisableUpdate() As Boolean
DisableUpdate = mvarDisableUpdate
End Property
Public Property Let DebugLang(ByVal vData As Boolean)
mvarDebugLang = vData
End Property
Public Property Get DebugLang() As Boolean
DebugLang = mvarDebugLang
End Property
Public Property Let Enabled(ByVal vData As Boolean)
mvarEnabled = vData
End Property
Public Property Get Enabled() As Boolean
Enabled = mvarEnabled
End Property
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
Set CallStack = New cCallStack
Set PerfMon = New cPerfMon
End Sub
Private Sub Class_Terminate()
Set CallStack = Nothing
Set PerfMon = Nothing
End Sub
Public Sub Setup()
mvarDisableUpdate = IIf(LCase$(Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "UpdateEnabled")) = "false", True, False)
End Sub
--- NEW FILE: cEventLog.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cEventLog"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
Attribute VB_Ext_KEY = "Member0" ,"cCommonDialog"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Private blnEnabled As Boolean
Private blnChanged As Boolean
Private strEventLog As String
Public Property Get Log() As String
blnChanged = False
Log = strEventLog
End Property
Public Property Get Changed() As Boolean
Changed = blnChanged
End Property
Public Sub AddEvent(ByVal strLocation As String, ByVal strEvent As String)
Attribute AddEvent.VB_UserMemId = 0
If blnEnabled = True Then
blnChanged = True
strEventLog = strEventLog & "(" & Format$(Now, "hh:mm:ss") & ") " & strLocation & ": " & strEvent & vbCrLf
Else
strEventLog = ""
End If
End Sub
Public Property Let Enabled(ByVal vData As Boolean)
blnEnabled = vData
End Property
Public Property Get Enabled() As Boolean
Enabled = blnEnabled
End Property
--- NEW FILE: cNet.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cNet"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'PageSource
Private Declare Function InternetOpen Lib "wininet.dll" Alias "InternetOpenA" (ByVal sAgent As String, ByVal lAccessType As Long, ByVal sProxyName As String, ByVal sProxyBypass As String, ByVal lFlags As Long) As Long
Private Declare Function InternetOpenUrl Lib "wininet.dll" Alias "InternetOpenUrlA" (ByVal hInternetSession As Long, ByVal sURL As String, ByVal sHeaders As String, ByVal lHeadersLength As Long, ByVal lFlags As Long, ByVal lContext As Long) As Long
Private Declare Function InternetReadFile Lib "wininet.dll" (ByVal hFile As Long, ByVal sBuffer As String, ByVal lNumBytesToRead As Long, lNumberOfBytesRead As Long) As Integer
Private Declare Function InternetCloseHandle Lib "wininet.dll" (ByVal hInet As Long) As Integer
'LaunchURL API
Private Declare Function ShellExecute Lib "shell32.dll" Alias "ShellExecuteA" (ByVal hWnd As Long, ByVal lpOperation As String, ByVal lpFile As String, ByVal lpParameters As String, ByVal lpDirectory As String, ByVal nShowCmd As Long) As Long
'IsOnline API
Private Declare Function InternetGetConnectedStateEx Lib "wininet.dll" Alias "InternetGetConnectedStateExA" (lpdwFlags As Long, lpszConnectionName As Long, dwNameLen As Long, ByVal dwReserved As Long) As Long
'PageSource
Private Const IF_NO_CACHE_WRITE = &H4000000
Private Const BUFFER_LEN = 256
Public Sub LaunchURL(ByVal strURL As String)
Call ShellExecute(0, vbNullString, strURL, vbNullString, vbNullString, vbNormalFocus)
End Sub
Public Function PageSource(ByVal sURL As String, Optional ByVal strHeaders As String = "") As String
Dim sBuffer As String * BUFFER_LEN, iResult As Integer, sData As String
Dim hInternet As Long, hSession As Long, lReturn As Long
Dim lngHeaderLen As Long
lngHeaderLen = Len(strHeaders)
'get the handle of the current internet connection
hSession = InternetOpen("User-Agent: SWEBS WinUI " & gCore.Version & " <ad...@im...>", 1, vbNullString, vbNullString, 0)
'get the handle of the url
If hSession Then hInternet = InternetOpenUrl(hSession, sURL, strHeaders, lngHeaderLen, IF_NO_CACHE_WRITE, 0)
'if we have the handle, then start reading the web page
If hInternet Then
'get the first chunk & buffer it.
iResult = InternetReadFile(hInternet, sBuffer, BUFFER_LEN, lReturn)
sData = sBuffer
'if there's more data then keep reading it into the buffer
Do While lReturn <> 0
iResult = InternetReadFile(hInternet, sBuffer, BUFFER_LEN, lReturn)
sData = sData + Mid$(sBuffer, 1, lReturn)
DoEvents
Loop
End If
'close the URL
iResult = InternetCloseHandle(hInternet)
PageSource = sData
End Function
Public Property Get IsOnline() As Boolean
Dim lNameLen As Long
Dim lRetVal As Long
Dim lConnectionFlags As Long
Dim LPTR As Long
Dim lNameLenPtr As Long
Dim sConnectionName As String
sConnectionName = Space$(256)
lNameLen = 256
LPTR = StrPtr(sConnectionName)
lNameLenPtr = VarPtr(lNameLen)
lRetVal = InternetGetConnectedStateEx(lConnectionFlags, ByVal LPTR, ByVal lNameLen, 0&)
IsOnline = (lRetVal <> 0)
End Property
--- NEW FILE: cPerfMon.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cPerfMon"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Private Declare Function QueryPerformanceCounter Lib "kernel32" (lpPerformanceCount As Currency) As Long
Private Declare Function QueryPerformanceFrequency Lib "kernel32" (lpFrequency As Currency) As Long
Private mCol As Collection
Private curFreq As Currency
Private strPerfLog As String
Private mvarEnabled As Boolean
Private lngCallCount As Long
Private curTotalTime As Currency
Public Property Let Enabled(ByVal vData As Boolean)
mvarEnabled = vData
End Property
Public Property Get Enabled() As Boolean
Enabled = mvarEnabled
End Property
Public Sub Add(strFunction As String)
Dim tData As cPerfMonData
Dim curStartTime As Currency
Set tData = New cPerfMonData
tData.Name = strFunction
QueryPerformanceCounter curStartTime
tData.StartTime = curStartTime
tData.StopTime = 0
mCol.Add tData, strFunction
Set tData = Nothing
End Sub
Public Sub Remove(strFunction As String)
Dim tData As cPerfMonData
Dim curExecTime As Currency
Dim curStopTime As Currency
Dim strFixedFunction As String * 50
Set tData = mCol.Item(strFunction)
QueryPerformanceCounter curStopTime
tData.StopTime = curStopTime
curExecTime = 1000 * (tData.StopTime - tData.StartTime) / curFreq
curTotalTime = curTotalTime + curExecTime
lngCallCount = lngCallCount + 1
strFixedFunction = strFunction
strPerfLog = strPerfLog & "Function: " & strFixedFunction & String(2, Chr(9)) & "Execution Time: " & Space(18 - Len(Format(Str(curExecTime), "#.0000"))) & Format(Str(curExecTime), "#.0000") & vbCrLf
mCol.Remove strFunction
Set tData = Nothing
End Sub
Public Function Save(strFile As String) As Boolean
strPerfLog = strPerfLog & "Statistics: Call Count: " & lngCallCount & " Average Execution Time: " & (curTotalTime / lngCallCount) & vbCrLf & String(103, "*") & vbCrLf
Open strFile For Append As 1
Print #1, strPerfLog
Close 1
Save = True
End Function
Private Sub Class_Initialize()
Set mCol = New Collection
QueryPerformanceFrequency curFreq
strPerfLog = String(103, "*") & vbCrLf & "Application Started: " & Now & vbCrLf
End Sub
Private Sub Class_Terminate()
Set mCol = Nothing
End Sub
--- NEW FILE: cPerfMonData.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cPerfMonData"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarStartTime As Currency
Private mvarStopTime As Currency
Private mvarName As String
Public Property Let Name(ByVal vData As String)
mvarName = vData
End Property
Public Property Get Name() As String
Name = mvarName
End Property
Public Property Let StopTime(ByVal vData As Currency)
mvarStopTime = vData
End Property
Public Property Get StopTime() As Currency
StopTime = mvarStopTime
End Property
Public Property Let StartTime(ByVal vData As Currency)
mvarStartTime = vData
End Property
Public Property Get StartTime() As Currency
StartTime = mvarStartTime
End Property
--- NEW FILE: cRegistration.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cRegistration"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Property Get IsRegistered() As Boolean
Dim strResult As String
strResult = Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "RegID")
If strResult <> "" Then
IsRegistered = True
Else
IsRegistered = False
End If
'lets default to yes either way until somebody gets around to writing &%$#@*& script
IsRegistered = True
End Property
Public Sub Start() 'TODO: Fix Me! - This is *not* UI/Core split
'Dim lngResult As Long
' lngResult = MsgBox(Translator.GetText("Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?"), vbQuestion + vbYesNo + vbApplicationModal)
' If lngResult = vbYes Then
' Load frmRegistration
' frmRegistration.Show vbModal
' End If
End Sub
Public Sub Renew()
'this is what should get called:
'PageSource "http://swebs.sf.net/register/regupdate.php?email=" & UrlEncode(GetRegistryString(&H80000002, "SOFTWARE\SWS", "RegID")) & "&ver=" & UrlEncode(WinUI.Version)
DoEvents
End Sub
--- NEW FILE: cServer.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cServer"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public HTTP As cHTTP
'CSEH: WinUI - Custom(No Stack)
Private Sub Class_Initialize()
Set HTTP = New cHTTP
End Sub
Private Sub Class_Terminate()
Set HTTP = Nothing
End Sub
--- NEW FILE: cUIInterface.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cUIInterface"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Property Get DefInstance() As cCore
Set DefInstance = gCore
End Property
--- NEW FILE: cUpdate.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cUpdate"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarIsAvailable As Boolean 'local copy
Private mvarVersion As String 'local copy
Private mvarReleaseDate As String 'local copy
Private mvarInfoURL As String 'local copy
Private mvarDownloadURL As String 'local copy
Private mvarDescription As String 'local copy
Private mvarUpdateLevel As String 'local copy
Private mvarFileSize As Long 'local copy
Public Sub Check()
Dim strData As String
Dim strNewVer() As String
Dim strCurVer() As String
Dim i As Long
If gCore.Debuger.DisableUpdate <> True Then
If gCore.Net.IsOnline = True Then
strData = Replace(gCore.Net.PageSource("http://swebs.sf.net/upgrade.xml"), vbLf, vbCrLf)
End If
If InStr(1, strData, "Server at swebs.sourceforge.net Port 80") = 0 And strData <> "" Then
gCore.EventLog.AddEvent "SWEBS_WinUI_DLL.cUpdate.Check", "Update Data Found, Processing."
mvarReleaseDate = Util.GetTaggedData(strData, "Date")
mvarDescription = Util.GetTaggedData(strData, "Description")
mvarDownloadURL = Util.GetTaggedData(strData, "DownloadURL")
mvarInfoURL = Util.GetTaggedData(strData, "InfoURL")
mvarVersion = Util.GetTaggedData(strData, "Version")
mvarUpdateLevel = Util.GetTaggedData(strData, "UpgradeLevel")
mvarFileSize = Val(Util.GetTaggedData(strData, "FileSize"))
'check to see if this is newer
'this is a bad way to do things, needs to be fixed, again
strNewVer() = Split(mvarVersion, ".")
strCurVer() = Split(gCore.Version, ".")
For i = 0 To UBound(strNewVer)
If Val(strNewVer(i)) > Val(strCurVer(i)) Then
mvarIsAvailable = True
gCore.EventLog.AddEvent "SWEBS_WinUI_DLL.cUpdate.Check", "Update Available. Old Version: " & gCore.Version & "; New Version: " & gCore.Update.Version
End If
Next
ElseIf mvarIsAvailable = True Then
gCore.EventLog.AddEvent "SWEBS_WinUI_DLL.cUpdate.Check", "Update status already true."
Else
mvarIsAvailable = False
gCore.EventLog.AddEvent "SWEBS_WinUI_DLL.cUpdate.Check", "No update data or update file not found."
End If
End If
End Sub
Public Property Get FileSize() As Long
FileSize = mvarFileSize
End Property
Public Property Get UpdateLevel() As String
UpdateLevel = mvarUpdateLevel
End Property
Public Property Get Description() As String
Description = mvarDescription
End Property
Public Property Get DownloadURL() As String
DownloadURL = mvarDownloadURL
End Property
Public Property Get InfoURL() As String
InfoURL = mvarInfoURL
End Property
Public Property Get ReleaseDate() As String
ReleaseDate = mvarReleaseDate
End Property
Public Property Get Version() As String
Version = mvarVersion
End Property
Public Property Get IsAvailable() As Boolean
IsAvailable = mvarIsAvailable
End Property
--- NEW FILE: ccCore.csi ---
[History]
B0=ccCore/cPerfMon/Class_Terminate
B1=ccCore/cPerfMon
B3=ccCore/cDebug/Enabled
B4=ccCore/cDebug
--- NEW FILE: ccCore.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccCore.exp ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccCore.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccCore.lvw ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccCore.vbp ---
Type=OleDll
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
Reference=*\G{09964172-0145-439E-9EA3-8CE311269AF1}#6.0#0#..\..\..\swebswebserver\winui\ccHTTP\ccHTTP.dll#
Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll#
Module=basMain; basMain.bas
Class=cUpdate; cUpdate.cls
Class=cServer; cServer.cls
Class=cRegistration; cRegistration.cls
Class=cPerfMonData; cPerfMonData.cls
Class=cPerfMon; cPerfMon.cls
Class=cNet; cNet.cls
Class=cEventLog; cEventLog.cls
Class=cDebug; cDebug.cls
Class=cCallStack; cCallStack.cls
Class=cUIInterface; cUIInterface.cls
Class=cCore; ..\..\..\swebswebserver\winui\ccCore\cCore.cls
Startup="Sub Main"
HelpFile=""
Title="ccCore"
ExeName32="ccCore.dll"
Command32=""
Name="ccCore"
HelpContextID="0"
CompatibleMode="1"
CompatibleEXE32="ccCore.dll"
MajorVer=1
MinorVer=0
RevisionVer=3
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="Imspire.com"
CompilationType=-1
OptimizationType=0
FavorPentiumPro(tm)=0
CodeViewDebugInfo=0
NoAliasing=0
BoundsCheck=0
OverflowCheck=0
FlPointCheck=0
FDIVCheck=0
UnroundedFP=0
StartMode=1
Unattended=0
Retained=0
ThreadPerObject=0
MaxNumberOfThreads=1
DebugStartupOption=0
[MS Transaction Server]
AutoRefresh=1
--- NEW FILE: ccCore.vbw ---
basMain = 0, 0, 0, 0, C
cUpdate = 0, 0, 0, 0, C
cServer = 0, 0, 0, 0, C
cRegistration = 0, 0, 0, 0, C
cPerfMonData = 0, 0, 0, 0, C
cPerfMon = 0, 0, 0, 0, C
cNet = 0, 0, 0, 0, C
cEventLog = 0, 0, 0, 0, C
cDebug = 0, 0, 0, 0, C
cCallStack = 0, 0, 0, 0, C
cUIInterface = 0, 0, 0, 0, C
cCore = 0, 0, 0, 0, C
|
|
From: <ple...@us...> - 2003-11-17 11:44:02
|
Update of /cvsroot/swebs/swebswebserver/winui/ccTranslator
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui/ccTranslator
Added Files:
basMain.bas cText.cls ccTranslator.csi ccTranslator.dll
ccTranslator.exp ccTranslator.lib ccTranslator.lvw
ccTranslator.vbp ccTranslator.vbw
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: basMain.bas ---
Attribute VB_Name = "basMain"
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Util As cUtil
Public strLang As String
Public Sub Main()
Set Util = New cUtil
End Sub
--- NEW FILE: cText.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cTranslate"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = True
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Public Function GetText(strString As String) As String
Dim strResult As String
If strString <> "Lang-Maintainer" Then
strResult = Util.GetTaggedData(strLang, "lang base=" & Chr$(34) & strString & Chr$(34), "lang")
Else
strResult = Util.GetTaggedData(strLang, strString)
End If
strResult = Util.CUnescape(strResult)
If strResult <> "" Then
GetText = strResult
Else
GetText = Util.CUnescape(strString)
End If
End Function
Public Sub LoadLang(strLangID As String, strLangFile As String)
Dim strLangTemp As String
If Dir$(strLangFile) <> "" Then
strLangTemp = Space$(FileLen(strLangFile))
Open strLangFile For Binary As 1
Get #1, 1, strLangTemp
Close 1
strLang = Util.GetTaggedData(strLangTemp, "lang-code id=" & Chr$(34) & strLangID & Chr$(34), "lang-code")
strLang = Trim$(strLang)
strLang = Replace(strLang, vbCrLf, "")
strLang = Replace(strLang, Chr$(9), "")
End If
End Sub
--- NEW FILE: ccTranslator.csi ---
[History]
B0=ccTranslator/basMain/Main
B1=ccTranslator/basMain
B2=ccTranslator/cTranslate/GetText
B3=ccTranslator/cTranslate
B4=ccTranslator/cTranslate/LoadLang
--- NEW FILE: ccTranslator.dll ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccTranslator.exp ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccTranslator.lib ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccTranslator.lvw ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: ccTranslator.vbp ---
Type=OleDll
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\ccUtil\ccUtil.dll#
Class=cTranslate; cText.cls
Module=basMain; basMain.bas
Startup="Sub Main"
HelpFile=""
ExeName32="ccTranslator.dll"
Command32=""
Name="ccTranslator"
HelpContextID="0"
CompatibleMode="2"
CompatibleEXE32="ccTranslator.dll"
VersionCompatible32="1"
MajorVer=1
MinorVer=0
RevisionVer=0
AutoIncrementVer=0
ServerSupportFiles=0
VersionCompanyName="Imspire.com"
CompilationType=0
OptimizationType=0
FavorPentiumPro(tm)=0
CodeViewDebugInfo=0
NoAliasing=0
BoundsCheck=0
OverflowCheck=0
FlPointCheck=0
FDIVCheck=0
UnroundedFP=0
StartMode=1
Unattended=0
Retained=0
ThreadPerObject=0
MaxNumberOfThreads=1
ThreadingModel=1
DebugStartupOption=0
[MS Transaction Server]
AutoRefresh=1
--- NEW FILE: ccTranslator.vbw ---
cTranslate = 0, 0, 0, 0, C
basMain = 0, 0, 0, 0, C
|
|
From: <ple...@us...> - 2003-11-16 15:20:51
|
Update of /cvsroot/swebs/swebswebserver/winui/ccCore In directory sc8-pr-cvs1:/tmp/cvs-serv4250/ccCore Log Message: Directory /cvsroot/swebs/swebswebserver/winui/ccCore added to the repository |
|
From: <ple...@us...> - 2003-11-16 15:20:51
|
Update of /cvsroot/swebs/swebswebserver/winui/ccTranslator In directory sc8-pr-cvs1:/tmp/cvs-serv4250/ccTranslator Log Message: Directory /cvsroot/swebs/swebswebserver/winui/ccTranslator added to the repository |
|
From: <ple...@us...> - 2003-11-16 15:20:51
|
Update of /cvsroot/swebs/swebswebserver/winui/ccHTTP In directory sc8-pr-cvs1:/tmp/cvs-serv4250/ccHTTP Log Message: Directory /cvsroot/swebs/swebswebserver/winui/ccHTTP added to the repository |
|
From: <ple...@us...> - 2003-11-16 15:20:51
|
Update of /cvsroot/swebs/swebswebserver/winui/ccUtil In directory sc8-pr-cvs1:/tmp/cvs-serv4250/ccUtil Log Message: Directory /cvsroot/swebs/swebswebserver/winui/ccUtil added to the repository |
|
From: <sw...@us...> - 2003-11-15 23:20:48
|
Update of /cvsroot/swebs/SWEBS Server/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv27515/Source
Modified Files:
SWEBSConnection.cpp SWEBSGlobals.cpp SWEBSMain.cpp
SWEBSSocket.cpp
Log Message:
Working version with ISAPI enabled. WOOHOO!
Index: SWEBSGlobals.cpp
===================================================================
RCS file: /cvsroot/swebs/SWEBS Server/Source/SWEBSGlobals.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SWEBSGlobals.cpp 15 Oct 2003 09:29:53 -0000 1.1
+++ SWEBSGlobals.cpp 15 Nov 2003 23:20:24 -0000 1.2
@@ -156,6 +156,48 @@
delete curNode;
}
+ // Loop through with the ISAPI entries
+ int Counter = 0;
+ map <int, string> CGIs;
+ node = xml.SearchForTag(0,"ISAPI");
+ while (node)
+ {
+ // Map Extension to Interpreter
+ node2 = xml.SearchForTag(node, "Extension");
+ string cExt;
+ if (node2)
+ {
+ cExt = node2->get_Content();
+ }
+
+ node2 = xml.SearchForTag(node, "Interpreter");
+ if (node2)
+ {
+ IsapiDLLExtensions[cExt] = node2->get_Content();
+ CGIs[Counter] = cExt;
+ }
+
+ CkXml *curNode = node;
+ Counter++;
+ node = xml.SearchForTag(curNode,"ISAPI");
+ delete curNode;
+ }
+
+ // All the ISAPI dll's have been named etc, lets load them.
+ Counter = 0;
+ while (CGIs[Counter].length() > 0)
+ {
+ IsapiDLL[ CGIs[Counter] ] = LoadLibrary(IsapiDLLExtensions[ CGIs[Counter] ].c_str());
+ if(IsapiDLL[ CGIs[Counter] ] == NULL)
+ {
+ string MsgText = "Could not load ISAPI module ";
+ MsgText += IsapiDLLExtensions[ CGIs[Counter] ];
+ MsgText += "!";
+ MessageBox(NULL, MsgText.c_str(), "SWEBS", MB_OK);
+ }
+ Counter++;
+ }
+
// Index files
node = xml.SearchForTag(0,"IndexFile");
int X = 0;
Index: SWEBSMain.cpp
===================================================================
RCS file: /cvsroot/swebs/SWEBS Server/Source/SWEBSMain.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SWEBSMain.cpp 1 Nov 2003 01:22:13 -0000 1.5
+++ SWEBSMain.cpp 15 Nov 2003 23:20:24 -0000 1.6
@@ -345,11 +345,11 @@
SWEBSGlobals.ErrorCodes[302] = "Moved Temporarily";
SWEBSGlobals.ErrorCodes[500] = "Internal Server Error";
- //!=============================================================================
+ /*//!=============================================================================
// This is for ISAPI testing, remove after
SWEBSGlobals.IsapiDLLExtensions["php"] = "C:\\PHP\\php-4.3.1-Win32\\SAPI\\php4isapi.dll";
- SWEBSGlobals.IsapiDLL["php"]= LoadLibrary(SWEBSGlobals.IsapiDLLExtensions["php"].c_str());// Loads the DLL
+ SWEBSGlobals.IsapiDLL["php"]= LoadLibrary(SWEBSGlobals.IsapiDLLExtensions["php"].c_str());// Loads the DLL*/
//------------------------------------------------------------------------------
// Step 3: Start web server
@@ -464,14 +464,6 @@
CONNECTION NewConn(Arg->SFD, Arg->CLA);
NewConn.ReadRequest(); // Read in the request
NewConn.HandleRequest(); // Handle the request
-
- /*while (NewConn.ConnectionType == "Keep-Alive")
- {
- NewConn.Clear();
- NewConn.ReadRequest();
- NewConn.HandleRequest();
- else break;
- }*/
closesocket(Arg->SFD);
return 0;
}
Index: SWEBSSocket.cpp
===================================================================
RCS file: /cvsroot/swebs/SWEBS Server/Source/SWEBSSocket.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SWEBSSocket.cpp 1 Nov 2003 01:22:13 -0000 1.3
+++ SWEBSSocket.cpp 15 Nov 2003 23:20:24 -0000 1.4
@@ -18,6 +18,16 @@
using namespace std;
#pragma comment(lib, "wsock32.lib")
+DWORD WINAPI TimeoutThread(LPVOID lpParam);
+
+DWORD WINAPI TimeoutThread(LPVOID lpParam)
+{
+ int SFD = (int)lpParam;
+ Sleep(60000);
+ closesocket(SFD);
+ return true;
+}
+
//----------------------------------------------------------------------------------
// Send()
// Our own version of send(), so that we can keep track of whats being sent
@@ -44,6 +54,23 @@
{
string Temp;
char Buffer[0x1000] = "";
+ DWORD dwThreadId;
+ HANDLE hThread;
+
+ // Before we start reading, create our timeout thread
+ hThread = CreateThread(
+ NULL, // default security attributes
+ 0, // use default stack size
+ TimeoutThread, // thread function
+ &SFD, // argument to thread function
+ 0, // use default creation flags
+ &dwThreadId
+ ); // returns the thread identifier
+
+ if (hThread != NULL) // If the thread was created, destroy it
+ {
+ CloseHandle( hThread );
+ }
int X = recv(SFD, Buffer, 0x1000, 0);
while ( X > 0 )
|
|
From: <sw...@us...> - 2003-11-15 23:20:47
|
Update of /cvsroot/swebs/SWEBS Server/SWEBS/Release In directory sc8-pr-cvs1:/tmp/cvs-serv27515/SWEBS/Release Modified Files: SWEBS.dll Log Message: Working version with ISAPI enabled. WOOHOO! |
|
From: <ple...@us...> - 2003-11-15 14:16:53
|
Update of /cvsroot/swebs/swebswebserver/winui In directory sc8-pr-cvs1:/tmp/cvs-serv2022/swebswebserver/winui Added Files: cCallStack.cls Log Message: This shouldn't have went away... |
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv1511/swebswebserver/winui
Modified Files:
ChangeLog.txt WinUI.lvw WinUI.vbp WinUI.vbw basMain.bas
cDebug.cls cWinUI.cls credits.rtf frmAbout.frm frmAbout.frx
frmMain.frm frmMain.frx llinksel.cur swebscc.exe
Added Files:
cPerfMon.cls cPerfMonData.cls frmNewISAPI.frm frmNewISAPI.frx
Removed Files:
SubclassingSink.idl SubclassingSink.tlb cCallStack.cls
cHookingThunk.cls cMemDC.cls cMenuHook.cls
cSubclassingThunk.cls ctxHookMenu.ctl ctxHookMenu.ctx
pagBitmaps.pag pagBitmaps.pgx
Log Message:
Ok, this is where I say this isn't as big as it looks.. well, this time it is... I now present to you, the new UI :) (BTW: This is only half tested so who knows whats going to happen..)
--- NEW FILE: cPerfMon.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cPerfMon"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Private Declare Function QueryPerformanceCounter Lib "kernel32" (lpPerformanceCount As Currency) As Long
Private Declare Function QueryPerformanceFrequency Lib "kernel32" (lpFrequency As Currency) As Long
Private mCol As Collection
Private curFreq As Currency
Private strPerfLog As String
Private mvarEnabled As Boolean
Private lngCallCount As Long
Private curTotalTime As Currency
Public Property Let Enabled(ByVal vData As Boolean)
'<EhHeader>
On Error GoTo Enabled_Err
'</EhHeader>
100 mvarEnabled = vData
'<EhFooter>
Exit Property
Enabled_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Enabled", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Get Enabled() As Boolean
'<EhHeader>
On Error GoTo Enabled_Err
'</EhHeader>
100 Enabled = mvarEnabled
'<EhFooter>
Exit Property
Enabled_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Enabled", Erl, False
Resume Next
'</EhFooter>
End Property
Public Sub Add(strFunction As String)
'<EhHeader>
On Error GoTo Add_Err
'</EhHeader>
Dim tData As cPerfMonData
Dim curStartTime As Currency
100 Set tData = New cPerfMonData
104 tData.Name = strFunction
108 QueryPerformanceCounter curStartTime
112 tData.StartTime = curStartTime
116 tData.StopTime = 0
120 mCol.Add tData, strFunction
124 Set tData = Nothing
'<EhFooter>
Exit Sub
Add_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Add", Erl, False
Resume Next
'</EhFooter>
End Sub
Public Sub Remove(strFunction As String)
'<EhHeader>
On Error GoTo Remove_Err
'</EhHeader>
Dim tData As cPerfMonData
Dim curExecTime As Currency
Dim curStopTime As Currency
Dim strFixedFunction As String * 50
100 Set tData = mCol.Item(strFunction)
104 QueryPerformanceCounter curStopTime
108 tData.StopTime = curStopTime
112 curExecTime = 1000 * (tData.StopTime - tData.StartTime) / curFreq
116 curTotalTime = curTotalTime + curExecTime
120 lngCallCount = lngCallCount + 1
124 strFixedFunction = strFunction
128 strPerfLog = strPerfLog & "Function: " & strFixedFunction & String(2, Chr(9)) & "Execution Time: " & Space(18 - Len(Format(Str(curExecTime), "#.0000"))) & Format(Str(curExecTime), "#.0000") & vbCrLf
132 mCol.Remove strFunction
136 Set tData = Nothing
'<EhFooter>
Exit Sub
Remove_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Remove", Erl, False
Resume Next
'</EhFooter>
End Sub
Public Function Save(strFile As String) As Boolean
'<EhHeader>
On Error GoTo Save_Err
'</EhHeader>
100 strPerfLog = strPerfLog & "Statistics: Call Count: " & lngCallCount & " Average Execution Time: " & (curTotalTime / lngCallCount) & vbCrLf & String(103, "*") & vbCrLf
104 Open strFile For Append As 1
108 Print #1, strPerfLog
112 Close 1
116 Save = True
'<EhFooter>
Exit Function
Save_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Save", Erl, False
Resume Next
'</EhFooter>
End Function
Private Sub Class_Initialize()
'<EhHeader>
On Error GoTo Class_Initialize_Err
'</EhHeader>
100 Set mCol = New Collection
104 QueryPerformanceFrequency curFreq
108 strPerfLog = String(103, "*") & vbCrLf & "Application Started: " & Now & vbCrLf
'<EhFooter>
Exit Sub
Class_Initialize_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMon.Class_Initialize", Erl, False
Resume Next
'</EhFooter>
End Sub
Private Sub Class_Terminate()
'<EhHeader>
On Error Resume Next
'</EhHeader>
Set mCol = Nothing
End Sub
--- NEW FILE: cPerfMonData.cls ---
VERSION 1.0 CLASS
BEGIN
MultiUse = -1 'True
Persistable = 0 'NotPersistable
DataBindingBehavior = 0 'vbNone
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
Attribute VB_Name = "cPerfMonData"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
Attribute VB_Exposed = False
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
'CSEH: WinUI - Custom(No Stack)
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
'local variable(s) to hold property value(s)
Private mvarStartTime As Currency
Private mvarStopTime As Currency
Private mvarName As String
Public Property Let Name(ByVal vData As String)
'<EhHeader>
On Error GoTo Name_Err
'</EhHeader>
100 mvarName = vData
'<EhFooter>
Exit Property
Name_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.Name", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Get Name() As String
'<EhHeader>
On Error GoTo Name_Err
'</EhHeader>
100 Name = mvarName
'<EhFooter>
Exit Property
Name_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.Name", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Let StopTime(ByVal vData As Currency)
'<EhHeader>
On Error GoTo StopTime_Err
'</EhHeader>
100 mvarStopTime = vData
'<EhFooter>
Exit Property
StopTime_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.StopTime", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Get StopTime() As Currency
'<EhHeader>
On Error GoTo StopTime_Err
'</EhHeader>
100 StopTime = mvarStopTime
'<EhFooter>
Exit Property
StopTime_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.StopTime", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Let StartTime(ByVal vData As Currency)
'<EhHeader>
On Error GoTo StartTime_Err
'</EhHeader>
100 mvarStartTime = vData
'<EhFooter>
Exit Property
StartTime_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.StartTime", Erl, False
Resume Next
'</EhFooter>
End Property
Public Property Get StartTime() As Currency
'<EhHeader>
On Error GoTo StartTime_Err
'</EhHeader>
100 StartTime = mvarStartTime
'<EhFooter>
Exit Property
StartTime_Err:
DisplayErrMsg Err.Description, "SWEBS_WinUI.cPerfMonData.StartTime", Erl, False
Resume Next
'</EhFooter>
End Property
--- NEW FILE: frmNewISAPI.frm ---
VERSION 5.00
Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX"
Begin VB.Form frmNewISAPI
BackColor = &H00FFFFFF&
BorderStyle = 4 'Fixed ToolWindow
Caption = "Add New ISAPI Plugin"
ClientHeight = 3060
ClientLeft = 45
ClientTop = 315
ClientWidth = 6240
Icon = "frmNewISAPI.frx":0000
LinkTopic = "Form1"
MaxButton = 0 'False
MinButton = 0 'False
ScaleHeight = 3060
ScaleWidth = 6240
ShowInTaskbar = 0 'False
StartUpPosition = 2 'CenterScreen
Begin MSComDlg.CommonDialog dlgMain
Left = 5520
Top = 2400
_ExtentX = 847
_ExtentY = 847
_Version = 393216
End
Begin VB.TextBox txtNewISAPIInterp
Height = 285
Left = 600
TabIndex = 2
Top = 1440
Width = 4695
End
Begin VB.TextBox txtNewISAPIExt
Height = 285
Left = 600
TabIndex = 1
Top = 2160
Width = 1935
End
Begin VB.Label lblBrowse
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "&Browse"
BeginProperty Font
Name = "Arial"
Size = 9
Charset = 0
Weight = 700
Underline = -1 'True
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
ForeColor = &H00FF0000&
Height = 225
Left = 5400
MouseIcon = "frmNewISAPI.frx":0CCA
MousePointer = 99 'Custom
TabIndex = 8
Top = 1440
Width = 660
End
Begin VB.Label lblCancel
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "&Cancel"
BeginProperty Font
Name = "Arial"
Size = 9
Charset = 0
Weight = 700
Underline = -1 'True
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
ForeColor = &H00FF0000&
Height = 225
Left = 3195
MouseIcon = "frmNewISAPI.frx":0E1C
MousePointer = 99 'Custom
TabIndex = 7
Top = 2640
Width = 585
End
Begin VB.Label lblOK
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "&OK"
BeginProperty Font
Name = "Arial"
Size = 9
Charset = 0
Weight = 700
Underline = -1 'True
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
ForeColor = &H00FF0000&
Height = 225
Left = 2640
MouseIcon = "frmNewISAPI.frx":0F6E
MousePointer = 99 'Custom
TabIndex = 6
Top = 2640
Width = 255
End
Begin VB.Label lblNewISAPITitle
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "Add a new ISAPI interpreter:"
Height = 195
Left = 120
TabIndex = 5
Top = 840
Width = 2010
End
Begin VB.Label lblNewISAPIInterp
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "Where is the executable that will interpret this script type?"
Height = 195
Left = 360
TabIndex = 4
Top = 1200
Width = 4050
End
Begin VB.Label lblNewISAPIIExt
AutoSize = -1 'True
BackStyle = 0 'Transparent
Caption = "What is the file extension for this file type?"
Height = 195
Left = 360
TabIndex = 3
Top = 1920
Width = 2955
End
Begin VB.Label lblTitle
BackStyle = 0 'Transparent
Caption = "Add New ISAPI Plugin"
BeginProperty Font
Name = "Arial"
Size = 14.25
Charset = 0
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
ForeColor = &H00000000&
Height = 330
Left = 120
TabIndex = 0
Top = 120
Width = 2850
End
Begin VB.Line Line1
X1 = 6330
X2 = 0
Y1 = 600
Y2 = 600
End
Begin VB.Shape shpTitle
BackColor = &H0062D0F4&
BackStyle = 1 'Opaque
BorderStyle = 0 'Transparent
Height = 615
Left = 0
Top = 0
Width = 6330
End
End
Attribute VB_Name = "frmNewISAPI"
Attribute VB_GlobalNameSpace = False
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
'CSEH: WinUI - Custom
'***************************************************************************
'
' SWEBS/WinUI
'
' Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation; either version 2 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program; if not, write to the Free Software
' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
'***************************************************************************
Option Explicit
Private Sub Form_Load()
lblNewISAPITitle.Caption = WinUI.GetTranslatedText("Add a new CGI interpreter:")
lblNewISAPIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret this script type?")
lblNewISAPIIExt.Caption = WinUI.GetTranslatedText("What is the file extension for this file type?")
lblBrowse.Caption = WinUI.GetTranslatedText("&Browse")
lblOK.Caption = WinUI.GetTranslatedText("&OK")
lblCancel.Caption = WinUI.GetTranslatedText("&Cancel")
End Sub
Private Sub lblBrowse_Click()
dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
dlgMain.Filter = WinUI.GetTranslatedText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
dlgMain.ShowSave
If dlgMain.FileName <> "" Then
txtNewISAPIInterp.Text = dlgMain.FileName
End If
End Sub
Private Sub lblCancel_Click()
Unload Me
End Sub
Private Sub lblOK_Click()
If txtNewISAPIInterp.Text <> "" And txtNewISAPIExt.Text <> "" Then
WinUI.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
Unload Me
Else
MsgBox WinUI.GetTranslatedText("Please fill all fields.")
End If
End Sub
--- NEW FILE: frmNewISAPI.frx ---
(This appears to be a binary file; contents omitted.)
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/ChangeLog.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog.txt 8 Nov 2003 10:09:58 -0000 1.28
+++ ChangeLog.txt 15 Nov 2003 14:15:01 -0000 1.29
@@ -27,7 +27,7 @@
# Removed DynDNS support.
# Removed serveral external dependincies.
# Added useless but cool form fading on the splash screen (Win2000+).
-# Office XP style menus (Vlad Vissoultchev).
+# Redesigned user interface.
0.9.8 (09/22/2003)
------------------
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvsaqdk90 and /tmp/cvs4Kg09T differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- WinUI.vbp 11 Nov 2003 10:00:47 -0000 1.67
+++ WinUI.vbp 15 Nov 2003 14:15:05 -0000 1.68
@@ -1,9 +1,7 @@
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
-Reference=*\G{63441E51-0F47-4888-B620-88BAC83A4C1F}#1.0#0#C:\Documents and Settings\Adam\My Documents\Projects\swebs\swebswebserver\winui\SubclassingSink.tlb#Subclassing/Hooking sink interfaces 1.0
Reference=*\G{7D521758-175B-48CB-AB02-4973824A3241}#1.0#0#C:\WINDOWS\System32\MSINET.oca#Microsoft Internet Transfer Control 6.0 (SP4)
-Object={77EBD0B1-871A-4AD1-951A-26AEFE783111}#2.0#0; vbalExpBar6.ocx
Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
Module=basMain; basMain.bas
@@ -33,13 +31,10 @@
Class=cHTTPVirtHostCol; cHTTPVirtHostCol.cls
Class=cSysTray; cSysTray.cls
Module=basExceptionFilter; basExceptionFilter.bas
-UserControl=ctxHookMenu.ctl
-PropertyPage=pagBitmaps.pag
-Class=cMenuHook; cMenuHook.cls
-Class=cMemDC; cMemDC.cls
-Class=cSubclassingThunk; cSubclassingThunk.cls
-Class=cHookingThunk; cHookingThunk.cls
Class=cCallStack; cCallStack.cls
+Form=frmNewISAPI.frm
+Class=cPerfMon; cPerfMon.cls
+Class=cPerfMonData; cPerfMonData.cls
IconForm="frmMain"
Startup="Sub Main"
HelpFile=""
@@ -52,15 +47,14 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=185
+RevisionVer=187
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
VersionFileDescription="SWEBS Windows UI"
VersionLegalCopyright="Copyright© 2003 Adam Caudill"
VersionProductName="SWEBS Web Server"
-CondComp="DontHookMenu = 1"
-CompilationType=0
+CompilationType=-1
OptimizationType=0
FavorPentiumPro(tm)=-1
CodeViewDebugInfo=0
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- WinUI.vbw 11 Nov 2003 10:00:47 -0000 1.24
+++ WinUI.vbw 15 Nov 2003 14:15:05 -0000 1.25
@@ -1,5 +1,5 @@
basMain = 89, 133, 1146, 784, C
-frmMain = 109, 271, 1164, 924, , 24, 19, 746, 443, C
+frmMain = 117, 303, 1172, 956, , 94, 38, 955, 630, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
frmAbout = 66, 87, 1068, 811, C, 88, 116, 506, 650, C
@@ -12,23 +12,20 @@
cRegistration = 154, 203, 1156, 927, C
cNet = 22, 29, 1024, 753, C
cEventLog = 132, 174, 1134, 898, C
-cDebug = 122, 268, 1124, 992, C
+cDebug = 77, 164, 1079, 888, C
cServer = 0, 0, 1002, 724, C
-cHTTP = 109, 185, 1111, 909,
+cHTTP = 72, 102, 1074, 826, C
cHTTPStats = 88, 116, 1090, 840, C
cHTTPConfig = 44, 58, 1046, 782, C
cHTTPISAPI = 241, 157, 1243, 881, C
cHTTPISAPICol = 176, 232, 1178, 956, C
cHTTPIndex = 44, 58, 1046, 782, C
-cHTTPIndexCol = 154, 203, 1156, 927, C
+cHTTPIndexCol = 32, 54, 1034, 778, C
cHTTPVirtHost = 110, 145, 1112, 869, C
cHTTPVirtHostCol = 132, 174, 1134, 898, C
cSysTray = 198, 261, 1200, 985, C
-basExceptionFilter = 242, 319, 1244, 1043, C
-ctxHookMenu = 242, 319, 1244, 1043, C, 0, 0, 1002, 724, C
-pagBitmaps = 0, 0, 1002, 724, C, 22, 29, 1024, 753, C
-cMenuHook = 44, 58, 1046, 782, C
-cMemDC = 66, 87, 1068, 811, C
-cSubclassingThunk = 22, 29, 1024, 753, C
-cHookingThunk = 88, 116, 1090, 840, C
-cCallStack = 3, 0, 1002, 724, C
+basExceptionFilter = 242, 319, 1244, 1043,
+cCallStack = 22, 29, 1024, 753, C
+frmNewISAPI = 0, 0, 0, 0, C, 0, 0, 0, 0, C
+cPerfMon = 183, 286, 1185, 1010, C
+cPerfMonData = 44, 58, 1046, 782, C
Index: basMain.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basMain.bas,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- basMain.bas 8 Nov 2003 09:01:39 -0000 1.56
+++ basMain.bas 15 Nov 2003 14:15:05 -0000 1.57
@@ -25,10 +25,6 @@
Public WinUI As cWinUI
-Public g_oMenuHook As cHookingThunk
-Public g_oMenuHookImpl As cMenuHook
-Public g_oCurrentMenu As ctxHookMenu
-
'CLI Option variables
Dim blnNoSplash As Boolean
Dim blnTrayOnly As Boolean
@@ -37,6 +33,7 @@
Dim blnNoUpdate As Boolean
Dim blnKillUpdate As Boolean
Dim blnDebugMode As Boolean
+Dim blnPerfMon As Boolean
'CSEH: WinUI - Custom(No Stack)
Public Sub Main()
@@ -53,43 +50,44 @@
128 If blnNoUpdate = True Then WinUI.Debuger.DisableUpdate = True
132 If blnKillUpdate = True Then WinUI.Debuger.KillUpdate
136 If blnDebugMode = True Then WinUI.Debuger.DebugMode = True
+140 If blnPerfMon = True Then WinUI.Debuger.PerfMon.Enabled = True
-140 If WinUI.Debuger.DisableSplash <> True Then
-144 Load frmSplash
-148 WinUI.Util.FormFade frmSplash, False
+144 If WinUI.Debuger.DisableSplash <> True Then
+148 Load frmSplash
+152 WinUI.Util.FormFade frmSplash, False
End If
-152 If App.PrevInstance = True Then
-156 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
-160 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
-164 End
+156 If App.PrevInstance = True Then
+160 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
+164 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
+168 End
End If
-168 End
+172 End
End If
-172 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
-176 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
-180 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
-184 End
+176 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
+180 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
+184 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
+188 End
End If
-188 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
-192 If WinUI.Net.IsOnline = True Then
-196 If WinUI.Registration.IsRegistered = False Then
-200 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
-204 WinUI.Registration.Start
+192 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
+196 If WinUI.Net.IsOnline = True Then
+200 If WinUI.Registration.IsRegistered = False Then
+204 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
+208 WinUI.Registration.Start
End If
End If
-208 Load frmMain
-212 If WinUI.Debuger.DisableSplash <> True Then
-216 WinUI.Util.FormFade frmSplash, True
-220 Unload frmSplash
-224 DoEvents
+212 Load frmMain
+216 If WinUI.Debuger.DisableSplash <> True Then
+220 WinUI.Util.FormFade frmSplash, True
+224 Unload frmSplash
+228 DoEvents
End If
-228 If blnTrayOnly <> True Then
-232 frmMain.Show
+232 If blnTrayOnly <> True Then
+236 frmMain.Show
End If
-236 If WinUI.Debuger.DisableTips <> True Then
-240 If LCase$(WinUI.Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
-244 Load frmTip
-248 frmTip.Show vbModal
+240 If WinUI.Debuger.DisableTips <> True Then
+244 If LCase$(WinUI.Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
+248 Load frmTip
+252 frmTip.Show vbModal
End If
End If
'<EhFooter>
@@ -159,9 +157,11 @@
152 blnKillUpdate = True
156 Case "--debug"
160 blnDebugMode = True
-164 Case Else
-168 MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug", vbApplicationModal + vbCritical
-172 End
+164 Case "--perfmon"
+168 blnPerfMon = True
+172 Case Else
+176 MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug" & vbCrLf & "--perfmon", vbApplicationModal + vbCritical
+180 End
End Select
Next
'<EhFooter>
Index: cDebug.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cDebug.cls,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cDebug.cls 8 Nov 2003 09:01:40 -0000 1.5
+++ cDebug.cls 15 Nov 2003 14:15:06 -0000 1.6
@@ -38,6 +38,7 @@
Option Explicit
Public CallStack As cCallStack
+Public PerfMon As cPerfMon
'local variable(s) to hold property value(s)
Private mvarEnabled As Boolean 'local copy
@@ -326,6 +327,7 @@
On Error GoTo Class_Initialize_Err
'</EhHeader>
100 Set CallStack = New cCallStack
+104 Set PerfMon = New cPerfMon
'<EhFooter>
Exit Sub
@@ -340,6 +342,7 @@
On Error Resume Next
'</EhHeader>
Set CallStack = Nothing
+ Set PerfMon = Nothing
End Sub
Public Sub Setup()
Index: cWinUI.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cWinUI.cls,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cWinUI.cls 18 Oct 2003 15:35:27 -0000 1.11
+++ cWinUI.cls 15 Nov 2003 14:15:06 -0000 1.12
@@ -108,6 +108,9 @@
'<EhHeader>
On Error Resume Next
'</EhHeader>
+ If Debuger.PerfMon.Enabled = True Then
+ Debuger.PerfMon.Save mvarPath & "ccperfmon.log"
+ End If
Set EventLog = Nothing
Set Registration = Nothing
Set Update = Nothing
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvsh83ANb and /tmp/cvsgwhInd differ
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- frmAbout.frm 5 Nov 2003 21:39:21 -0000 1.35
+++ frmAbout.frm 15 Nov 2003 14:15:06 -0000 1.36
@@ -27,7 +27,7 @@
BorderStyle = 0
ReadOnly = -1 'True
ScrollBars = 2
- FileName = "C:\Documents and Settings\Adam\My Documents\Projects\swebs\swebswebserver\winui\credits.rtf"
+ FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
TextRTF = $"frmAbout.frx":0CCA
End
Begin VB.CommandButton cmdClose
@@ -53,7 +53,7 @@
ForeColor = &H00FF0000&
Height = 195
Left = 120
- MouseIcon = "frmAbout.frx":173F
+ MouseIcon = "frmAbout.frx":1632
MousePointer = 99 'Custom
TabIndex = 4
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
@@ -63,7 +63,7 @@
Begin VB.Image imgLogo
Height = 480
Left = 600
- Picture = "frmAbout.frx":1A49
+ Picture = "frmAbout.frx":193C
Top = 120
Width = 480
End
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
Binary files /tmp/cvshrozij and /tmp/cvsaJIrls differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- frmMain.frm 8 Nov 2003 10:09:59 -0000 1.77
+++ frmMain.frm 15 Nov 2003 14:15:06 -0000 1.78
@@ -1,173 +1,214 @@
VERSION 5.00
-Object = "{77EBD0B1-871A-4AD1-951A-26AEFE783111}#2.0#0"; "vbalExpBar6.ocx"
Object = "{3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0"; "RICHTX32.OCX"
Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX"
Begin VB.Form frmMain
+ BackColor = &H00FFFFFF&
BorderStyle = 1 'Fixed Single
Caption = "SWEBS Web Server - Control Center"
- ClientHeight = 4290
+ ClientHeight = 7305
ClientLeft = 150
[...3950 lines suppressed...]
-120 Case "advanced"
-124 fraConfigAdv.ZOrder 0
-128 Case "vhost"
-132 fraConfigvHost.ZOrder 0
-136 Case "isapi"
-140 fraConfigISAPI.ZOrder 0
-144 Case "logs"
-148 fraLogs.ZOrder 0
- End Select
-152 vbaSideBar.ZOrder 0
-156 WinUI.Util.StopWinUpdate
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-vbaSideBar_ItemClick_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.vbaSideBar_ItemClick", Erl, False
Resume Next
'</EhFooter>
End Sub
Index: frmMain.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvsTvFvMC and /tmp/cvsGbi0d5 differ
Index: llinksel.cur
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/llinksel.cur,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsK5rUFE and /tmp/cvsCcBpub differ
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
Binary files /tmp/cvsLsqOjH and /tmp/cvs4JIjXl differ
--- SubclassingSink.idl DELETED ---
--- SubclassingSink.tlb DELETED ---
--- cCallStack.cls DELETED ---
--- cHookingThunk.cls DELETED ---
--- cMemDC.cls DELETED ---
--- cMenuHook.cls DELETED ---
--- cSubclassingThunk.cls DELETED ---
--- ctxHookMenu.ctl DELETED ---
--- ctxHookMenu.ctx DELETED ---
--- pagBitmaps.pag DELETED ---
--- pagBitmaps.pgx DELETED ---
|
|
From: <ple...@us...> - 2003-11-11 10:01:13
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv19786/swebswebserver/winui
Modified Files:
WinUI.vbp WinUI.vbw swebscc.exe
Log Message:
Nothing big, just commiting whatevers changed, feel free to ignore this.
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- WinUI.vbp 8 Nov 2003 10:09:59 -0000 1.66
+++ WinUI.vbp 11 Nov 2003 10:00:47 -0000 1.67
@@ -1,8 +1,8 @@
Type=Exe
-Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation
-Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#..\..\..\..\..\..\..\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
-Reference=*\G{63441E51-0F47-4888-B620-88BAC83A4C1F}#1.0#0#SubclassingSink.tlb#Subclassing/Hooking sink interfaces 1.0
-Reference=*\G{7D521758-175B-48CB-AB02-4973824A3241}#1.0#0#..\..\..\..\..\..\..\WINDOWS\System32\MSINET.oca#Microsoft Internet Transfer Control 6.0 (SP4)
+Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
+Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
+Reference=*\G{63441E51-0F47-4888-B620-88BAC83A4C1F}#1.0#0#C:\Documents and Settings\Adam\My Documents\Projects\swebs\swebswebserver\winui\SubclassingSink.tlb#Subclassing/Hooking sink interfaces 1.0
+Reference=*\G{7D521758-175B-48CB-AB02-4973824A3241}#1.0#0#C:\WINDOWS\System32\MSINET.oca#Microsoft Internet Transfer Control 6.0 (SP4)
Object={77EBD0B1-871A-4AD1-951A-26AEFE783111}#2.0#0; vbalExpBar6.ocx
Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
@@ -52,7 +52,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=184
+RevisionVer=185
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- WinUI.vbw 8 Nov 2003 09:01:39 -0000 1.23
+++ WinUI.vbw 11 Nov 2003 10:00:47 -0000 1.24
@@ -1,24 +1,24 @@
basMain = 89, 133, 1146, 784, C
-frmMain = 109, 271, 1164, 924, C, 24, 19, 746, 443, C
+frmMain = 109, 271, 1164, 924, , 24, 19, 746, 443, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
frmAbout = 66, 87, 1068, 811, C, 88, 116, 506, 650, C
frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C
-frmSplash = 0, 0, 0, 0, C, 220, 290, 1222, 1014, C
+frmSplash = 198, 261, 1200, 985, C, 220, 290, 1222, 1014, C
frmUpdate = 154, 203, 1156, 927, C, 176, 232, 1178, 956, C
-cWinUI = 84, 172, 1086, 896,
-cUtil = 44, 58, 1046, 782,
-cUpdate = 44, 58, 1046, 782,
-cRegistration = 154, 203, 1156, 927,
+cWinUI = 84, 172, 1086, 896, C
+cUtil = 44, 58, 1046, 782, C
+cUpdate = 44, 58, 1046, 782, C
+cRegistration = 154, 203, 1156, 927, C
cNet = 22, 29, 1024, 753, C
cEventLog = 132, 174, 1134, 898, C
cDebug = 122, 268, 1124, 992, C
-cServer = 0, 0, 1002, 724,
-cHTTP = 109, 185, 1111, 909, C
+cServer = 0, 0, 1002, 724, C
+cHTTP = 109, 185, 1111, 909,
cHTTPStats = 88, 116, 1090, 840, C
cHTTPConfig = 44, 58, 1046, 782, C
-cHTTPCGI = 241, 157, 1243, 881, C
-cHTTPCGICol = 176, 232, 1178, 956, C
+cHTTPISAPI = 241, 157, 1243, 881, C
+cHTTPISAPICol = 176, 232, 1178, 956, C
cHTTPIndex = 44, 58, 1046, 782, C
cHTTPIndexCol = 154, 203, 1156, 927, C
cHTTPVirtHost = 110, 145, 1112, 869, C
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
Binary files /tmp/cvs22vQfi and /tmp/cvsiQKZJz differ
|
|
From: <ple...@us...> - 2003-11-08 10:10:08
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv31801/swebswebserver/winui
Modified Files:
ChangeLog.txt WinUI.lvw WinUI.vbp cHTTPCGI.cls cHTTPCGICol.cls
cHTTPConfig.cls cUtil.cls frmMain.frm frmMain.frx lang.xml
swebscc.exe
Log Message:
How I missed that one I dont know.... (fixed translation bug)
Also renamed all the CGI stuff to ISAPI for now, once I hear that CGI works I'll copy it and re-add support for CGI..
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/ChangeLog.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog.txt 18 Oct 2003 15:35:27 -0000 1.27
+++ ChangeLog.txt 8 Nov 2003 10:09:58 -0000 1.28
@@ -15,9 +15,11 @@
$ Added several new command line options.
$ Implemented system tray support.
$ Implemented better error handling system.
+$ Implemented support for ISPAI.
! Fixed minor display bug in the TOD form.
! Fixed some file size limitations.
! Fixed log display limitaion.
+! Fixed minor string translation bug.
# Added about 45 new tips.
# Added application status to the splash screen.
# Re-wrote all data change detection routines.
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
Binary files /tmp/cvsQn3E9K and /tmp/cvsSgSZOl differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- WinUI.vbp 8 Nov 2003 09:01:39 -0000 1.65
+++ WinUI.vbp 8 Nov 2003 10:09:59 -0000 1.66
@@ -25,8 +25,8 @@
Class=cHTTP; cHTTP.cls
Class=cHTTPStats; cHTTPStats.cls
Class=cHTTPConfig; cHTTPConfig.cls
-Class=cHTTPCGI; cHTTPCGI.cls
-Class=cHTTPCGICol; cHTTPCGICol.cls
+Class=cHTTPISAPI; cHTTPCGI.cls
+Class=cHTTPISAPICol; cHTTPCGICol.cls
Class=cHTTPIndex; cHTTPIndex.cls
Class=cHTTPIndexCol; cHTTPIndexCol.cls
Class=cHTTPVirtHost; cHTTPVirtHost.cls
@@ -52,7 +52,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=183
+RevisionVer=184
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: cHTTPCGI.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGI.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTPCGI.cls 5 Nov 2003 21:39:21 -0000 1.4
+++ cHTTPCGI.cls 8 Nov 2003 10:09:59 -0000 1.5
@@ -6,7 +6,7 @@
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
-Attribute VB_Name = "cHTTPCGI"
+Attribute VB_Name = "cHTTPISAPI"
Attribute VB_GlobalNameSpace = True
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
@@ -46,7 +46,7 @@
'Syntax: X.Extention = 5
'<EhHeader>
On Error GoTo Extension_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPI.Extension")
'</EhHeader>
100 mvarExtension = vData
'<EhFooter>
@@ -54,7 +54,7 @@
Exit Property
Extension_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPI.Extension", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -64,7 +64,7 @@
'Syntax: Debug.Print X.Extention
'<EhHeader>
On Error GoTo Extension_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPI.Extension")
'</EhHeader>
100 Extension = mvarExtension
'<EhFooter>
@@ -72,7 +72,7 @@
Exit Property
Extension_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPI.Extension", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -82,7 +82,7 @@
'Syntax: X.Interpreter = 5
'<EhHeader>
On Error GoTo Interpreter_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Interpreter")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPI.Interpreter")
'</EhHeader>
100 mvarInterpreter = vData
'<EhFooter>
@@ -90,7 +90,7 @@
Exit Property
Interpreter_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Interpreter", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPI.Interpreter", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -100,7 +100,7 @@
'Syntax: Debug.Print X.Interpreter
'<EhHeader>
On Error GoTo Interpreter_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Interpreter")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPI.Interpreter")
'</EhHeader>
100 Interpreter = mvarInterpreter
'<EhFooter>
@@ -108,7 +108,7 @@
Exit Property
Interpreter_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Interpreter", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPI.Interpreter", Erl, False
Resume Next
'</EhFooter>
End Property
Index: cHTTPCGICol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGICol.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTPCGICol.cls 5 Nov 2003 21:39:21 -0000 1.4
+++ cHTTPCGICol.cls 8 Nov 2003 10:09:59 -0000 1.5
@@ -6,7 +6,7 @@
DataSourceBehavior = 0 'vbNone
MTSTransactionMode = 0 'NotAnMTSObject
END
-Attribute VB_Name = "cHTTPCGICol"
+Attribute VB_Name = "cHTTPISAPICol"
Attribute VB_GlobalNameSpace = True
Attribute VB_Creatable = True
Attribute VB_PredeclaredId = False
@@ -42,14 +42,14 @@
'local variable to hold collection
Private mCol As Collection
-Public Function Add(Interpreter As String, Extension As String, Optional sKey As String) As cHTTPCGI
+Public Function Add(Interpreter As String, Extension As String, Optional sKey As String) As cHTTPISAPI
'create a new object
'<EhHeader>
On Error GoTo Add_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Add")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.Add")
'</EhHeader>
- Dim objNewMember As cHTTPCGI
-100 Set objNewMember = New cHTTPCGI
+ Dim objNewMember As cHTTPISAPI
+100 Set objNewMember = New cHTTPISAPI
'set the properties passed into the method
104 objNewMember.Interpreter = Interpreter
108 objNewMember.Extension = Extension
@@ -66,12 +66,12 @@
Exit Function
Add_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Add", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Add", Erl, False
Resume Next
'</EhFooter>
End Function
-Public Property Get Item(vntIndexKey As Variant) As cHTTPCGI
+Public Property Get Item(vntIndexKey As Variant) As cHTTPISAPI
Attribute Item.VB_UserMemId = 0
'used when referencing an element in the collection
'vntIndexKey contains either the Index or Key to the collection,
@@ -79,7 +79,7 @@
'Syntax: Set foo = x.Item(xyz) or Set foo = x.Item(5)
'<EhHeader>
On Error GoTo Item_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Item")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.Item")
'</EhHeader>
100 Set Item = mCol(vntIndexKey)
'<EhFooter>
@@ -87,7 +87,7 @@
Exit Property
Item_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Item", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Item", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -97,7 +97,7 @@
'collection. Syntax: Debug.Print x.Count
'<EhHeader>
On Error GoTo Count_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Count")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.Count")
'</EhHeader>
100 Count = mCol.Count
'<EhFooter>
@@ -105,7 +105,7 @@
Exit Property
Count_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Count", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Count", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -117,7 +117,7 @@
'Syntax: x.Remove(xyz)
'<EhHeader>
On Error GoTo Remove_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Remove")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.Remove")
'</EhHeader>
100 mCol.Remove vntIndexKey
'<EhFooter>
@@ -125,7 +125,7 @@
Exit Sub
Remove_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Remove", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Remove", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -137,7 +137,7 @@
'this collection with the For...Each syntax
'<EhHeader>
On Error GoTo NewEnum_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.NewEnum")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.NewEnum")
'</EhHeader>
100 Set NewEnum = mCol.[_NewEnum]
'<EhFooter>
@@ -145,7 +145,7 @@
Exit Property
NewEnum_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.NewEnum", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.NewEnum", Erl, False
Resume Next
'</EhFooter>
End Property
@@ -161,7 +161,7 @@
Exit Sub
Class_Initialize_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Class_Initialize", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Class_Initialize", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -178,7 +178,7 @@
'destroys collection
'<EhHeader>
On Error GoTo Clear_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Clear")
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPISAPICol.Clear")
'</EhHeader>
100 Set mCol = Nothing
'creates the collection
@@ -188,7 +188,7 @@
Exit Function
Clear_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Clear", Erl, False
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPISAPICol.Clear", Erl, False
Resume Next
'</EhFooter>
End Function
Index: cHTTPConfig.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPConfig.cls,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cHTTPConfig.cls 5 Nov 2003 21:39:21 -0000 1.5
+++ cHTTPConfig.cls 8 Nov 2003 10:09:59 -0000 1.6
@@ -39,7 +39,7 @@
Option Explicit
Public VirtHost As cHTTPVirtHostCol
-Public CGI As cHTTPCGICol
+Public ISAPI As cHTTPISAPICol
Public Index As cHTTPIndexCol
'local variable(s) to hold property value(s)
@@ -60,7 +60,7 @@
On Error GoTo Class_Initialize_Err
'</EhHeader>
100 Set VirtHost = New cHTTPVirtHostCol
-104 Set CGI = New cHTTPCGICol
+104 Set ISAPI = New cHTTPISAPICol
108 Set Index = New cHTTPIndexCol
'<EhFooter>
Exit Sub
@@ -76,7 +76,7 @@
On Error Resume Next
'</EhHeader>
Set VirtHost = Nothing
- Set CGI = Nothing
+ Set ISAPI = Nothing
Set Index = Nothing
End Sub
@@ -201,13 +201,13 @@
End If
'<CGI>
-300 Set Node = ConfigXML.FindChild("CGI")
+300 Set Node = ConfigXML.FindChild("ISAPI")
304 If Not (Node Is Nothing) Then
308 Do While Not (Node Is Nothing)
312 If Node.GetChildContent("Interpreter") <> "" Then
-316 CGI.Add Trim$(Node.GetChildContent("Interpreter")), Trim$(Node.GetChildContent("Extension")), Trim$(Node.GetChildContent("Extension"))
+316 ISAPI.Add Trim$(Node.GetChildContent("Interpreter")), Trim$(Node.GetChildContent("Extension")), Trim$(Node.GetChildContent("Extension"))
End If
-320 Set Node = ConfigXML.SearchForTag(Node, "CGI")
+320 Set Node = ConfigXML.SearchForTag(Node, "ISAPI")
Loop
End If
@@ -568,8 +568,8 @@
156 strReport = strReport & "Index Files: " & Trim$(strTemp) & vbCrLf
160 strReport = strReport & vbCrLf & String$(30, "-") & vbCrLf
-164 For Each vItem In CGI
-168 strReport = strReport & WinUI.GetTranslatedText("CGI: Extension") & ": " & vItem.Extension & " " & WinUI.GetTranslatedText("Interpreter") & ": " & vItem.Interpreter & vbCrLf
+164 For Each vItem In ISAPI
+168 strReport = strReport & WinUI.GetTranslatedText("ISAPI: Extension") & ": " & vItem.Extension & " " & WinUI.GetTranslatedText("Interpreter") & ": " & vItem.Interpreter & vbCrLf
Next
172 strReport = strReport & vbCrLf & String$(30, "-") & vbCrLf
@@ -632,8 +632,8 @@
160 ConfigXML.NewChild2 "IndexFile", vItem.FileName
Next
-164 For Each vItem In CGI
-168 Set ConfigXML2 = ConfigXML2.NewChild("CGI", "")
+164 For Each vItem In ISAPI
+168 Set ConfigXML2 = ConfigXML2.NewChild("ISAPI", "")
172 ConfigXML2.NewChild2 "Interpreter", vItem.Interpreter
176 ConfigXML2.NewChild2 "Extension", vItem.Extension
180 ConfigXML.AddChildTree ConfigXML2
Index: cUtil.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cUtil.cls,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cUtil.cls 8 Nov 2003 09:01:40 -0000 1.7
+++ cUtil.cls 8 Nov 2003 10:09:59 -0000 1.8
@@ -193,16 +193,19 @@
Dim lngStart As Long
Dim lngEnd As Long
-100 lngStart = (InStr(1, strData, "<" & strTag & ">") + Len(strTag) + 2)
-104 If strEndTag = "" Then
-108 lngEnd = InStr(lngStart, strData, "</" & strTag & ">")
- Else
-112 lngEnd = InStr(lngStart, strData, "</" & strEndTag & ">")
+100 lngStart = InStr(1, strData, "<" & strTag & ">")
+104 If lngStart > 0 Then
+108 lngStart = lngStart + Len(strTag) + 2
+112 If strEndTag = "" Then
+116 lngEnd = InStr(lngStart, strData, "</" & strTag & ">")
+ Else
+120 lngEnd = InStr(lngStart, strData, "</" & strEndTag & ">")
+ End If
End If
-116 If lngStart = 0 Or lngEnd = 0 Then
-120 GetTaggedData = ""
+124 If lngStart = 0 Or lngEnd = 0 Then
+128 GetTaggedData = ""
Else
-124 GetTaggedData = Mid$(strData, lngStart, lngEnd - lngStart)
+132 GetTaggedData = Mid$(strData, lngStart, lngEnd - lngStart)
End If
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- frmMain.frm 8 Nov 2003 09:01:41 -0000 1.76
+++ frmMain.frm 8 Nov 2003 10:09:59 -0000 1.77
@@ -15,49 +15,238 @@
ScaleHeight = 4290
ScaleWidth = 9555
StartUpPosition = 2 'CenterScreen
+ Begin VB.Frame fraNewISAPI
+ BorderStyle = 0 'None
+ Height = 3735
+ Left = 2520
+ TabIndex = 71
+ Top = 0
+ Width = 6975
+ Begin VB.PictureBox picButton
+ BorderStyle = 0 'None
+ Height = 375
+ Index = 8
+ Left = 2520
+ ScaleHeight = 375
+ ScaleWidth = 2055
+ TabIndex = 79
+ Top = 3120
+ Width = 2055
+ Begin VB.CommandButton cmdNewISAPICancel
+ Caption = "Cancel"
+ Height = 375
+ Left = 1080
+ TabIndex = 81
+ Top = 0
+ Width = 975
+ End
+ Begin VB.CommandButton cmdNewISAPIOK
+ Caption = "OK"
+ Height = 375
+ Left = 0
+ TabIndex = 80
+ Top = 0
+ Width = 975
+ End
+ End
+ Begin VB.PictureBox picButton
+ BorderStyle = 0 'None
+ Height = 255
+ Index = 7
+ Left = 5880
+ ScaleHeight = 255
+ ScaleWidth = 255
+ TabIndex = 77
+ Top = 960
+ Width = 255
+ Begin VB.CommandButton cmdBrowseNewISAPIInterp
+ Caption = "..."
+ Height = 255
+ Left = 0
+ TabIndex = 78
+ Top = 0
+ Width = 255
+ End
+ End
+ Begin VB.TextBox txtNewISAPIExt
+ Height = 285
+ Left = 1080
+ TabIndex = 76
+ Top = 1680
+ Width = 1935
+ End
+ Begin VB.TextBox txtNewISAPIInterp
+ Height = 285
+ Left = 1080
+ TabIndex = 74
+ Top = 960
+ Width = 4695
+ End
+ Begin VB.Label lblNewISAPIIExt
+ Caption = "What is the file extension for this file type?"
+ Height = 255
+ Left = 840
+ TabIndex = 75
+ Top = 1440
+ Width = 5655
+ End
+ Begin VB.Label lblNewISAPIInterp
+ Caption = "Where is the executable that will interpret this script type?"
+ Height = 255
+ Left = 840
+ TabIndex = 73
+ Top = 720
+ Width = 5775
+ End
+ Begin VB.Label lblNewISAPITitle
+ Caption = "Add a new ISAPI interpreter:"
+ Height = 255
+ Left = 480
+ TabIndex = 72
+ Top = 360
+ Width = 2055
+ End
+ End
+ Begin VB.Frame fraConfigISAPI
+ BorderStyle = 0 'None
+ Height = 3735
+ Left = 2520
+ TabIndex = 34
+ Top = 0
+ Width = 6975
+ Begin VB.PictureBox picButton
+ BorderStyle = 0 'None
+ Height = 375
+ Index = 1
+ Left = 2040
+ ScaleHeight = 375
+ ScaleWidth = 2055
+ TabIndex = 44
+ Top = 3240
+ Width = 2055
+ Begin VB.CommandButton cmdISAPIRemove
+ Caption = "Remove..."
+ Enabled = 0 'False
+ Height = 375
+ Left = 1080
+ TabIndex = 46
+ Top = 0
+ Width = 975
+ End
+ Begin VB.CommandButton cmdISAPINew
+ Caption = "Add New..."
+ Height = 375
+ Left = 0
+ TabIndex = 45
+ Top = 0
+ Width = 975
+ End
+ End
+ Begin VB.PictureBox picButton
+ BorderStyle = 0 'None
+ Height = 375
+ Index = 0
+ Left = 5880
+ ScaleHeight = 375
+ ScaleWidth = 375
+ TabIndex = 42
+ Top = 600
+ Width = 375
+ Begin VB.CommandButton cmdBrowseISAPIInterp
+ Caption = "..."
+ Enabled = 0 'False
+ Height = 255
+ Left = 0
+ TabIndex = 43
+ Top = 0
+ Width = 255
+ End
+ End
+ Begin VB.ListBox lstISAPI
+ Height = 3375
+ ItemData = "frmMain.frx":0CCA
+ Left = 120
+ List = "frmMain.frx":0CD1
+ TabIndex = 37
+ Top = 240
+ Width = 1815
+ End
+ Begin VB.TextBox txtISAPIInterp
+ Enabled = 0 'False
+ Height = 285
+ Left = 2160
+ TabIndex = 36
+ Top = 600
+ Width = 3615
+ End
+ Begin VB.TextBox txtISAPIExt
+ Enabled = 0 'False
+ Height = 285
+ Left = 2160
+ TabIndex = 35
+ Top = 1320
+ Width = 975
+ End
+ Begin VB.Label lblISAPIInterp
+ Caption = "Where is the ISAPI Plugin?"
+ Height = 255
+ Left = 2040
+ TabIndex = 39
+ Top = 360
+ Width = 4935
+ End
+ Begin VB.Label lblISAPIExt
+ Caption = "What is the extension that is mapped to this interpreter."
+ Height = 255
+ Left = 2040
+ TabIndex = 38
+ Top = 1080
+ Width = 4815
+ End
+ End
Begin SWEBS_WinUI.ctxHookMenu ctxXPMenu
Left = 5280
Top = 3960
_ExtentX = 900
_ExtentY = 900
BmpCount = 13
- Bmp:1 = "frmMain.frx":0CCA
+ Bmp:1 = "frmMain.frx":0CDF
Mask:1 = 12632256
Key:1 = "#mnuFileSave"
- Bmp:2 = "frmMain.frx":0DDC
+ Bmp:2 = "frmMain.frx":0DF1
Mask:2 = 12632256
Key:2 = "#mnuHelpRegister"
- Bmp:3 = "frmMain.frx":0EEE
+ Bmp:3 = "frmMain.frx":0F03
Mask:3 = 12632256
Key:3 = "#mnuHelpUpdate"
- Bmp:4 = "frmMain.frx":1000
+ Bmp:4 = "frmMain.frx":1015
Mask:4 = 12632256
Key:4 = "#mnuFileExit"
- Bmp:5 = "frmMain.frx":1112
+ Bmp:5 = "frmMain.frx":1127
Mask:5 = 12632256
Key:5 = "#mnuHelpForum"
- Bmp:6 = "frmMain.frx":1224
+ Bmp:6 = "frmMain.frx":1239
Mask:6 = 13355979
Key:6 = "#mnuHelpHomePage"
- Bmp:7 = "frmMain.frx":1776
+ Bmp:7 = "frmMain.frx":178B
Mask:7 = 13553358
Key:7 = "#mnuHelpAbout"
- Bmp:8 = "frmMain.frx":1CC8
+ Bmp:8 = "frmMain.frx":1CDD
Mask:8 = 13355979
Key:8 = "#mnuFileExport"
- Bmp:9 = "frmMain.frx":221A
+ Bmp:9 = "frmMain.frx":222F
Mask:9 = 12632256
Key:9 = "#mnuSysTrayPopupExit"
- Bmp:10 = "frmMain.frx":232C
+ Bmp:10 = "frmMain.frx":2341
Mask:10 = 13553358
Key:10 = "#mnuSysTrayPopupAbout"
- Bmp:11 = "frmMain.frx":287E
+ Bmp:11 = "frmMain.frx":2893
Mask:11 = 12632256
Key:11 = "#mnuSysTrayPopupUpdate"
- Bmp:12 = "frmMain.frx":2990
+ Bmp:12 = "frmMain.frx":29A5
Mask:12 = 12632256
Key:12 = "#mnuSysTrayPopupForum"
- Bmp:13 = "frmMain.frx":2AA2
+ Bmp:13 = "frmMain.frx":2AB7
Mask:13 = 13355979
Key:13 = "#mnuSysTrayPopupHomePage"
BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851}
@@ -142,7 +331,7 @@
ForeColor = &H00FF0000&
Height = 195
Left = 660
- MouseIcon = "frmMain.frx":2FF4
+ MouseIcon = "frmMain.frx":3009
MousePointer = 99 'Custom
TabIndex = 89
ToolTipText = "Click here for details."
@@ -234,7 +423,7 @@
Begin VB.Image imgLogo
Height = 480
Left = 3360
- Picture = "frmMain.frx":32FE
+ Picture = "frmMain.frx":3313
Top = 3120
Width = 480
End
@@ -284,13 +473,13 @@
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
- TextRTF = $"frmMain.frx":3FC8
+ TextRTF = $"frmMain.frx":3FDD
End
Begin VB.ComboBox cmbViewLogFiles
Height = 315
- ItemData = "frmMain.frx":404A
+ ItemData = "frmMain.frx":405F
Left = 120
- List = "frmMain.frx":404C
+ List = "frmMain.frx":4061
Style = 2 'Dropdown List
TabIndex = 41
Top = 120
@@ -363,9 +552,9 @@
End
Begin VB.ListBox lstvHosts
Height = 3375
- ItemData = "frmMain.frx":404E
+ ItemData = "frmMain.frx":4063
Left = 120
- List = "frmMain.frx":4050
+ List = "frmMain.frx":4065
TabIndex = 29
Top = 240
Width = 1815
@@ -556,7 +745,7 @@
Width = 2415
End
Begin VB.Label lblWebroot
- Caption = $"frmMain.frx":4052
+ Caption = $"frmMain.frx":4067
Height = 495
Left = 120
TabIndex = 12
@@ -642,7 +831,7 @@
Width = 3255
End
Begin VB.Label lblIndexFiles
- Caption = $"frmMain.frx":40F6
+ Caption = $"frmMain.frx":410B
Height = 495
Left = 120
TabIndex = 22
@@ -842,195 +1031,6 @@
Width = 3855
End
End
- Begin VB.Frame fraNewCGI
- BorderStyle = 0 'None
- Height = 3735
- Left = 2520
- TabIndex = 71
- Top = 0
- Width = 6975
- Begin VB.PictureBox picButton
- BorderStyle = 0 'None
- Height = 375
- Index = 8
- Left = 2520
- ScaleHeight = 375
- ScaleWidth = 2055
- TabIndex = 79
- Top = 3120
- Width = 2055
- Begin VB.CommandButton cmdNewCGICancel
- Caption = "Cancel"
- Height = 375
- Left = 1080
- TabIndex = 81
- Top = 0
- Width = 975
- End
- Begin VB.CommandButton cmdNewCGIOK
- Caption = "OK"
- Height = 375
- Left = 0
- TabIndex = 80
- Top = 0
- Width = 975
- End
- End
- Begin VB.PictureBox picButton
- BorderStyle = 0 'None
- Height = 255
- Index = 7
- Left = 5880
- ScaleHeight = 255
- ScaleWidth = 255
- TabIndex = 77
- Top = 960
- Width = 255
- Begin VB.CommandButton cmdBrowseNewCGIInterp
- Caption = "..."
- Height = 255
- Left = 0
- TabIndex = 78
- Top = 0
- Width = 255
- End
- End
- Begin VB.TextBox txtNewCGIExt
- Height = 285
- Left = 1080
- TabIndex = 76
- Top = 1680
- Width = 1935
- End
- Begin VB.TextBox txtNewCGIInterp
- Height = 285
- Left = 1080
- TabIndex = 74
- Top = 960
- Width = 4695
- End
- Begin VB.Label lblNewCGIExt
- Caption = "What is the file extension for this file type?"
- Height = 255
- Left = 840
- TabIndex = 75
- Top = 1440
- Width = 5655
- End
- Begin VB.Label lblNewCGIInterp
- Caption = "Where is the executable that will interpret this script type?"
- Height = 255
- Left = 840
- TabIndex = 73
- Top = 720
- Width = 5775
- End
- Begin VB.Label lblNewCGITitle
- Caption = "Add a new CGI interpreter:"
- Height = 255
- Left = 480
- TabIndex = 72
- Top = 360
- Width = 2055
- End
- End
- Begin VB.Frame fraConfigCGI
- BorderStyle = 0 'None
- Height = 3735
- Left = 2520
- TabIndex = 34
- Top = 0
- Width = 6975
- Begin VB.PictureBox picButton
- BorderStyle = 0 'None
- Height = 375
- Index = 1
- Left = 2040
- ScaleHeight = 375
- ScaleWidth = 2055
- TabIndex = 44
- Top = 3240
- Width = 2055
- Begin VB.CommandButton cmdCGIRemove
- Caption = "Remove..."
- Enabled = 0 'False
- Height = 375
- Left = 1080
- TabIndex = 46
- Top = 0
- Width = 975
- End
- Begin VB.CommandButton cmdCGINew
- Caption = "Add New..."
- Height = 375
- Left = 0
- TabIndex = 45
- Top = 0
- Width = 975
- End
- End
- Begin VB.PictureBox picButton
- BorderStyle = 0 'None
- Height = 375
- Index = 0
- Left = 5880
- ScaleHeight = 375
- ScaleWidth = 375
- TabIndex = 42
- Top = 600
- Width = 375
- Begin VB.CommandButton cmdBrowseCGIInterp
- Caption = "..."
- Enabled = 0 'False
- Height = 255
- Left = 0
- TabIndex = 43
- Top = 0
- Width = 255
- End
- End
- Begin VB.ListBox lstCGI
- Height = 3375
- ItemData = "frmMain.frx":41A4
- Left = 120
- List = "frmMain.frx":41A6
- TabIndex = 37
- Top = 240
- Width = 1815
- End
- Begin VB.TextBox txtCGIInterp
- Enabled = 0 'False
- Height = 285
- Left = 2160
- TabIndex = 36
- Top = 600
- Width = 3615
- End
- Begin VB.TextBox txtCGIExt
- Enabled = 0 'False
- Height = 285
- Left = 2160
- TabIndex = 35
- Top = 1320
- Width = 975
- End
- Begin VB.Label lblCGIInterp
- Caption = "Where is the executable that will interpret these CGI scripts?"
- Height = 255
- Left = 2040
- TabIndex = 39
- Top = 360
- Width = 4935
- End
- Begin VB.Label lblCGIExt
- Caption = "What is the extension that is mapped to this interpreter."
- Height = 255
- Left = 2040
- TabIndex = 38
- Top = 1080
- Width = 4815
- End
- End
Begin VB.Label lblAppStatus
Caption = "Ready..."
Height = 255
@@ -1210,28 +1210,28 @@
'</EhFooter>
End Sub
-Private Sub cmdBrowseCGIInterp_Click()
+Private Sub cmdBrowseISAPIInterp_Click()
'<EhHeader>
- On Error GoTo cmdBrowseCGIInterp_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseCGIInterp_Click")
+ On Error GoTo cmdBrowseISAPIInterp_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseISAPIInterp_Click")
'</EhHeader>
Dim strDefaultFile As String
100 blnDirty = True
104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
-108 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.exe|All Files (*.*)|*.*")
-112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, (InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\") + 1))
+108 dlgMain.Filter = WinUI.GetTranslatedText("ISAPI Plugin Files (*.dll)|*.dll|All Files (*.*)|*.*")
+112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.ISAPI(lstISAPI.ListIndex + 1).Interpreter, (InStrRev(WinUI.Server.HTTP.Config.ISAPI(lstISAPI.ListIndex + 1).Interpreter, "\") + 1))
116 dlgMain.FileName = strDefaultFile
-120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, 1, (Len(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter) - InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\")))
+120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.ISAPI(lstISAPI.ListIndex + 1).Interpreter, 1, (Len(WinUI.Server.HTTP.Config.ISAPI(lstISAPI.ListIndex + 1).Interpreter) - InStrRev(WinUI.Server.HTTP.Config.ISAPI(lstISAPI.ListIndex + 1).Interpreter, "\")))
124 dlgMain.ShowSave
128 If dlgMain.FileName <> strDefaultFile Then
-132 txtCGIInterp.Text = dlgMain.FileName
+132 txtISAPIInterp.Text = dlgMain.FileName
End If
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdBrowseCGIInterp_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseCGIInterp_Click", Erl, False
+cmdBrowseISAPIInterp_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseISAPIInterp_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -1284,23 +1284,23 @@
'</EhFooter>
End Sub
-Private Sub cmdBrowseNewCGIInterp_Click()
+Private Sub cmdBrowseNewISAPIInterp_Click()
'<EhHeader>
- On Error GoTo cmdBrowseNewCGIInterp_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewCGIInterp_Click")
+ On Error GoTo cmdBrowseNewISAPIInterp_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewISAPIInterp_Click")
'</EhHeader>
100 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
-104 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.log|All Files (*.*)|*.*")
+104 dlgMain.Filter = WinUI.GetTranslatedText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
108 dlgMain.ShowSave
112 If dlgMain.FileName <> "" Then
-116 txtNewCGIInterp.Text = dlgMain.FileName
+116 txtNewISAPIInterp.Text = dlgMain.FileName
End If
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdBrowseNewCGIInterp_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseNewCGIInterp_Click", Erl, False
+cmdBrowseNewISAPIInterp_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseNewISAPIInterp_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -1457,51 +1457,51 @@
'</EhFooter>
End Sub
-Private Sub cmdCGINew_Click()
+Private Sub cmdISAPINew_Click()
'<EhHeader>
- On Error GoTo cmdCGINew_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGINew_Click")
+ On Error GoTo cmdISAPINew_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdISAPINew_Click")
'</EhHeader>
-100 fraNewCGI.ZOrder 0
+100 fraNewISAPI.ZOrder 0
104 vbaSideBar.ZOrder 0
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdCGINew_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGINew_Click", Erl, False
+cmdISAPINew_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdISAPINew_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
-Private Sub cmdCGIRemove_Click()
+Private Sub cmdISAPIRemove_Click()
'<EhHeader>
- On Error GoTo cmdCGIRemove_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGIRemove_Click")
+ On Error GoTo cmdISAPIRemove_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdISAPIRemove_Click")
'</EhHeader>
Dim lngRetVal As Long
Dim vItem As Variant
Dim i As Long
-100 If lstCGI.ListIndex >= 0 Then
+100 If lstISAPI.ListIndex >= 0 Then
104 lngRetVal = MsgBox(WinUI.GetTranslatedText("Are you sure you want to delete this item?\r\rThis can not be undone."), vbQuestion + vbYesNo)
108 If lngRetVal = vbYes Then
112 blnDirty = True
-116 WinUI.Server.HTTP.Config.CGI.Remove (lstCGI.Text)
-120 lstCGI.Clear
-124 If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
-128 For Each vItem In WinUI.Server.HTTP.Config.CGI
-132 lstCGI.AddItem vItem.Extension
-136 lstCGI.Enabled = True
+116 WinUI.Server.HTTP.Config.ISAPI.Remove (lstISAPI.Text)
+120 lstISAPI.Clear
+124 If WinUI.Server.HTTP.Config.ISAPI.Count > 0 Then
+128 For Each vItem In WinUI.Server.HTTP.Config.ISAPI
+132 lstISAPI.AddItem vItem.Extension
+136 lstISAPI.Enabled = True
Next
Else
-140 lstCGI.Enabled = False
-144 cmdBrowseCGIInterp.Enabled = False
-148 cmdCGIRemove.Enabled = False
-152 txtCGIInterp.Enabled = False
-156 txtCGIExt.Enabled = False
-160 txtCGIInterp.Text = ""
-164 txtCGIExt.Text = ""
+140 lstISAPI.Enabled = False
+144 cmdBrowseISAPIInterp.Enabled = False
+148 cmdISAPIRemove.Enabled = False
+152 txtISAPIInterp.Enabled = False
+156 txtISAPIExt.Enabled = False
+160 txtISAPIInterp.Text = ""
+164 txtISAPIExt.Text = ""
End If
End If
End If
@@ -1509,53 +1509,53 @@
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdCGIRemove_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGIRemove_Click", Erl, False
+cmdISAPIRemove_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdISAPIRemove_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
-Private Sub cmdNewCGICancel_Click()
+Private Sub cmdNewISAPICancel_Click()
'<EhHeader>
- On Error GoTo cmdNewCGICancel_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGICancel_Click")
+ On Error GoTo cmdNewISAPICancel_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewISAPICancel_Click")
'</EhHeader>
-100 fraNewCGI.ZOrder 1
-104 txtNewCGIInterp.Text = ""
-108 txtNewCGIExt.Text = ""
+100 fraNewISAPI.ZOrder 1
+104 txtNewISAPIInterp.Text = ""
+108 txtNewISAPIExt.Text = ""
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdNewCGICancel_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGICancel_Click", Erl, False
+cmdNewISAPICancel_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewISAPICancel_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
-Private Sub cmdNewCGIOK_Click()
+Private Sub cmdNewISAPIOK_Click()
'<EhHeader>
- On Error GoTo cmdNewCGIOK_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGIOK_Click")
+ On Error GoTo cmdNewISAPIOK_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewISAPIOK_Click")
'</EhHeader>
Dim vItem As Variant
Dim i As Long
-100 If txtNewCGIInterp.Text <> "" And txtNewCGIExt.Text <> "" Then
+100 If txtNewISAPIInterp.Text <> "" And txtNewISAPIExt.Text <> "" Then
104 blnDirty = True
-108 WinUI.Server.HTTP.Config.CGI.Add txtNewCGIInterp.Text, txtNewCGIExt.Text, txtNewCGIExt.Text
-112 If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
-116 lstCGI.Clear
-120 For Each vItem In WinUI.Server.HTTP.Config.CGI
-124 lstCGI.AddItem vItem.Extension
-128 lstCGI.Enabled = True
+108 WinUI.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
+112 If WinUI.Server.HTTP.Config.ISAPI.Count > 0 Then
+116 lstISAPI.Clear
+120 For Each vItem In WinUI.Server.HTTP.Config.ISAPI
+124 lstISAPI.AddItem vItem.Extension
+128 lstISAPI.Enabled = True
Next
Else
-132 lstCGI.Enabled = False
+132 lstISAPI.Enabled = False
End If
-136 fraNewCGI.ZOrder 1
-140 txtNewCGIInterp.Text = ""
-144 txtNewCGIExt.Text = ""
+136 fraNewISAPI.ZOrder 1
+140 txtNewISAPIInterp.Text = ""
+144 txtNewISAPIExt.Text = ""
Else
148 MsgBox WinUI.GetTranslatedText("Please fill all fields.")
End If
@@ -1563,8 +1563,8 @@
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdNewCGIOK_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGIOK_Click", Erl, False
+cmdNewISAPIOK_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewISAPIOK_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -1817,21 +1817,21 @@
204 lblPort.Caption = WinUI.GetTranslatedText("What port do you want to use? (Default is 80)")
208 lblWebroot.Caption = WinUI.GetTranslatedText("This is the root directory where files are kept. Any files/folders in this folder will be publicly visible on the internet. Be careful when changing this entry.")
212 lblLogFile.Caption = WinUI.GetTranslatedText("This is the file where all logging is written to. Any requests that DO NOT use a virtual server will be logged here.")
-216 lblCGIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret these CGI scripts?")
-220 lblCGIExt.Caption = WinUI.GetTranslatedText("What is the extension that is mapped to this interpreter.")
-224 cmdCGINew.Caption = WinUI.GetTranslatedText("Add New...")
-228 cmdCGIRemove.Caption = WinUI.GetTranslatedText("Remove...")
+216 lblISAPIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret these CGI scripts?")
+220 lblISAPIExt.Caption = WinUI.GetTranslatedText("What is the extension that is mapped to this interpreter.")
+224 cmdISAPINew.Caption = WinUI.GetTranslatedText("Add New...")
+228 cmdISAPIRemove.Caption = WinUI.GetTranslatedText("Remove...")
232 cmdvHostNew.Caption = WinUI.GetTranslatedText("Add New...")
236 cmdvHostRemove.Caption = WinUI.GetTranslatedText("Remove...")
240 lblvHostName.Caption = WinUI.GetTranslatedText("What is the name of this Virtual Host?")
244 lblvHostDomain.Caption = WinUI.GetTranslatedText("What is it's domain name?")
248 lblvHostRoot.Caption = WinUI.GetTranslatedText("This is the root directory where files are kept for this Virtual Host.")
252 lblvHostLog.Caption = WinUI.GetTranslatedText("Where do you want to keep the log file for this Virtual Host?")
-256 lblNewCGITitle.Caption = WinUI.GetTranslatedText("Add a new CGI interpreter:")
-260 lblNewCGIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret this script type?")
-264 lblNewCGIExt.Caption = WinUI.GetTranslatedText("What is the file extension for this file type?")
-268 cmdNewCGIOK.Caption = WinUI.GetTranslatedText("&OK")
-272 cmdNewCGICancel.Caption = WinUI.GetTranslatedText("&Cancel")
+256 lblNewISAPITitle.Caption = WinUI.GetTranslatedText("Add a new CGI interpreter:")
+260 lblNewISAPIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret this script type?")
+264 lblNewISAPIIExt.Caption = WinUI.GetTranslatedText("What is the file extension for this file type?")
+268 cmdNewISAPIOK.Caption = WinUI.GetTranslatedText("&OK")
+272 cmdNewISAPICancel.Caption = WinUI.GetTranslatedText("&Cancel")
276 lblNewvHostTitle.Caption = WinUI.GetTranslatedText("Add a new Virtual Host:")
280 lblNewvHostName.Caption = WinUI.GetTranslatedText("What is the name of this Virtual Host?")
284 lblNewvHostDomain.Caption = WinUI.GetTranslatedText("What is the domain for this Virtual Host?")
@@ -1866,7 +1866,7 @@
372 Set cItem = cBar.Items.Add(, "basic", WinUI.GetTranslatedText("Basic"), 0)
376 Set cItem = cBar.Items.Add(, "advanced", WinUI.GetTranslatedText("Advanced"), 0)
380 Set cItem = cBar.Items.Add(, "vhost", WinUI.GetTranslatedText("Virtual Host"), 0)
-384 Set cItem = cBar.Items.Add(, "cgi", WinUI.GetTranslatedText("CGI"), 0)
+384 Set cItem = cBar.Items.Add(, "isapi", WinUI.GetTranslatedText("ISAPI Plugins"), 0)
388 Set cBar = .Bars.Add(, "logs", WinUI.GetTranslatedText("System Logs"))
392 Set cItem = cBar.Items.Add(, "logs", WinUI.GetTranslatedText("View Logs"), 0)
@@ -1984,23 +1984,23 @@
'</EhFooter>
End Sub
-Private Sub lstCGI_Click()
+Private Sub lstISAPI_Click()
'<EhHeader>
- On Error GoTo lstCGI_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.lstCGI_Click")
+ On Error GoTo lstISAPI_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.lstISAPI_Click")
'</EhHeader>
-100 cmdBrowseCGIInterp.Enabled = True
-104 cmdCGIRemove.Enabled = True
-108 txtCGIInterp.Enabled = True
-112 txtCGIExt.Enabled = True
-116 txtCGIInterp.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Interpreter
-120 txtCGIExt.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension
+100 cmdBrowseISAPIInterp.Enabled = True
+104 cmdISAPIRemove.Enabled = True
+108 txtISAPIInterp.Enabled = True
+112 txtISAPIExt.Enabled = True
+116 txtISAPIInterp.Text = WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Interpreter
+120 txtISAPIExt.Text = WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Extension
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-lstCGI_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.lstCGI_Click", Erl, False
+lstISAPI_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.lstISAPI_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -2444,11 +2444,11 @@
Next
156 txtIndexFiles.Text = Trim$(strTemp)
-160 lstCGI.Enabled = False
-164 lstCGI.Clear
-168 For Each vItem In WinUI.Server.HTTP.Config.CGI
-172 lstCGI.AddItem vItem.Extension
-176 lstCGI.Enabled = True
+160 lstISAPI.Enabled = False
+164 lstISAPI.Clear
+168 For Each vItem In WinUI.Server.HTTP.Config.ISAPI
+172 lstISAPI.AddItem vItem.Extension
+176 lstISAPI.Enabled = True
Next
180 lstvHosts.Enabled = False
@@ -2534,14 +2534,14 @@
'</EhFooter>
End Sub
-Private Sub txtCGIExt_Change()
+Private Sub txtISAPIExt_Change()
'<EhHeader>
- On Error GoTo txtCGIExt_Change_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtCGIExt_Change")
+ On Error GoTo txtISAPIExt_Change_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtISAPIExt_Change")
'</EhHeader>
-100 If lstCGI.ListIndex <> -1 Then
-104 If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension <> txtCGIExt.Text Then
-108 WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension = txtCGIExt.Text
+100 If lstISAPI.ListIndex <> -1 Then
+104 If WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Extension <> txtISAPIExt.Text Then
+108 WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Extension = txtISAPIExt.Text
112 blnDirty = True
End If
End If
@@ -2549,20 +2549,20 @@
WinUI.Debuger.CallStack.Pop
Exit Sub
-txtCGIExt_Change_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtCGIExt_Change", Erl, False
+txtISAPIExt_Change_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtISAPIExt_Change", Erl, False
Resume Next
'</EhFooter>
End Sub
-Private Sub txtCGIInterp_Change()
+Private Sub txtISAPIInterp_Change()
'<EhHeader>
- On Error GoTo txtCGIInterp_Change_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtCGIInterp_Change")
+ On Error GoTo txtISAPIInterp_Change_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtISAPIInterp_Change")
'</EhHeader>
-100 If lstCGI.ListIndex <> -1 Then
-104 If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Interpreter <> txtCGIInterp.Text Then
-108 WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Interpreter = txtCGIInterp.Text
+100 If lstISAPI.ListIndex <> -1 Then
+104 If WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Interpreter <> txtISAPIInterp.Text Then
+108 WinUI.Server.HTTP.Config.ISAPI.Item(lstISAPI.Text).Interpreter = txtISAPIInterp.Text
112 blnDirty = True
End If
End If
@@ -2570,8 +2570,8 @@
WinUI.Debuger.CallStack.Pop
Exit Sub
-txtCGIInterp_Change_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtCGIInterp_Change", Erl, False
+txtISAPIInterp_Change_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtISAPIInterp_Change", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -2885,8 +2885,8 @@
124 fraConfigAdv.ZOrder 0
128 Case "vhost"
132 fraConfigvHost.ZOrder 0
-136 Case "cgi"
-140 fraConfigCGI.ZOrder 0
+136 Case "isapi"
+140 fraConfigISAPI.ZOrder 0
144 Case "logs"
148 fraLogs.ZOrder 0
End Select
Index: frmMain.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
Binary files /tmp/cvsoZFN3D and /tmp/cvsG6fjM7 differ
Index: lang.xml
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- lang.xml 8 Nov 2003 09:01:43 -0000 1.11
+++ lang.xml 8 Nov 2003 10:09:59 -0000 1.12
@@ -23,9 +23,6 @@
<lang base="Control Center Build">
Control Center Build
</lang>
- <lang base="Lang-Maintainer">
- Lang-Maintainer
- </lang>
</lang-obj>
<lang-obj name="frmMain">
<lang base="Loading Log File">
@@ -268,8 +265,8 @@
<lang base="Virtual Host">
Virtual Host
</lang>
- <lang base="CGI">
- CGI
+ <lang base="ISAPI Plugins">
+ ISAPI Plugins
</lang>
<lang base="System Logs">
System Logs
@@ -464,8 +461,8 @@
<lang base="Allow Index">
Allow Index
</lang>
- <lang base="CGI: Extension">
- CGI: Extension
+ <lang base="ISAPI: Extension">
+ ISAPI: Extension
</lang>
<lang base="vHost: Name">
vHost: Name
@@ -483,9 +480,6 @@
<lang base="There is already a instance of this application running.">
There is already a instance of this application running.
</lang>
- <lang base="SWEBS Web Server - Control Center">
- SWEBS Web Server - Control Center
- </lang>
<lang base="Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.">
Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.
</lang>
@@ -495,17 +489,8 @@
<lang base="Starting Registration">
Starting Registration
</lang>
- <lang base="SWEBS Web Server - Control Center">
- SWEBS Web Server - Control Center
- </lang>
<lang base="There was an unknown error.">
There was an unknown error.
- </lang>
- <lang base="This application has encountered a error:\n\nError:">
- This application has encountered a error:\n\nError:
- </lang>
- <lang base="SWEBS System Error">
- SWEBS System Error
</lang>
<lang base="This application has encountered a error:\n\nError:">
This application has encountered a error:\n\nError:
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
Binary files /tmp/cvsIIF2nS and /tmp/cvsg3FoRJ differ
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv22776/swebswebserver/winui
Modified Files:
WinUI.lvw WinUI.vbp WinUI.vbw basMain.bas cDebug.cls cHTTP.cls
cSysTray.cls cUtil.cls credits.rtf frmMain.frm frmMain.frx
lang.xml swebscc.exe
Added Files:
MenuAbout.gif MenuExit.gif MenuExport.gif MenuForum.gif
MenuRegister.gif MenuSave.gif MenuUpdate.gif MenuWebsite.gif
Log Message:
New icons & other cool stuff...
--- NEW FILE: MenuAbout.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuExit.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuExport.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuForum.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuRegister.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuSave.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuUpdate.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuWebsite.gif ---
(This appears to be a binary file; contents omitted.)
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvsPzUNVE and /tmp/cvsYyLlt9 differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- WinUI.vbp 5 Nov 2003 21:39:21 -0000 1.64
+++ WinUI.vbp 8 Nov 2003 09:01:39 -0000 1.65
@@ -52,7 +52,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=176
+RevisionVer=183
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- WinUI.vbw 25 Oct 2003 00:38:57 -0000 1.22
+++ WinUI.vbw 8 Nov 2003 09:01:39 -0000 1.23
@@ -1,23 +1,23 @@
basMain = 89, 133, 1146, 784, C
-frmMain = 109, 271, 1164, 924, , 24, 19, 746, 443, C
+frmMain = 109, 271, 1164, 924, C, 24, 19, 746, 443, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
frmAbout = 66, 87, 1068, 811, C, 88, 116, 506, 650, C
frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C
frmSplash = 0, 0, 0, 0, C, 220, 290, 1222, 1014, C
frmUpdate = 154, 203, 1156, 927, C, 176, 232, 1178, 956, C
-cWinUI = 84, 172, 1086, 896, C
-cUtil = 44, 58, 1046, 782, C
-cUpdate = 44, 58, 1046, 782, C
-cRegistration = 154, 203, 1156, 927, C
+cWinUI = 84, 172, 1086, 896,
+cUtil = 44, 58, 1046, 782,
+cUpdate = 44, 58, 1046, 782,
+cRegistration = 154, 203, 1156, 927,
cNet = 22, 29, 1024, 753, C
cEventLog = 132, 174, 1134, 898, C
cDebug = 122, 268, 1124, 992, C
-cServer = 0, 0, 1002, 724, C
-cHTTP = 109, 185, 1111, 909,
+cServer = 0, 0, 1002, 724,
+cHTTP = 109, 185, 1111, 909, C
cHTTPStats = 88, 116, 1090, 840, C
cHTTPConfig = 44, 58, 1046, 782, C
-cHTTPCGI = 242, 319, 1244, 1043, C
+cHTTPCGI = 241, 157, 1243, 881, C
cHTTPCGICol = 176, 232, 1178, 956, C
cHTTPIndex = 44, 58, 1046, 782, C
cHTTPIndexCol = 154, 203, 1156, 927, C
Index: basMain.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basMain.bas,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- basMain.bas 18 Oct 2003 15:35:27 -0000 1.55
+++ basMain.bas 8 Nov 2003 09:01:39 -0000 1.56
@@ -60,20 +60,20 @@
End If
152 If App.PrevInstance = True Then
156 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
-160 MsgBox "There is already a instance of this application running.", vbApplicationModal + vbCritical
+160 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
164 End
End If
168 End
End If
172 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
176 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
-180 MsgBox "Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.", vbApplicationModal + vbCritical
+180 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
184 End
End If
-188 SetStatus "Checking For Registration Data..."
+188 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
192 If WinUI.Net.IsOnline = True Then
196 If WinUI.Registration.IsRegistered = False Then
-200 SetStatus "Starting Registration..."
+200 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
204 WinUI.Registration.Start
End If
End If
@@ -111,7 +111,7 @@
108 frmSplash.lblStatus.Caption = strStatus
112 frmSplash.Refresh
End If
-116 ElseIf IsLoaded("SWEBS Web Server - Control Center") = True Then
+116 ElseIf IsLoaded(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = True Then
120 If frmMain.lblAppStatus.Caption <> strStatus Then
124 If blnBusy = True Then
128 Screen.MousePointer = vbArrowHourglass '13 arrow + hourglass
@@ -205,22 +205,22 @@
Dim lngRetVal As Long
If strMessage = "" Then
- strMessage = "There was an unknown error."
+ strMessage = WinUI.GetTranslatedText("There was an unknown error.")
End If
If WinUI Is Nothing Then
- strErrMsg = "This application has encountered a error: " & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "")
+ strErrMsg = "This application has encountered a error:" & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "")
MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, "SWEBS System Error"
Else
If WinUI.Debuger.DebugMode = True Then
strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- strErrMsg = "This application has encountered a error: " & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "") & vbCrLf & vbCrLf & "An error log has been written to:" & vbCrLf & strErrReport
- MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, "SWEBS System Error"
+ strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport
+ MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, WinUI.GetTranslatedText("SWEBS System Error")
Else
- strErrMsg = "This application has encountered a error: " & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "") & vbCrLf & vbCrLf & "Would you like to create an error log?"
- lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, "SWEBS System Error")
+ strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Would you like to create an error log?")
+ lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, WinUI.GetTranslatedText("SWEBS System Error"))
If lngRetVal = vbYes Then
strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- MsgBox "An error log has been written to:" & vbCrLf & strErrReport, vbInformation + vbApplicationModal
+ MsgBox WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
End If
End If
End If
Index: cDebug.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cDebug.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cDebug.cls 18 Oct 2003 15:35:27 -0000 1.4
+++ cDebug.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -57,14 +57,14 @@
Dim i As Long
100 strMessage = String(30, "*") & vbCrLf
-104 strMessage = strMessage & "WinUI Bug Report - Version: " & WinUI.Version & vbCrLf & vbCrLf
-108 strMessage = strMessage & "Time: (" & Now & ") Location: (" & strLocation & ") Line: (" & strLine & ")" & vbCrLf
-112 strMessage = strMessage & "Message: (" & strErrMsg & ")" & vbCrLf
-116 strMessage = strMessage & "Call Stack:" & vbCrLf
+104 strMessage = strMessage & WinUI.GetTranslatedText("WinUI Bug Report - Version:") & " " & WinUI.Version & vbCrLf & vbCrLf
+108 strMessage = strMessage & WinUI.GetTranslatedText("Time:") & " (" & Now & ") " & WinUI.GetTranslatedText("Location:") & " (" & strLocation & ") " & WinUI.GetTranslatedText("Line:") & " (" & strLine & ")" & vbCrLf
+112 strMessage = strMessage & WinUI.GetTranslatedText("Message:") & " (" & strErrMsg & ")" & vbCrLf
+116 strMessage = strMessage & WinUI.GetTranslatedText("Call Stack:") & vbCrLf
120 For i = 1 To CallStack.Count
124 strMessage = strMessage & Chr(9) & CallStack.Peek(i) & vbCrLf
Next
-128 strMessage = strMessage & vbCrLf & "Please see http://swebs.sf.net for information on this error." & vbCrLf
+128 strMessage = strMessage & vbCrLf & WinUI.GetTranslatedText("Please see http://swebs.sf.net for information on this error.") & vbCrLf
132 strMessage = strMessage & String(30, "*") & vbCrLf
136 Open WinUI.Path & "WinUI_ErrLog.log" For Append As 1
140 Print #1, strMessage
Index: cHTTP.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTP.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTP.cls 25 Oct 2003 00:38:57 -0000 1.4
+++ cHTTP.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -61,8 +61,7 @@
Dim lngRetVal As Long
100 lngRetVal = WebStop
-104 MsgBox "WebStop RetVal: " & lngRetVal
-108 blnRunning = False
+104 blnRunning = False
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Function
Index: cSysTray.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cSysTray.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cSysTray.cls 25 Oct 2003 00:38:57 -0000 1.4
+++ cSysTray.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -19,7 +19,7 @@
' SWEBS/WinUI
'
' Copyright (c) Martin Richardson.
-' Copyright (c) 2003 Adam Caudill.
+' Portions Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
Index: cUtil.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cUtil.cls,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cUtil.cls 18 Oct 2003 15:35:27 -0000 1.6
+++ cUtil.cls 8 Nov 2003 09:01:40 -0000 1.7
@@ -145,7 +145,7 @@
Public Function BrowseForFolder(Optional ByRef psTitle As String = "Select A Directory", Optional ByVal flAllowNewFolder As Boolean = False, Optional psStartDir As String = "C:\") As String
''this has a bug, I know, i'll fix it some day, just not today.
- ''***this needs to get replaces for the upgrade...
+ ''***this needs to get replaced for the upgrade...
'<EhHeader>
On Error GoTo BrowseForFolder_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cUtil.BrowseForFolder")
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
Binary files /tmp/cvsyU67Ws and /tmp/cvsq0mM1N differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- frmMain.frm 5 Nov 2003 21:39:21 -0000 1.75
+++ frmMain.frm 8 Nov 2003 09:01:41 -0000 1.76
@@ -15,6 +15,61 @@
ScaleHeight = 4290
ScaleWidth = 9555
StartUpPosition = 2 'CenterScreen
+ Begin SWEBS_WinUI.ctxHookMenu ctxXPMenu
+ Left = 5280
+ Top = 3960
+ _ExtentX = 900
+ _ExtentY = 900
+ BmpCount = 13
+ Bmp:1 = "frmMain.frx":0CCA
+ Mask:1 = 12632256
+ Key:1 = "#mnuFileSave"
+ Bmp:2 = "frmMain.frx":0DDC
+ Mask:2 = 12632256
+ Key:2 = "#mnuHelpRegister"
+ Bmp:3 = "frmMain.frx":0EEE
+ Mask:3 = 12632256
+ Key:3 = "#mnuHelpUpdate"
+ Bmp:4 = "frmMain.frx":1000
+ Mask:4 = 12632256
+ Key:4 = "#mnuFileExit"
+ Bmp:5 = "frmMain.frx":1112
+ Mask:5 = 12632256
+ Key:5 = "#mnuHelpForum"
+ Bmp:6 = "frmMain.frx":1224
+ Mask:6 = 13355979
+ Key:6 = "#mnuHelpHomePage"
+ Bmp:7 = "frmMain.frx":1776
+ Mask:7 = 13553358
+ Key:7 = "#mnuHelpAbout"
+ Bmp:8 = "frmMain.frx":1CC8
+ Mask:8 = 13355979
+ Key:8 = "#mnuFileExport"
+ Bmp:9 = "frmMain.frx":221A
+ Mask:9 = 12632256
+ Key:9 = "#mnuSysTrayPopupExit"
+ Bmp:10 = "frmMain.frx":232C
+ Mask:10 = 13553358
+ Key:10 = "#mnuSysTrayPopupAbout"
+ Bmp:11 = "frmMain.frx":287E
+ Mask:11 = 12632256
+ Key:11 = "#mnuSysTrayPopupUpdate"
+ Bmp:12 = "frmMain.frx":2990
+ Mask:12 = 12632256
+ Key:12 = "#mnuSysTrayPopupForum"
+ Bmp:13 = "frmMain.frx":2AA2
+ Mask:13 = 13355979
+ Key:13 = "#mnuSysTrayPopupHomePage"
+ BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851}
+ Name = "Tahoma"
+ Size = 8.25
+ Charset = 0
+ Weight = 400
+ Underline = 0 'False
+ Italic = 0 'False
+ Strikethrough = 0 'False
+ EndProperty
+ End
Begin VB.Frame fraStatus
BorderStyle = 0 'None
Height = 3735
@@ -87,7 +142,7 @@
ForeColor = &H00FF0000&
Height = 195
Left = 660
- MouseIcon = "frmMain.frx":0CCA
+ MouseIcon = "frmMain.frx":2FF4
MousePointer = 99 'Custom
TabIndex = 89
ToolTipText = "Click here for details."
@@ -179,7 +234,7 @@
Begin VB.Image imgLogo
Height = 480
Left = 3360
- Picture = "frmMain.frx":0FD4
+ Picture = "frmMain.frx":32FE
Top = 3120
Width = 480
End
@@ -201,22 +256,6 @@
Width = 2895
End
End
- Begin SWEBS_WinUI.ctxHookMenu ctxXPMenu
- Left = 5400
- Top = 3960
- _ExtentX = 900
- _ExtentY = 900
- BmpCount = 0
- BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851}
- Name = "Tahoma"
- Size = 8.25
- Charset = 0
- Weight = 400
- Underline = 0 'False
- Italic = 0 'False
- Strikethrough = 0 'False
- EndProperty
- End
Begin MSComDlg.CommonDialog dlgMain
Left = 5040
Top = 3960
@@ -241,16 +280,17 @@
_ExtentY = 5741
_Version = 393217
BorderStyle = 0
+ Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
- TextRTF = $"frmMain.frx":1C9E
+ TextRTF = $"frmMain.frx":3FC8
End
Begin VB.ComboBox cmbViewLogFiles
Height = 315
- ItemData = "frmMain.frx":1D20
+ ItemData = "frmMain.frx":404A
Left = 120
- List = "frmMain.frx":1D22
+ List = "frmMain.frx":404C
Style = 2 'Dropdown List
TabIndex = 41
Top = 120
@@ -323,9 +363,9 @@
End
Begin VB.ListBox lstvHosts
Height = 3375
- ItemData = "frmMain.frx":1D24
+ ItemData = "frmMain.frx":404E
Left = 120
- List = "frmMain.frx":1D26
+ List = "frmMain.frx":4050
TabIndex = 29
Top = 240
Width = 1815
@@ -516,7 +556,7 @@
Width = 2415
End
Begin VB.Label lblWebroot
- Caption = $"frmMain.frx":1D28
+ Caption = $"frmMain.frx":4052
Height = 495
Left = 120
TabIndex = 12
@@ -602,7 +642,7 @@
Width = 3255
End
Begin VB.Label lblIndexFiles
- Caption = $"frmMain.frx":1DCC
+ Caption = $"frmMain.frx":40F6
Height = 495
Left = 120
TabIndex = 22
@@ -647,9 +687,8 @@
Left = 5280
Top = 3840
End
- Begin VB.CommandButton cmdCancel
- Cancel = -1 'True
- Caption = "&Cancel"
+ Begin VB.CommandButton cmdExit
+ Caption = "E&xit"
Height = 375
Left = 8400
TabIndex = 3
@@ -952,9 +991,9 @@
End
Begin VB.ListBox lstCGI
Height = 3375
- ItemData = "frmMain.frx":1E7A
+ ItemData = "frmMain.frx":41A4
Left = 120
- List = "frmMain.frx":1E7C
+ List = "frmMain.frx":41A6
TabIndex = 37
Top = 240
Width = 1815
@@ -1178,8 +1217,8 @@
'</EhHeader>
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.exe|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, (InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, 1, (Len(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter) - InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\")))
@@ -1205,8 +1244,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.ErrorLog, (InStrRev(WinUI.Server.HTTP.Config.ErrorLog, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = WinUI.Path
@@ -1250,8 +1289,8 @@
On Error GoTo cmdBrowseNewCGIInterp_Click_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewCGIInterp_Click")
'</EhHeader>
-100 dlgMain.DialogTitle = "Please select a file..."
-104 dlgMain.Filter = "Executable Files (*.exe)|*.log|All Files (*.*)|*.*"
+100 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+104 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.log|All Files (*.*)|*.*")
108 dlgMain.ShowSave
112 If dlgMain.FileName <> "" Then
116 txtNewCGIInterp.Text = dlgMain.FileName
@@ -1272,8 +1311,8 @@
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewvHostLogs_Click")
'</EhHeader>
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 dlgMain.InitDir = WinUI.Path
116 dlgMain.ShowSave
120 txtvHostLog.Text = dlgMain.FileName
@@ -1336,8 +1375,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, (InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, 1, (Len(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log) - InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\")))
@@ -1383,8 +1422,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.LogFile, (InStrRev(WinUI.Server.HTTP.Config.LogFile, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.LogFile, 1, (Len(WinUI.Server.HTTP.Config.LogFile) - InStrRev(WinUI.Server.HTTP.Config.LogFile, "\")))
@@ -1402,18 +1441,18 @@
'</EhFooter>
End Sub
-Private Sub cmdCancel_Click()
+Private Sub cmdExit_Click()
'<EhHeader>
- On Error GoTo cmdCancel_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCancel_Click")
+ On Error GoTo cmdExit_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdExit_Click")
'</EhHeader>
100 Unload Me
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdCancel_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCancel_Click", Erl, False
+cmdExit_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdExit_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -1593,7 +1632,21 @@
On Error GoTo cmdOK_Click_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdOK_Click")
'</EhHeader>
-100 Unload Me
+100 If blnDirty <> False Then
+104 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
+108 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+ Else
+112 blnDirty = False
+116 WinUI.Server.HTTP.StopServer
+120 DoEvents
+124 WinUI.Server.HTTP.StartServer
+128 UpdateStats
+132 Me.Hide
+ End If
+ Else
+136 Me.WindowState = vbMinimized
+140 Me.Hide
+ End If
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1614,7 +1667,7 @@
108 DoEvents
112 WinUI.Server.HTTP.StartServer
116 UpdateStats
-120 SetStatus "Ready..."
+120 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1732,7 +1785,7 @@
Dim RetVal As Long
Dim cBar As cExplorerBar
Dim cItem As cExplorerBarItem
-
+
'setup the translated strings...
100 SetStatus "Loading Translated Strings..."
@@ -1748,7 +1801,7 @@
140 mnuHelpAbout.Caption = WinUI.GetTranslatedText("&About") & "..."
144 cmdOK.Caption = WinUI.GetTranslatedText("&OK")
148 cmdApply.Caption = WinUI.GetTranslatedText("&Apply")
-152 cmdCancel.Caption = WinUI.GetTranslatedText("&Cancel")
+152 cmdExit.Caption = WinUI.GetTranslatedText("E&xit")
156 fraSrvStatus.Caption = WinUI.GetTranslatedText("Current Service Status:")
160 lblSrvStatus.Caption = WinUI.GetTranslatedText("Status:")
164 cmdSrvStart.Caption = WinUI.GetTranslatedText("S&tart")
@@ -1824,13 +1877,13 @@
404 Set SysTray = New cSysTray
408 Set SysTray.SourceWindow = Me
412 SysTray.IconInSysTray
-416 SysTray.ToolTip = "SWEBS Web Server " & WinUI.Version
+416 SysTray.ToolTip = WinUI.GetTranslatedText("SWEBS Web Server") & " " & WinUI.Version
420 SysTray.Icon = Me.Icon
424 fraStatus.ZOrder 0
428 vbaSideBar.ZOrder 0
432 tmrStatus_Timer
-436 SetStatus "Ready..."
+436 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1847,28 +1900,22 @@
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.Form_QueryUnload")
'</EhHeader>
Dim lngRetVal As Long
- Dim i As Long
-100 If blnDirty = True Then
-104 lngRetVal = MsgBox(WinUI.GetTranslatedText("Do you want to save your settings before closing?"), vbYesNo + vbQuestion + vbApplicationModal)
-108 If lngRetVal = vbYes Then
-112 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
-116 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+100 If UnloadMode <> vbFormControlMenu Then
+104 If blnDirty = True Then
+108 lngRetVal = MsgBox(WinUI.GetTranslatedText("Do you want to save your settings before closing?"), vbYesNo + vbQuestion + vbApplicationModal)
+112 If lngRetVal = vbYes Then
+116 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
+120 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+124 Cancel = True
+ End If
End If
End If
+ Else
+128 Cancel = True
+132 Me.WindowState = vbMinimized
+136 Me.Hide
End If
-
-120 SysTray.RemoveFromSysTray
-124 Set SysTray = Nothing
-128 DoEvents
-132 Me.Hide
-136 For i = Forms.Count - 1 To 0 Step -1
-140 Unload Forms(i)
- Next
-144 WinUI.Util.LoadUser32 False
-148 Set WinUI = Nothing
-152 SetExceptionFilter False
-156 End
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1888,6 +1935,36 @@
End If
End Sub
+Private Sub Form_Unload(Cancel As Integer)
+ '<EhHeader>
+ On Error GoTo Form_Unload_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.Form_Unload")
+ '</EhHeader>
+ Dim i As Long
+
+100 Me.Hide
+104 PostMessage Me.hwnd, 0&, 0&, 0&
+108 DoEvents
+112 SysTray.RemoveFromSysTray
+116 Set SysTray = Nothing
+120 DoEvents
+124 For i = Forms.Count - 1 To 0 Step -1
+128 Unload Forms(i)
+ Next
+132 WinUI.Util.LoadUser32 False
+136 Set WinUI = Nothing
+140 SetExceptionFilter False
+144 End
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
+
+Form_Unload_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.Form_Unload", Erl, False
+ Resume Next
+ '</EhFooter>
+End Sub
+
Private Sub lblUpdateStatus_Click()
'<EhHeader>
On Error GoTo lblUpdateStatus_Click_Err
@@ -2256,7 +2333,7 @@
Else
136 MsgBox WinUI.GetTranslatedText("You have the most current version available."), vbOKOnly + vbInformation
End If
-140 SetStatus "Ready..."
+140 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
Index: frmMain.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvs1rY9JJ and /tmp/cvswOUxcj differ
Index: lang.xml
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lang.xml 5 Nov 2003 21:39:22 -0000 1.10
+++ lang.xml 8 Nov 2003 09:01:43 -0000 1.11
@@ -40,6 +40,24 @@
<lang base="You data has been saved.\r\rYou will need to restart the SWEBS Service before these setting will take effect.">
You data has been saved.\r\rYou will need to restart the SWEBS Service before these setting will take effect.
</lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
<lang base="Are you sure you want to delete this item?\r\rThis can not be undone.">
Are you sure you want to delete this item?\r\rThis can not be undone.
</lang>
@@ -49,9 +67,15 @@
<lang base="Please fill all fields.">
Please fill all fields.
</lang>
+ <lang base="Data was not saved, no idea why...">
+ Data was not saved, no idea why...
+ </lang>
<lang base="Restarting Service">
Restarting Service
</lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Starting Service">
Starting Service
</lang>
@@ -97,8 +121,8 @@
<lang base="&Apply">
&Apply
</lang>
- <lang base="&Cancel">
- &Cancel
+ <lang base="E&xit">
+ E&xit
</lang>
<lang base="Current Service Status:">
Current Service Status:
@@ -253,6 +277,12 @@
<lang base="View Logs">
View Logs
</lang>
+ <lang base="SWEBS Web Server">
+ SWEBS Web Server
+ </lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Do you want to save your settings before closing?">
Do you want to save your settings before closing?
</lang>
@@ -295,6 +325,9 @@
<lang base="You have the most current version available.">
You have the most current version available.
</lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Stopped">
Stopped
</lang>
@@ -389,6 +422,23 @@
File Size
</lang>
</lang-obj>
+ <lang-obj name="cDebug">
+ <lang base="WinUI Bug Report - Version:">
+ WinUI Bug Report - Version:
+ </lang>
+ <lang base="Time:">
+ Time:
+ </lang>
+ <lang base="Message:">
+ Message:
+ </lang>
+ <lang base="Call Stack:">
+ Call Stack:
+ </lang>
+ <lang base="Please see http://swebs.sf.net for information on this error.">
+ Please see http://swebs.sf.net for information on this error.
+ </lang>
+ </lang-obj>
<lang-obj name="cHTTPConfig">
<lang base="Date">
Date
@@ -430,10 +480,42 @@
<lang base="SWEBS Web Server - Control Center">
SWEBS Web Server - Control Center
</lang>
+ <lang base="There is already a instance of this application running.">
+ There is already a instance of this application running.
+ </lang>
+ <lang base="SWEBS Web Server - Control Center">
+ SWEBS Web Server - Control Center
+ </lang>
+ <lang base="Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.">
+ Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.
+ </lang>
+ <lang base="Checking For Registration Data">
+ Checking For Registration Data
+ </lang>
+ <lang base="Starting Registration">
+ Starting Registration
+ </lang>
<lang base="SWEBS Web Server - Control Center">
SWEBS Web Server - Control Center
</lang>
+ <lang base="There was an unknown error.">
+ There was an unknown error.
+ </lang>
+ <lang base="This application has encountered a error:\n\nError:">
+ This application has encountered a error:\n\nError:
+ </lang>
+ <lang base="SWEBS System Error">
+ SWEBS System Error
+ </lang>
+ <lang base="This application has encountered a error:\n\nError:">
+ This application has encountered a error:\n\nError:
+ </lang>
+ <lang base="SWEBS System Error">
+ SWEBS System Error
+ </lang>
+ <lang base="An error log has been written to:">
+ An error log has been written to:
+ </lang>
</lang-obj>
-
</lang-code>
</SWEBS-WinUI-Lang>
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
Binary files /tmp/cvsy7DUuT and /tmp/cvs4UQhyK differ
|
|
From: <ple...@us...> - 2003-11-05 21:39:32
|
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv8417/swebswebserver/winui
Modified Files:
.cvsignore WinUI.vbp cHTTPCGI.cls cHTTPCGICol.cls
cHTTPConfig.cls cHTTPIndexCol.cls cHTTPVirtHostCol.cls
credits.rtf frmAbout.frm frmAbout.frx frmMain.frm lang.xml
swebscc.exe
Log Message:
I've been putting this off for two weeks, and got it done in just a couple hours... Well, this seems to work and it compiles..
Let me know if anything is broke..
Index: .cvsignore
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore 25 Oct 2003 00:38:57 -0000 1.5
+++ .cvsignore 5 Nov 2003 21:39:20 -0000 1.6
@@ -4,4 +4,5 @@
WinUI.PDM
WinUI.csi
TransExtract.exe
-SWEBS.dll
\ No newline at end of file
+SWEBS.dll
+
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- WinUI.vbp 25 Oct 2003 00:38:57 -0000 1.63
+++ WinUI.vbp 5 Nov 2003 21:39:21 -0000 1.64
@@ -52,7 +52,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=173
+RevisionVer=176
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: cHTTPCGI.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGI.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPCGI.cls 18 Oct 2003 15:35:27 -0000 1.3
+++ cHTTPCGI.cls 5 Nov 2003 21:39:21 -0000 1.4
@@ -39,40 +39,40 @@
'local variable(s) to hold property value(s)
Private mvarInterpreter As String 'local copy
-Private mvarExtention As String 'local copy
+Private mvarExtension As String 'local copy
-Public Property Let Extention(ByVal vData As String)
+Public Property Let Extension(ByVal vData As String)
'used when assigning a value to the property, on the left side of an assignment.
'Syntax: X.Extention = 5
'<EhHeader>
- On Error GoTo Extention_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extention")
+ On Error GoTo Extension_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
'</EhHeader>
-100 mvarExtention = vData
+100 mvarExtension = vData
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Property
-Extention_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extention", Erl, False
+Extension_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
Resume Next
'</EhFooter>
End Property
-Public Property Get Extention() As String
+Public Property Get Extension() As String
'used when retrieving value of a property, on the right side of an assignment.
'Syntax: Debug.Print X.Extention
'<EhHeader>
- On Error GoTo Extention_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extention")
+ On Error GoTo Extension_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
'</EhHeader>
-100 Extention = mvarExtention
+100 Extension = mvarExtension
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Property
-Extention_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extention", Erl, False
+Extension_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
Resume Next
'</EhFooter>
End Property
Index: cHTTPCGICol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGICol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPCGICol.cls 18 Oct 2003 15:35:27 -0000 1.3
+++ cHTTPCGICol.cls 5 Nov 2003 21:39:21 -0000 1.4
@@ -42,7 +42,7 @@
'local variable to hold collection
Private mCol As Collection
-Public Function Add(Interpreter As String, Extention As String, Optional sKey As String) As cHTTPCGI
+Public Function Add(Interpreter As String, Extension As String, Optional sKey As String) As cHTTPCGI
'create a new object
'<EhHeader>
On Error GoTo Add_Err
@@ -52,7 +52,7 @@
100 Set objNewMember = New cHTTPCGI
'set the properties passed into the method
104 objNewMember.Interpreter = Interpreter
-108 objNewMember.Extention = Extention
+108 objNewMember.Extension = Extension
112 If Len(sKey) = 0 Then
116 mCol.Add objNewMember
Else
@@ -174,3 +174,21 @@
Set mCol = Nothing
End Sub
+Public Function Clear()
+ 'destroys collection
+ '<EhHeader>
+ On Error GoTo Clear_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Clear")
+ '</EhHeader>
+100 Set mCol = Nothing
+ 'creates the collection
+104 Set mCol = New Collection
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Function
+
+Clear_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Clear", Erl, False
+ Resume Next
+ '</EhFooter>
+End Function
Index: cHTTPConfig.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPConfig.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTPConfig.cls 18 Oct 2003 15:35:27 -0000 1.4
+++ cHTTPConfig.cls 5 Nov 2003 21:39:21 -0000 1.5
@@ -179,11 +179,11 @@
'<IndexFile>
248 Set Node = ConfigXML.SearchForTag(Nothing, "IndexFile")
252 If Node Is Nothing Then
-256 Index.Add "index.html", "index.html"
+256 Index.Add "index.html"
Else
260 Do While Not (Node Is Nothing)
264 If Trim$(Node.Content) <> "" Then
-268 Index.Add Trim$(Node.Content), Trim$(Node.Content)
+268 Index.Add Trim$(Node.Content)
End If
272 Set Node = ConfigXML.SearchForTag(Node, "IndexFile")
Loop
Index: cHTTPIndexCol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPIndexCol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPIndexCol.cls 18 Oct 2003 15:35:27 -0000 1.3
+++ cHTTPIndexCol.cls 5 Nov 2003 21:39:21 -0000 1.4
@@ -173,3 +173,21 @@
Set mCol = Nothing
End Sub
+Public Function Clear()
+ 'destroys collection
+ '<EhHeader>
+ On Error GoTo Clear_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPIndexCol.Clear")
+ '</EhHeader>
+100 Set mCol = Nothing
+ 'creates the collection
+104 Set mCol = New Collection
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Function
+
+Clear_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPIndexCol.Clear", Erl, False
+ Resume Next
+ '</EhFooter>
+End Function
Index: cHTTPVirtHostCol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPVirtHostCol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPVirtHostCol.cls 18 Oct 2003 15:35:27 -0000 1.3
+++ cHTTPVirtHostCol.cls 5 Nov 2003 21:39:21 -0000 1.4
@@ -51,7 +51,6 @@
Dim objNewMember As cHTTPVirtHost
100 Set objNewMember = New cHTTPVirtHost
-
'set the properties passed into the method
104 objNewMember.HostName = HostName
108 objNewMember.Domain = Domain
@@ -63,12 +62,10 @@
128 mCol.Add objNewMember, sKey
End If
-
'return the object created
132 Set Add = objNewMember
136 Set objNewMember = Nothing
-
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Function
@@ -182,3 +179,21 @@
Set mCol = Nothing
End Sub
+Public Function Clear()
+ 'destroys collection
+ '<EhHeader>
+ On Error GoTo Clear_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPVirtHostCol.Clear")
+ '</EhHeader>
+100 Set mCol = Nothing
+ 'creates the collection
+104 Set mCol = New Collection
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Function
+
+Clear_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPVirtHostCol.Clear", Erl, False
+ Resume Next
+ '</EhFooter>
+End Function
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
Binary files /tmp/cvsLGCNlI and /tmp/cvsyFIzug differ
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- frmAbout.frm 18 Oct 2003 15:35:27 -0000 1.34
+++ frmAbout.frm 5 Nov 2003 21:39:21 -0000 1.35
@@ -53,7 +53,7 @@
ForeColor = &H00FF0000&
Height = 195
Left = 120
- MouseIcon = "frmAbout.frx":16B1
+ MouseIcon = "frmAbout.frx":173F
MousePointer = 99 'Custom
TabIndex = 4
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
@@ -63,7 +63,7 @@
Begin VB.Image imgLogo
Height = 480
Left = 600
- Picture = "frmAbout.frx":19BB
+ Picture = "frmAbout.frx":1A49
Top = 120
Width = 480
End
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvsvGlCvM and /tmp/cvsYgbJLo differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- frmMain.frm 25 Oct 2003 00:38:57 -0000 1.74
+++ frmMain.frm 5 Nov 2003 21:39:21 -0000 1.75
@@ -241,7 +241,6 @@
_ExtentY = 5741
_Version = 393217
BorderStyle = 0
- Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1199,29 +1198,30 @@
End Sub
Private Sub cmdBrowseErrorLog_Click()
-'Dim strDefaultFile As String
-' blnDirty = True
-' dlgMain.DialogTitle = "Please select a file..."
-' dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-' strDefaultFile = Mid$(Config.vHost((WinUI.Config.ErrorLog + 1), 4), (InStrRev(Config.vHost((WinUI.Config.ErrorLog + 1), 4), "\") + 1))
-' dlgMain.FileName = strDefaultFile
-' dlgMain.InitDir = WinUI.Path
-' dlgMain.ShowSave
-' If dlgMain.FileName <> strDefaultFile Then
-' txtvHostLog.Text = dlgMain.FileName
-' End If
-'<EhHeader>
-On Error GoTo cmdBrowseErrorLog_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdBrowseErrorLog_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click")
+ '</EhHeader>
+ Dim strDefaultFile As String
+
+100 blnDirty = True
+104 dlgMain.DialogTitle = "Please select a file..."
+108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.ErrorLog, (InStrRev(WinUI.Server.HTTP.Config.ErrorLog, "\") + 1))
+116 dlgMain.FileName = strDefaultFile
+120 dlgMain.InitDir = WinUI.Path
+124 dlgMain.ShowSave
+128 If dlgMain.FileName <> strDefaultFile Then
+132 txtvHostLog.Text = dlgMain.FileName
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdBrowseErrorLog_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdBrowseErrorPages_Click()
@@ -1329,29 +1329,30 @@
End Sub
Private Sub cmdBrowsevHostLog_Click()
-'Dim strDefaultFile As String
-' blnDirty = True
-' dlgMain.DialogTitle = "Please select a file..."
-' dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-' strDefaultFile = Mid$(WinUI.Config.vHost((lstvHosts.ListIndex + 1), 4), (InStrRev(Config.vHost((lstvHosts.ListIndex + 1), 4), "\") + 1))
-' dlgMain.FileName = strDefaultFile
-' dlgMain.InitDir = Mid$(Config.vHost((lstvHosts.ListIndex + 1), 4), 1, (Len(Config.vHost((lstvHosts.ListIndex + 1), 4)) - InStrRev(Config.vHost((lstvHosts.ListIndex + 1), 4), "\")))
-' dlgMain.ShowSave
-' If dlgMain.FileName <> strDefaultFile Then
-' txtvHostLog.Text = dlgMain.FileName
-' End If
-'<EhHeader>
-On Error GoTo cmdBrowsevHostLog_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdBrowsevHostLog_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click")
+ '</EhHeader>
+ Dim strDefaultFile As String
+
+100 blnDirty = True
+104 dlgMain.DialogTitle = "Please select a file..."
+108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, (InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\") + 1))
+116 dlgMain.FileName = strDefaultFile
+120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, 1, (Len(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log) - InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\")))
+124 dlgMain.ShowSave
+128 If dlgMain.FileName <> strDefaultFile Then
+132 txtvHostLog.Text = dlgMain.FileName
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdBrowsevHostLog_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdBrowsevHostRoot_Click()
@@ -1375,29 +1376,30 @@
End Sub
Private Sub cmdBrowseLogFile_Click()
-'Dim strDefaultFile As String
-' blnDirty = True
-' dlgMain.DialogTitle = "Please select a file..."
-' dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-' strDefaultFile = Mid$(Config.LogFile, (InStrRev(Config.LogFile, "\") + 1))
-' dlgMain.FileName = strDefaultFile
-' dlgMain.InitDir = Mid$(Config.LogFile, 1, (Len(Config.LogFile) - InStrRev(Config.LogFile, "\")))
-' dlgMain.ShowSave
-' If dlgMain.FileName <> strDefaultFile Then
-' txtLogFile.Text = dlgMain.FileName
-' End If
-'<EhHeader>
-On Error GoTo cmdBrowseLogFile_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdBrowseLogFile_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click")
+ '</EhHeader>
+ Dim strDefaultFile As String
+
+100 blnDirty = True
+104 dlgMain.DialogTitle = "Please select a file..."
+108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.LogFile, (InStrRev(WinUI.Server.HTTP.Config.LogFile, "\") + 1))
+116 dlgMain.FileName = strDefaultFile
+120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.LogFile, 1, (Len(WinUI.Server.HTTP.Config.LogFile) - InStrRev(WinUI.Server.HTTP.Config.LogFile, "\")))
+124 dlgMain.ShowSave
+128 If dlgMain.FileName <> strDefaultFile Then
+132 txtLogFile.Text = dlgMain.FileName
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdBrowseLogFile_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdCancel_Click()
@@ -1434,43 +1436,44 @@
End Sub
Private Sub cmdCGIRemove_Click()
-'***this needs replaced
-'Dim lngRetVal As Long
-'Dim i As Long
-'
-' If lstCGI.ListIndex >= 0 Then
-' lngRetVal = MsgBox(WinUI.GetTranslatedText("Are you sure you want to delete this item?\r\rThis can not be undone."), vbQuestion + vbYesNo)
-' If lngRetVal = vbYes Then
-' blnDirty = True
-' RemoveCGI (lstCGI.ListIndex + 1)
-' lstCGI.Clear
-' If WinUI.Config.CGI(1, 2) <> "" Then
-' For i = 1 To UBound(WinUI.Config.CGI)
-' lstCGI.AddItem WinUI.Config.CGI(i, 2)
-' Next
-' Else
-' lstCGI.Enabled = False
-' cmdBrowseCGIInterp.Enabled = False
-' cmdCGIRemove.Enabled = False
-' txtCGIInterp.Enabled = False
-' txtCGIExt.Enabled = False
-' txtCGIInterp.Text = ""
-' txtCGIExt.Text = ""
-' End If
-' End If
-' End If
-'<EhHeader>
-On Error GoTo cmdCGIRemove_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGIRemove_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdCGIRemove_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGIRemove_Click")
+ '</EhHeader>
+ Dim lngRetVal As Long
+ Dim vItem As Variant
+ Dim i As Long
+
+100 If lstCGI.ListIndex >= 0 Then
+104 lngRetVal = MsgBox(WinUI.GetTranslatedText("Are you sure you want to delete this item?\r\rThis can not be undone."), vbQuestion + vbYesNo)
+108 If lngRetVal = vbYes Then
+112 blnDirty = True
+116 WinUI.Server.HTTP.Config.CGI.Remove (lstCGI.Text)
+120 lstCGI.Clear
+124 If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
+128 For Each vItem In WinUI.Server.HTTP.Config.CGI
+132 lstCGI.AddItem vItem.Extension
+136 lstCGI.Enabled = True
+ Next
+ Else
+140 lstCGI.Enabled = False
+144 cmdBrowseCGIInterp.Enabled = False
+148 cmdCGIRemove.Enabled = False
+152 txtCGIInterp.Enabled = False
+156 txtCGIExt.Enabled = False
+160 txtCGIInterp.Text = ""
+164 txtCGIExt.Text = ""
+ End If
+ End If
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdCGIRemove_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGIRemove_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGIRemove_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdNewCGICancel_Click()
@@ -1492,38 +1495,39 @@
End Sub
Private Sub cmdNewCGIOK_Click()
-'***this needs replaced
-'Dim i As Long
-'
-' If txtNewCGIInterp.Text <> "" And txtNewCGIExt.Text <> "" Then
-' blnDirty = True
-' AddNewCGI txtNewCGIExt.Text, txtNewCGIInterp.Text
-' If WinUI.Config.CGI(1, 2) <> "" Then
-' lstCGI.Clear
-' For i = 1 To UBound(WinUI.Config.CGI)
-' lstCGI.AddItem WinUI.Config.CGI(i, 2)
-' Next
-' Else
-' lstCGI.Enabled = False
-' End If
-' fraNewCGI.ZOrder 1
-' txtNewCGIInterp.Text = ""
-' txtNewCGIExt.Text = ""
-' Else
-' MsgBox WinUi.GetTranslatedText("Please fill all fields.")
-' End If
-'<EhHeader>
-On Error GoTo cmdNewCGIOK_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGIOK_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdNewCGIOK_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGIOK_Click")
+ '</EhHeader>
+ Dim vItem As Variant
+ Dim i As Long
+
+100 If txtNewCGIInterp.Text <> "" And txtNewCGIExt.Text <> "" Then
+104 blnDirty = True
+108 WinUI.Server.HTTP.Config.CGI.Add txtNewCGIInterp.Text, txtNewCGIExt.Text, txtNewCGIExt.Text
+112 If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
+116 lstCGI.Clear
+120 For Each vItem In WinUI.Server.HTTP.Config.CGI
+124 lstCGI.AddItem vItem.Extension
+128 lstCGI.Enabled = True
+ Next
+ Else
+132 lstCGI.Enabled = False
+ End If
+136 fraNewCGI.ZOrder 1
+140 txtNewCGIInterp.Text = ""
+144 txtNewCGIExt.Text = ""
+ Else
+148 MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdNewCGIOK_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGIOK_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGIOK_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdNewvHostCancel_Click()
@@ -1547,41 +1551,41 @@
End Sub
Private Sub cmdNewvHostOK_Click()
-'***this needs replaced
-'Dim i As Long
-'
-' If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then
-' blnDirty = True
-' AddNewvHost txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text
-' lstvHosts.Clear
-' If WinUI.Config.vHost(1).Name <> "" Then
-' For i = 1 To UBound(WinUI.Config.vHost)
-' lstvHosts.AddItem WinUI.Config.vHost(i).Name
-' Next
-' lstvHosts.Enabled = True
-' Else
-' lstvHosts.Enabled = False
-' End If
-' fraNewvHost.ZOrder 1
-' txtNewvHostName.Text = ""
-' txtNewvHostDomain.Text = ""
-' txtNewvHostRoot.Text = ""
-' txtNewvHostLogs.Text = ""
-' Else
-' MsgBox WinUi.GetTranslatedText("Please fill all fields.")
-' End If
-'<EhHeader>
-On Error GoTo cmdNewvHostOK_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewvHostOK_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo cmdNewvHostOK_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewvHostOK_Click")
+ '</EhHeader>
+ Dim vItem As Variant
+ Dim i As Long
+
+100 If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then
+104 blnDirty = True
+108 WinUI.Server.HTTP.Config.VirtHost.Add txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text, txtNewvHostName.Text
+112 lstvHosts.Clear
+116 If WinUI.Server.HTTP.Config.VirtHost.Count > 0 Then
+120 For Each vItem In WinUI.Server.HTTP.Config.VirtHost
+124 lstvHosts.AddItem vItem.HostName
+ Next
+128 lstvHosts.Enabled = True
+ Else
+132 lstvHosts.Enabled = False
+ End If
+136 fraNewvHost.ZOrder 1
+140 txtNewvHostName.Text = ""
+144 txtNewvHostDomain.Text = ""
+148 txtNewvHostRoot.Text = ""
+152 txtNewvHostLogs.Text = ""
+ Else
+156 MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
cmdNewvHostOK_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewvHostOK_Click", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewvHostOK_Click", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub cmdOK_Click()
@@ -1913,7 +1917,7 @@
108 txtCGIInterp.Enabled = True
112 txtCGIExt.Enabled = True
116 txtCGIInterp.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Interpreter
-120 txtCGIExt.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention
+120 txtCGIExt.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -2366,7 +2370,7 @@
160 lstCGI.Enabled = False
164 lstCGI.Clear
168 For Each vItem In WinUI.Server.HTTP.Config.CGI
-172 lstCGI.AddItem vItem.Extention
+172 lstCGI.AddItem vItem.Extension
176 lstCGI.Enabled = True
Next
@@ -2459,8 +2463,8 @@
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtCGIExt_Change")
'</EhHeader>
100 If lstCGI.ListIndex <> -1 Then
-104 If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention <> txtCGIExt.Text Then
-108 WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention = txtCGIExt.Text
+104 If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension <> txtCGIExt.Text Then
+108 WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension = txtCGIExt.Text
112 blnDirty = True
End If
End If
@@ -2553,30 +2557,29 @@
End Sub
Private Sub txtIndexFiles_Change()
-'***this needs replaced
-'Dim strTmpArray() As String
-'Dim lngRecCount As Long
-'Dim i As Long
-' strTmpArray = Split(Trim$(txtIndexFiles.Text), " ")
-' If UBound(strTmpArray) >= 1 Then
-' ReDim WinUI.Config.Index(1 To (UBound(strTmpArray) + 1))
-' lngRecCount = UBound(strTmpArray)
-' For i = 0 To lngRecCount
-' WinUI.Config.Index(i + 1) = strTmpArray(i)
-' Next
-' End If
-'<EhHeader>
-On Error GoTo txtIndexFiles_Change_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtIndexFiles_Change")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+ '<EhHeader>
+ On Error GoTo txtIndexFiles_Change_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtIndexFiles_Change")
+ '</EhHeader>
+ Dim strTmpArray() As String
+ Dim lngRecCount As Long
+ Dim i As Long
+100 strTmpArray = Split(Trim$(txtIndexFiles.Text), " ")
+104 If Not IsEmpty(strTmpArray) Then
+108 WinUI.Server.HTTP.Config.Index.Clear
+112 lngRecCount = UBound(strTmpArray)
+116 For i = 0 To lngRecCount
+120 WinUI.Server.HTTP.Config.Index.Add strTmpArray(i)
+ Next
+ End If
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
txtIndexFiles_Change_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtIndexFiles_Change", Erl, False
-Resume Next
-'</EhFooter>
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtIndexFiles_Change", Erl, False
+ Resume Next
+ '</EhFooter>
End Sub
Private Sub txtIndexFiles_KeyPress(KeyAscii As Integer)
Index: lang.xml
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lang.xml 18 Oct 2003 15:35:28 -0000 1.9
+++ lang.xml 5 Nov 2003 21:39:22 -0000 1.10
@@ -27,8 +27,6 @@
Lang-Maintainer
</lang>
</lang-obj>
- <lang-obj name="frmEventView">
- </lang-obj>
<lang-obj name="frmMain">
<lang base="Loading Log File">
Loading Log File
@@ -300,24 +298,9 @@
<lang base="Stopped">
Stopped
</lang>
- <lang base="Start Pending">
- Start Pending
- </lang>
- <lang base="Stop Pending">
- Stop Pending
- </lang>
<lang base="Running">
Running
</lang>
- <lang base="Continue Pending">
- Continue Pending
- </lang>
- <lang base="Pause Pending">
- Pause Pending
- </lang>
- <lang base="Paused">
- Paused
- </lang>
<lang base="Loading Configuration Data">
Loading Configuration Data
</lang>
@@ -372,8 +355,6 @@
What will you use this software for?
</lang>
</lang-obj>
- <lang-obj name="frmSplash">
- </lang-obj>
<lang-obj name="frmTip">
<lang base="TOD XML Data File Not Found.">
TOD XML Data File Not Found.
@@ -408,18 +389,6 @@
File Size
</lang>
</lang-obj>
- <lang-obj name="cDebug">
- </lang-obj>
- <lang-obj name="cEventLog">
- </lang-obj>
- <lang-obj name="cHookingThunk">
- </lang-obj>
- <lang-obj name="cHTTP">
- </lang-obj>
- <lang-obj name="cHTTPCGI">
- </lang-obj>
- <lang-obj name="cHTTPCGICol">
- </lang-obj>
<lang-obj name="cHTTPConfig">
<lang base="Date">
Date
@@ -452,40 +421,10 @@
vHost: Name
</lang>
</lang-obj>
- <lang-obj name="cHTTPIndex">
- </lang-obj>
- <lang-obj name="cHTTPIndexCol">
- </lang-obj>
- <lang-obj name="cHTTPStats">
- </lang-obj>
- <lang-obj name="cHTTPVirtHost">
- </lang-obj>
- <lang-obj name="cHTTPVirtHostCol">
- </lang-obj>
- <lang-obj name="cMemDC">
- </lang-obj>
- <lang-obj name="cMenuHook">
- </lang-obj>
- <lang-obj name="cNet">
- </lang-obj>
<lang-obj name="cRegistration">
<lang base="Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?">
Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?
</lang>
- </lang-obj>
- <lang-obj name="cServer">
- </lang-obj>
- <lang-obj name="cSubclassingThunk">
- </lang-obj>
- <lang-obj name="cSysTray">
- </lang-obj>
- <lang-obj name="cUpdate">
- </lang-obj>
- <lang-obj name="cUtil">
- </lang-obj>
- <lang-obj name="cWinUI">
- </lang-obj>
- <lang-obj name="basExceptionFilter">
</lang-obj>
<lang-obj name="basMain">
<lang base="SWEBS Web Server - Control Center">
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
Binary files /tmp/cvsePCboS and /tmp/cvsQXtU1G differ
|
