Merge pull request #3 from unexpected-eof/OZM

fix some small issues, compiles fine now
tuxuser · Nov 13, 2014 · 455611a · 455611a
2 parents 11d2ead + 36c74e8
commit 455611a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/OZMTool/common.h b/OZMTool/common.h
@@ -77,7 +77,7 @@ struct sectionEntry {
 
 #define OZMFFS_SIZE 17
 
-static const sectionEntry OzmFfs[]{
+static const sectionEntry OzmFfs[] = {
     // Filesystem
     {"PartitionDxe","1FA1F39E-FEFF-4AAE-BD7B-38A070A3B609", "partitiondxe.efi", SRC_EFI, EFI_SECTION_PE32, TRUE},
     {"EnhancedFat","961578FE-B6B7-44C3-AF35-6BC705CD2B1F", "enhancedfat.efi", SRC_EFI, EFI_SECTION_PE32, TRUE},
@@ -105,7 +105,7 @@ static const sectionEntry OzmFfs[]{
 
 #define DELETABLEFFS_SIZE 10
 
-static const sectionEntry deletableFfs[]{
+static const sectionEntry deletableFfs[] = {
   {"TcpDxe","B1625D3C-9D2D-4E0D-B864-8A763EE4EC50", "tcpdxe.efi", SRC_EFI, EFI_SECTION_PE32, FALSE},
   {"Dhcp4Dxe","8DD9176E-EE87-4F0E-8A84-3F998311F930", "dhcp4dxe.efi", SRC_EFI, EFI_SECTION_PE32, FALSE},
   {"Ip4ConfigDxe","8F9296EF-2880-4659-B857-915A8901BDC8", "ip4configdxe.efi", SRC_EFI, EFI_SECTION_PE32, FALSE},

diff --git a/OZMTool/util.cpp b/OZMTool/util.cpp
@@ -664,7 +664,7 @@ UINT8 injectDSDTintoAmiboardInfo(QByteArray ami, QByteArray dsdtbuf, QByteArray
         _DInst decomposed[MAX_INSTRUCTIONS];
         _DecodedInst disassembled[MAX_INSTRUCTIONS];
         _DecodeResult res, res2;
-        _CodeInfo ci = {0};
+        _CodeInfo ci = {0, 0, 0, 0, Decode64Bits, 0};
         ci.codeOffset = HeaderNT->OptionalHeader.BaseOfCode;
         ci.codeLen = HeaderNT->OptionalHeader.SizeOfCode;
         ci.code = (const unsigned char*)&amiboardbuf[ci.codeOffset];
@@ -694,7 +694,7 @@ UINT8 injectDSDTintoAmiboardInfo(QByteArray ami, QByteArray dsdtbuf, QByteArray
             return ERR_ERROR;
         }
 
-        for (int i = 0; i < decodedInstructionsCount; i++) {
+        for (int i = 0; i < (int) decodedInstructionsCount; i++) {
 
             if((decomposed[i].disp < (UINT64)offset)||decomposed[i].disp > (MAX_DSDT & 0xFF000))
                 continue;

diff --git a/ffsengine.cpp b/ffsengine.cpp
@@ -359,7 +359,7 @@ UINT8 FfsEngine::parseIntelImage(const QByteArray & intelImage, QModelIndex & in
         biosEnd = calculateRegionSize(regionSection->BiosBase, regionSection->BiosLimit);
 
         // Check for Gigabyte specific descriptor map
-        if (biosEnd - biosBegin == intelImage.size()) {
+        if (biosEnd - biosBegin == (unsigned int) intelImage.size()) {
             if (!meEnd) {
                 msg(tr("parseIntelImage: can determine BIOS region start from Gigabyte-specific descriptor"));
                 return ERR_INVALID_FLASH_DESCRIPTOR;
@@ -3583,4 +3583,4 @@ UINT8 FfsEngine::patchViaPattern(QByteArray & data, const QByteArray & hexFindPa
 
     data = body;
     return ERR_SUCCESS;
-}
+}