hg/stx-libbasic: comparison Win32OperatingSystem.st

equal deleted inserted replaced

-:44ba935b47ba
+:92efacf8b050
 WIN32_FIND_DATA wfd;
 char szGotPath[MAX_PATH];
 IPersistFile *ppf;
 if (! __isString(aPathName)) {
-	console_fprintf(stderr, "invalid argument\n");
+console_fprintf(stderr, "invalid argument\n");
-	goto error;
+goto error;
 }
 hres = CoInitialize(NULL);
 if (! SUCCEEDED(hres)) {
-	console_fprintf(stderr, "Could not open the COM library\n");
+console_fprintf(stderr, "Could not open the COM library\n");
-	goto error;
+goto error;
 }
 hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
-			    &IID_IShellLink, (LPVOID *)&psl);
+&IID_IShellLink, (LPVOID *)&psl);
 if (SUCCEEDED(hres)) {
-	hres = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, &ppf);
+hres = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, &ppf);
-	if (SUCCEEDED(hres)) {
+if (SUCCEEDED(hres)) {
-	    WORD wsz[MAX_PATH];
+WORD wsz[MAX_PATH];
-	    MultiByteToWideChar(CP_ACP, 0, __stringVal(aPathName), -1, wsz, MAX_PATH);
+MultiByteToWideChar(CP_ACP, 0, __stringVal(aPathName), -1, wsz, MAX_PATH);
-	    hres = ppf->lpVtbl->Load(ppf, wsz, STGM_READ);
+hres = ppf->lpVtbl->Load(ppf, wsz, STGM_READ);
-	    if (SUCCEEDED(hres)) {
+if (SUCCEEDED(hres)) {
 #if 0
-		hres = psl->lpVtbl->Resolve(psl, 0, SLR_ANY_MATCH|SLR_NO_UI);
+hres = psl->lpVtbl->Resolve(psl, 0, SLR_ANY_MATCH|SLR_NO_UI);
 #endif
-		if (SUCCEEDED(hres)) {
+if (SUCCEEDED(hres)) {
-		    hres = psl->lpVtbl->GetPath(psl, szGotPath, MAX_PATH,
+hres = psl->lpVtbl->GetPath(psl, szGotPath, MAX_PATH,
-				(WIN32_FIND_DATA *)&wfd, 0 /* SLGP_SHORTPATH */ );
+(WIN32_FIND_DATA *)&wfd, 0 /* SLGP_SHORTPATH */ );
-		    if (!SUCCEEDED(hres)) {
+if (!SUCCEEDED(hres)) {
-			console_fprintf(stderr, "GetPath failed!\n");
+console_fprintf(stderr, "GetPath failed!\n");
-		    } else {
+} else {
 #if 0
-			console_printf("This points to %s\n", wfd.cFileName); console_fflush(stdout);
+console_printf("This points to %s\n", wfd.cFileName); console_fflush(stdout);
-			console_printf("Path is %s\n", szGotPath); console_fflush(stdout);
+console_printf("Path is %s\n", szGotPath); console_fflush(stdout);
-			if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-			    console_printf("This is a directory\n"); console_fflush(stdout);
+console_printf("This is a directory\n"); console_fflush(stdout);
-			}
+}
 #endif
-			resolvedPath = __MKSTRING(szGotPath);
+resolvedPath = __MKSTRING(szGotPath);
 #if 0
-			hres = psl->lpVtbl->GetWorkingDirectory(psl, szGotPath, MAX_PATH);
+hres = psl->lpVtbl->GetWorkingDirectory(psl, szGotPath, MAX_PATH);
-			if (!SUCCEEDED(hres)) {
+if (!SUCCEEDED(hres)) {
-			    console_fprintf(stderr, "GetWorkingDirectory failed!\n");
+console_fprintf(stderr, "GetWorkingDirectory failed!\n");
-			} else {
+} else {
-			    console_printf("In Directory %s\n", szGotPath);
+console_printf("In Directory %s\n", szGotPath);
-			}
+}
 #endif
-		    }
+}
-		}
+}
-	    } else {
+} else {
-	       console_fprintf(stderr, "IPersistFile Load Error\n");
+console_fprintf(stderr, "IPersistFile Load Error\n");
-	    }
+}
-	    ppf->lpVtbl->Release(ppf);
+ppf->lpVtbl->Release(ppf);
-	} else {
+} else {
-	    console_fprintf(stderr, "QueryInterface Error\n");
+console_fprintf(stderr, "QueryInterface Error\n");
-	}
+}
-	psl->lpVtbl->Release(psl);
+psl->lpVtbl->Release(psl);
 } else {
-	console_fprintf(stderr, "CoCreateInstance Error - hres = %08x\n", hres);
+console_fprintf(stderr, "CoCreateInstance Error - hres = %08x\n", hres);
 }
 error: ;
 %}.
 resolvedPath notNil ifTrue:[^ resolvedPath ].
-self primitiveFailed.
+"/ self primitiveFailed.
+^ nil.
 "
 OperatingSystem getLinkTarget:'C:\Dokumente und Einstellungen\cg\Favoriten\Incoming.lnk'
 OperatingSystem getLinkTarget:'C:\Dokumente und Einstellungen\cg\Favoriten\cg auf G5.lnk'
 "
 "Created: / 07-11-2006 / 10:52:44 / cg"
-"Modified: / 08-11-2006 / 12:20:33 / cg"
+"Modified: / 07-02-2007 / 10:37:48 / cg"
 !
 linkFile:oldPath to:newPath
 "link the file 'oldPath' to 'newPath'. The link will be a hard link.
 Return true if successful, false if not."
 infoOf: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.
 For symbolic links (if supported by the OS),
 |info target|
 info := self linkInfoOf:aPathName.
 (info notNil and:[info isSymbolicLink]) ifTrue:[
-	target := info path.
+target := info path.
-	^ self linkInfoOf:target.
+target notNil ifTrue:[
+^ self linkInfoOf:target.
+]
 ].
 ^ info
 "
 OperatingSystem infoOf:'c:\windows'
 OperatingSystem infoOf:'stx.exe'
 (OperatingSystem infoOf:'/') uid
 (OperatingSystem infoOf:'/') accessed
 "
-"Modified: / 07-11-2006 / 16:27:02 / cg"
+"Modified: / 07-02-2007 / 10:37:14 / cg"
 !
 isDirectory:aPathName
 "return true, if 'aPathName' is a valid directory path name.
 (i.e. exists and is a directory).
 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.
 For symbolic links (if supported by the OS),
 char fileNameBuffer[MAX_PATH+1];
 unsigned INT ino;
 if (__isString(aPathName)) {
-	HANDLE hFile;
+HANDLE hFile;
-	FILETIME tempFileTime;
+FILETIME tempFileTime;
-	SYSTEMTIME creationTime;
+SYSTEMTIME creationTime;
-	SYSTEMTIME accessTime;
+SYSTEMTIME accessTime;
-	SYSTEMTIME modificationTime;
+SYSTEMTIME modificationTime;
-	int modeBits = 0;
+int modeBits = 0;
-	WIN32_FIND_DATA findStruct;
+WIN32_FIND_DATA findStruct;
 #ifdef DO_WRAP_CALLS
-	{
+{
-	    char _aPathName[MAXPATHLEN];
+char _aPathName[MAXPATHLEN];
-	    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;
-		hFile = STX_API_CALL2( "FindFirstFile", FindFirstFile, _aPathName, &findStruct);
+hFile = STX_API_CALL2( "FindFirstFile", FindFirstFile, _aPathName, &findStruct);
-	    } while ((hFile < 0) && (__threadErrno == EINTR));
+} while ((hFile < 0) && (__threadErrno == EINTR));
-	}
+}
 #else
-	hFile = FindFirstFile(__stringVal(aPathName), &findStruct);
+hFile = FindFirstFile(__stringVal(aPathName), &findStruct);
-	if (hFile < 0) {
+if (hFile < 0) {
-	    __threadErrno = __WIN32_ERR(GetLastError());
+__threadErrno = __WIN32_ERR(GetLastError());
-	}
+}
 #endif
-	if (! hFile || (hFile == (HANDLE)(-1)) || (hFile == INVALID_HANDLE_VALUE)) {
+if (! hFile || (hFile == (HANDLE)(-1)) || (hFile == INVALID_HANDLE_VALUE)) {
-	    @global(LastErrorNumber) = __mkSmallInteger(__threadErrno);
+@global(LastErrorNumber) = __mkSmallInteger(__threadErrno);
-	} else {
+} else {
-	    FindClose(hFile);
+FindClose(hFile);
-	    id = __mkSmallInteger(0);   /* could get it by opening ... */
+id = __mkSmallInteger(0);   /* could get it by opening ... */
-	    size = __MKLARGEINT64(1, findStruct.nFileSizeLow, findStruct.nFileSizeHigh);
+size = __MKLARGEINT64(1, findStruct.nFileSizeLow, findStruct.nFileSizeHigh);
-	    if (findStruct.cFileName[0] != '\0') {
+if (findStruct.cFileName[0] != '\0') {
-		bcopy(findStruct.cFileName, fileNameBuffer, MAX_PATH);
+bcopy(findStruct.cFileName, fileNameBuffer, MAX_PATH);
-		fileNameBuffer[MAX_PATH] = '\0';
+fileNameBuffer[MAX_PATH] = '\0';
-		fileName = __MKSTRING(fileNameBuffer);             /* FULL name */
+fileName = __MKSTRING(fileNameBuffer);             /* FULL name */
-	    }
+}
-	    if (findStruct.cAlternateFileName[0] != '\0') {
+if (findStruct.cAlternateFileName[0] != '\0') {
-		bcopy(findStruct.cAlternateFileName, alternativeFileNameBuffer, 14);
+bcopy(findStruct.cAlternateFileName, alternativeFileNameBuffer, 14);
-		alternativeFileNameBuffer[14] = '\0';
+alternativeFileNameBuffer[14] = '\0';
-		alternativeName = __MKSTRING(alternativeFileNameBuffer); /* DOS name */
+alternativeName = __MKSTRING(alternativeFileNameBuffer); /* DOS name */
-	    }
+}
-	    /*
+/*
-	     * simulate access bits
+* simulate access bits
-	     */
+*/
-	    if (findStruct.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
+if (findStruct.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
-		modeBits = 0444;
+modeBits = 0444;
-	    } else {
+} else {
-		modeBits = 0666;
+modeBits = 0666;
-	    }
+}
-	    if (findStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+if (findStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-		type = @symbol(directory);
+type = @symbol(directory);
-		modeBits |= 0111;   /* executable */
+modeBits |= 0111;   /* executable */
-	    } else {
+} else {
-		type = @symbol(regular);
+type = @symbol(regular);
-	    }
+}
-	    mode = __mkSmallInteger(modeBits);
+mode = __mkSmallInteger(modeBits);
-	    /*
+/*
-	     * sigh - convert from stupid time to useful time
+* sigh - convert from stupid time to useful time
-	     */
+*/
-	    FileTimeToLocalFileTime(&findStruct.ftCreationTime, &tempFileTime);
+FileTimeToLocalFileTime(&findStruct.ftCreationTime, &tempFileTime);
-	    FileTimeToSystemTime(&tempFileTime, &creationTime);
+FileTimeToSystemTime(&tempFileTime, &creationTime);
-	    FileTimeToLocalFileTime(&findStruct.ftLastAccessTime, &tempFileTime);
+FileTimeToLocalFileTime(&findStruct.ftLastAccessTime, &tempFileTime);
-	    FileTimeToSystemTime(&tempFileTime, &accessTime);
+FileTimeToSystemTime(&tempFileTime, &accessTime);
-	    FileTimeToLocalFileTime(&findStruct.ftLastWriteTime, &tempFileTime);
+FileTimeToLocalFileTime(&findStruct.ftLastWriteTime, &tempFileTime);
-	    FileTimeToSystemTime(&tempFileTime, &modificationTime);
+FileTimeToSystemTime(&tempFileTime, &modificationTime);
-	    aYr  = __mkSmallInteger(accessTime.wYear);
+aYr  = __mkSmallInteger(accessTime.wYear);
-	    aMon = __mkSmallInteger(accessTime.wMonth);
+aMon = __mkSmallInteger(accessTime.wMonth);
-	    aDay = __mkSmallInteger(accessTime.wDay);
+aDay = __mkSmallInteger(accessTime.wDay);
-	    aHr  = __mkSmallInteger(accessTime.wHour);
+aHr  = __mkSmallInteger(accessTime.wHour);
-	    aMin = __mkSmallInteger(accessTime.wMinute);
+aMin = __mkSmallInteger(accessTime.wMinute);
-	    aSec = __mkSmallInteger(accessTime.wSecond);
+aSec = __mkSmallInteger(accessTime.wSecond);
-	    aMS  = __mkSmallInteger(accessTime.wMilliseconds);
+aMS  = __mkSmallInteger(accessTime.wMilliseconds);
-	    mYr  = __mkSmallInteger(modificationTime.wYear);
+mYr  = __mkSmallInteger(modificationTime.wYear);
-	    mMon = __mkSmallInteger(modificationTime.wMonth);
+mMon = __mkSmallInteger(modificationTime.wMonth);
-	    mDay = __mkSmallInteger(modificationTime.wDay);
+mDay = __mkSmallInteger(modificationTime.wDay);
-	    mHr  = __mkSmallInteger(modificationTime.wHour);
+mHr  = __mkSmallInteger(modificationTime.wHour);
-	    mMin = __mkSmallInteger(modificationTime.wMinute);
+mMin = __mkSmallInteger(modificationTime.wMinute);
-	    mSec = __mkSmallInteger(modificationTime.wSecond);
+mSec = __mkSmallInteger(modificationTime.wSecond);
-	    mMS  = __mkSmallInteger(modificationTime.wMilliseconds);
+mMS  = __mkSmallInteger(modificationTime.wMilliseconds);
-	    cYr  = __mkSmallInteger(creationTime.wYear);
+cYr  = __mkSmallInteger(creationTime.wYear);
-	    cMon = __mkSmallInteger(creationTime.wMonth);
+cMon = __mkSmallInteger(creationTime.wMonth);
-	    cDay = __mkSmallInteger(creationTime.wDay);
+cDay = __mkSmallInteger(creationTime.wDay);
-	    cHr  = __mkSmallInteger(creationTime.wHour);
+cHr  = __mkSmallInteger(creationTime.wHour);
-	    cMin = __mkSmallInteger(creationTime.wMinute);
+cMin = __mkSmallInteger(creationTime.wMinute);
-	    cSec = __mkSmallInteger(creationTime.wSecond);
+cSec = __mkSmallInteger(creationTime.wSecond);
-	    cMS  = __mkSmallInteger(creationTime.wMilliseconds);
+cMS  = __mkSmallInteger(creationTime.wMilliseconds);
-	}
+}
 }
 %}.
 (aPathName endsWith:'.lnk') ifTrue:[
-	type := #symbolicLink.
+type := #symbolicLink.
-	path := self getLinkTarget:aPathName.
+path := nil.
+"/ now done lazyly in FileStatusInfo, when the path is accessed
+"/ 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
+"/ simulate
-	    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 day:aDay month:aMon year:aYr hour:aHr minutes:aMin seconds:aSec milliseconds:aMS.
+atime := Timestamp day:aDay month:aMon year:aYr hour:aHr minutes:aMin seconds:aSec milliseconds:aMS.
-	].
+].
-	mtime isNil ifTrue:[
+mtime isNil ifTrue:[
-	    mtime := Timestamp day:mDay month:mMon year:mYr hour:mHr minutes:mMin seconds:mSec milliseconds:mMS.
+mtime := Timestamp day:mDay month:mMon year:mYr hour:mHr minutes:mMin seconds:mSec milliseconds:mMS.
-	].
+].
-	ctime isNil ifTrue:[
+ctime isNil ifTrue:[
-	    ctime := Timestamp day:cDay month:cMon year:cYr hour:cHr minutes:cMin seconds:cSec milliseconds:cMS.
+ctime := Timestamp day:cDay month:cMon year:cYr hour:cHr minutes:cMin seconds:cSec milliseconds:cMS.
-	].
+].
-	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
-		    path:path
+path:path
-		    fullName:fileName
+fullName:fileName
-		    alternativeName:alternativeName.
+alternativeName:alternativeName.
-	^ info
+^ info
 ].
 ^ nil
 "
 OperatingSystem linkInfoOf:'c:\windows'
 (OperatingSystem linkInfoOf:'/') uid
 (OperatingSystem linkInfoOf:'/') accessed
 OperatingSystem linkInfoOf:'C:\Dokumente und Einstellungen\cg\Favoriten\Incoming.lnk'
 "
-"Modified: / 08-11-2006 / 12:20:13 / cg"
+"Modified: / 07-02-2007 / 10:30:14 / cg"
 !
 mimeTypeForSuffix:aFileSuffix
 "given a file suffix, return a corresponding mimeType.
 Here, the Registry is consulted.
 !
 path
 "for symbolic links only: return the path where the symbolic link points to"
+"/ access lazily...
+path isNil ifTrue:[
+type == #symbolicLink ifTrue:[
+path := OperatingSystem getLinkTarget:fullName.
+]
+].
 ^ path
+"Modified: / 07-02-2007 / 10:31:56 / cg"
 !
 recordAttributes
 "return the recordAttributes (VMS only; nil everywhere else)"
 ! !
 !Win32OperatingSystem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.264 2007-01-26 13:34:10 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.265 2007-02-07 09:50:22 cg Exp $'
 ! !
 Win32OperatingSystem initialize!
 Win32OperatingSystem::RegistryEntry initialize!

changeset 10373	92efacf8b050
parent 10365	51b5bd2918c7
child 10386	491685fba02e