Menu
▾
▴
[swebs-commits] swebswebserver/winui cPerfMon.cls,NONE,1.1 cPerfMonData.cls,NONE,1.1 frmNewISAPI.frm,NONE,1.1 frmNewISAPI.frx,NONE,1.1 ChangeLog.txt,1.28,1.29 WinUI.lvw,1.22,1.23 WinUI.vbp,1.67,1.68 WinUI.vbw,1.24,1.25 basMain.bas,1.56,1.57 cDebug.cls,1.5,1.6 cWinUI.cls,1.11,1.12 credits.rtf,1.20,1.21 frmAbout.frm,1.35,1.36 frmAbout.frx,1.21,1.22 frmMain.frm,1.77,1.78 frmMain.frx,1.22,1.23 llinksel.cur,1.1,1.2 swebscc.exe,1.64,1.65 SubclassingSink.idl,1.1,NONE SubclassingSink.tlb,1.1,NONE cCallStack.cls,1.2,NONE cHookingThunk.cls,1.2,NONE cMemDC.cls,1.2,NONE cMenuHook.cls,1.2,NONE cSubclassingThunk.cls,1.2,NONE ctxHookMenu.ctl,1.1,NONE ctxHookMenu.ctx,1.1,NONE pagBitmaps.pag,1.1,NONE pagBitmaps.pgx,1.1,NONE
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 ---
|
