[Scummvm-cvs-logs] CVS: scummvm/backends/fs/windows windows-fs.cpp,1.27,1.28

Nicolas Bacca arisme at users.sourceforge.net
Wed Mar 16 15:00:02 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/fs/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16709

Modified Files:
	windows-fs.cpp 
Log Message:
Weird ... but fixes the second (and hopefully last) crash

Index: windows-fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/windows/windows-fs.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- windows-fs.cpp	25 Feb 2005 20:16:25 -0000	1.27
+++ windows-fs.cpp	16 Mar 2005 22:58:42 -0000	1.28
@@ -54,7 +54,7 @@
 
 private:
 	static char *toAscii(TCHAR *x);
-	static const TCHAR* toUnicode(const char *x);
+	static TCHAR* toUnicode(const char *x);
 	static void addFile (FSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
 };
 
@@ -70,12 +70,12 @@
 #endif
 }
 
-const TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
+TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
 #ifndef UNICODE
-	return (const TCHAR *)x;
+	return (TCHAR *)x;
 #else
-	static const TCHAR unicodeString[MAX_PATH];
-	MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, (TCHAR *)unicodeString, sizeof(unicodeString));
+	static TCHAR unicodeString[MAX_PATH];
+	MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, unicodeString, sizeof(unicodeString) / sizeof(TCHAR));
 	return unicodeString;
 #endif
 }





More information about the Scummvm-git-logs mailing list