[Scummvm-cvs-logs] SF.net SVN: scummvm: [25431] scummvm/trunk/backends/platform

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Feb 8 23:54:09 CET 2007


Revision: 25431
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25431&view=rev
Author:   fingolfin
Date:     2007-02-08 14:54:09 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
The restriction on 'small' mouse cursors has been lifted quite some time ago; PalmOS and WinCE port should be extended accordingly (in particular, the PalmOS port would silently overwrite its memory when big cursors are used)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/os5_mouse.cpp
    scummvm/trunk/backends/platform/sdl/sdl-common.h
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_mouse.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_mouse.cpp	2007-02-08 22:27:47 UTC (rev 25430)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_mouse.cpp	2007-02-08 22:54:09 UTC (rev 25431)
@@ -41,6 +41,15 @@
 	if (w == 0 || h == 0)
 		return;
 
+FIXME: The restriction on MAX_MOUSE_H / MAX_MOUSE_W is obsolete;
+in particular, BS2 might use bigger cursors these days.
+See also bug #1609058. 1607180
+Hence this code now might overwrite memory unchecked; at the
+very least an assert should be inserted to cause a controlled
+crash, but of course it would be better to remove the restriction
+on "small" cursors.
+
+
 	_mouseCurState.w = w;
 	_mouseCurState.h = h;
 

Modified: scummvm/trunk/backends/platform/sdl/sdl-common.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl-common.h	2007-02-08 22:27:47 UTC (rev 25430)
+++ scummvm/trunk/backends/platform/sdl/sdl-common.h	2007-02-08 22:54:09 UTC (rev 25431)
@@ -283,9 +283,6 @@
 
 	enum {
 		NUM_DIRTY_RECT = 100,
-
-		MAX_MOUSE_W = 80,
-		MAX_MOUSE_H = 80,
 		MAX_SCALING = 3
 	};
 

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-02-08 22:27:47 UTC (rev 25430)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2007-02-08 22:54:09 UTC (rev 25431)
@@ -851,7 +851,7 @@
 			if (ConfMan.hasKey("landscape"))
 				if (ConfMan.get("landscape")[0] > 57) {
 					_newOrientation = _orientationLandscape = ConfMan.getBool("landscape");
-					//ConfMan.removeKey("landscape", String::emptyString);
+					//ConfMan.removeKey("landscape", "");
 					ConfMan.setInt("landscape", _orientationLandscape);
 				} else
 					_newOrientation = _orientationLandscape = ConfMan.getInt("landscape");
@@ -1704,6 +1704,11 @@
 	if (w == 0 || h == 0)
 		return;
 
+/*
+FIXME: The restriction on MAX_MOUSE_H / MAX_MOUSE_W is obsolete;
+in particular, BS2 might use bigger cursors these days.
+See also bug #1609058. 1607180
+*/
 	assert(w <= MAX_MOUSE_W);
 	assert(h <= MAX_MOUSE_H);
 	_mouseCurState.w = w;


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




More information about the Scummvm-git-logs mailing list