Ticket #7947: windbg.diff

scummvm/Makefile.cygwin

@@ +1 @@
+# Makefile CYGWIN 1.3.10 (gcc 2.95.3, sdl, mad)
+
+CC      = gcc
+CFLAGS  = -O2 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
+DEFINES = -DUNIX -DUSE_WINDBG -DDUMP_SCRIPTS -DUSE_COMPRESSED_SOUND -DCOMPRESSED_SOUND_FILE
+LDFLAGS :=
+INCLUDES:= `sdl-config --cflags` -I./ -I./sound
+CPPFLAGS= $(DEFINES) $(INCLUDES)
+EXE = .exe
+
+# Add -lmad for -DCOMPRESSED_SOUND_FILE
+LIBS    = `sdl-config --libs` -lwinmm -lmad -mconsole 
+ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
+
+INCS    = scumm.h scummsys.h stdafx.h
+
+OBJS    = actor.o boxes.o costume.o gfx.o object.o resource.o \
+        saveload.o script.o scummvm.o sound.o string.o \
+        sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
+        sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \
+        akos.o vars.o insane.o gameDetector.o init.o \
+        v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
+        simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o
+
+DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
+        windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \
+        scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
+
+.cpp.o:
+        $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+
+all: scummvm install
+
+install: scummvm
+        cp scummvm$(EXE) /usr/bin
+
+scummvm: $(OBJS)
+        $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+
+clean:
+        rm -f $(OBJS) scummvm$(EXE)
+        rm -f -r *.bak *.stackdump *.rej *.orig
+        rm -f dumps/*
+
+dist:
+        rm -f $(ZIPFILE)
+        zip -q $(ZIPFILE) $(DISTFILES)
+
+check:
+$(OBJS): $(INCS)

scummvm/gameDetector.cpp

@@ -32 +32 @@
 static const char USAGE_STRING[] = 
         "ScummVM - Scumm Interpreter\n"
         "Syntax:\n"
-  "\tscummvm [-v] [-d] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n"
+  "\tscummvm [-v] [-d[<num>]] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n"
         "Flags:\n"
         "\tv       - show version info and exit\n"
         "\tc<num>  - use cdrom <num> for cd audio\n"
-        "\td       - enable debug output\n"
+        "\td[<num>]- enable debug output (level <num>)\n"
         "\tn       - no subtitles for speech\n"
         "\tb<num>  - start in room <num>\n"
         "\tt<num>  - set music tempo. Suggested: 1F0000\n"
@@ -83 +83 @@
                                         break;
                                 case 'd':
                                         _debugMode = true;
-                                        break;
+                                        if (*(s+1) != '\0')
+                                                _debugLevel = atoi(s+1);
+                                        debug(1,"Debugmode (level %d) on",_debugLevel);
+                                        goto NextArg;
                                 case 'n':
                                         _noSubtitles = true;
                                         break;

scummvm/readme.txt

@@ -130 +130 @@
 .SOU files, you will need to install the MAD library and define
 COMPRESSED_SOUND_FILE. Tools for compressing .SOU files to .SO3 files can be
 found in the 'tools' CVS module, or in the 'scummvm-tools' package.
+On Win9x/NT/XP you can define WIN_DBG and attach WinDbg to browse the debug 
+messages (see www.sysinternals.com/ntw2k/freeware/debugview.shtml).
 
         GCC:
         * Type make (or gmake if that's what GNU make is called on your
@@ -196 +198 @@
         -t<num>   - Set music tempo.              Default is '2031616'
         -e<mode>  - Select sound engine. See below.
         -g<mode>  - Select graphics scaler. See below.
+        -d[<num>] - Set debug verbosity to <num>
         -f        - Full-screen mode.
         -n        - Disable subtitles. Use with games that have voice.
         -r        - Enable Roland conversion. Try if music sounds incorrect.

scummvm/resource.cpp

@@ -357 +357 @@
         int num;
         int i;
 
-        debug(9, "readResTypeList(%d,%x,%s)", id, FROM_LE_32(tag), name);
+        debug(9, "readResTypeList(%s,%x,%s)", resTypeFromId(id), FROM_LE_32(tag), name);
 
         num = fileReadWordLE();
 
@@ -388 +388 @@
 #endif
 }
 
+char *Scumm::resTypeFromId(int id) {
+        static char buf[100];
+
+        switch(id) {
+                case rtRoom:      sprintf(buf, "Room"); break;
+                case rtScript:    sprintf(buf, "Script"); break;
+                case rtCostume:   sprintf(buf, "Costume"); break;
+                case rtSound:     sprintf(buf, "Sound"); break;
+                case rtInventory: sprintf(buf, "Inventory"); break;
+                case rtCharset:   sprintf(buf, "Charset"); break;
+                case rtString:    sprintf(buf, "String"); break;
+                case rtVerb:      sprintf(buf, "Verb"); break;
+                case rtActorName: sprintf(buf, "ActorName"); break;
+                case rtBuffer:    sprintf(buf, "Buffer"); break;
+                case rtScaleTable:sprintf(buf, "ScaleTable"); break;
+                case rtTemp:      sprintf(buf, "Temp"); break;
+                case rtFlObject:  sprintf(buf, "FlObject"); break;
+                case rtMatrix:    sprintf(buf, "Matrix"); break;
+                case rtBox:       sprintf(buf, "Box"); break;
+                case rtLast:      sprintf(buf, "Last"); break;
+                case rtNumTypes:  sprintf(buf, "NumTypes"); break;
+                default: sprintf(buf,"%d", id);
+        }
+        return buf;
+}
 
 void Scumm::allocResTypeData(int id, uint32 tag, int num, const char *name,
                                                                                                                  int mode)
 {
-        debug(9, "allocResTypeData(%d,%x,%d,%s,%d)", id, FROM_LE_32(tag), num, name,
-                                mode);
+        debug(9, "allocResTypeData(%s/%s,%x,%d,%d)", resTypeFromId(id), name, FROM_LE_32(tag), num, mode);
         assert(id >= 0 && id < (int)(sizeof(res.mode) / sizeof(res.mode[0])));
 
         if (num >= 2000) {
@@ -444 +468 @@
 {
         void *addr;
 
-        debug(9, "ensureResourceLoaded(%d,%d)", type, i);
+        debug(9, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i);
 
         if (type == rtRoom && i > 127) {
                 i = _resourceMapper[i & 127];
@@ -470 +494 @@
         uint32 fileOffs;
         uint32 size, tag;
 
-//  debug(1, "loadResource(%d,%d)", type,idx);
+//  debug(1, "loadResource(%s,%d)", resTypeFromId(type),idx);
 
         if (type == rtCharset && (_features & GF_SMALL_HEADER)) {
                 loadCharset(idx);
@@ -545 +569 @@
         int pri, best_pri;
         uint32 best_size = 0, best_offs = 0;
 
-        debug(9, "readSoundResource(%d,%d)", type, idx);
+        debug(9, "readSoundResource(%s,%d)", resTypeFromId(type), idx);
 
         pos = 0;
 
@@ -622 +646 @@
 {
         byte *ptr;
 
-        debug(9, "getResourceAddress(%d,%d)", type, idx);
-
         CHECK_HEAP validateResource("getResourceAddress", type, idx);
-        if (!res.address[type])
+        if (!res.address[type]) {
+                debug(9, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx);
                 return NULL;
+        }
 
         if (res.mode[type] && !res.address[type][idx]) {
                 ensureResourceLoaded(type, idx);
         }
 
 
-        if (!(ptr = (byte *)res.address[type][idx]))
+        if (!(ptr = (byte *)res.address[type][idx])) {
+                debug(9, "getResourceAddress(%s,%d) == NULL", resTypeFromId(type), idx);
                 return NULL;
+        }
 
         setResourceCounter(type, idx, 1);
 
+        debug(9, "getResourceAddress(%s,%d) == %ld", resTypeFromId(type), idx, ptr + sizeof(MemBlkHeader));
         return ptr + sizeof(MemBlkHeader);
 }
 
@@ -665 +692 @@
 {
         byte *ptr;
 
-        CHECK_HEAP debug(9, "createResource(%d,%d,%d)", type, idx, size);
+        CHECK_HEAP debug(9, "createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
 
         if (size > 65536 * 4 + 37856)
                 warning("Probably invalid size allocating %d", size);
@@ -691 +718 @@
 void Scumm::validateResource(const char *str, int type, int idx)
 {
         if (type < rtFirst || type > rtLast || (uint) idx >= (uint) res.num[type]) {
-                warning("%s Illegal Glob type %d num %d", str, type, idx);
+                warning("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
         }
 }
 
@@ -699 +726 @@
 {
         byte *ptr;
 
-        debug(9, "nukeResource(%d,%d)", type, idx);
+        debug(9, "nukeResource(%s,%d)", resTypeFromId(type), idx);
 
         CHECK_HEAP if (!res.address[type])
                 return;

scummvm/script.cpp

@@ -357 +357 @@
                 _vars[var] = value;
 
                 if ((_varwatch == (int)var) || (_varwatch == 0))
-                        printf("vars[%d] = %d (via script %d)\n", var, value,
+                        debug(0, "vars[%d] = %d (via script %d)", var, value,
                                                  vm.slot[_currentScript].number);
                 return;
         }

scummvm/scumm.h

@@ -808 +808 @@
         bool openResourceFile(const char *filename);
         void loadPtrToResource(int type, int i, byte *ptr);
         void readResTypeList(int id, uint32 tag, const char *name);
+        char *resTypeFromId(int id);
         void allocResTypeData(int id, uint32 tag, int num, const char *name, int mode);
         byte *createResource(int type, int index, uint32 size);
         void nukeResource(int type, int i);     
@@ -1826 +1827 @@
 
 extern const uint32 IMxx_tags[];
 extern const byte default_scale_table[768];
+extern uint16 _debugLevel;
 
 void outputdisplay2(Scumm *s, int disp);
 extern const byte revBitMask[8];

scummvm/scummsys.h

@@ -65 +65 @@
 #define FORCEINLINE inline
 #define NORETURN __attribute__((__noreturn__))
 #define GCC_PACK __attribute__((packed))
-#define CDECL
+/* #define CDECL */
+#define _HEAPOK 0
 
 typedef unsigned char byte;
 typedef unsigned char uint8;

scummvm/scummvm.cpp

@@ -1057 +1057 @@
 void NORETURN CDECL error(const char *s, ...)
 {
         char buf[1024];
+#if defined( USE_WINDBG )
+        char buf2[1024];
+#endif
         va_list va;
 
         va_start(va, s);
@@ -1069 +1072 @@
                                                 g_scumm->_roomResource,
                                                 ss->number,
                                                 g_scumm->_scriptPointer - g_scumm->_scriptOrgPointer, buf);
+#if defined( USE_WINDBG )
+                sprintf(buf2, "Error(%d:%d:0x%X): %s!\n",
+                        g_scumm->_roomResource,
+                        ss->number,
+                        g_scumm->_scriptPointer - g_scumm->_scriptOrgPointer,
+                        buf);
+                OutputDebugString(buf2);
+#endif
         } else {
                 fprintf(stderr, "Error: %s!\n", buf);
+#if defined( USE_WINDBG )
+                sprintf(&buf[strlen(buf)], "\n");
+                OutputDebugString(buf);
+#endif
         }
         // Doesn't wait for any keypress!! Is it intended to?
         exit(1);
@@ -1086 +1101 @@
         va_end(va);
 
         fprintf(stderr, "WARNING: %s!\n", buf);
+#if defined( USE_WINDBG )
+        sprintf(&buf[strlen(buf)], "\n");
+        OutputDebugString(buf);
+#endif
 }
 
+uint16 _debugLevel = 1;
+
 void CDECL debug(int level, const char *s, ...)
 {
         char buf[1024];
         va_list va;
 
-        if (level > 5)
+        if (level > _debugLevel)
                 return;
 
         va_start(va, s);
         vsprintf(buf, s, va);
         va_end(va);
         printf("%s\n", buf);
+#if defined( USE_WINDBG )
+        sprintf(&buf[strlen(buf)], "\n");
+        OutputDebugString(buf);
+#endif
         fflush(stdout);
 }
 

scummvm/simon/simon.h

@@ -220 +220 @@
 };
 
 /* dummy typedefs to make it compile in *nix */
+#if !defined(__CYGWIN__)
 #if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__)
 typedef void* HMIDISTRM;
 typedef void* HMIDIOUT;
@@ -238 +239 @@
 
 int GetAsyncKeyState(int key);
 
+#endif
 #endif
 
 class MidiDriver;