[Scummvm-cvs-logs] SF.net SVN: scummvm: [22306] scummvm/trunk/backends/fs/windows/windows-fs.cpp

[kirben at users.sourceforge.net]

Revision: 22306
Author:   kirben
Date:     2006-05-03 06:06:22 -0700 (Wed, 03 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22306&view=rev

Log Message:
-----------
Make sure AbstractFilesystemNode::child() only returns a directory in Windows

Modified Paths:
--------------
    scummvm/trunk/backends/fs/windows/windows-fs.cpp
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-05-03 12:54:37 UTC (rev 22305)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp	2006-05-03 13:06:22 UTC (rev 22306)
@@ -153,7 +153,7 @@
 	// Check whether it is a directory, and whether the file actually exists
 	DWORD fileAttribs = GetFileAttributes(toUnicode(_path.c_str()));
 
-	if (fileAttribs == 0xffffffff) {
+	if (fileAttribs == INVALID_FILE_ATTRIBUTES) {
 		_isValid = false;
 		_isDirectory = false;
 	} else {
@@ -239,7 +239,7 @@
 
 	// Check whether the directory actually exists
 	DWORD fileAttribs = GetFileAttributes(toUnicode(newPath.c_str()));
-	if (fileAttribs == 0xffffffff)
+	if (fileAttribs != FILE_ATTRIBUTE_DIRECTORY || fileAttribs == INVALID_FILE_ATTRIBUTES)
 		return 0;
 
 	WindowsFilesystemNode *p = new WindowsFilesystemNode(newPath);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.