[Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp,1.7,1.8 wxldserv.cpp,1.6,1.7

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxluasocket/src

Modified Files:
	dservice.cpp wxldserv.cpp 
Log Message:
try to make the stack tree not segfault in wxLua app (still doesn't work)
no major changes


Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dservice.cpp	2 Dec 2005 06:38:31 -0000	1.7
--- dservice.cpp	5 Dec 2005 06:11:15 -0000	1.8
***************
*** 1022,1027 ****
          case wxLUA_EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
!                 wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(-1, pDebugData);
--- 1022,1027 ----
          case wxLUA_EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
!                 wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(-1, pDebugData);
***************
*** 1033,1039 ****
          case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
!                 int              stackRef   = m_debuggerSocket->ReadInt();
!                 wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(stackRef, pDebugData);
--- 1033,1039 ----
          case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
!                 int             stackRef   = m_debuggerSocket->ReadInt();
!                 wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(stackRef, pDebugData);
***************
*** 1045,1051 ****
          case wxLUA_EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
!                 int              itemNode   = m_debuggerSocket->ReadInt();
!                 wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(itemNode, pDebugData);
--- 1045,1051 ----
          case wxLUA_EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
!                 int             itemNode   = m_debuggerSocket->ReadInt();
!                 wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
                      debugEvent.SetDebugData(itemNode, pDebugData);
***************
*** 1057,1063 ****
          case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
!                 int              exprRef   = m_debuggerSocket->ReadInt();
!                 wxString         strResult = m_debuggerSocket->ReadString();
  
                  debugEvent.SetMessage(strResult);
--- 1057,1063 ----
          case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
!                 int             exprRef   = m_debuggerSocket->ReadInt();
!                 wxString        strResult = m_debuggerSocket->ReadString();
  
                  debugEvent.SetMessage(strResult);
***************
*** 1070,1076 ****
          case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED:
              {
!                 wxString         fileName = m_debuggerSocket->ReadString();
!                 int              line = m_debuggerSocket->ReadInt();
!                 bool             enabled = m_debuggerSocket->ReadInt() ? true : false;
  
                  wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
--- 1070,1076 ----
          case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED:
              {
!                 wxString fileName = m_debuggerSocket->ReadString();
!                 int      line = m_debuggerSocket->ReadInt();
!                 bool     enabled = m_debuggerSocket->ReadInt() ? true : false;
  
                  wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
***************
*** 1081,1086 ****
          case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
!                 wxString         fileName = m_debuggerSocket->ReadString();
!                 int              line = m_debuggerSocket->ReadInt();
  
                  wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);
--- 1081,1086 ----
          case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
!                 wxString fileName = m_debuggerSocket->ReadString();
!                 int      line = m_debuggerSocket->ReadInt();
  
                  wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxldserv.cpp	2 Dec 2005 06:38:31 -0000	1.6
--- wxldserv.cpp	5 Dec 2005 06:11:15 -0000	1.7
***************
*** 586,591 ****
                              case wxLUA_EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
!                                     wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(-1, pDebugData);
--- 586,591 ----
                              case wxLUA_EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
!                                     wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(-1, pDebugData);
***************
*** 597,603 ****
                              case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
!                                     int              stackRef   = ReadInt(m_acceptedSocket);
!                                     wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(stackRef, pDebugData);
--- 597,603 ----
                              case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
!                                     int             stackRef = ReadInt(m_acceptedSocket);
!                                     wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(stackRef, pDebugData);
***************
*** 609,615 ****
                              case wxLUA_EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
!                                     int              itemNode   = ReadInt(m_acceptedSocket);
!                                     wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(itemNode, pDebugData);
--- 609,615 ----
                              case wxLUA_EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
!                                     int             itemNode   = ReadInt(m_acceptedSocket);
!                                     wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
                                          debugEvent.SetDebugData(itemNode, pDebugData);
***************
*** 621,627 ****
                              case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
!                                     int              exprRef   = ReadInt(m_acceptedSocket);
!                                     wxString         strResult = ReadString(m_acceptedSocket);
  
                                      debugEvent.SetMessage(strResult);
--- 621,627 ----
                              case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
!                                     int             exprRef   = ReadInt(m_acceptedSocket);
!                                     wxString        strResult = ReadString(m_acceptedSocket);
  
                                      debugEvent.SetMessage(strResult);