hg/stx-libbasic: comparison Win32OperatingSystem.st

equal deleted inserted replaced

-:1171ee15fa9c
+:6852892b27cd
 	    fprintf(stderr, "stdin %x\n", lpsiStartInfo.hStdInput);
 	    fprintf(stderr, "stdout %x\n",lpsiStartInfo.hStdOutput);
 	    fprintf(stderr, "stderr %x\n",lpsiStartInfo.hStdError);
 #endif
 	} else {
-	    fprintf(stderr, "Win32OS: bad fd arg in createProcess\n");
+	    fprintf(stderr, "Win32OS [warning]: bad fd arg in createProcess\n");
 	}
 	if (doFork == true) {
 #ifdef PROCESSDEBUGWIN32
 	    fprintf(stderr, "create process cmdPath:<%s> cmdLine:<%s> in <%s>\n", cmdPath, cmdLine, dir);
 "low level close of a filedescriptor"
 %{
 if (__isExternalAddressLike(anIntegerOrHandle) ) {
 if( !CloseHandle( anIntegerOrHandle ) ) {
-	   fprintf( stderr, "Could not close handle : %x\n", anIntegerOrHandle);
+	   fprintf( stderr, "Win32OS [warning]: Could not close handle : %x\n", anIntegerOrHandle);
 }
 RETURN(self);
 }
 if (__isSmallInteger(anIntegerOrHandle)) {
 	close(__intVal(anIntegerOrHandle));
 if (create == 0) {
 	fileHandle = nil;
 	argumentError = @symbol(missingCreateMode);
 	goto badArgument;
 }
-fprintf(stderr, "name:<%s> access:%x share:%x create:%x attr:%x\n",
+#ifdef PROCESSDEBUGWIN32
+fprintf(stderr, "name:<%s> access:%x share:%x create:%x attr:%x\n",
 		name, access, share, create, attr);
+#endif
 h = CreateFile(name, access, share, 0 /* sa */, create, attr, 0 /* hTempl */);
 if (h != INVALID_HANDLE_VALUE) {
 	__externalAddressVal(fileHandle) = (void *)h;
 } else {
 	fileHandle = nil;
 "/ or not supported by OS
 "/
 ^ self primitiveFailed
 !
-terminateProcess:processId
+terminateProcess:processHandle
 "terminate a process.
 The process has a chance to do some cleanup.
 WIN32:
 	 Under unix, we have terminateProcess, which does a soft
 	 terminate (giving the process a chance to cleanup) and
 	 Use it only in extreme circumstances. The state of
 	 global data maintained by dynamic-link libraries (DLLs)
 	 may be compromised if TerminateProcess is used.
 TODO: send it a WM_QUIT instead, to allow for proper shutdown."
-self terminateProcess:processId exitCode:0
+self terminateProcess:processHandle exitCode:0
 !
-terminateProcess:processId exitCode:exitCode
+terminateProcess:processHandle exitCode:exitCode
 "terminate a process.
 The process should have a chance to do some cleanup.
 WIN32:
 	 Under unix, we have terminateProcess, which does a soft
 	 terminate (giving the process a chance to cleanup) and
 	 global data maintained by dynamic-link libraries (DLLs)
 	 may be compromised if TerminateProcess is used.
 TODO: send it a WM_QUIT instead, to allow for proper shutdown."
 %{
-if (__isExternalAddressLike(processId) ) {
+if (__isExternalAddressLike(processHandle) ) {
-	HANDLE hProcess = _HANDLEVal(processId);
+	HANDLE hProcess = _HANDLEVal(processHandle);
 #ifdef PROCESS1DEBUGWIN32
 	printf("TerminateProcess handle: %x\n", hProcess);
 #endif
 	if (hProcess != 0) {
 	    TerminateProcess(hProcess, __intVal(exitCode));
-	}
+	} else {
-}
+	    fprintf(stderr, "Win32OS [warning]: wrong hProcess in TerminateProcess\n");
-#ifdef PROCESS1DEBUGWIN32
+	}
-else {
+} else {
-	printf("TerminateProcess wrong handle\n");
+	fprintf(stderr, "Win32OS [warning]: wrong processHandle in TerminateProcess\n");
 }
-#endif
 %}
 "Modified: / 28.12.1995 / 15:05:37 / stefan"
 "Modified: / 27.1.1998 / 20:05:47 / cg"
 !
 terminateProcessGroup:processGroupHandle
 "terminate a process group.
 The processes should have a chance to do some cleanup.
 WIN32:
-	 The TerminateProcess function is used to unconditionally cause
+	 The processGroup is terminated by sending it a CTRL-C
-	 a process to exit.
+	 using GenerateConsoleCtrlEvent."
-	 Use it only in extreme circumstances. The state of
-	 global data maintained by dynamic-link libraries (DLLs)
-	 may be compromised if TerminateProcess is used.
-Not implemented - TODO: enumerate all sub-processes and terminate them all ..."
 %{
 if (__isExternalAddressLike(processGroupHandle) ) {
 	HANDLE hProcessGroup = _HANDLEVal(processGroupHandle);
-	DWORD processGroupId = _HANDLEVal(processGroupHandle);
+	DWORD processGroupId;
-	processGroupId = __intVal( ((struct __Win32OperatingSystem__Win32ProcessHandle_struct *)(processGroupHandle))->pid );
+	if (hProcessGroup != (HANDLE)0) {
+	    processGroupId = __intVal( ((struct __Win32OperatingSystem__Win32ProcessHandle_struct *)(processGroupHandle))->pid );
 #ifdef PROCESS1DEBUGWIN32
-	printf("TerminateProcessGroup processGroupHandle: %x (%d)\n", hProcessGroup, processGroupId);
+	    printf("TerminateProcessGroup processGroupHandle: %x (%d)\n", hProcessGroup, processGroupId);
 #endif
-	if (hProcessGroup != 0) {
 	    GenerateConsoleCtrlEvent(CTRL_C_EVENT, processGroupId);
-	}
+	} else {
-}
+	    fprintf(stderr, "Win32OS [warning]: wrong hProcessGroup in TerminateProcessGroup \n");
-#ifdef PROCESS1DEBUGWIN32
+	}
-else {
+} else {
-	printf("TerminateProcessGroup wrong processGroupHandle\n");
+	fprintf(stderr, "Win32OS [warning]: wrong processGroupHandle in TerminateProcessGroup \n");
 }
-#endif
 %}
 ! !
 !Win32OperatingSystem class methodsFor:'ipc support'!
 		__threadErrno = 0;
 		@global(LastErrorNumber) = nil;
 	    } else {
 		__threadErrno = EBADF;
 		if (@global(InfoPrinting) == true) {
-		    fprintf(stderr, "OS [info]: select errno = %d\n", __threadErrno);
+		    fprintf(stderr, "Win32OS [info]: select errno = %d\n", __threadErrno);
 		}
 		@global(LastErrorNumber) = __MKSMALLINT(__threadErrno);
 	    }
 	    RETURN ( nil );
 	}
 	    if (fd < 20000) {
 		RETURN ( __ArrayInstPtr(writeFdArray)->a_element[fd-10000] );
 	    }
 	    RETURN ( __ArrayInstPtr(exceptFdArray)->a_element[fd-20000] );
 	}
-	printf("wait Handles ret = %d error2 %d\n", ret, GetLastError());
+	fprintf(stderr, "Win32OS [info]: wait Handles ret = %d error2 %d\n", ret, GetLastError());
 	goto fail;
 } else {
 polling:
 libraries...
 "
 !
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.176 2005-03-11 12:50:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.177 2005-03-16 22:28:50 cg Exp $'
 ! !
 !Win32OperatingSystem::Win32FILEHandle methodsFor:'release'!
 closeFile
 I represent a generic HANDLE, which can be closed via CloseHandle.
 "
 !
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.176 2005-03-11 12:50:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.177 2005-03-16 22:28:50 cg Exp $'
 ! !
 !Win32OperatingSystem::Win32Handle methodsFor:'io'!
 readBytes:count into:aByteBuffer startingAt:firstIndex
 ! !
 !Win32OperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.176 2005-03-11 12:50:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.177 2005-03-16 22:28:50 cg Exp $'
 ! !
 Win32OperatingSystem initialize!
 Win32OperatingSystem::RegistryEntry initialize!

changeset 8792	6852892b27cd
parent 8783	41f53c93fb79
child 8800	b1762fb45942