[Scummvm-git-logs] scummvm master -> 45aa7e12bc7b29086d6e703192509fb2e5233755

[rvanlaar]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
898dfcdae3 DEVTOOLS: COMPANION: Fix masking lower flag bits
45aa7e12bc DEVTOOLS: COMPANION: Remove old comments


Commit: 898dfcdae3570664e559482a190eada89fadf6a6
    https://github.com/scummvm/scummvm/commit/898dfcdae3570664e559482a190eada89fadf6a6
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-09-15T21:03:56+02:00

Commit Message:
DEVTOOLS: COMPANION: Fix masking lower flag bits

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 1a55dd12f0..1c236ac992 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -130,7 +130,7 @@ def decode_macjapanese(text: ByteString) -> str:
 
 def file_to_macbin(f: machfs.File, name: ByteString) -> bytes:
     oldFlags = f.flags >> 8
-    newFlags = f.flags & 8
+    newFlags = f.flags & 0xFF
     macbin = pack(
         ">xB63s4s4sBxHHHBxIIIIHB14xIHBB",
         len(name),


Commit: 45aa7e12bc7b29086d6e703192509fb2e5233755
    https://github.com/scummvm/scummvm/commit/45aa7e12bc7b29086d6e703192509fb2e5233755
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-09-15T21:05:29+02:00

Commit Message:
DEVTOOLS: COMPANION: Remove old comments

The dates are correct when creating a mac binary.
Example from the binary Majestic:

Majestic: MacBinary II, inited, busy, Thu Nov  9 05:09:33 1995, modified Thu Nov  9 05:11:55 1995, creator 'PJ93', type application, 23374400 bytes "Majestic" , at 0x164aac0 486640 bytes resource

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 1c236ac992..c38e3bdbbe 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -144,8 +144,8 @@ def file_to_macbin(f: machfs.File, name: ByteString) -> bytes:
         f.locked,
         len(f.data),
         len(f.rsrc),
-        f.crdate,  # TODO: dates are wrong, investigate
-        f.mddate,  # TODO: dates are wrong, investigate
+        f.crdate,
+        f.mddate,
         0,
         newFlags,
         0,