[Scummvm-git-logs] scummvm master -> 7fa0d97e32b0039d475095922418bdb4ed69aaaa

sev- sev at scummvm.org
Sun Oct 31 17:28:07 UTC 2021 

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

Summary:
ef485c619a DIRECTOR: Removed duplicate entry with incorrect punycode
10afe1b63a DIRECTOR: Fixed double-encoded Jonssolingan detection entries
3b281bd85c COMMON: Further synchronisation of the escape characters for punycode
7fa0d97e32 DEVTOOLS: Added more tests for punycode


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

Commit Message:
DIRECTOR: Removed duplicate entry with incorrect punycode

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index f344ae04b8..ae046a51fd 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2802,7 +2802,6 @@ 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),


Commit: 10afe1b63ae91bf7fdf812c5733e5dcc7863d4f8
    https://github.com/scummvm/scummvm/commit/10afe1b63ae91bf7fdf812c5733e5dcc7863d4f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T18:59:10+02:00

Commit Message:
DIRECTOR: Fixed double-encoded Jonssolingan detection entries

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index ae046a51fd..7e72efe061 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -4742,8 +4742,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// All of the installers also use Director
 	// Mac filename is Starta Jönssonligan
 	MACGAME1_l("jonssonligan1", "", "Starta Jonssonligan", "0944b962ebb00f4b5d5149d220f8449b", 113750, Common::SE_SWE, 702),
-	WINGAME1_l("jonssonligan1", "", "xn--Jnssonligan.exe-zya4t",					"7c18c9a6af2694156bf09ed195c1ab09", 2432602, Common::SE_SWE, 702),
-	WINGAME1_l("jonssonligan2", "", "xn--Jnssonligan gr p djupet.exe-83ad70c4mnae", "6213518ca81bb9e7397b408a8f38703d", 3374107, Common::SE_SWE, 702),
+	WINGAME1_l("jonssonligan1", "", "xn--Jnssonligan.exe-8sb", "7c18c9a6af2694156bf09ed195c1ab09", 2432602, Common::SE_SWE, 702),
+	WINGAME1_l("jonssonligan2", "", "xn--Jnssonligan gr p djupet.exe-glcd70c", "6213518ca81bb9e7397b408a8f38703d", 3374107, Common::SE_SWE, 702),
 
 	// Plays QuickTime movie then opens webpage (still works in 2021)
 	WINGAME2("jsa", "Demo", "Projector.exe", "7c18c9a6af2694156bf09ed195c1ab09", 2289485,


Commit: 3b281bd85cc7be5a5ae977ad7f290695fd6c14f1
    https://github.com/scummvm/scummvm/commit/3b281bd85cc7be5a5ae977ad7f290695fd6c14f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T19:26:48+02:00

Commit Message:
COMMON: Further synchronisation of the escape characters for punycode

Changed paths:
    common/punycode.cpp


diff --git a/common/punycode.cpp b/common/punycode.cpp
index abdace0d5d..bedbb3ce57 100644
--- a/common/punycode.cpp
+++ b/common/punycode.cpp
@@ -59,7 +59,7 @@ namespace Common {
 #define INITIAL_BIAS 72
 #define SMAX 0x10ffff // maximum Unicode code point
 
-#define SPECIAL_SYMBOLS "/\":*|\\?%<>,;="
+#define SPECIAL_SYMBOLS "/\":*|\\?%<>"
 
 static uint32 adapt_bias(uint32 delta, unsigned n_points, int is_first) {
 	uint32 k;


Commit: 7fa0d97e32b0039d475095922418bdb4ed69aaaa
    https://github.com/scummvm/scummvm/commit/7fa0d97e32b0039d475095922418bdb4ed69aaaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T19:27:34+02:00

Commit Message:
DEVTOOLS: Added more tests for punycode

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


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 65f94d1226..d1f0fdbf4f 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -532,6 +532,17 @@ def test_decode_name():
         ["ends with space ", "xn--ends with space -"],
         ["バッドデイ(Power PC)", "xn--(Power PC)-jx4ilmwb1a7h"],
         ["Hello*", "xn--Hello-la10a"],
+        ["File I/O", "xn--File IO-oa82b"],
+        ["HDにｺﾋﾟｰして下さい。G3", "xn--HDG3-rw3c5o2dpa9kzb2170dd4tzyda5j4k"],
+        ["Buried in Timeâ„¢ Demo", "xn--Buried in Time Demo-eo0l"],
+        ["•Main Menu", "xn--Main Menu-zd0e"],
+        ["Spaceship Warlockâ„¢", "xn--Spaceship Warlock-306j"],
+        ["ワロビージャックの大冒険<デモ>", "xn--baa0pja0512dela6bueub9gshf1k1a1rt742c060a2x4u"],
+        ["Jönssonligan går på djupet.exe", "xn--Jnssonligan gr p djupet.exe-glcd70c"],
+        ["Jönssonligan.exe", "xn--Jnssonligan.exe-8sb"],
+        ["G3フォルダ", "xn--G3-3g4axdtexf"],
+#        ["Big[test]", "Big[test]"],
+        ["Where \\ Do <you> Want / To: G* ? ;Unless=nowhere,or|\"(everything)/\":*|\\?%<>,;=", "xn--Where  Do you Want  To G  ;Unless=nowhere,or(everything),;=-5baedgdcbtamaaaaaaaaa99woa3wnnmb82aqb71ekb9g3c1f1cyb7bx6rfcv2pxa"],
     ]
     for input, output in checks:
         assert punyencode(input) == output
diff --git a/test/common/punycode.h b/test/common/punycode.h
index 1a8ce3dc4d..79e0f23839 100644
--- a/test/common/punycode.h
+++ b/test/common/punycode.h
@@ -11,9 +11,19 @@ static const char *strings[] = {
 	"ends with space ", "xn--ends with space -", "1",
 	"バッドデイ(Power PC)", "xn--(Power PC)-jx4ilmwb1a7h", "1",
 	"Hello*", "xn--Hello-la10a", "1",
+	"File I/O", "xn--File IO-oa82b", "1",
+	"HDにｺﾋﾟｰして下さい。G3", "xn--HDG3-rw3c5o2dpa9kzb2170dd4tzyda5j4k", "1",
+	"Buried in Timeâ„¢ Demo", "xn--Buried in Time Demo-eo0l", "1",
+	"•Main Menu", "xn--Main Menu-zd0e", "1",
+	"Spaceship Warlockâ„¢", "xn--Spaceship Warlock-306j", "1",
+	"ワロビージャックの大冒険<デモ>", "xn--baa0pja0512dela6bueub9gshf1k1a1rt742c060a2x4u", "1",
+	"Jönssonligan går på djupet.exe", "xn--Jnssonligan gr p djupet.exe-glcd70c", "1",
+	"Jönssonligan.exe", "xn--Jnssonligan.exe-8sb", "1",
+	"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",
 	0
 };
-
 class PunycodeTestSuite : public CxxTest::TestSuite {
 	public:
 
@@ -26,8 +36,6 @@ class PunycodeTestSuite : public CxxTest::TestSuite {
 			TS_ASSERT_EQUALS(punycode_decodefilename(string_out), string_in);
 			TS_ASSERT_EQUALS(punycode_encodefilename(string_in), string_out);
 			TS_ASSERT_EQUALS(punycode_needEncode(string_in), need);
-
-			warning("'%s' -> '%s'", string_in.encode().c_str(), punycode_encodefilename(string_in).c_str());
 		}
 	}
 };

More information about the Scummvm-git-logs mailing list