Merged revisions 33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621,33623,33626-33627,33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716,33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766,33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919,33928,33930,33932-33936,33938-33940,33942-33943,33948,33950,33953,33967,33973,33976,33978,33980,33985,33991,33993,33999-34000,34006,34009,34011,34013,34015,34019,34021-34023,34025,34027-34028,34030,34032-34034,34036,34038-34039,34041,34046-34048,34050-34055,34057,34059-34065,34067,34072,34074,34076,34078-34081,34084,34086-34087,34089-34090,34093,34096-34102,34104,34107,34113,34116,34119,34122,34124,34126,34128,34131-34132,34135,34138,34141,34144,34146,34149,34152-34154,34156-34157,34160,34163-34164,34169,34173,34179-34194,34196-34198,34200-34201,34205-34206,34208-34217,34219-34225,34227-34228,34234-34237,34239-34249,34251-34279,34281-34284,34286-34288,34290-34320,34323-34324,34326,34328-34329,34332,34334,34336,34338-34340,34343-34353,34356-34357,34359-34371,34373,34375,34378,34381-34382,34384-34385,34389-34391,34393-34394,34396-34397,34399-34405,34407-34409,34411,34413,34415,34417-34420,34423-34426,34428-34438,34440-34454,34456-34458,34460,34462-34469,34472,34474,34479-34481,34483-34498,34501-34505,34508,34511-34518,34520-34524,34526-34563,34566-34569,34571-34590,34592,34595-34599,34602-34603,34605,34613-34615,34617,34619-34624,34627-34628,34630-34639,34642-34649 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r34654

1 files changed, 5 insertions, 22 deletions

diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index f76940343e..fab2d80d30 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -30,6 +30,7 @@
 #include "common/config-manager.h"
 #include "common/fs.h"
 #include "graphics/imageman.h"
+#include "common/unzip.h"
 
 #define KEY_START_CHAR ('[')
 #define KEY_END_CHAR (']')
@@ -86,11 +87,6 @@ bool VirtualKeyboard::loadKeyboardPack(String packName) {
 		vkDir = new FilesystemNode(".");
 	}
 
-	// HACK/FIXME:
-	// - the ImageManager still needs the default directory to be added
-	// - would be nice for everything to use FSNodes
-	File::addDefaultDirectory(vkDir->getPath());
-
 	if (vkDir->getChild(packName + ".xml").exists()) {
 		// uncompressed keyboard pack
 		
@@ -100,28 +96,15 @@ bool VirtualKeyboard::loadKeyboardPack(String packName) {
 	} else if (vkDir->getChild(packName + ".zip").exists()) {
 		// compressed keyboard pack
 #ifdef USE_ZLIB
-		unzFile zipFile = unzOpen(vkDir->getChild(packName + ".zip").getPath().c_str());
-		if (zipFile && unzLocateFile(zipFile, (packName + ".xml").c_str(), 2) == UNZ_OK) {
-			unz_file_info fileInfo;
-			unzOpenCurrentFile(zipFile);
-			unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
-			byte *buffer = (byte *)malloc(fileInfo.uncompressed_size+1 * sizeof(byte));
-			assert(buffer);
-			memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(byte));
-			unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);
-			unzCloseCurrentFile(zipFile);
-			if (!_parser->loadBuffer(buffer, fileInfo.uncompressed_size+1, true)) {
-				unzClose(zipFile);
+		ZipArchive arch(vkDir->getChild(packName + ".zip").getPath().c_str());
+		if (arch.hasFile(packName + ".xml")) {
+			if (!_parser->loadStream(arch.openFile(packName + ".xml")))
 				return false;
-			}
 		} else {
 			warning("Could not find %s.xml file in %s.zip keyboard pack", packName.c_str(), packName.c_str());
-			unzClose(zipFile);
 			return false;
 		}
-		unzClose(zipFile);
-
-		ImageMan.addArchive(packName + ".zip");
+		ImageMan.addArchive(vkDir->getChild(packName + ".zip").getPath().c_str());
 #else
 		return false;
 #endif