[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.18.2.6,1.18.2.7 CEException.cpp,1.1,1.1.2.1

Nicolas Bacca arisme at users.sourceforge.net
Fri Jan 28 14:38:57 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7098

Modified Files:
      Tag: branch-0-7-0
	wince-sdl.cpp CEException.cpp 
Log Message:
No exception handling for non ARM devices

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -u -d -r1.18.2.6 -r1.18.2.7
--- wince-sdl.cpp	10 Jan 2005 22:34:12 -0000	1.18.2.6
+++ wince-sdl.cpp	28 Jan 2005 19:43:44 -0000	1.18.2.7
@@ -118,7 +118,7 @@
 
 extern "C" int scummvm_main(GameDetector &gameDetector, int argc, char **argv);
 
-void handleException(EXCEPTION_POINTERS *exceptionPointers) {
+int handleException(EXCEPTION_POINTERS *exceptionPointers) {
 	CEException::writeException(TEXT("\\scummvmCrash"), exceptionPointers);
 	drawError("Unrecoverable exception occurred - see crash dump in latest \\scummvmCrash file");
 	fclose(stdout_file);
@@ -126,6 +126,7 @@
 	CEDevice::end();
 	SDL_Quit();
 	exit(0);
+	return EXCEPTION_EXECUTE_HANDLER;
 }
 
 int SDL_main(int argc, char **argv) {

Index: CEException.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEException.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- CEException.cpp	30 May 2004 13:15:02 -0000	1.1
+++ CEException.cpp	28 Jan 2005 19:43:44 -0000	1.1.2.1
@@ -43,6 +43,7 @@
 	DWORD size;
 	unsigned int i;
 
+#ifdef ARM
 	writeBreak(file);
 	writeString(file, "Context dump");
 	sprintf(tempo, "R0=%.8x R1=%.8x R2=%.8x R3=%.8x R4=%.8x", context->R0, context->R1,
@@ -77,13 +78,17 @@
 			writeString(file, tempo);
 		}
 	}
+#else
+	writeBreak(file);
+	writeString(file, "Context dump only available on ARM devices");
+#endif
 }
 
 void CEException::dumpException(HANDLE file, EXCEPTION_RECORD *exceptionRecord) {
 	char tempo[200];
 	char exceptionName[50];
 	unsigned int i;
-	
+#if (_WIN32_WCE >= 300)
 	writeBreak(file);
 	switch(exceptionRecord->ExceptionCode) {
 		case EXCEPTION_ACCESS_VIOLATION :
@@ -122,6 +127,10 @@
 	}
 	if (exceptionRecord->ExceptionRecord)
 		dumpException(file, exceptionRecord->ExceptionRecord);
+#else
+	writeBreak(file);
+	writeString(file, "Cannot get exception information on this CE version");
+#endif
 }
 
 bool CEException::writeException(TCHAR *path, EXCEPTION_POINTERS *exceptionPointers) {





More information about the Scummvm-git-logs mailing list