[pywin32-checkins] pywin32/win32/src PythonService.cpp,1.11,1.12

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4153

Modified Files:
	PythonService.cpp 
Log Message:
PythonService.exe -register would crash with a thread-state error.
Update usage to indicate that '-register' shouldn't be necessary any
more (as win32serviceutil can generally find it fine - registration
is only a fallback when the .EXE isn't in a place win32serviceutil
can find.
One day I will drop PythonService.exe completely, and with it will
go this entire concept.


Index: PythonService.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PythonService.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PythonService.cpp	8 Nov 2003 12:34:45 -0000	1.11
--- PythonService.cpp	11 Nov 2003 23:57:31 -0000	1.12
***************
*** 972,976 ****
  			printf("Options:\n");
  #ifndef BUILD_FREEZE
! 			printf(" -register - register the EXE - this must be done at least once.\n");
  #endif
  		    printf(" -debug servicename [parms] - debug the Python service.\n");
--- 972,976 ----
  			printf("Options:\n");
  #ifndef BUILD_FREEZE
! 			printf(" -register - register the EXE - this should generally not be necessary.\n");
  #endif
  		    printf(" -debug servicename [parms] - debug the Python service.\n");
***************
*** 1140,1145 ****
  		return FALSE;
  	}
! 	if (!Py_IsInitialized())
! 		Py_Initialize();
  	// Register this specific EXE against this specific DLL version
  	PyObject *obVerString = PySys_GetObject("winver");
--- 1140,1145 ----
  		return FALSE;
  	}
! 	assert (Py_IsInitialized());
! 	CEnterLeavePython _celp;
  	// Register this specific EXE against this specific DLL version
  	PyObject *obVerString = PySys_GetObject("winver");