hg/stx-libbasic: comparison Win32OperatingSystem.st

equal deleted inserted replaced

-:b53ad9abf79c
+:5e0c389a8164
 !
 !Win32OperatingSystem primitiveDefinitions!
 %{
+/*
+* if DO_WRAP_CALLS is not defined, API-calls are performed directly
+* if it is, they are performed by another thread.
+* The system does not work correctly without wrapCalls.
+*/
 # ifndef DO_WRAP_CALLS
-#  define STX_C_CALL0(__nm__, __f__)                                    __f__((__a1__))
+#  define STX_C_CALL0(__nm__, __f__)                                            __f__( )
-#  define STX_C_CALL1(__nm__, __f__, __a1__)                            __f__((__a1__))
+#  define STX_C_CALL1(__nm__, __f__, __a1__)                                    __f__((__a1__))
-#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)                    __f__((__a1__), (__a2__))
+#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)                            __f__((__a1__), (__a2__))
-#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)            __f__((__a1__), (__a2__), (__a3__))
+#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)                    __f__((__a1__), (__a2__), (__a3__))
-#  define STX_API_CALL0(__nm__, __f__)                                  __f__((__a1__))
+#  define STX_API_CALL0(__nm__, __f__)                                          __f__( )
-#  define STX_API_CALL1(__nm__, __f__, __a1__)                          __f__((__a1__))
+#  define STX_API_CALL1(__nm__, __f__, __a1__)                                  __f__((__a1__))
-#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)                  __f__((__a1__), (__a2__))
+#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)                          __f__((__a1__), (__a2__))
-#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)          __f__((__a1__), (__a2__), (__a3__))
+#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)                  __f__((__a1__), (__a2__), (__a3__))
-#  define STX_API_CALL4(__nm__, __f__, __a1__, __a2__, __a3__, __a4__)  __f__((__a1__), (__a2__), (__a3__), (__a4__))
+#  define STX_API_CALL4(__nm__, __f__, __a1__, __a2__, __a3__, __a4__)          __f__((__a1__), (__a2__), (__a3__), (__a4__))
+#  define STX_API_CALL5(__nm__, __f__, __a1__, __a2__, __a3__, __a4__, __a5__)  __f__((__a1__), (__a2__), (__a3__), (__a4__), (__a5__))
 # else
-#  define STX_C_CALL0(__nm__, __f__)                                    __STX_C_CALL0(__nm__, (void*)__f__)
+#  define STX_C_CALL0(__nm__, __f__)                                            __STX_C_CALL0(__nm__, (void*)__f__)
-#  define STX_C_CALL1(__nm__, __f__, __a1__)                            __STX_C_CALL1(__nm__, (void*)__f__, (void*)(__a1__))
+#  define STX_C_CALL1(__nm__, __f__, __a1__)                                    __STX_C_CALL1(__nm__, (void*)__f__, (void*)(__a1__))
-#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)                    __STX_C_CALL2(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__))
+#  define STX_C_CALL2(__nm__, __f__, __a1__, __a2__)                            __STX_C_CALL2(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__))
-#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)            __STX_C_CALL3(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
+#  define STX_C_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)                    __STX_C_CALL3(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
-#  define STX_API_CALL0(__nm__, __f__)                                  __STX_API_CALL0(__nm__, (void*)__f__)
+#  define STX_API_CALL0(__nm__, __f__)                                          __STX_API_CALL0(__nm__, (void*)__f__)
-#  define STX_API_CALL1(__nm__, __f__, __a1__)                          __STX_API_CALL1(__nm__, (void*)__f__, (void*)(__a1__))
+#  define STX_API_CALL1(__nm__, __f__, __a1__)                                  __STX_API_CALL1(__nm__, (void*)__f__, (void*)(__a1__))
-#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)                  __STX_API_CALL2(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__))
+#  define STX_API_CALL2(__nm__, __f__, __a1__, __a2__)                          __STX_API_CALL2(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__))
-#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)          __STX_API_CALL3(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
+#  define STX_API_CALL3(__nm__, __f__, __a1__, __a2__, __a3__)                  __STX_API_CALL3(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__))
-#  define STX_API_CALL4(__nm__, __f__, __a1__, __a2__, __a3__, __a4__)  __STX_API_CALL4(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__), (void*)(__a4__))
+#  define STX_API_CALL4(__nm__, __f__, __a1__, __a2__, __a3__, __a4__)          __STX_API_CALL4(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__), (void*)(__a4__))
+#  define STX_API_CALL5(__nm__, __f__, __a1__, __a2__, __a3__, __a4__, __a5__)  __STX_API_CALL5(__nm__, (void*)__f__, (void*)(__a1__), (void*)(__a2__), (void*)(__a3__), (void*)(__a4__), (void*)(__a5__))
 # endif
-# ifndef MSDOS_LIKE
+# ifndef MSDOS_LIKE    /* windows is not a real operating system */
 #  define MSDOS_LIKE
 # endif
-# undef UNIX_LIKE       /* oops - we were too optimistic - no OS */
+# undef UNIX_LIKE
 # ifdef i386
 #  ifndef _X86_
 #   define _X86_
 #  endif
 * notice: although many systems' include files
 * already block against multiple inclusion, some
 * do not. Therefore, this is done here again.
 * (it does not hurt)
 */
 # ifndef _SIGNAL_H_INCLUDED_
 #  include <signal.h>
 #  define _SIGNAL_H_INCLUDED_
 # endif
 # ifndef _FCNTL_H_INCLUDED_
 #  include <fcntl.h>
 #  define _FCNTL_H_INCLUDED_
 # endif
-/*# define PROCESSDEBUGWIN32     /* */
+/* # define PROCESSDEBUGWIN32     /* */
-/*# define PROCESS1DEBUGWIN32    /* */
+/* # define PROCESS1DEBUGWIN32    /* */
-/*# define PROCESS2DEBUGWIN32    /* */
+/* # define PROCESS2DEBUGWIN32    /* */
 /* # define SELECTDEBUGWIN32     /* */
 /* # define SELECT1DEBUGWIN32    /* */
 /* # define SELECT2DEBUGWIN32    /* */
 /* # define WAITDEBUGWIN32       /* */
 /* # define SIGNALDEBUGWIN32     /* */
 # undef INT
 # undef Array
 # undef Number
 # undef Method
 # undef Point
 # if defined(HAS_SYSINFO)
 #  include <sys/systeminfo.h>
 # endif
-/*
-* some (old ?) systems do not define this ...
-*/
-#if !defined(R_OK) && !defined(_AIX)
-# define R_OK    4       /* Test for Read permission */
-# define W_OK    2       /* Test for Write permission */
-# define X_OK    1       /* Test for eXecute permission */
-# define F_OK    0       /* Test for existence of File */
-#endif
 #define SIGHANDLER_ARG int
 #define _HANDLEVal(o)        (HANDLE)(__externalAddressVal(o))
 /*
 ! !
 !Win32OperatingSystem primitiveFunctions!
 %{
+/* isWindows-NT flag:
+*  1 for NT based systemes, such as NT,XP or 2k
+*  0 for w95 based systems, such as w95/w98/ME
+*/
 static int __isWinNT = 0;
 #define __wait wait
-static int _canAccessIOWithoutBlocking (aFD, readMode)
+static int
+_canAccessIOWithoutBlocking (aFD, readMode)
 int aFD;
 int readMode;
 {
 struct timeval tv;
 fd_set         fds;
 !Win32OperatingSystem class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1988 by Claus Gittinger
-COPYRIGHT (c) 1998 by eXept Software AG
+COPYRIGHT (c) 1998-2004 by eXept Software AG
 	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 "
 !
 documentation
 "
-NOTICE: this is being developed;
 this class resulted from extracting WIN32 specifics of the old
 OperatingSystemClass into this sub-class.
 You may find some leftover unix stuff, which will go away sooner
 or later.
 ! !
 !Win32OperatingSystem class methodsFor:'initialization'!
 initOSType
-"internal - see if running under win-NT
+"internal - see if running under win-NT/XP/2k
-(as opposed to win-95)"
+(as opposed to win-95/98/ME)"
 %{  /* NOCONTEXT */
 OSVERSIONINFO osvi;
 memset(&osvi, 0, sizeof(OSVERSIONINFO));
 exec:aCommandPath withArguments:argString environment:environment fileDescriptors:fdArray fork:doFork newPgrp:newPgrp inDirectory:aDirectory
 "Internal lowLevel entry for combined fork & exec for WIN32
 If fork is false (chain a command):
-execute the OS command specified by the argument, aCommandPath, with
+	 execute the OS command specified by the argument, aCommandPath, with
-arguments in argArray (no arguments, if nil).
+	 arguments in argArray (no arguments, if nil).
-If successful, this method does not return and smalltalk is gone.
+	 If successful, this method does not return and smalltalk is gone.
-If not successful, it does return.
+	 If not successful, it does return.
-Normal use is with forkForCommand.
+	 Normal use is with forkForCommand.
 If fork is true (subprocess command execution):
-fork a child to do the above.
+	fork a child to do the above.
-The process id of the child process is returned; nil if the fork failed.
+	The process id of the child process is returned; nil if the fork failed.
 fdArray contains the filedescriptors, to be used for the child (if fork is true).
-fdArray[1] = 15 -> use fd 15 as stdin.
+	fdArray[1] = 15 -> use fd 15 as stdin.
-If an element of the array is set to nil, the corresponding filedescriptor
+	If an element of the array is set to nil, the corresponding filedescriptor
-will be closed for the child.
+	will be closed for the child.
-fdArray[0] == StdIn for child
+	fdArray[0] == StdIn for child
-fdArray[1] == StdOut for child
+	fdArray[1] == StdOut for child
-fdArray[2] == StdErr for child
+	fdArray[2] == StdErr for child
-on VMS, these must be channels as returned by createMailBox.
+	on VMS, these must be channels as returned by createMailBox.
 NOTE that in WIN32 the fds are HANDLES.
 If newPgrp is true, the subprocess will be established in a new process group.
-The processgroup will be equal to id.
+	The processgroup will be equal to id.
-newPgrp is not used on WIN32 and VMS systems."
+	newPgrp is not used on WIN32 and VMS systems."
 |dirPath cmdPath cmdLine rslt|
 aDirectory notNil ifTrue:[
-dirPath := aDirectory asFilename asAbsoluteFilename osNameForDirectory.
+	dirPath := aDirectory asFilename asAbsoluteFilename osNameForDirectory.
-(dirPath endsWith:':') ifTrue:[
+	(dirPath endsWith:':') ifTrue:[
-dirPath := dirPath , '\'.
+	    dirPath := dirPath , '\'.
-].
+	].
 ].
 self isMSWINDOWSNTlike ifTrue:[
-cmdPath := aCommandPath.
+	cmdPath := aCommandPath.
-cmdLine := argString
+	cmdLine := argString
 ] ifFalse:[
-cmdPath := 'stxspawn.exe'.
+	cmdPath := 'stxspawn.exe'.
-cmdLine := 'stxspawn.exe ' , aCommandPath , ' ' , argString
+	cmdLine := 'stxspawn.exe ' , aCommandPath , ' ' , argString
 ].
 rslt := self
-primExec:cmdPath
+	primExec:cmdPath
-commandLine:cmdLine
+	commandLine:cmdLine
-fileDescriptors:fdArray
+	fileDescriptors:fdArray
-fork:doFork
+	fork:doFork
-newPgrp:newPgrp
+	newPgrp:newPgrp
-inPath:dirPath
+	inPath:dirPath
-createFlags:nil.
+	createFlags:nil.
 "/ 'created ' print. cmdLine print. ' -> ' print. rslt printCR.
 ^ rslt
 "Modified: / 31.1.1998 / 10:54:24 / md"
 "this is a test method;
 For testing double CTRL-C in blocking primitives"
 %{
 while(1) {
-	printf("b");
+	printf("blocking...");
 	Sleep(50);
 }
 %}.
 "
 OperatingSystem blockingTest
+"
+!
+blockingTest2
+"this is a test method;
+For testing double CTRL-C in blocking primitives"
+%{
+while(1) {
+	printf("blocking...");
+	STX_API_CALL1("Sleep", Sleep, 50);
+}
+%}.
+"
+OperatingSystem blockingTest2
 "
 !
 defaultSignal:signalNumber
 "revert to the default action on arrival of a (Unix-)signal.
 %{  /* NOCONTEXT */
 extern void __win32SetTimer();
 if (__isSmallInteger(milliSeconds)) {
-	int millis;
+	__win32SetTimer( __intVal(milliSeconds) );
-	millis = __intVal(milliSeconds);
-	__win32SetTimer(millis);
 	RETURN (true);
 }
 %}.
 ^ false
 !
 !
 getLanguage
 "return the domain this host is in.
 Notice:
-not all systems support this; on some, 'unknown' is returned."
+	not all systems support this; on some, 'unknown' is returned."
 |name|
 name := self getEnvironment:'LANG'.
 name isNil ifTrue:[
-"/ ok, search the registry ...
+	"/ ok, search the registry ...
-"/ under XP, it is found there ...
+	"/ under XP, it is found there ...
-name := RegistryEntry
+	name := RegistryEntry
-stringValueFor:'sLanguage'
+		    stringValueFor:'sLanguage'
-atKey:'HKEY_CURRENT_USER\Control Panel\International'.
+		    atKey:'HKEY_CURRENT_USER\Control Panel\International'.
-name notNil ifTrue:[
+	name notNil ifTrue:[
-name := self mapLanguage:name.
+	    name := self mapLanguage:name.
-].
+	].
 ].
 ^ name
 "
 OperatingSystem getLanguage
 since my windows system menu crashes so often
 (even CTRL-ALT-DEL does no longer function, but ST/X is still alive),
 I added this in order to be able to shutdown w95 cleanly"
 confirmationMessageOrNil notNil ifTrue:[
-(Dialog confirm:confirmationMessageOrNil) ifFalse:[
+	(Dialog confirm:confirmationMessageOrNil) ifFalse:[
-^ false
+	    ^ false
-].
+	].
 ].
 %{
 int flag;
 if (how == @symbol(shutdown)) {
-flag = EWX_SHUTDOWN;
+	flag = EWX_SHUTDOWN;
 } else if (how == @symbol(reboot)) {
-flag = EWX_REBOOT;
+	flag = EWX_REBOOT;
 } else if (how == @symbol(logoff)) {
-flag = EWX_LOGOFF;
+	flag = EWX_LOGOFF;
 } else if (how == @symbol(forceShutdown)) {
-flag = EWX_SHUTDOWN | EWX_FORCE;
+	flag = EWX_SHUTDOWN | EWX_FORCE;
 } else if (how == @symbol(forceReboot)) {
-flag = EWX_REBOOT | EWX_FORCE;
+	flag = EWX_REBOOT | EWX_FORCE;
 } else if (how == @symbol(forceLogoff)) {
-flag = EWX_LOGOFF | EWX_FORCE;
+	flag = EWX_LOGOFF | EWX_FORCE;
 } else {
-RETURN (false);
+	RETURN (false);
 }
 RETURN ((ExitWindowsEx(flag, 0) == TRUE) ? true : false);
 %}
 ! !
 libraries...
 "
 !
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.144 2004-01-29 08:22:36 ca Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca 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.144 2004-01-29 08:22:36 ca Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca Exp $'
 ! !
 !Win32OperatingSystem::Win32Handle methodsFor:'io'!
 readBytes:count into:aByteBuffer startingAt:firstIndex
 	extPtr = extPtr + offs;
 }
 do {
 	__threadErrno = 0;
-#ifndef DO_WRAP_CALLS
+	ok = STX_API_CALL5( "ReadFile", ReadFile, hFile, extPtr, cntWanted, &cntRead, 0 /* lpOverlapped */);
-	ok = ReadFile(hFile, extPtr, cntWanted, &cntRead, 0 /* lpOverlapped */);
-#else
-	ok = __STX_API_CALL5( "ReadFile", ReadFile, hFile, extPtr, cntWanted, &cntRead, 0 /* lpOverlapped */);
-#endif
 } while(__threadErrno == EINTR);
 if (ok == TRUE) {
 	if (! bufferIsExternalBytes) {
 	    /* copy over */
 	extPtr = extPtr + offs;
 }
 do {
 	__threadErrno = 0;
-#ifndef DO_WRAP_CALLS
+	ok = STX_API_CALL5( "WriteFile", WriteFile, hFile, extPtr, cntWanted, &cntWritten, 0 /* lpOverlapped */);
-	ok = WriteFile(hFile, extPtr, cntWanted, &cntWritten, 0 /* lpOverlapped */);
-#else
-	ok = __STX_API_CALL5( "WriteFile", WriteFile, hFile, extPtr, cntWanted, &cntWritten, 0 /* lpOverlapped */);
-#endif
 } while(__threadErrno == EINTR);
 if (ok == TRUE) {
 	if (mustFreeBuffer) {
 	    free(extPtr);
 ! !
 !Win32OperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.144 2004-01-29 08:22:36 ca Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca Exp $'
 ! !
 Win32OperatingSystem initialize!
 Win32OperatingSystem::RegistryEntry initialize!

changeset 7852	5e0c389a8164
parent 7850	087b4ca01736
child 7860	d08a47772aa1