[Firebird-checkins] CVS: interbase/iscguard cntl_guard.c,1.2,1.3 iscguard.c,1.5,1.6 iscguard.rc,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/iscguard
In directory usw-pr-cvs1:/tmp/cvs-serv32292/iscguard

Modified Files:
	cntl_guard.c iscguard.c iscguard.rc 
Log Message:
Committed Changes made in the borland tree
Committed Changes made by Mike Nordel re, 64 bit io for win32 and bug fixes


Index: cntl_guard.c
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/cntl_guard.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** cntl_guard.c	2000/08/16 08:53:05	1.2
--- cntl_guard.c	2001/04/05 17:05:43	1.3
***************
*** 28,31 ****
--- 28,32 ----
  #include "../jrd/thd.h"
  #include "../jrd/isc_proto.h"
+ #include "../jrd/gds_proto.h"
  #include "../jrd/sch_proto.h"
  #include "../jrd/thd_proto.h"
***************
*** 122,126 ****
  TEXT	*p;
  TEXT	default_mode[100] = { 0 };
! DWORD	last_error;
  
  service_handle = RegisterServiceCtrlHandler (service_name, 
--- 123,129 ----
  TEXT	*p;
  TEXT	default_mode[100] = { 0 };
! DWORD	last_error = 0;
! DWORD 	temp;
! int	status;
  
  service_handle = RegisterServiceCtrlHandler (service_name, 
***************
*** 161,164 ****
--- 164,168 ----
   * the service is stoping. */
  
+ status = 1;
  if (report_status (SERVICE_START_PENDING, NO_ERROR, 1, 3000) &&
      (stop_event_handle = CreateEvent (NULL, TRUE, FALSE, NULL)) != NULL &&
***************
*** 166,172 ****
      !gds__thread_start ((FPTR_INT) main_handler, (void*) flag, 0, 0, NULL_PTR) &&
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
!     WaitForSingleObject (stop_event_handle, INFINITE);
  
! last_error = GetLastError();
  
  if (stop_event_handle)
--- 170,180 ----
      !gds__thread_start ((FPTR_INT) main_handler, (void*) flag, 0, 0, NULL_PTR) &&
      report_status (SERVICE_RUNNING, NO_ERROR, 0, 0))
!     {
!     status = 0;
!     temp = WaitForSingleObject (stop_event_handle, INFINITE);
!     }
  
! if (temp == WAIT_FAILED || status)
!     last_error = GetLastError();
  
  if (stop_event_handle)

Index: iscguard.c
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/iscguard.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** iscguard.c	2000/09/02 07:53:34	1.5
--- iscguard.c	2001/04/05 17:05:43	1.6
***************
*** 714,717 ****
--- 714,718 ----
          while (WaitForSingleObject (procHandle, INFINITE) == WAIT_FAILED);
          GetExitCodeProcess (procHandle, &exit_status);
+ 	CloseHandle(procHandle);
          }      
  

Index: iscguard.rc
===================================================================
RCS file: /cvsroot/firebird/interbase/iscguard/iscguard.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** iscguard.rc	2000/08/16 08:53:05	1.2
--- iscguard.rc	2001/04/05 17:05:43	1.3
***************
*** 17,20 ****
--- 17,21 ----
   * Contributor(s): ______________________________________.
   */
+ #include <windows.h>
  #include "iscguard.rh"
  #include "windows.h"
***************
*** 63,67 ****
   CONTROL "", IDC_RESTARTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 96, 80, 60, 8, 0
   CONTROL "", IDC_LOCATION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 49, 144, 8, 0
!  CONTROL "InterBase Guardian for Windows NT / 95", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 12, 144, 8, 0
   CONTROL "Text7", IDC_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 61, 144, 8, 0
   CONTROL "ListView1", IDC_LOG, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER, 12, 99, 184, 81
--- 64,68 ----
   CONTROL "", IDC_RESTARTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 96, 80, 60, 8, 0
   CONTROL "", IDC_LOCATION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 49, 144, 8, 0
!  CONTROL "InterBase Guardian for Windows", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 12, 144, 8, 0
   CONTROL "Text7", IDC_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 44, 61, 144, 8, 0
   CONTROL "ListView1", IDC_LOG, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER, 12, 99, 184, 81