[Scummvm-git-logs] scummvm master -> 610fe3ac4b63043cfc1684b979c1cf93c3baaed7

[mistydemeo]

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:
1d6b4d8c91 DIRECTOR: add Willy Wabbit
610fe3ac4b DIRECTOR: Resource: do not delete stream on fail


Commit: 1d6b4d8c915eff7875a36567c2be1de96da00d11
    https://github.com/scummvm/scummvm/commit/1d6b4d8c915eff7875a36567c2be1de96da00d11
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-06-22T22:07:37-07:00

Commit Message:
DIRECTOR: add Willy Wabbit

There's also an Asian release with a different title.

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 367fc65aeda..9705d805fe7 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -463,6 +463,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "wallobeetemple",		"The temple of Monakumba: Starring Wallobee Jack" },
 	{ "warlock",			"Spaceship Warlock" },
 	{ "wiggles1",			"A Day with the Wiggles" },
+	{ "willywabbit",		"Willy Wabbit & His Magical Books" },
 	{ "winniewitch",		"Winnie the Witch" },
 	{ "wishbone", 			"Wishbone and the Amazing Odyssey" },
 	{ "wrath",				"Wrath of the Gods" },
@@ -3041,6 +3042,9 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// Produced by Microsoft; designed by AdWare Inc, Los Gatos, California (1992)
 	WINDEMO1("wfw31", "Demo", "WFWDEMO.EXE", "d98c3f5c1b7ea3039c47cc63d238a60d", 253540, 300),
 
+	// Mac version is D4
+	WINGAME1t("willywabbit", "North American release", "WILLY.EXE", "d5a5389a2c9fcae112f1d5772d2d6fd3", 375280, 310),
+
 	// Designed and produced by AdWare Inc, Los Gatos, California (1992)
 	WINDEMO2t("windows31", "Demo", "WINDEMO.EXE", "7d007410fece051b819735a282da7601", 255447,
 								   "WINDEMO.MMM", "0c13c2c5768cd54b01e5b9b1ef093f28", 2824822, 300),
@@ -5488,6 +5492,9 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME1t("williamsbts", "", "BEHIND.EXE", "0a432cb988c9865c478bdc195429d3fd", 693077, 404),
 	MACGAME1("williamsbts", "", "Behind the Scenes", "5442b05b2d320eb2e2ec3c74fa41f953", 483490, 404),
 
+	// Windows version is D3
+	MACGAME1t("willywabbit", "North American release", "Willy Wabbit(Click me)", "04e5a9a6c98f48aaef7fe7115b3606ca", 304029, 400),
+
 	WINDEMO1("windows95", "Demo", "W95DEMO.EXE", "508a025373f0e8f6ae514578cf97c281", 24814094, 404),
 
 	// Heksenspul met Hennie de heks en de kat Helmer (NL); Häxan Hekla (SE)


Commit: 610fe3ac4b63043cfc1684b979c1cf93c3baaed7
    https://github.com/scummvm/scummvm/commit/610fe3ac4b63043cfc1684b979c1cf93c3baaed7
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-06-22T22:07:38-07:00

Commit Message:
DIRECTOR: Resource: do not delete stream on fail

The stream becomes owned by the Archive as soon as openStream()
is called, so freeing the Archive object also frees the stream.
Trying to delete it a second time will blow up.

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index d766f796566..49cee89591f 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -403,7 +403,6 @@ Archive *DirectorEngine::loadEXEv3(Common::SeekableReadStream *stream) {
 		warning("DirectorEngine::loadEXEv3(): Failed to load RIFF from EXE");
 		delete result;
 		result = nullptr;
-		delete stream;
 	}
 
 	result = createArchive();