Merge remote-tracking branch 'origin/master' into OZM

.gitignore

@@ -224,3 +224,13 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#############
+## qmake / make
+#############
+*.o
+Makefile
+UEFIExtract/UEFIExtract
+UEFIFind/UEFIFind
+UEFIPatch/UEFIPatch
+UEFITool

.travis.yml

@@ -0,0 +1,14 @@
+language: cpp
+
+compiler:
+  - clang
+  - gcc
+
+before_install:
+  - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
+
+script:
+  - qmake -qt=qt5 uefitool.pro
+  - make

LICENSE.md

@@ -0,0 +1,23 @@
+Copyright (c) 2015, Nikolaj Schlej
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LZMA/LzmaCompress.c

@@ -19,92 +19,91 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #define LZMA_HEADER_SIZE (LZMA_PROPS_SIZE + 8)
 
-static void * AllocForLzma(void *p, size_t size) { return malloc(size); }
-static void FreeForLzma(void *p, void *address) { free(address); }
+static void * AllocForLzma(void *p, size_t size) { (void)p; return malloc(size); }
+static void FreeForLzma(void *p, void *address) { (void)p; free(address); }
 static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma };
 
 SRes OnProgress(void *p, UInt64 inSize, UInt64 outSize)
 {
-	return SZ_OK;
+    (void)p; (void) inSize; (void) outSize;
+    return SZ_OK;
 }
 
 static ICompressProgress g_ProgressCallback = { &OnProgress };
 
 STATIC
-	UINT64
-	EFIAPI
-	RShiftU64 (
-	UINT64                    Operand,
-	UINT32                     Count
-	)
+UINT64
+EFIAPI
+RShiftU64(
+UINT64                    Operand,
+UINT32                     Count
+)
 {
-	return Operand >> Count;
+    return Operand >> Count;
 }
 
 VOID
-	SetEncodedSizeOfBuf(
-	UINT64 EncodedSize,
-	UINT8 *EncodedData
-	)
+SetEncodedSizeOfBuf(
+UINT64 EncodedSize,
+UINT8 *EncodedData
+)
 {
-	INT32   Index;
-
-	EncodedData[LZMA_PROPS_SIZE]  = EncodedSize & 0xFF;
-	for (Index = LZMA_PROPS_SIZE+1; Index <= LZMA_PROPS_SIZE + 7; Index++)
-	{
-		EncodedSize = RShiftU64(EncodedSize, 8);
-		EncodedData[Index] = EncodedSize & 0xFF;
-	}
+    INT32   Index;
+
+    EncodedData[LZMA_PROPS_SIZE] = EncodedSize & 0xFF;
+    for (Index = LZMA_PROPS_SIZE + 1; Index <= LZMA_PROPS_SIZE + 7; Index++)
+    {
+        EncodedSize = RShiftU64(EncodedSize, 8);
+        EncodedData[Index] = EncodedSize & 0xFF;
+    }
 }
 
 INT32
-	EFIAPI
-	LzmaCompress (
-	CONST UINT8  *Source,
-	UINT32       SourceSize,
-	UINT8    *Destination,
-	UINT32   *DestinationSize
-	)
+EFIAPI
+LzmaCompress(
+CONST UINT8  *Source,
+UINT32       SourceSize,
+UINT8    *Destination,
+UINT32   *DestinationSize
+)
 {
-	SRes              LzmaResult;
-	CLzmaEncProps     props;
-	SizeT propsSize = LZMA_PROPS_SIZE;
-	SizeT destLen = SourceSize + SourceSize / 3 + 128;
-
-	if (*DestinationSize < destLen)
-	{
-		*DestinationSize = destLen;
-		return ERR_BUFFER_TOO_SMALL;
-	}
-
-	LzmaEncProps_Init(&props);
-	props.dictSize = LZMA_DICTIONARY_SIZE;
-	props.level = 9;
-	props.fb = 273;
-
-	LzmaResult = LzmaEncode(
-		(Byte*)((UINT8*)Destination + LZMA_HEADER_SIZE), 
-		&destLen,
-		Source, 
-		SourceSize,
-		&props, 
-		(UINT8*)Destination, 
-		&propsSize, 
-		props.writeEndMark,
-		&g_ProgressCallback, 
-		&SzAllocForLzma, 
-		&SzAllocForLzma);
-
-	*DestinationSize = destLen + LZMA_HEADER_SIZE;
-
-	SetEncodedSizeOfBuf((UINT64)SourceSize, Destination);
-
-	if (LzmaResult == SZ_OK) {
-		return ERR_SUCCESS;
-	} else {
-		return ERR_INVALID_PARAMETER;
-	}
+    SRes              LzmaResult;
+    CLzmaEncProps     props;
+    SizeT propsSize = LZMA_PROPS_SIZE;
+    SizeT destLen = SourceSize + SourceSize / 3 + 128;
+
+    if (*DestinationSize < destLen)
+    {
+        *DestinationSize = destLen;
+        return ERR_BUFFER_TOO_SMALL;
+    }
+
+    LzmaEncProps_Init(&props);
+    props.dictSize = LZMA_DICTIONARY_SIZE;
+    props.level = 9;
+    props.fb = 273;
+
+    LzmaResult = LzmaEncode(
+        (Byte*)((UINT8*)Destination + LZMA_HEADER_SIZE),
+        &destLen,
+        Source,
+        SourceSize,
+        &props,
+        (UINT8*)Destination,
+        &propsSize,
+        props.writeEndMark,
+        &g_ProgressCallback,
+        &SzAllocForLzma,
+        &SzAllocForLzma);
+
+    *DestinationSize = destLen + LZMA_HEADER_SIZE;
+
+    SetEncodedSizeOfBuf((UINT64)SourceSize, Destination);
+
+    if (LzmaResult == SZ_OK) {
+        return ERR_SUCCESS;
+    }
+    else {
+        return ERR_INVALID_PARAMETER;
+    }
 }
-
-
-

LZMA/LzmaCompress.h

@@ -9,7 +9,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-*/
+  */
 
 #ifndef __LZMACOMPRESS_H__
 #define __LZMACOMPRESS_H__
@@ -24,14 +24,14 @@ extern "C" {
 #define LZMA_DICTIONARY_SIZE 0x800000
 #define _LZMA_SIZE_OPT
 
-INT32
-EFIAPI
-LzmaCompress (
-  const UINT8  *Source,
-  UINT32       SourceSize,
-  UINT8    *Destination,
-  UINT32   *DestinationSize
-  );
+    INT32
+        EFIAPI
+        LzmaCompress(
+        const UINT8  *Source,
+        UINT32       SourceSize,
+        UINT8    *Destination,
+        UINT32   *DestinationSize
+        );
 
 #ifdef __cplusplus
 }