1 files changed, 46 insertions, 1 deletions

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index e7f35c2..c48e506 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -21,6 +21,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <zip.h>
+#include <fstream>
+#include <iostream>
+
 #include <QApplication>
 #include <QMessageBox>
 #include <QMenuBar>
@@ -1412,15 +1416,56 @@ QString MainWindow::loadErrorStr(int error)
     }
 }
 
+std::string extractROM(char* zipName, std::string zipDir){
+    //Open the ZIP archive
+    int err = 0;
+    zip *z = zip_open(zipName, 0, &err);
+    
+    struct zip_stat st;
+    zip_stat_init(&st);
+    zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0
+    char newName[255];
+    strcpy(newName, st.name); //fix for Linux invalid encoding filename	
+    //Allocate memory for its uncompressed contents
+    u8 *contents = new u8[st.size];
+	
+    //Read the compressed file
+    zip_file *f = zip_fopen_index(z, 0, 0); //Open file at index 0
+    zip_fread(f, contents, st.size);
+    zip_fclose(f);
+
+    zip_close(z);
+
+    //Write the file (binary mode)
+    std::ofstream(zipDir + "/" + newName, std::ofstream::binary).write((char*) contents, st.size);
+    delete[] contents;
+    return zipDir + "/" + newName;
+}
 
 void MainWindow::onOpenFile()
 {
     emuThread->emuPause();
 
+    bool romExtracted = false; //No use yet but may be useful later
     QString filename = QFileDialog::getOpenFileName(this,
                                                     "Open ROM",
                                                     Config::LastROMFolder,
-                                                    "DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba);;Any file (*.*)");
+                                                    "DS ROMs (*.nds *.dsi *.srl *.zip);;GBA ROMs (*.gba *.zip);;Any file (*.*)");
+    QFileInfo filenameExtLoc = filename;
+
+    if (filenameExtLoc.completeSuffix().toUtf8() == "zip")
+    {
+        printf("Extracting ROM from ZIP...\n");
+	std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data());
+	printf("Done.\n");
+	filename = QString::fromUtf8(extractRomLoc.c_str());
+	romExtracted = true;
+    } else if (filenameExtLoc.completeSuffix().toUtf8() == "") {
+        //do nothing
+    } else {
+	romExtracted = false;    
+    }
+	
     if (filename.isEmpty())
     {
         emuThread->emuUnpause();