hg/stx-libbasic: comparison Win32OperatingSystem.st

equal deleted inserted replaced

-:419fe7273142
+:c701f431b3f6
 linkInfoOf:aPathName
 "return some object filled with info for the file 'aPathName';
 the info (for which corresponding access methods are understood by
 the returned object) is:
-type            - a symbol giving the files type
+	 type            - a symbol giving the files type
-mode            - numeric access mode
+	 mode            - numeric access mode
-uid             - owners user id
+	 uid             - owners user id
-gid             - owners group id
+	 gid             - owners group id
-size            - files size
+	 size            - files size
-id              - files number (i.e. inode number)
+	 id              - files number (i.e. inode number)
-accessed        - last access time (as Timestamp)
+	 accessed        - last access time (as Timestamp)
-modified        - last modification time (as Timestamp)
+	 modified        - last modification time (as Timestamp)
-statusChanged   - last status change time (as Timestamp)
+	 statusChanged   - last status change time (as Timestamp)
-alternativeName - (windows only:) the MSDOS name of the file
+	 alternativeName - (windows only:) the MSDOS name of the file
 Some of the fields may be returned as nil on systems which do not provide
 all of the information.
 Return nil if such a file does not exist.
 WIN32_FILE_ATTRIBUTE_DATA fileAttributeData;
 unsigned INT ino;
 wchar_t _aPathName[MAXPATHLEN+1];
 if (__isStringLike(aPathName)) {
-int i;
+	int i;
-int l = __stringSize(aPathName);
+	int l = __stringSize(aPathName);
-if (l > MAXPATHLEN) l = MAXPATHLEN;
+	if (l > MAXPATHLEN) l = MAXPATHLEN;
-for (i=0; i<l; i++) {
+	for (i=0; i<l; i++) {
-_aPathName[i] = __stringVal(aPathName)[i];
+	    _aPathName[i] = __stringVal(aPathName)[i];
-}
+	}
-_aPathName[i] = 0;
+	_aPathName[i] = 0;
 } else if (__isUnicode16String(aPathName)) {
-int i;
+	int i;
-int l = __unicode16StringSize(aPathName);
+	int l = __unicode16StringSize(aPathName);
-if (l > MAXPATHLEN) l = MAXPATHLEN;
+	if (l > MAXPATHLEN) l = MAXPATHLEN;
-for (i=0; i<l; i++) {
+	for (i=0; i<l; i++) {
-_aPathName[i] = __unicode16StringVal(aPathName)[i];
+	    _aPathName[i] = __unicode16StringVal(aPathName)[i];
-}
+	}
-_aPathName[i] = 0;
+	_aPathName[i] = 0;
 } else
-goto badArgument;
+	goto badArgument;
 #ifdef DO_WRAP_CALLS
 {
-do {
+	do {
-__threadErrno = 0;
+	    __threadErrno = 0;
-result = STX_API_NOINT_CALL3( "GetFileAttributesExW", GetFileAttributesExW, _aPathName, GetFileExInfoStandard, &fileAttributeData);
+	    result = STX_API_NOINT_CALL3( "GetFileAttributesExW", GetFileAttributesExW, _aPathName, GetFileExInfoStandard, &fileAttributeData);
-} while (!result && (__threadErrno == EINTR));
+	} while (!result && (__threadErrno == EINTR));
 }
 #else
 result = GetFileAttributesExW(_aPathName, GetFileExInfoStandard, &fileAttributeData);
 if (!result) {
-__threadErrno = __WIN32_ERR(GetLastError());
+	__threadErrno = __WIN32_ERR(GetLastError());
 }
 #endif
 if (!result) {
-@global(LastErrorNumber) = __mkSmallInteger(__threadErrno);
+	@global(LastErrorNumber) = __mkSmallInteger(__threadErrno);
 } else {
-id = __mkSmallInteger(0);   /* could get it by opening ... */
+	id = __mkSmallInteger(0);   /* could get it by opening ... */
-size = __MKLARGEINT64(1, fileAttributeData.nFileSizeLow, fileAttributeData.nFileSizeHigh);
+	size = __MKLARGEINT64(1, fileAttributeData.nFileSizeLow, fileAttributeData.nFileSizeHigh);
 //        if (fileAttributeData.cFileName[0] != '\0') {
 //            bcopy(fileAttributeData.cFileName, fileNameBuffer, MAXPATHLEN*sizeof(wchar_t));
 //            fileNameBuffer[MAXPATHLEN] = '\0';
 //            fileName = __MKU16STRING(fileNameBuffer);             /* FULL name */
 //            bcopy(fileAttributeData.cAlternateFileName, alternativeFileNameBuffer, 14*sizeof(wchar_t));
 //            alternativeFileNameBuffer[14] = '\0';
 //            alternativeName = __MKU16STRING(alternativeFileNameBuffer); /* DOS name */
 //        }
-/*
+	/*
-* simulate access bits
+	 * simulate access bits
-*/
+	 */
-if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
+	if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
-modeBits = 0444;
+	    modeBits = 0444;
-} else {
+	} else {
-modeBits = 0666;
+	    modeBits = 0666;
-}
+	}
-if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+	if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-type = @symbol(directory);
+	    type = @symbol(directory);
-modeBits = 0777;   /* executable and WRITABLE - refer to comment in #isWritable: */
+	    modeBits = 0777;   /* executable and WRITABLE - refer to comment in #isWritable: */
-} else if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+	} else if (fileAttributeData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-type = @symbol(symbolicLink);
+	    type = @symbol(symbolicLink);
-modeBits = 0777;   /* even in UNIX symlinks have 0777 */
+	    modeBits = 0777;   /* even in UNIX symlinks have 0777 */
-} else {
+	} else {
-type = @symbol(regular);
+	    type = @symbol(regular);
-}
+	}
-mode = __mkSmallInteger(modeBits);
+	mode = __mkSmallInteger(modeBits);
-cOsTime = FileTimeToOsTime(&fileAttributeData.ftCreationTime);
+	cOsTime = FileTimeToOsTime(&fileAttributeData.ftCreationTime);
-aOsTime = FileTimeToOsTime(&fileAttributeData.ftLastAccessTime);
+	aOsTime = FileTimeToOsTime(&fileAttributeData.ftLastAccessTime);
-mOsTime = FileTimeToOsTime(&fileAttributeData.ftLastWriteTime);
+	mOsTime = FileTimeToOsTime(&fileAttributeData.ftLastWriteTime);
 }
 badArgument: ;
 %}.
 (aPathName endsWith:'.lnk') ifTrue:[
-type := #symbolicLink.
+	type := #symbolicLink.
-"/ now done lazyly in FileStatusInfo, when the path is accessed
+	"/ now done lazyly in FileStatusInfo, when the path is accessed
-"/ path := self getLinkTarget:aPathName.
+	"/ path := self getLinkTarget:aPathName.
 ].
 mode isNil ifTrue:[
-(self isDirectory:aPathName) ifTrue:[
+	(self isDirectory:aPathName) ifTrue:[
-"/ the code above fails for root directories (these do not exist).
+	    "/ the code above fails for root directories (these do not exist).
-"/ simulate here
+	    "/ simulate here
-mode := 8r777.
+	    mode := 8r777.
-type := #directory.
+	    type := #directory.
-uid := gid := 0.
+	    uid := gid := 0.
-size := 0.
+	    size := 0.
-id := 0.
+	    id := 0.
-atime := mtime := ctime := Timestamp now.
+	    atime := mtime := ctime := Timestamp now.
-].
+	].
 ].
 mode notNil ifTrue:[
-atime isNil ifTrue:[
+	atime isNil ifTrue:[
-atime := Timestamp new fromOSTime:aOsTime.
+	    atime := Timestamp new fromOSTime:aOsTime.
-].
+	].
-mtime isNil ifTrue:[
+	mtime isNil ifTrue:[
-mtime := Timestamp new fromOSTime:mOsTime.
+	    mtime := Timestamp new fromOSTime:mOsTime.
-].
+	].
-ctime isNil ifTrue:[
+	ctime isNil ifTrue:[
-ctime := Timestamp new fromOSTime:cOsTime.
+	    ctime := Timestamp new fromOSTime:cOsTime.
-].
+	].
-fileName notNil ifTrue:[
+	fileName notNil ifTrue:[
-fileName := fileName asSingleByteStringIfPossible
+	    fileName := fileName asSingleByteStringIfPossible
-].
+	].
-alternativeName notNil ifTrue:[
+	alternativeName notNil ifTrue:[
-alternativeName := alternativeName asSingleByteStringIfPossible
+	    alternativeName := alternativeName asSingleByteStringIfPossible
-].
+	].
-info := FileStatusInfo
+	info := FileStatusInfo
-type:type
+		    type:type
-mode:mode
+		    mode:mode
-uid:uid
+		    uid:uid
-gid:gid
+		    gid:gid
-size:size
+		    size:size
-id:id
+		    id:id
-accessed:atime
+		    accessed:atime
-modified:mtime
+		    modified:mtime
-created:ctime
+		    created:ctime
-sourcePath:aPathName
+		    sourcePath:aPathName
-fullName:fileName
+		    fullName:fileName
-alternativeName:alternativeName.
+		    alternativeName:alternativeName.
-^ info
+	^ info
 ].
 ^ nil
 "
 OperatingSystem linkInfoOf:'c:\windows'
 |error|
 %{
 if (__isStringLike(aPathName)) {
-char nameBuffer[MAXPATHLEN + 1];
+	char nameBuffer[MAXPATHLEN + 1];
-char nameBuffer2[MAXPATHLEN + 1];
+	char nameBuffer2[MAXPATHLEN + 1];
-char *returnedName = NULL;
+	char *returnedName = NULL;
-int rslt;
+	int rslt;
 #ifdef DO_WRAP_CALLS
-char _aPathName[MAXPATHLEN+1];
+	char _aPathName[MAXPATHLEN+1];
-strncpy(_aPathName, __stringVal(aPathName), MAXPATHLEN-1); _aPathName[MAXPATHLEN-1] = '\0';
+	strncpy(_aPathName, __stringVal(aPathName), MAXPATHLEN-1); _aPathName[MAXPATHLEN-1] = '\0';
-do {
+	do {
-__threadErrno = 0;
+	    __threadErrno = 0;
-rslt = STX_API_NOINT_CALL4( "GetFullPathNameA", GetFullPathNameA, _aPathName, MAXPATHLEN, nameBuffer, NULL);
+	    rslt = STX_API_NOINT_CALL4( "GetFullPathNameA", GetFullPathNameA, _aPathName, MAXPATHLEN, nameBuffer, NULL);
-} while ((rslt < 0) && (__threadErrno == EINTR));
+	} while ((rslt < 0) && (__threadErrno == EINTR));
 #else
-rslt = GetFullPathNameA(__stringVal(aPathName), MAXPATHLEN, nameBuffer, NULL);
+	rslt = GetFullPathNameA(__stringVal(aPathName), MAXPATHLEN, nameBuffer, NULL);
 #endif
 	returnedName = nameBuffer;
 	if (rslt > 0) {
 #ifdef DO_WRAP_CALLS
 	}
 	__threadErrno = __WIN32_ERR(GetLastError());
 	RETURN (nil);
 }
 if (__isUnicode16String(aPathName)) {
-wchar_t nameBuffer[MAXPATHLEN + 1];
+	wchar_t nameBuffer[MAXPATHLEN + 1];
-wchar_t nameBuffer2[MAXPATHLEN + 1];
+	wchar_t nameBuffer2[MAXPATHLEN + 1];
-wchar_t *returnedName = NULL;
+	wchar_t *returnedName = NULL;
-int rslt;
+	int rslt;
-wchar_t _aPathName[MAXPATHLEN+1];
+	wchar_t _aPathName[MAXPATHLEN+1];
-int i, l;
+	int i, l;
-l = __unicode16StringSize(aPathName);
+	l = __unicode16StringSize(aPathName);
-if (l > MAXPATHLEN) l = MAXPATHLEN;
+	if (l > MAXPATHLEN) l = MAXPATHLEN;
-for (i=0; i<l; i++) {
+	for (i=0; i<l; i++) {
-_aPathName[i] = __unicode16StringVal(aPathName)[i];
+	    _aPathName[i] = __unicode16StringVal(aPathName)[i];
-}
+	}
-_aPathName[i] = 0;
+	_aPathName[i] = 0;
 #ifdef DO_WRAP_CALLS
-do {
+	do {
-__threadErrno = 0;
+	    __threadErrno = 0;
-rslt = STX_API_NOINT_CALL4( "GetFullPathNameW", GetFullPathNameW, _aPathName, MAXPATHLEN, nameBuffer, NULL);
+	    rslt = STX_API_NOINT_CALL4( "GetFullPathNameW", GetFullPathNameW, _aPathName, MAXPATHLEN, nameBuffer, NULL);
-} while ((rslt < 0) && (__threadErrno == EINTR));
+	} while ((rslt < 0) && (__threadErrno == EINTR));
 #else
-rslt = GetFullPathNameW(_aPathName, MAXPATHLEN, nameBuffer, NULL);
+	rslt = GetFullPathNameW(_aPathName, MAXPATHLEN, nameBuffer, NULL);
 #endif
 	returnedName = nameBuffer;
 	if (rslt > 0) {
 "Created: / 18-09-2007 / 16:31:23 / cg"
 !
 primGetLastError
+%{  /* NOCONTEXT */
-<apicall: dword "GetLastError" () module: "kernel32.dll" >
+DWORD e;
+e = GetLastError();
+RETURN(__MKUINT(e));
+%}.
+"/ <apicall: dword "GetLastError" () module: "kernel32.dll" >
 "
 	self primGetLastError
 "
 !
 primSetLastError: i
-%{
+%{  /* NOCONTEXT */
 if (__isSmallInteger(i)) {
-SetLastError(__intVal(i));
+	SetLastError(__intVal(i));
-RETURN(self);
+	RETURN(self);
 }
 %}.
 self primitiveFailed.
 "/ <apicall: void "SetLastError" (dword) module: "kernel32.dll" >
 "
-self primSetLastError: 0
+	self primSetLastError: 0
 "
 !
 primWritePrivateProfileString: appName keyName: keyName profileString: profString fileName: aString
 "Created: 23.12.1995 / 14:19:20 / cg"
 !
 getNetworkMACAddresses
 "return a dictionary filled with
-key -> name of interface
+	key -> name of interface
-value -> the MAC adress (as ByteArray)
+	value -> the MAC adress (as ByteArray)
 for each interface
 "
 |info nAdapters rawData entry
 name description macAddress ipAddress ipAddressMask|
 }
 %}.
 "Keep the order as reurned by the OS"
 info := OrderedDictionary new:nAdapters.
 nAdapters notNil ifTrue:[
-1 to:nAdapters do:[:i |
+	1 to:nAdapters do:[:i |
-|entry name description macAddr ipAddr|
+	    |entry name description macAddr ipAddr|
-entry := rawData at:i.
+	    entry := rawData at:i.
-name := entry at:1.
+	    name := entry at:1.
-"/ description := entry at:2.
+	    "/ description := entry at:2.
-macAddr := entry at:3.
+	    macAddr := entry at:3.
-"/ ipAddr := entry at:4.
+	    "/ ipAddr := entry at:4.
-info at:name put:macAddr.
+	    info at:name put:macAddr.
-].
+	].
 ].
 ^ info
 "
 OperatingSystem getNetworkMACAddresses
 ^ type == #socket
 !
 isSpecialFile
 ^ (type ~~ #directory
-and:[type ~~ #remoteDirectory
+	and:[type ~~ #remoteDirectory
-and:[type ~~ #regular
+	and:[type ~~ #regular
-and:[type ~~ #symbolicLink
+	and:[type ~~ #symbolicLink
 ]]])
 !
 isSymbolicLink
 ^ type == #symbolicLink
 ! !
 !Win32OperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.463 2013-05-28 12:36:53 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.464 2013-05-28 12:44:56 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.463 2013-05-28 12:36:53 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.464 2013-05-28 12:44:56 cg Exp $'
 !
 version_SVN
-^ '$Id: Win32OperatingSystem.st,v 1.463 2013-05-28 12:36:53 cg Exp $'
+^ '$Id: Win32OperatingSystem.st,v 1.464 2013-05-28 12:44:56 cg Exp $'
 ! !
 Win32OperatingSystem initialize!

changeset 15339	c701f431b3f6
parent 15338	419fe7273142
child 15369	4c2d17d8fa1a