Menu
▾
▴
[Seq-cvs-commit] myseq/client myseq.sln,1.3,1.4 MapOptimizer.cs,NONE,1.1 MacroQuestPanel.resx,NONE,1.1 MacroQuestPanel.cs,NONE,1.1 ListViewPanel.resx,NONE,1.1 ListViewPanel.cs,NONE,1.1 Docking.bmp,NONE,1.1 Compile.bat,NONE,1.1 ClientReleaseNotes.htm,NONE,1.1 Classes.cs,NONE,1.1 UtilSocket.cs,1.1,1.2 Structures.cs,1.1,1.2 myseq.csproj,1.4,1.5 MapPane.resx,1.4,1.5 MapPane.cs,1.6,1.7 MapCon.resx,1.3,1.4 MapCon.cs,1.8,1.9 frmOptions.resx,1.1,1.2 frmOptions.cs,1.1,1.2 frmMain.resx,1.1,1.2 frmMain.cs,1.1,1.2 AssemblyInfo.cs,1.3,1.4 App.ico,1.4,1.5 AboutDlg.resx,1.1,1.2 AboutDlg.cs,1.1,1.2 ClientRleaseNotes.html,1.1,NONE
Update of /cvsroot/seq/myseq/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29798 Modified Files: UtilSocket.cs Structures.cs myseq.csproj MapPane.resx MapPane.cs MapCon.resx MapCon.cs frmOptions.resx frmOptions.cs frmMain.resx frmMain.cs AssemblyInfo.cs App.ico AboutDlg.resx AboutDlg.cs Added Files: myseq.sln MapOptimizer.cs MacroQuestPanel.resx MacroQuestPanel.cs ListViewPanel.resx ListViewPanel.cs Docking.bmp Compile.bat ClientReleaseNotes.htm Classes.cs Removed Files: ClientRleaseNotes.html Log Message: Update source to version 1.16.1 Index: UtilSocket.cs =================================================================== RCS file: /cvsroot/seq/myseq/client/UtilSocket.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- UtilSocket.cs 8 Nov 2003 14:22:59 -0000 1.1 +++ UtilSocket.cs 30 Sep 2004 18:53:05 -0000 1.2 @@ -2,14 +2,13 @@ using System.Net; using System.Net.Sockets; using System.Threading; + using Structures; -namespace SocketSystem -{ +namespace SocketSystem { //======================================================================== /// <summary> This class abstracts a socket </summary> - public class CSocketClient - { + public class CSocketClient { // Delegate Method Types /// <summary> DelType: Called when a message is received </summary> public delegate void MESSAGE_HANDLER(CSocketClient pSocket, Int32 iNumberOfBytes); @@ -96,8 +95,8 @@ /// <param name="pfnCloseHandler"> DelType: Reference to the user defined close handler method </param> /// <param name="pfnErrorHandler"> DelType: Reference to the user defined error handler method </param> public CSocketClient(Int32 iSizeOfRawBuffer, Object pUserArg, - MESSAGE_HANDLER pfnMessageHandler, CLOSE_HANDLER pfnCloseHandler, ERROR_HANDLER pfnErrorHandler) - { + MESSAGE_HANDLER pfnMessageHandler, CLOSE_HANDLER pfnCloseHandler, ERROR_HANDLER pfnErrorHandler) { + LogLib.WriteLine("Entering in CSocketClient.CSocketClient()", 2); // Create the raw buffer GetSizeOfRawBuffer = iSizeOfRawBuffer; GetRawBuffer = new Byte[GetSizeOfRawBuffer]; @@ -116,6 +115,8 @@ // Init the dispose flag IsDisposed = false; + + LogLib.WriteLine("Exiting in CSocketClient.CSocketClient()", 2); } //******************************************************************** /// <summary> Constructor for SocketServer Suppport </summary> @@ -131,8 +132,8 @@ /// <param name="pUserArg"> RefType: A Reference to the Users arguments </param> public CSocketClient(CSocketServer pSocketServer, Socket pClientSocket, Int32 iSocketListArray, String strIpAddress, Int16 iPort, Int32 iSizeOfRawBuffer, Object pUserArg, MESSAGE_HANDLER pfnMessageHandler, CLOSE_HANDLER pfnCloseHandler, - ERROR_HANDLER pfnErrorHandler) - { + ERROR_HANDLER pfnErrorHandler) { + LogLib.WriteLine("Entering in CSocketClient.CSocketClient()", 2); // Create the raw buffer GetSizeOfRawBuffer = iSizeOfRawBuffer; GetRawBuffer = new Byte[GetSizeOfRawBuffer]; @@ -174,18 +175,20 @@ // Wait for a message Receive(); + + LogLib.WriteLine("Exiting in CSocketClient.CSocketClient()", 2); } //******************************************************************* /// <summary> Finialize </summary> - ~CSocketClient() - { + ~CSocketClient() { if (!IsDisposed) Dispose(); } //******************************************************************** /// <summary> Dispose </summary> public void Dispose() { + LogLib.WriteLine("Entering in CSocketClient.Dispose()", 2); try { // Flag that dispose has been called IsDisposed = true; @@ -193,93 +196,81 @@ // Disconnect the client from the server Disconnect(); } - catch (Exception ex) {LogLib.WriteLine("Error in CSocketClient.Dispose(): " + ex.Message);} // Remove the socket from the list if (GetSocketServer != null) GetSocketServer.RemoveSocket(this); + + LogLib.WriteLine("Exiting in CSocketClient.Dispose()", 2); } // Private Methods //******************************************************************** /// <summary> Called when a message arrives </summary> /// <param name="ar"> RefType: An async result interface </param> - private void ReceiveComplete(IAsyncResult ar) - { - try - { + private void ReceiveComplete(IAsyncResult ar) { + LogLib.WriteLine("Entering in CSocketClient.ReceiveComplete()", 2); + try { // Is the Network Stream object valid - if (GetNetworkStream.CanRead) - { + if (GetNetworkStream.CanRead) { // Read the current bytes from the stream buffer Int32 iBytesRecieved = GetNetworkStream.EndRead(ar); // If there are bytes to process else the connection is lost - if (iBytesRecieved > 0) + if (iBytesRecieved > 0) { - try - { - // A message came in send it to the MessageHandler - GetMessageHandler(this, iBytesRecieved); - } - + // A message came in send it to the MessageHandler + try {GetMessageHandler(this, iBytesRecieved);} catch (Exception ex) {LogLib.WriteLine("Error with GetMessageHandler() in CSocketClient.ReceiveComplete(): " + ex.Message);} // Wait for a new message Receive(); + } else { + LogLib.WriteLine("CSocketClient.ReceiveComplete(): Shuting Down", 2); + throw new Exception("Shut Down"); } - else throw new Exception("Shut Down"); } } - catch (Exception) - { - try - { - // The connection must have dropped call the CloseHandler - GetCloseHandler(this); - } + catch (Exception) { + // The connection must have dropped call the CloseHandler + try {GetCloseHandler(this);} catch (Exception ex) {LogLib.WriteLine("Error in CSocketClient.ReceiveComplete(): " + ex.Message);} // Dispose of the class Dispose(); } + + LogLib.WriteLine("Exiting in CSocketClient.ReceiveComplete()", 2); } //******************************************************************** /// <summary> Called when a message is sent </summary> /// <param name="ar"> RefType: An async result interface </param> - private void SendComplete(IAsyncResult ar) - { - try - { + private void SendComplete(IAsyncResult ar) { + LogLib.WriteLine("Entering in CSocketClient.SendComplete()", 2); + try { // Is the Network Stream object valid - if (GetNetworkStream.CanWrite) + if (GetNetworkStream.CanWrite) { GetNetworkStream.EndWrite(ar); + LogLib.WriteLine("CSocketClient.SendComplete(): GetNetworkStream.EndWrite()", 2); + } } - catch (Exception ex) - { - LogLib.WriteLine("Error in CSocketClient.SendComplete(): " + ex.Message); - } - } - - - + catch (Exception ex) {LogLib.WriteLine("Error in CSocketClient.SendComplete(): " + ex.Message);} - + LogLib.WriteLine("Exiting in CSocketClient.SendComplete()", 2); + } // Public Methods //******************************************************************** /// <summary> Function used to connect to a server </summary> /// <param name="strIpAddress"> RefType: The address to connect to </param> /// <param name="iPort"> SimType: The Port to connect to </param> - public void Connect(String strIpAddress, Int16 iPort) - { - try - { - if (GetNetworkStream == null) - { + public void Connect(String strIpAddress, Int16 iPort) { + LogLib.WriteLine("Entering in CSocketClient.Connect()", 2); + try { + if (GetNetworkStream == null) { // Set the Ipaddress and Port GetIpAddress = strIpAddress; GetPort = iPort; @@ -299,15 +290,15 @@ } } - catch (System.Net.Sockets.SocketException e) - { - throw new Exception(e.Message, e.InnerException); - } + catch (System.Net.Sockets.SocketException e) {throw new Exception(e.Message, e.InnerException);} + + LogLib.WriteLine("Entering in CSocketClient.Connect()", 2); } //******************************************************************** /// <summary> Function used to disconnect from the server </summary> - public void Disconnect() - { + public void Disconnect() { + LogLib.WriteLine("Entering in CSocketClient.Disconnect()", 2); + // Close down the connection if (GetNetworkStream != null) GetNetworkStream.Close(); @@ -322,15 +313,17 @@ GetClientSocket = null; GetNetworkStream = null; GetTcpClient = null; + + LogLib.WriteLine("Exiting in CSocketClient.Disconnect()", 2); } //******************************************************************** /// <summary> Function to send a string to the server </summary> /// <param name="strMessage"> RefType: A string to send </param> - public void Send(String strMessage) - { - if ((GetNetworkStream != null) && (GetNetworkStream.CanWrite)) - { + public void Send(String strMessage) { + LogLib.WriteLine("Entering in CSocketClient.Send(String): " + strMessage, 2); + + if ((GetNetworkStream != null) && (GetNetworkStream.CanWrite)) { // Convert the string into a Raw Buffer Byte[] pRawBuffer = System.Text.Encoding.ASCII.GetBytes(strMessage); @@ -338,39 +331,42 @@ GetNetworkStream.BeginWrite(pRawBuffer, 0, pRawBuffer.GetLength(0), GetCallbackWriteMethod, null); } else - throw new Exception("Socket Closed"); + LogLib.WriteLine("Error in CSocketClient.Send(string): Socket Closed"); + + LogLib.WriteLine("Exiting in CSocketClient.Send(String): " + strMessage, 2); } //******************************************************************** /// <summary> Function to send a raw buffer to the server </summary> /// <param name="pRawBuffer"> RefType: A Raw buffer of bytes to send </param> - public void Send(Byte[] pRawBuffer) - { - if ((GetNetworkStream != null) && (GetNetworkStream.CanWrite)) - { + public void Send(Byte[] pRawBuffer) { + LogLib.WriteLine("Entering in CSocketClient.Send(Byte[])", 2); + if ((GetNetworkStream != null) && (GetNetworkStream.CanWrite)) { // Issue an asynchronus write GetNetworkStream.BeginWrite(pRawBuffer, 0, pRawBuffer.GetLength(0), GetCallbackWriteMethod, null); } else - throw new Exception("Socket Closed"); + LogLib.WriteLine("Error in CSocketClient.Send(Byte[]): Socket Closed"); + + LogLib.WriteLine("Exiting in CSocketClient.Send(Byte[])", 2); } //******************************************************************** /// <summary> Wait for a message to arrive </summary> - public void Receive() - { - if ((GetNetworkStream != null) && (GetNetworkStream.CanRead)) - { + public void Receive() { + LogLib.WriteLine("Entering in CSocketClient.Receive()", 2); + if ((GetNetworkStream != null) && (GetNetworkStream.CanRead)) { // Issue an asynchronous read GetNetworkStream.BeginRead(GetRawBuffer, 0, GetSizeOfRawBuffer, GetCallbackReadMethod, null); } else - throw new Exception("Socket Closed"); + LogLib.WriteLine("Error in CSocketClient.Receive(): Socket Closed"); + + LogLib.WriteLine("Exiting in CSocketClient.Receive()", 2); } } // End of CSocketClient //======================================================================== /// <summary> This class abstracts a socket server </summary> - public class CSocketServer - { + public class CSocketServer { // Delegate Method Types /// <summary> DelType: Called when a message is extracted from the socket </summary> public delegate void MESSAGE_HANDLER(CSocketClient pSocket, Int32 iNumberOfBytes); @@ -446,8 +442,7 @@ //******************************************************************** /// <summary> Constructor </summary> - public CSocketServer() - { + public CSocketServer() { // Create the critical section object GetSocketListCS = new Object(); @@ -456,18 +451,16 @@ } //******************************************************************** /// <summary> Finalize </summary> - ~CSocketServer() - { + ~CSocketServer() { // If this object has not been disposed yet if (!IsDisposed) Stop(); } //******************************************************************** /// <summary> Dispose function to shutdown the SocketManager </summary> - public void Dispose() - { - try - { + public void Dispose() { + LogLib.WriteLine("Entering in CSocketServer.Dispose()", 2); + try { // Mark the object as disposed IsDisposed = true; @@ -475,11 +468,9 @@ if (GetAcceptThread != null) Stop(); } - - catch (Exception ex) - { - LogLib.WriteLine("Error in CSocketServer.Dispose(): " + ex.Message); - } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Dispose(): " + ex.Message);} + + LogLib.WriteLine("Exiting in CSocketServer.Dispose()", 2); } @@ -487,59 +478,65 @@ //******************************************************************** /// <summary> Function to locate an empty slot in the client socket list array </summary> /// <returns> Will return the index slot or user defined MaxClientConnections if none found </returns> - private Int32 LocateSocketIndex() - { - Int32 iSocket = GetMaxClientConnections; - + private Int32 LocateSocketIndex() { + LogLib.WriteLine("Entering in CSocketServer.LocateSocketIndex()", 2); + Int32 iSocket = 0; //GetMaxClientConnections; + Monitor.Enter(GetSocketListCS); - try - { + try { // Find an empty slot in the list for (iSocket = 0; iSocket < GetMaxClientConnections; ++iSocket) if (GetSocketClientList[iSocket] == null) break; } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.LocateSocketIndex(): " + ex.Message);} - catch (Exception ex) - { - LogLib.WriteLine("Error in CSocketServer.LocateSocketIndex(): " + ex.Message); - } - + Monitor.Exit(GetSocketListCS); + LogLib.WriteLine("Exiting in CSocketServer.LocateSocketIndex()", 2); return iSocket; } //******************************************************************** /// <summary> Function to process and accept socket connection requests </summary> - private void AcceptThread() - { + private void AcceptThread() { + LogLib.WriteLine("Entering in CSocketServer.AcceptThread()", 2); Socket pClientSocket = null; - - try - { + + try { // Create a new TCPListner and start it up - GetTcpListener = new TcpListener(Dns.Resolve(GetIpAddress).AddressList[0],GetPort); + IPAddress localAddr = IPAddress.Parse(GetIpAddress); + GetTcpListener = new TcpListener(localAddr, GetPort); + + //GetTcpListener = new TcpListener(GetPort); //Dns.Resolve(GetIpAddress).AddressList[0], GetTcpListener.Start(); - for (;;) - { + for (;;) { // If a client connects, accept the connection pClientSocket = GetTcpListener.AcceptSocket(); - if (pClientSocket.Connected) - { + if (pClientSocket.Connected) { // Locate a socket index Int32 iSocketIndex = LocateSocketIndex(); - + + LogLib.WriteLine("Located SocketIndex: " + iSocketIndex.ToString()); // If we got a valid index - if (iSocketIndex != GetMaxClientConnections) - { + if (iSocketIndex != GetMaxClientConnections) { + LogLib.WriteLine("Using SocketIndex: " + iSocketIndex.ToString()); + + LogLib.WriteLine("Trying to resolve Server IP Address"); + string clientIPAddress = null; + + try {clientIPAddress = pClientSocket.RemoteEndPoint.ToString().Substring(0,15);} + catch (Exception ex) {LogLib.WriteLine("Error in Setting Server IP Address: " + ex.Message);} + + LogLib.WriteLine("Opening SocketClient for Client: " + clientIPAddress); // Create a SocketClient object GetSocketClientList[iSocketIndex] = new CSocketClient(this, pClientSocket, // The socket object for the connection iSocketIndex, // The index into the SocketClientList - pClientSocket.RemoteEndPoint.ToString().Substring(0,15), // The IpAddress of the client + clientIPAddress, // The IpAddress of the client GetPort, // The port the client connected to GetSizeOfRawBuffer, // The size of the byte array for storing messages GetUserArg, // Application developer state @@ -547,25 +544,28 @@ new CSocketClient.CLOSE_HANDLER(GetCloseHandler), // Application developer Close Handler new CSocketClient.ERROR_HANDLER(GetErrorHandler)); // Application developer Error Handler + LogLib.WriteLine("Created the SocketClientList."); + // Call the Accept Handler GetAcceptHandler(GetSocketClientList[iSocketIndex]); - } - else - { + LogLib.WriteLine("Accepthandeler set for SocketClient."); + } else { + LogLib.WriteLine("SocketIndex: " + iSocketIndex.ToString() + " is not a valid SocketIndex.\r\nGetMaxClientConnections: " + GetMaxClientConnections.ToString()); + // Call the Error Handler GetErrorHandler(null, new Exception("Unable To Accept Socket Connection")); // Close the socket connection pClientSocket.Close(); + + LogLib.WriteLine("Error in CSocketServer.AcceptThread() - Unable To Accept Socket Connection: "); } } } } - catch (System.Net.Sockets.SocketException e) - { + catch (System.Net.Sockets.SocketException e) { // Did we stop the TCPListener - if (e.ErrorCode != 10004) - { + if (e.ErrorCode != 10004) { // Call the error handler GetErrorHandler(null, e); @@ -573,19 +573,30 @@ if (pClientSocket != null) if (pClientSocket.Connected) pClientSocket.Close(); + + LogLib.WriteLine("Error in CSocketServer.AcceptThread() - Stop Listener: "); } } - catch (Exception e) - { + catch (Exception e) { // Call the error handler - GetErrorHandler(null, e); + if (m_pfnErrorHandler != null) + GetErrorHandler(null, e); // Close the socket down if it exists if (pClientSocket != null) if (pClientSocket.Connected) pClientSocket.Close(); + LogLib.WriteLine("Error in CSocketServer.AcceptThread() - Close Handler: "); + } + catch { + // Close the socket down if it exists + if (pClientSocket != null) + if (pClientSocket.Connected) + pClientSocket.Close(); + LogLib.WriteLine("Error in CSocketServer.AcceptThread() - Close Socket: "); } + LogLib.WriteLine("Exiting in CSocketServer.AcceptThread()", 2); } @@ -593,26 +604,21 @@ //******************************************************************** /// <summary> Funciton to remove a socket from the list of sockets </summary> /// <param name="iSocketListIndex"> SimType: The index of the socket to remove </param> - public void RemoveSocket(CSocketClient pSocketClient) - { + public void RemoveSocket(CSocketClient pSocketClient) { + LogLib.WriteLine("Entering in CSocketServer.RemoveSocket()", 2); Monitor.Enter(GetSocketListCS); - - try - { + + try { // Is the supplied CSocketClient object valid - if (pSocketClient == GetSocketClientList[pSocketClient.GetSocketListIndex]) - { + if (pSocketClient == GetSocketClientList[pSocketClient.GetSocketListIndex]) { // Set the slot to null GetSocketClientList[pSocketClient.GetSocketListIndex] = null; } } - - catch (Exception ex) - { - LogLib.WriteLine("Error in CSocketServer.RemoveSocket(): " + ex.Message); - } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.RemoveSocket(): " + ex.Message);} Monitor.Exit(GetSocketListCS); + LogLib.WriteLine("Exiting in CSocketServer.RemoveSocket()", 2); } //******************************************************************** @@ -626,74 +632,102 @@ /// <param name="pfnAcceptHandler"> DelType: Function pointer to the user AcceptHandler function </param> /// <param name="pfnCloseHandler"> DelType: Function pointer to the user CloseHandler function </param> /// <param name="pfnErrorHandler"> DelType: Function pointer to the user ErrorHandler function </param> - public void Start(String strIpAddress, Int16 iPort, Int32 iMaxClientConnections, Int32 iSizeOfRawBuffer, Object pUserArg, + public void Start(string strIpAddress, Int16 iPort, Int32 iMaxClientConnections, Int32 iSizeOfRawBuffer, Object pUserArg, MESSAGE_HANDLER pfnMessageHandler, ACCEPT_HANDLER pfnAcceptHandler, CLOSE_HANDLER pfnCloseHandler, - ERROR_HANDLER pfnErrorHandler) - { - // Is an AcceptThread currently running - if (GetAcceptThread == null) - { - // Set connection values - GetIpAddress = strIpAddress; - GetPort = iPort; - GetMaxClientConnections = iMaxClientConnections; - - // Init the array of CSocketClient references - GetSocketClientList = new CSocketClient[iMaxClientConnections]; - - // Save the Handler Functions - GetMessageHandler = pfnMessageHandler; - GetAcceptHandler = pfnAcceptHandler; - GetCloseHandler = pfnCloseHandler; - GetErrorHandler = pfnErrorHandler; - - // Save the buffer size and user arguments - GetSizeOfRawBuffer = iSizeOfRawBuffer; - GetUserArg = pUserArg; - - // Start the listening thread if one is currently not running - ThreadStart tsThread = new ThreadStart(AcceptThread); - GetAcceptThread = new Thread(tsThread); - GetAcceptThread.Name = "Accept"; - GetAcceptThread.Start(); + ERROR_HANDLER pfnErrorHandler) { + LogLib.WriteLine("Entering in CSocketServer.Start()", 2); + try { + // Is an AcceptThread currently running + if (GetAcceptThread == null) { + // Set connection values + GetIpAddress = strIpAddress; + GetPort = iPort; + GetMaxClientConnections = iMaxClientConnections; + + // Init the array of CSocketClient references + GetSocketClientList = new CSocketClient[iMaxClientConnections]; + + // Save the Handler Functions + GetMessageHandler = pfnMessageHandler; + GetAcceptHandler = pfnAcceptHandler; + GetCloseHandler = pfnCloseHandler; + GetErrorHandler = pfnErrorHandler; + + // Save the buffer size and user arguments + GetSizeOfRawBuffer = iSizeOfRawBuffer; + GetUserArg = pUserArg; + + // Start the listening thread if one is currently not running + ThreadStart tsThread = new ThreadStart(AcceptThread); + GetAcceptThread = new Thread(tsThread); + GetAcceptThread.Name = "Accept"; + GetAcceptThread.Start(); + } } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Start() Abort Thread: " + ex.Message);} + LogLib.WriteLine("Exiting in CSocketServer.Start()", 2); } //******************************************************************** /// <summary> Function to stop the SocketServer. It can be restarted with Start </summary> - public void Stop() - { - // Abort the accept thread - if (GetAcceptThread != null) - { - GetTcpListener.Stop(); - GetAcceptThread.Join(); - GetAcceptThread = null; + public void Stop() { + LogLib.WriteLine("Entering in CSocketServer.Stop()", 2); + + try { + LogLib.WriteLine("Aborting the accept thread", 2); + // Abort the accept thread + if (GetAcceptThread != null) { + GetTcpListener.Stop(); + GetAcceptThread.Join(); + GetAcceptThread.Abort(); + } } - - // Dispose of all of the socket connections - for (int iSocket = 0; iSocket < GetMaxClientConnections; ++iSocket) - { - if (GetSocketClientList[iSocket] != null) - { - GetSocketClientList[iSocket].Dispose(); - GetSocketClientList[iSocket] = null; + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Stop() Abort Thread: " + ex.Message);} + + try { + LogLib.WriteLine("Disposing of all of the socket connections", 2); + // Dispose of all of the socket connections + for (int iSocket = 0; iSocket < GetMaxClientConnections; ++iSocket) { + if (GetSocketClientList[iSocket] != null) { + GetSocketClientList[iSocket].Dispose(); + GetSocketClientList[iSocket] = null; + } } } - - // Wait for all of the socket client objects to be destroyed - GC.Collect(); - GC.WaitForPendingFinalizers(); - - // Clear the Handler Functions - GetMessageHandler = null; - GetAcceptHandler = null; - GetCloseHandler = null; - GetErrorHandler = null; - - // Clear the buffer size and user arguments - GetSizeOfRawBuffer = 0; - GetUserArg = null; + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Stop() Dispose Sockets: " + ex.Message);} + + try { + LogLib.WriteLine("Waiting for all of the socket client objects to be destroyed", 2); + // Wait for all of the socket client objects to be destroyed + GC.Collect(); + GC.WaitForPendingFinalizers(); + } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Stop() Destroy Sockets: " + ex.Message);} + + try { + LogLib.WriteLine("Clearing the buffer size and user arguments", 2); + // Clear the buffer size and user arguments + GetSizeOfRawBuffer = 0; + GetUserArg = null; + + // Clear the Handler Functions + GetMessageHandler = null; + GetAcceptHandler = null; + GetCloseHandler = null; + GetErrorHandler = null; + GetAcceptThread = null; + } + catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Stop() Clear Buffers: " + ex.Message);} + + //try { + // Close the socket down if it exists + // if (pClientSocket != null) + // if (pClientSocket.Connected) + // pClientSocket.Close(); + //} + //catch (Exception ex) {LogLib.WriteLine("Error in CSocketServer.Stop() Clocse Client Socket: " + ex.Message);} + + LogLib.WriteLine("Exiting in CSocketServer.Stop()", 2); } } // End of CSocketServer Index: frmMain.resx =================================================================== RCS file: /cvsroot/seq/myseq/client/frmMain.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- frmMain.resx 8 Nov 2003 14:22:59 -0000 1.1 +++ frmMain.resx 30 Sep 2004 18:53:06 -0000 1.2 @@ -97,15 +97,15 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="mapPane.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Public</value> - </data> <data name="mapPane.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="mapPane.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="mapPane.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Public</value> + </data> <data name="openFileDialog.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -151,15 +151,6 @@ <data name="statusBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Public</value> </data> - <data name="lstSpawnList.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </data> - <data name="lstSpawnList.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="lstSpawnList.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Public</value> - </data> <data name="colorPicker.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -250,6 +241,42 @@ <data name="mnuSep4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="mnuServerSelection.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuServerSelection.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuIPAddress5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="mnuMapSettings.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -268,12 +295,6 @@ <data name="mnuSep5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowGridLines.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="mnuShowGridLines.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> <data name="mnuGridInterval.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -304,16 +325,22 @@ <data name="mnuGridInterval1000.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuGridColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowGridLines.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuGridColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowGridLines.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuBackgroungColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMobTrails.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuBackgroungColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMobTrails.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowSpawnPoints.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowSpawnPoints.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="mnuSep6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -352,18 +379,6 @@ <data name="mnuShowListGridLines.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuSpawnListFont.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="mnuSpawnListFont.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="mnuListColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="mnuListColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> <data name="mnuAlert.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -382,6 +397,12 @@ <data name="mnuSep7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="mnuGlobalAlerts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuGlobalAlerts.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="mnuAddEditAlerts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -394,6 +415,54 @@ <data name="mnuCollectMobTrails.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="mnuSep11.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuSep11.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChangeColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChangeColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuGridColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuGridColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuListColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuListColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuBackgroungColor.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuBackgroungColor.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChangeFont.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuChangeFont.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuSpawnListFont.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuSpawnListFont.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuTargetInfoFont.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuTargetInfoFont.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="mnuSep8.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> @@ -412,58 +481,172 @@ <data name="mnuAutoSelectEQTarget.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuSep9.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuView.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuSep9.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuView.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowNPCs.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuViewMap.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowNPCs.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuViewMap.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowCorpses.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapNPCs.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowCorpses.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapNPCs.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowPlayers.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapCorpses.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowPlayers.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapCorpses.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowInvisMobs.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapPlayers.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowInvisMobs.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapPlayers.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowMobTrails.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapInvis.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuShowMobTrails.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapInvis.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuHelpMain.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapMounts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuHelpMain.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapMounts.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuAbout.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapFamiliars.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuAbout.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapFamiliars.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuGlobalAlerts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapPets.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> - <data name="mnuGlobalAlerts.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="mnuShowMapPets.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuViewList.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuViewList.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListNPCs.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListNPCs.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListCorpses.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListCorpses.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListPlayers.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListPlayers.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListInvis.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListInvis.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListMounts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListMounts.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListFamiliars.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListFamiliars.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListPets.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowListPets.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="menuItem3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuViewAll.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuViewAll.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllNPCs.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllNPCs.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllCorpses.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllCorpses.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllPlayers.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllPlayers.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllInvis.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllInvis.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllMounts.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllMounts.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllFamiliars.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllFamiliars.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllPets.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuShowAllPets.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuHelpMain.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuHelpMain.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuAbout.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="mnuAbout.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -475,9 +658,6 @@ <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> - <data name="$this.Name"> - <value>frmMain</value> - </data> <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> @@ -487,6 +667,9 @@ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> + <data name="$this.Name"> + <value>frmMain</value> + </data> <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>56</value> </data> @@ -496,4 +679,21 @@ <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAQAAAAAADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAAAIAAAAAAAAAAAAAEAAAABAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8A7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u + 7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7uiI7u7u7u7u + 7u7u7u7oiIiIiIiO7u6H8AAA8AB4d3cHf3//gHh/AAB////3////f/9//4D/cAAP////8P///3//f/93 + AH+If/////D///+P////eAD3iI/4//+Hh3d3eIiH//h4eIiI93gP//f///j///dwAIiIgP//f//3//// + //9//4iIAAf//3//9///+P/4//gAAAAH//9/93d3j39/d48AAAAAAA93////j///+P/4gAAAAAAIiP// + /3////f/8AAAAAAAAIiP//////+IiGAAAAAAAAB4eHd3d3h393cAAAAAAAAACHiIf///+IhwAAAAAAAA + AAh4iI//+HiHAAAAAAAAAAAAh4j3d493AAAAAAAAAAAAAAB3d4h2AAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAP4AAAH/AAAB/4AAA/+AAAf/wA + AP/+AAH//gAD//8AD///wD///////////////////////////////////////w== +</value> + </data> </root> \ No newline at end of file --- NEW FILE: Docking.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MacroQuestPanel.cs --- using System; using System.IO; using System.Data; using System.Text; using System.Drawing; using System.Threading; using System.Collections; using System.Windows.Forms; using System.ComponentModel; using System.Runtime.InteropServices; using System.Text.RegularExpressions; // Class Files using SocketSystem; using Structures; namespace myseq { public class MacroQuestPanel : System.Windows.Forms.UserControl { public MapCon mapCon; public int iColorCount = 0; public string MQType = null; public string MQLogin = null; public string MQPassword = null; public ArrayList TextColors = new ArrayList(); public string []MacroName = null; public string []MacroCommand = null; public Color []textColors; public const int SB_VERT = 1; public const int EM_SETSCROLLPOS = 0x0400 + 222; [DllImport("user32", CharSet=CharSet.Auto)] public static extern bool GetScrollRange(IntPtr hWnd, int nBar, out int lpMinPos, out int lpMaxPos); [DllImport("user32", CharSet=CharSet.Auto)] public static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, POINT lParam); [StructLayout(LayoutKind.Sequential)] public class POINT { public POINT() {} public POINT(int x, int y) { this.x = x; this.y = y; } public int x; public int y; } public CSocketClient pMacroQuestClient = null; public System.Windows.Forms.ListBox lstMacroQuest; public System.Windows.Forms.RichTextBox rtbMacroQuest; public System.Windows.Forms.TextBox txtMacroQuest; private System.Windows.Forms.Button cmdSend; private System.Windows.Forms.Button cmdServer; private System.Windows.Forms.TextBox txtIPAddress; private System.Windows.Forms.TextBox txtPort; private System.ComponentModel.Container components = null; public MacroQuestPanel() { InitializeComponent(); LoadIni(); } protected override void Dispose(bool disposing) { if (disposing) if(components != null) components.Dispose(); base.Dispose(disposing); } #region Component Designer generated code private void InitializeComponent() { this.rtbMacroQuest = new System.Windows.Forms.RichTextBox(); this.txtMacroQuest = new System.Windows.Forms.TextBox(); this.cmdSend = new System.Windows.Forms.Button(); this.cmdServer = new System.Windows.Forms.Button(); this.txtIPAddress = new System.Windows.Forms.TextBox(); this.txtPort = new System.Windows.Forms.TextBox(); this.lstMacroQuest = new System.Windows.Forms.ListBox(); this.SuspendLayout(); // // rtbMacroQuest // this.rtbMacroQuest.BackColor = System.Drawing.Color.Black; this.rtbMacroQuest.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); this.rtbMacroQuest.ForeColor = System.Drawing.Color.White; this.rtbMacroQuest.Location = new System.Drawing.Point(0, 112); ... [truncated message content] |
