Ticket #8525: aos4_changes.patch

configure

@@ -78 +78 @@
 _zip="zip -q"
 _cp=cp
 _win32path="C:/scummvm"
+_aos4path="Games:ScummVM_Snapshot"
 _sdlconfig=sdl-config
 _sdlpath="$PATH"
 _nasmpath="$PATH"
@@ -1419 +1424 @@
 ZIP := $_zip
 CP := $_cp
 WIN32PATH=$_win32path
+AOS4PATH=$_aos4path
 
 BACKEND := $_backend
 MODULES += $MODULES

backends/fs/amigaos4/amigaos4-fs.cpp

@@ -39 +39 @@
 #include "base/engine.h"
 #include "backends/fs/fs.h"
 
-#define ENTER() /* debug(6, "Enter\n") */
-#define LEAVE() /* debug(6, "Leave\n") */
+#define ENTER() /* debug(6, "Enter") */
+#define LEAVE() /* debug(6, "Leave") */
 
 
 const uint32 kExAllBufferSize = 40960; // TODO: is this okay for sure?
@@ -120 +120 @@
 
         struct FileInfoBlock *fib = (struct FileInfoBlock *)IDOS->AllocDosObject(DOS_FIB, NULL);
         if (!fib) {
-                debug(6, "fib == 0\n");
+                debug(6, "FileInfoBlock is NULL");
                 LEAVE();
                 return;
         }
 
-        BPTR pLock = IDOS->Lock( (char *)_sPath.c_str(), SHARED_LOCK);
+        BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
         if (pLock) {
                 if (IDOS->Examine(pLock, fib) != DOSFALSE) {
                         if (fib->fib_EntryType > 0)
@@ -155 +155 @@
 
         while (1) {
                 char *name = new char[bufSize];
-                if (IDOS->NameFromLock(pLock, name, bufSize) != DOSFALSE) {
+                if (IDOS->NameFromLock(pLock, (STRPTR)name, bufSize) != DOSFALSE) {
                         _sPath = name;
-                        _sDisplayName = pDisplayName ? pDisplayName : IDOS->FilePart(name);
+                        _sDisplayName = pDisplayName ? pDisplayName : IDOS->FilePart((STRPTR)name);
                         delete [] name;
                         break;
                 }
 
                 if (IDOS->IoErr() != ERROR_LINE_TOO_LONG) {
                         _bIsValid = false;
-                        debug(6, "Error\n");
+                        debug(6, "IoErr() != ERROR_LINE_TOO_LONG");
                         LEAVE();
                         delete [] name;
                         return;
@@ -177 +177 @@
 
         struct FileInfoBlock *fib = (struct     FileInfoBlock *)IDOS->AllocDosObject(DOS_FIB, NULL);
         if (!fib) {
-                debug(6, "fib == 0\n");
+                debug(6, "FileInfoBlock is NULL");
                 LEAVE();
                 return;
         }
@@ -226 +226 @@
         FSList myList;
 
         if (!_bIsValid) {
-                debug(6, "Invalid node\n");
+                debug(6, "Invalid node");
                 LEAVE();
                 return myList; // Empty list
         }
 
         if (!_bIsDirectory) {
-                debug(6, "Not a directory\n");
+                debug(6, "Not a directory");
                 LEAVE();
                 return myList; // Empty list
         }
 
         if (_pFileLock == 0) {
-                debug(6, "Root node\n");
+                debug(6, "Root node");
                 LEAVE();
                 return listVolumes();
         }
 
-        //FSList *myList = new FSList();
-
         struct ExAllControl *eac = (struct ExAllControl *)IDOS->AllocDosObject(DOS_EXALLCONTROL, 0);
         if (eac) {
                 struct ExAllData *data = (struct ExAllData *)IExec->AllocVec(kExAllBufferSize, MEMF_ANY);
@@ -252 +250 @@
                         BOOL bExMore;
                         eac->eac_LastKey = 0;
                         do {
+                                // Examine directory
                                 bExMore = IDOS->ExAll(_pFileLock, data, kExAllBufferSize, ED_TYPE, eac);
 
                                 LONG error = IDOS->IoErr();
                                 if (!bExMore && error != ERROR_NO_MORE_ENTRIES)
-                                        break;
+                                        break; // Abnormal failure
 
                                 if (eac->eac_Entries == 0)
-                                        continue;
+                                        continue; // Normal failure, no entries
 
                                 struct ExAllData *ead = data;
                                 do {
-                                        if ((mode == kListAll) || (EAD_IS_DRAWER(ead) && (mode == kListDirectoriesOnly)) ||
+                                        if ((mode == kListAll) ||
+                                                (EAD_IS_DRAWER(ead) && (mode == kListDirectoriesOnly)) ||
                                                 (EAD_IS_FILE(ead) && (mode == kListFilesOnly))) {
                                                 String full_path = _sPath;
                                                 full_path += (char*)ead->ed_Name;
 
-                                                BPTR lock = IDOS->Lock((char *)full_path.c_str(), SHARED_LOCK);
+                                                BPTR lock = IDOS->Lock((STRPTR)full_path.c_str(), SHARED_LOCK);
                                                 if (lock) {
                                                         AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(lock, (char *)ead->ed_Name);
                                                         if (entry) {
@@ -298 +298 @@
         ENTER();
 
         if (!_bIsDirectory) {
-                debug(6, "No directory\n");
+                debug(6, "Not a directory");
                 LEAVE();
                 return 0;
         }
 
         if (_pFileLock == 0) {
-                debug(6, "Root node\n");
+                debug(6, "Root node");
                 LEAVE();
                 return new AmigaOSFilesystemNode(*this);
         }
@@ -325 +325 @@
 
 FSList AmigaOSFilesystemNode::listVolumes(void) const {
         ENTER();
-        //FSList *myList = new FSList();
+
         FSList myList;
 
         const uint32 kLockFlags = LDF_READ | LDF_VOLUMES;
@@ -333 +333 @@
 
         struct DosList *dosList = IDOS->LockDosList(kLockFlags);
         if (!dosList) {
-                debug(6, "Cannot lock dos list\n");
+                debug(6, "Cannot lock the DOS list");
                 LEAVE();
                 return myList;
         }
@@ -350 +350 @@
                         strcpy(name, volName);
                         strcat(name, ":");
 
-                        BPTR volumeLock = IDOS->Lock(name, SHARED_LOCK);
+                        BPTR volumeLock = IDOS->Lock((STRPTR)name, SHARED_LOCK);
                         if (volumeLock) {
                                 sprintf(name, "%s (%s)", volName, devName);
                                 AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(volumeLock, name);

Makefile

@@ -141 +141 @@
         cp /usr/local/bin/SDL.dll $(WIN32PATH)
         u2d $(WIN32PATH)/*.txt
 
+# Special target to create an AmigaOS snapshot installation
+aos4dist: scummvm
+        mkdir -p $(AOS4PATH)
+        strip -R.comment $< -o $(AOS4PATH)/$<
+        cp aos4icon.info $(AOS4PATH)/$<.info
+        cp gui/themes/default-theme.ini $(AOS4PATH)
+        cp gui/themes/default-theme.zip $(AOS4PATH)
+        cp AUTHORS $(AOS4PATH)/AUTHORS.txt
+        cp COPYING $(AOS4PATH)/COPYING.txt
+        cp NEWS $(AOS4PATH)/NEWS.txt
+        cp README $(AOS4PATH)/README.txt
+        cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
 
 .PHONY: deb bundle osxsnap win32dist dist install uninstall