[Scummvm-git-logs] scummvm master -> 5750b66ae0ebf58fc6ea5034f8f6785cf11dcb4b

[sev-]

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

Summary:
44bc2e2eab COMMON: Fix punycode implementation for upper Unicode characters
55a171867e DEVTOOLS: COMPANION: Added test for higher Unicode characters
5750b66ae0 Revert "DIRECTOR: Removed duplicate entry with incorrect punycode"


Commit: 44bc2e2eab146dbe9906fd28d25b62def5f62d59
    https://github.com/scummvm/scummvm/commit/44bc2e2eab146dbe9906fd28d25b62def5f62d59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T23:00:35+02:00

Commit Message:
COMMON: Fix punycode implementation for upper Unicode characters

Changed paths:
    common/punycode.cpp


diff --git a/common/punycode.cpp b/common/punycode.cpp
index bedbb3ce57..ab7ad15668 100644
--- a/common/punycode.cpp
+++ b/common/punycode.cpp
@@ -57,7 +57,7 @@ namespace Common {
 #define DAMP 700
 #define INITIAL_N 128
 #define INITIAL_BIAS 72
-#define SMAX 0x10ffff // maximum Unicode code point
+#define SMAX 2147483647 // maximum Unicode code point
 
 #define SPECIAL_SYMBOLS "/\":*|\\?%<>"
 


Commit: 55a171867e96402650899d4e94f1a40d650fec7a
    https://github.com/scummvm/scummvm/commit/55a171867e96402650899d4e94f1a40d650fec7a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T23:00:35+02:00

Commit Message:
DEVTOOLS: COMPANION: Added test for higher Unicode characters

Changed paths:
    devtools/dumper-companion.py
    test/common/punycode.h


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index fa473e9c9c..3f5a151222 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -542,6 +542,7 @@ def test_decode_name():
         ["Jönssonligan.exe", "xn--Jnssonligan.exe-8sb"],
         ["G3フォルダ", "xn--G3-3g4axdtexf"],
         ["Where \\ Do <you> Want / To: G* ? ;Unless=nowhere,or|\"(everything)/\":*|\\?%<>,;=", "xn--Where  Do you Want  To G  ;Unless=nowhere,or(everything),;=-5baedgdcbtamaaaaaaaaa99woa3wnnmb82aqb71ekb9g3c1f1cyb7bx6rfcv2pxa"],
+        ["Buried in Timeｪ Demo", "xn--Buried in Time Demo-yp97h"],
     ]
     for input, output in checks:
         assert punyencode(input) == output
diff --git a/test/common/punycode.h b/test/common/punycode.h
index 79e0f23839..c7fb040260 100644
--- a/test/common/punycode.h
+++ b/test/common/punycode.h
@@ -22,6 +22,7 @@ static const char *strings[] = {
 	"G3フォルダ", "xn--G3-3g4axdtexf", "1",
 	"Big[test]", "Big[test]", "0",
 	"Where \\ Do <you> Want / To: G* ? ;Unless=nowhere,or|\"(everything)/\":*|\\?%<>,;=", "xn--Where  Do you Want  To G  ;Unless=nowhere,or(everything),;=-5baedgdcbtamaaaaaaaaa99woa3wnnmb82aqb71ekb9g3c1f1cyb7bx6rfcv2pxa", "1",
+	"Buried in Timeｪ Demo", "xn--Buried in Time Demo-yp97h", "1",
 	0
 };
 class PunycodeTestSuite : public CxxTest::TestSuite {


Commit: 5750b66ae0ebf58fc6ea5034f8f6785cf11dcb4b
    https://github.com/scummvm/scummvm/commit/5750b66ae0ebf58fc6ea5034f8f6785cf11dcb4b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T23:00:35+02:00

Commit Message:
Revert "DIRECTOR: Removed duplicate entry with incorrect punycode"

This reverts commit ef485c619a9620b33a03bdc6fe38849244c4699b.

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 7e72efe061..fcaf098582 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2802,6 +2802,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1_l("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 86324, Common::DE_DEU, 400),
 	MACDEMO1("jman2", "Demo", "Buried in Time Demo", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 400),
 	MACDEMO1("jman2", "06/22/94 Demo", "Buried in Time Demo", "cdb27c916044ae4dceb4b7326063fa03", 328895, 400),
+	MACDEMO1("jman2", "06/22/94 Demo 2", "xn--Buried in Time Demo-yp97h", "cdb27c916044ae4dceb4b7326063fa03", 329851, 400),
 	MACDEMO1("jman2", "06/22/94 Demo 2", "xn--Buried in Time Demo-eo0l", "cdb27c916044ae4dceb4b7326063fa03", 329851, 400),
 	MACDEMO1("jman2", "Final Demo", "Buried in Time Demo", "cc3321069072b90f091f220bba16e4d4", 292731, 400),
 	MACDEMO1("jman2", "Gallery", "BIT Gallery", "01be45e7241194dad07938e7059b88e3", 484284, 400),