Packman Build Service PMBS

Changes of Revision 3

finalhe.changes Changed

@@ -1,4 +1,54 @@
 -------------------------------------------------------------------
+Tue Apr 21 07:31:43 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 1.92
+ * Added support for 3.73 with existing h-encore^2
+ version 1.91:
+ * Added support for 3.72 with updated h-encore²
+ version 1.9:
+ * Support 3.69-3.71 with h-encore²
+ * Fixed a bug which causes memcore not working on 3.61
+ version 1.81:
+ * Remove deflate from h-encore to get payload loading slight
+ faster
+ * Support 3.61/3.67 now, you won't be asked to update on these
+ firmwares (#46)
+ * Reduced C2-12821-1 error (#47)
+ * Fixed mismatch firmware versions display on firmware update
+ version 1.8:
+ * Support for memecore(h-encore 2.0 for VITA 3.60 support),
+ compiled from [my fork](https://github.com/soarqin/h-encore),
+ thanks to [CelesteBlue-dev](https://github.com/CelesteBlue-dev)
+ for his port
+ * Can trim h-encore app to only 6.5MB now, thanks to
+ [KuromeSan](https://github.com/KuromeSan)
+ * Fixed a bug that button is reset to be clickable when
+ another info sync from PSVITA is received
+ * Fixed French language
+ version 1.71:
+ * Updated official fix for h-encore 2.0
+ version 1.7:
+ * Updated h-encore to 2.0
+ version 1.6:
+ * Calculate Backup key from AID offline (#43), thanks to
+ [KuromeSan's
+ code](https://bitbucket.org/SilicaAndPina/cmakeyderiv)
+ version 1.5:
+ * New feature: Check firmware version and support firmware
+ update 3.65/3.68 through USB connection
+ * New feature: build prepared applications for transferring
+ through Content Manager
+ * Added translation: Russian
+
+- Drop finalhe.patch (no longer necessary)
+
+- Drop Group tag
+
+- Switch build to qmake
+
+- Spec cleanup
+
+-------------------------------------------------------------------
 Mon Jul 30 21:48:25 UTC 2018 - p.seiler@linuxmail.org
 
 - initial commit of version 1.4

finalhe.spec Changed

@@ -1,6 +1,7 @@
 #
 # spec file for package finalhe
 #
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,48 +13,43 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
 
+%define _lto_cflags %{nil}
 Name: finalhe
-Version: 1.4
+Version: 1.92
 Release: 0
 Summary: Vita exploiting toolset
-# FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses
-License: GPL-3.0
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group: Hardware/Other
-Url: https://github.com/soarqin/finalhe
-Source: %{name}-%{version}.tar.gz
-Patch0: finalhe.patch
-BuildRequires: cmake >= 3.11
+License: GPL-3.0-or-later
+URL: https://github.com/soarqin/finalhe
+Source: https://github.com/soarqin/finalhe/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires: gcc-c++
-BuildRequires: zlib-devel
-BuildRequires: libxml2-devel
-BuildRequires: libQt5Widgets-devel
 BuildRequires: libQt5Network-devel
-BuildRequires: libqt5-linguist-devel
-BuildRequires: libusb-compat-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(libusb)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(zlib)
+ExcludeArch: %arm aarch64
 
 %description
 This all-in-one program sets up h-encore for your PS Vita or PS TV
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
-%cmake
-%cmake_build
+%qmake5
+%make_build
 
 %install
-install -D -m0755 build/src/FinalHE %{buildroot}/%{_bindir}/FinalHE
+install -D -m0755 src/FinalHE %{buildroot}/%{_bindir}/FinalHE
 
 %files
-%defattr(-,root,root)
-%doc CHANGES README.md COPYING COPYING.Qcma COPYING.Qt COPYING.Qt.LGPLv21 CREDITS.md
+%license COPYING COPYING.Qcma COPYING.Qt COPYING.Qt.LGPLv21
+%doc CHANGES README.md CREDITS.md
 %{_bindir}/FinalHE
 
 %changelog
-

finalhe.patch Deleted

finalhe-1.4.tar.gz/deps/psvlib/img/pthread-win32.h Deleted

@@ -1,38 +0,0 @@
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-typedef HANDLE pthread_t;
-
-typedef struct {
- void *(*func)(void *);
- void *arg;
-} _ThreadParam;
-
-static DWORD WINAPI _ThreadProc(void* param) {
- _ThreadParam *p = (_ThreadParam*)param;
- DWORD result = (DWORD)(uintptr_t)p->func(p->arg);
- free(p);
- return result;
-}
-
-typedef struct pthread_attr_t pthread_attr_t;
-
-static inline int pthread_create(pthread_t *th, const pthread_attr_t *attr, void *(*func)(void *), void *arg) {
- _ThreadParam *param = (_ThreadParam*)malloc(sizeof(_ThreadParam));
- param->func = func;
- param->arg = arg;
- *th = CreateThread(NULL, 0, _ThreadProc, param, 0, NULL);
- if (*th == NULL) return GetLastError();
- return 0;
-}
-
-static inline int pthread_join(pthread_t t, void **res) {
- DWORD code;
- if (WaitForSingleObject(t, INFINITE) == WAIT_FAILED) return -1;
- GetExitCodeThread(t, &code);
- CloseHandle(t);
- if (res != NULL) *res = (void*)(uintptr_t)code;
- return 0;
-}

finalhe-1.4.tar.gz/deps/vitamtp/byteorder.h Deleted

@@ -1,140 +0,0 @@
-/* This file is generated automatically by configure */
-
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
-
-/* Use these as generic byteswapping macros on this little endian system */
-#define swap16(x)		ntohs(x)
-#define swap32(x)		ntohl(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \
-			 ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \
-			 ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \
-			 ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \
-			 ((x) >> 8) & 0x00000000ff000000ULL | \
-			 ((x) >> 24) & 0x0000000000ff0000ULL | \
-			 ((x) >> 40) & 0x000000000000ff00ULL | \
-			 ((x) >> 56) & 0x00000000000000ffULL))
-
-/* The byte swapping macros have the form: */
-/* EENN[a]toh or htoEENN[a] where EE is be (big endian) or */
-/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
-/* if present, indicates that the endian side is a pointer to an */
-/* array of uint8_t bytes instead of an integer of the specified length. */
-/* h refers to the host's ordering method. */
-
-/* So, to convert a 32-bit integer stored in a buffer in little-endian */
-/* format into a uint32_t usable on this machine, you could use: */
-/* uint32_t value = le32atoh(&buf[3]); */
-/* To put that value back into the buffer, you could use: */
-/* htole32a(&buf[3], value); */
-
-/* Define aliases for the standard byte swapping macros */
-/* Arguments to these macros must be properly aligned on natural word */
-/* boundaries in order to work properly on all architectures */
-#ifndef htobe16
-# define htobe16(x) htons(x)
-#endif
-#ifndef htobe32
-# define htobe32(x) htonl(x)
-#endif
-#ifndef be16toh
-# define be16toh(x) ntohs(x)
-#endif
-#ifndef be32toh
-# define be32toh(x) ntohl(x)
-#endif
-
-#define HTOBE16(x) (x) = htobe16(x)
-#define HTOBE32(x) (x) = htobe32(x)
-#define BE32TOH(x) (x) = be32toh(x)
-#define BE16TOH(x) (x) = be16toh(x)
-
-/* On little endian machines, these macros are null */
-#ifndef htole16
-# define htole16(x) (x)
-#endif
-#ifndef htole32
-# define htole32(x) (x)
-#endif
-#ifndef htole64
-# define htole64(x) (x)
-#endif
-#ifndef le16toh
-# define le16toh(x) (x)
-#endif
-#ifndef le32toh
-# define le32toh(x) (x)
-#endif
-#ifndef le64toh
-# define le64toh(x) (x)
-#endif
-
-#define HTOLE16(x) (void) (x)
-#define HTOLE32(x) (void) (x)
-#define HTOLE64(x) (void) (x)
-#define LE16TOH(x) (void) (x)
-#define LE32TOH(x) (void) (x)
-#define LE64TOH(x) (void) (x)
-
-/* These don't have standard aliases */
-#ifndef htobe64
-# define htobe64(x) swap64(x)
-#endif
-#ifndef be64toh
-# define be64toh(x) swap64(x)
-#endif
-
-#define HTOBE64(x) (x) = htobe64(x)
-#define BE64TOH(x) (x) = be64toh(x)
-
-/* Define the C99 standard length-specific integer types */
-#include <stdint.h>
-
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness. This is the most portable way to generate */
-/* and read messages to a network or serial device. Each member of a */
-/* packet structure must be handled separately. */
-
-/* The i386 and compatibles can handle unaligned memory access, */
-/* so use the optimized macros above to do this job */
-#ifndef be16atoh
-# define be16atoh(x) be16toh(*(uint16_t*)(x))
-#endif
-#ifndef be32atoh
-# define be32atoh(x) be32toh(*(uint32_t*)(x))
-#endif
-#ifndef be64atoh
-# define be64atoh(x) be64toh(*(uint64_t*)(x))
-#endif
-#ifndef le16atoh
-# define le16atoh(x) le16toh(*(uint16_t*)(x))
-#endif
-#ifndef le32atoh
-# define le32atoh(x) le32toh(*(uint32_t*)(x))
-#endif
-#ifndef le64atoh
-# define le64atoh(x) le64toh(*(uint64_t*)(x))
-#endif
-
-#ifndef htob16a
-# define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x)
-#endif
-#ifndef htobe32a
-# define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x)
-#endif
-#ifndef htobe64a
-# define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x)
-#endif
-#ifndef htole16a
-# define htole16a(a,x) *(uint16_t*)(a) = htole16(x)
-#endif
-#ifndef htole32a
-# define htole32a(a,x) *(uint32_t*)(a) = htole32(x)
-#endif
-#ifndef htole64a
-# define htole64a(a,x) *(uint64_t*)(a) = htole64(x)
-#endif
-
-#endif /*__BYTEORDER_H*/

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64 Deleted

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64/bld_ml64.bat Deleted

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64/gvmat64.asm Deleted

@@ -1,553 +0,0 @@
-;uInt longest_match_x64(
-; deflate_state *s,
-; IPos cur_match); /* current match */
-
-; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86_64
-; (AMD64 on Athlon 64, Opteron, Phenom
-; and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
-; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
-;
-; File written by Gilles Vollant, by converting to assembly the longest_match
-; from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
-;
-; and by taking inspiration on asm686 with masm, optimised assembly code
-; from Brian Raiter, written 1998
-;
-; This software is provided 'as-is', without any express or implied
-; warranty. In no event will the authors be held liable for any damages
-; arising from the use of this software.
-;
-; Permission is granted to anyone to use this software for any purpose,
-; including commercial applications, and to alter it and redistribute it
-; freely, subject to the following restrictions:
-;
-; 1. The origin of this software must not be misrepresented; you must not
-; claim that you wrote the original software. If you use this software
-; in a product, an acknowledgment in the product documentation would be
-; appreciated but is not required.
-; 2. Altered source versions must be plainly marked as such, and must not be
-; misrepresented as being the original software
-; 3. This notice may not be removed or altered from any source distribution.
-;
-;
-;
-; http://www.zlib.net
-; http://www.winimage.com/zLibDll
-; http://www.muppetlabs.com/~breadbox/software/assembly.html
-;
-; to compile this file for infozip Zip, I use option:
-; ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm
-;
-; to compile this file for zLib, I use option:
-; ml64.exe /Flgvmat64 /c /Zi gvmat64.asm
-; Be carrefull to adapt zlib1222add below to your version of zLib
-; (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change
-; value of zlib1222add later)
-;
-; This file compile with Microsoft Macro Assembler (x64) for AMD64
-;
-; ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
-;
-; (you can get Windows WDK with ml64 for AMD64 from
-; http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
-;
-
-
-;uInt longest_match(s, cur_match)
-; deflate_state *s;
-; IPos cur_match; /* current match */
-.code
-longest_match PROC
-
-
-;LocalVarsSize equ 88
- LocalVarsSize equ 72
-
-; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
-; free register : r14,r15
-; register can be saved : rsp
-
- chainlenwmask equ rsp + 8 - LocalVarsSize ; high word: current chain len
- ; low word: s->wmask
-;window equ rsp + xx - LocalVarsSize ; local copy of s->window ; stored in r10
-;windowbestlen equ rsp + xx - LocalVarsSize ; s->window + bestlen , use r10+r11
-;scanstart equ rsp + xx - LocalVarsSize ; first two bytes of string ; stored in r12w
-;scanend equ rsp + xx - LocalVarsSize ; last two bytes of string use ebx
-;scanalign equ rsp + xx - LocalVarsSize ; dword-misalignment of string r13
-;bestlen equ rsp + xx - LocalVarsSize ; size of best match so far -> r11d
-;scan equ rsp + xx - LocalVarsSize ; ptr to string wanting match -> r9
-IFDEF INFOZIP
-ELSE
- nicematch equ (rsp + 16 - LocalVarsSize) ; a good enough match size
-ENDIF
-
-save_rdi equ rsp + 24 - LocalVarsSize
-save_rsi equ rsp + 32 - LocalVarsSize
-save_rbx equ rsp + 40 - LocalVarsSize
-save_rbp equ rsp + 48 - LocalVarsSize
-save_r12 equ rsp + 56 - LocalVarsSize
-save_r13 equ rsp + 64 - LocalVarsSize
-;save_r14 equ rsp + 72 - LocalVarsSize
-;save_r15 equ rsp + 80 - LocalVarsSize
-
-
-; summary of register usage
-; scanend ebx
-; scanendw bx
-; chainlenwmask edx
-; curmatch rsi
-; curmatchd esi
-; windowbestlen r8
-; scanalign r9
-; scanalignd r9d
-; window r10
-; bestlen r11
-; bestlend r11d
-; scanstart r12d
-; scanstartw r12w
-; scan r13
-; nicematch r14d
-; limit r15
-; limitd r15d
-; prev rcx
-
-; all the +4 offsets are due to the addition of pending_buf_size (in zlib
-; in the deflate_state structure since the asm code was first written
-; (if you compile with zlib 1.0.4 or older, remove the +4).
-; Note : these value are good with a 8 bytes boundary pack structure
-
-
- MAX_MATCH equ 258
- MIN_MATCH equ 3
- MIN_LOOKAHEAD equ (MAX_MATCH+MIN_MATCH+1)
-
-
-;;; Offsets for fields in the deflate_state structure. These numbers
-;;; are calculated from the definition of deflate_state, with the
-;;; assumption that the compiler will dword-align the fields. (Thus,
-;;; changing the definition of deflate_state could easily cause this
-;;; program to crash horribly, without so much as a warning at
-;;; compile time. Sigh.)
-
-; all the +zlib1222add offsets are due to the addition of fields
-; in zlib in the deflate_state structure since the asm code was first written
-; (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-; (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-; if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-
-
-IFDEF INFOZIP
-
-_DATA SEGMENT
-COMM window_size:DWORD
-; WMask ; 7fff
-COMM window:BYTE:010040H
-COMM prev:WORD:08000H
-; MatchLen : unused
-; PrevMatch : unused
-COMM strstart:DWORD
-COMM match_start:DWORD
-; Lookahead : ignore
-COMM prev_length:DWORD ; PrevLen
-COMM max_chain_length:DWORD
-COMM good_match:DWORD
-COMM nice_match:DWORD
-prev_ad equ OFFSET prev
-window_ad equ OFFSET window
-nicematch equ nice_match
-_DATA ENDS
-WMask equ 07fffh
-
-ELSE
-
- IFNDEF zlib1222add
- zlib1222add equ 8
- ENDIF
-dsWSize equ 56+zlib1222add+(zlib1222add/2)
-dsWMask equ 64+zlib1222add+(zlib1222add/2)
-dsWindow equ 72+zlib1222add
-dsPrev equ 88+zlib1222add
-dsMatchLen equ 128+zlib1222add
-dsPrevMatch equ 132+zlib1222add
-dsStrStart equ 140+zlib1222add
-dsMatchStart equ 144+zlib1222add
-dsLookahead equ 148+zlib1222add
-dsPrevLen equ 152+zlib1222add
-dsMaxChainLen equ 156+zlib1222add
-dsGoodMatch equ 172+zlib1222add
-dsNiceMatch equ 176+zlib1222add
-
-window_size equ [ rcx + dsWSize]
-WMask equ [ rcx + dsWMask]
-window_ad equ [ rcx + dsWindow]
-prev_ad equ [ rcx + dsPrev]
-strstart equ [ rcx + dsStrStart]
-match_start equ [ rcx + dsMatchStart]
-Lookahead equ [ rcx + dsLookahead] ; 0ffffffffh on infozip
-prev_length equ [ rcx + dsPrevLen]
-max_chain_length equ [ rcx + dsMaxChainLen]
-good_match equ [ rcx + dsGoodMatch]
-nice_match equ [ rcx + dsNiceMatch]
-ENDIF
-
-; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)
-
-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
-;
-; All registers must be preserved across the call, except for
-; rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
-
-
-
-;;; Save registers that the compiler may be using, and adjust esp to
-;;; make room for our stack frame.
-
-
-;;; Retrieve the function arguments. r8d will hold cur_match
-;;; throughout the entire function. edx will hold the pointer to the
-;;; deflate_state structure during the function's setup (before
-;;; entering the main loop.
-
-; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
-
-; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
-
- mov [save_rdi],rdi
- mov [save_rsi],rsi
- mov [save_rbx],rbx
- mov [save_rbp],rbp
-IFDEF INFOZIP
- mov r8d,ecx
-ELSE
- mov r8d,edx
-ENDIF
- mov [save_r12],r12
- mov [save_r13],r13
-; mov [save_r14],r14
-; mov [save_r15],r15
-
-
-;;; uInt wmask = s->w_mask;
-;;; unsigned chain_length = s->max_chain_length;
-;;; if (s->prev_length >= s->good_match) {
-;;; chain_length >>= 2;
-;;; }
-
- mov edi, prev_length
- mov esi, good_match
- mov eax, WMask
- mov ebx, max_chain_length
- cmp edi, esi
- jl LastMatchGood
- shr ebx, 2
-LastMatchGood:
-
-;;; chainlen is decremented once beforehand so that the function can
-;;; use the sign flag instead of the zero flag for the exit test.
-;;; It is then shifted into the high word, to make room for the wmask
-;;; value, which it will always accompany.
-
- dec ebx
- shl ebx, 16
- or ebx, eax
-
-;;; on zlib only
-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-IFDEF INFOZIP
- mov [chainlenwmask], ebx
-; on infozip nice_match = [nice_match]
-ELSE
- mov eax, nice_match
- mov [chainlenwmask], ebx
- mov r10d, Lookahead
- cmp r10d, eax
- cmovnl r10d, eax
- mov [nicematch],r10d
-ENDIF
-
-;;; register Bytef *scan = s->window + s->strstart;
- mov r10, window_ad
- mov ebp, strstart
- lea r13, [r10 + rbp]
-
-;;; Determine how many bytes the scan ptr is off from being
-;;; dword-aligned.
-
- mov r9,r13
- neg r13
- and r13,3
-
-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-;;; s->strstart - (IPos)MAX_DIST(s) : NIL;
-IFDEF INFOZIP
- mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))
-ELSE
- mov eax, window_size
- sub eax, MIN_LOOKAHEAD
-ENDIF
- xor edi,edi
- sub ebp, eax
-
- mov r11d, prev_length
-
- cmovng ebp,edi
-
-;;; int best_len = s->prev_length;
-
-
-;;; Store the sum of s->window + best_len in esi locally, and in esi.
-
- lea rsi,[r10+r11]
-
-;;; register ush scan_start = *(ushf*)scan;
-;;; register ush scan_end = *(ushf*)(scan+best_len-1);
-;;; Posf *prev = s->prev;
-
- movzx r12d,word ptr [r9]
- movzx ebx, word ptr [r9 + r11 - 1]
-
- mov rdi, prev_ad
-
-;;; Jump into the main loop.
-
- mov edx, [chainlenwmask]
-
- cmp bx,word ptr [rsi + r8 - 1]
- jz LookupLoopIsZero
-
-LookupLoop1:
- and r8d, edx
-
- movzx r8d, word ptr [rdi + r8*2]
- cmp r8d, ebp
- jbe LeaveNow
- sub edx, 00010000h
- js LeaveNow
-
-LoopEntry1:
- cmp bx,word ptr [rsi + r8 - 1]
- jz LookupLoopIsZero
-
-LookupLoop2:
- and r8d, edx
-
- movzx r8d, word ptr [rdi + r8*2]
- cmp r8d, ebp
- jbe LeaveNow
- sub edx, 00010000h
- js LeaveNow
-
-LoopEntry2:
- cmp bx,word ptr [rsi + r8 - 1]
- jz LookupLoopIsZero
-
-LookupLoop4:
- and r8d, edx
-
- movzx r8d, word ptr [rdi + r8*2]
- cmp r8d, ebp
- jbe LeaveNow
- sub edx, 00010000h
- js LeaveNow
-
-LoopEntry4:
-
- cmp bx,word ptr [rsi + r8 - 1]
- jnz LookupLoop1
- jmp LookupLoopIsZero
-
-
-;;; do {
-;;; match = s->window + cur_match;
-;;; if (*(ushf*)(match+best_len-1) != scan_end ||
-;;; *(ushf*)match != scan_start) continue;
-;;; [...]
-;;; } while ((cur_match = prev[cur_match & wmask]) > limit
-;;; && --chain_length != 0);
-;;;
-;;; Here is the inner loop of the function. The function will spend the
-;;; majority of its time in this loop, and majority of that time will
-;;; be spent in the first ten instructions.
-;;;
-;;; Within this loop:
-;;; ebx = scanend
-;;; r8d = curmatch
-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-;;; esi = windowbestlen - i.e., (window + bestlen)
-;;; edi = prev
-;;; ebp = limit
-
-LookupLoop:
- and r8d, edx
-
- movzx r8d, word ptr [rdi + r8*2]
- cmp r8d, ebp
- jbe LeaveNow
- sub edx, 00010000h
- js LeaveNow
-
-LoopEntry:
-
- cmp bx,word ptr [rsi + r8 - 1]
- jnz LookupLoop1
-LookupLoopIsZero:
- cmp r12w, word ptr [r10 + r8]
- jnz LookupLoop1
-
-
-;;; Store the current value of chainlen.
- mov [chainlenwmask], edx
-
-;;; Point edi to the string under scrutiny, and esi to the string we
-;;; are hoping to match it up with. In actuality, esi and edi are
-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
-;;; initialized to -(MAX_MATCH_8 - scanalign).
-
- lea rsi,[r8+r10]
- mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8)
- lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8]
- lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8]
-
- prefetcht1 [rsi+rdx]
- prefetcht1 [rdi+rdx]
-
-
-;;; Test the strings for equality, 8 bytes at a time. At the end,
-;;; adjust rdx so that it is offset to the exact byte that mismatched.
-;;;
-;;; We already know at this point that the first three bytes of the
-;;; strings match each other, and they can be safely passed over before
-;;; starting the compare loop. So what this code does is skip over 0-3
-;;; bytes, as much as necessary in order to dword-align the edi
-;;; pointer. (rsi will still be misaligned three times out of four.)
-;;;
-;;; It should be confessed that this loop usually does not represent
-;;; much of the total running time. Replacing it with a more
-;;; straightforward "rep cmpsb" would not drastically degrade
-;;; performance.
-
-
-LoopCmps:
- mov rax, [rsi + rdx]
- xor rax, [rdi + rdx]
- jnz LeaveLoopCmps
-
- mov rax, [rsi + rdx + 8]
- xor rax, [rdi + rdx + 8]
- jnz LeaveLoopCmps8
-
-
- mov rax, [rsi + rdx + 8+8]
- xor rax, [rdi + rdx + 8+8]
- jnz LeaveLoopCmps16
-
- add rdx,8+8+8
-
- jnz short LoopCmps
- jmp short LenMaximum
-LeaveLoopCmps16: add rdx,8
-LeaveLoopCmps8: add rdx,8
-LeaveLoopCmps:
-
- test eax, 0000FFFFh
- jnz LenLower
-
- test eax,0ffffffffh
-
- jnz LenLower32
-
- add rdx,4
- shr rax,32
- or ax,ax
- jnz LenLower
-
-LenLower32:
- shr eax,16
- add rdx,2
-LenLower: sub al, 1
- adc rdx, 0
-;;; Calculate the length of the match. If it is longer than MAX_MATCH,
-;;; then automatically accept it as the best possible match and leave.
-
- lea rax, [rdi + rdx]
- sub rax, r9
- cmp eax, MAX_MATCH
- jge LenMaximum
-
-;;; If the length of the match is not longer than the best match we
-;;; have so far, then forget it and return to the lookup loop.
-;///////////////////////////////////
-
- cmp eax, r11d
- jg LongerMatch
-
- lea rsi,[r10+r11]
-
- mov rdi, prev_ad
- mov edx, [chainlenwmask]
- jmp LookupLoop
-
-;;; s->match_start = cur_match;
-;;; best_len = len;
-;;; if (len >= nice_match) break;
-;;; scan_end = *(ushf*)(scan+best_len-1);
-
-LongerMatch:
- mov r11d, eax
- mov match_start, r8d
- cmp eax, [nicematch]
- jge LeaveNow
-
- lea rsi,[r10+rax]
-
- movzx ebx, word ptr [r9 + rax - 1]
- mov rdi, prev_ad
- mov edx, [chainlenwmask]
- jmp LookupLoop
-
-;;; Accept the current string, with the maximum possible length.
-
-LenMaximum:
- mov r11d,MAX_MATCH
- mov match_start, r8d
-
-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-;;; return s->lookahead;
-
-LeaveNow:
-IFDEF INFOZIP
- mov eax,r11d
-ELSE
- mov eax, Lookahead
- cmp r11d, eax
- cmovng eax, r11d
-ENDIF
-
-;;; Restore the stack and return from whence we came.
-
-
- mov rsi,[save_rsi]
- mov rdi,[save_rdi]
- mov rbx,[save_rbx]
- mov rbp,[save_rbp]
- mov r12,[save_r12]
- mov r13,[save_r13]
-; mov r14,[save_r14]
-; mov r15,[save_r15]
-
-
- ret 0
-; please don't remove this string !
-; Your can freely use gvmat64 in any free or commercial app
-; but it is far better don't remove the string in the binary!
- db 0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
-longest_match ENDP
-
-match_init PROC
- ret 0
-match_init ENDP
-
-
-END

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64/inffas8664.c Deleted

@@ -1,186 +0,0 @@
-/* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding
- * version for AMD64 on Windows using Microsoft C compiler
- *
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant
- *
- * inffas8664.c call function inffas8664fnc in inffasx64.asm
- * inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
- *
- * Dec-29-2003 -- I added AMD64 inflate asm support. This version is also
- * slightly quicker on x86 systems because, instead of using rep movsb to copy
- * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
- * bytes. I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
- * from http://fedora.linux.duke.edu/fc1_x86_64
- * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
- * 1GB ram. The 64-bit version is about 4% faster than the 32-bit version,
- * when decompressing mozilla-source-1.3.tar.gz.
- *
- * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
- * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at
- * the moment. I have successfully compiled and tested this code with gcc2.96,
- * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S
- * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
- * enabled. I will attempt to merge the MMX code into this version. Newer
- * versions of this and inffast.S can be found at
- * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
- *
- */
-
-#include <stdio.h>
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* Mark Adler's comments from inffast.c: */
-
-/*
- Decode literal, length, and distance codes and write out the resulting
- literal and match bytes until either not enough input or output is
- available, an end-of-block is encountered, or a data error is encountered.
- When large enough input and output buffers are supplied to inflate(), for
- example, a 16K input buffer and a 64K output buffer, more than 95% of the
- inflate execution time is spent in this routine.
-
- Entry assumptions:
-
- state->mode == LEN
- strm->avail_in >= 6
- strm->avail_out >= 258
- start >= strm->avail_out
- state->bits < 8
-
- On return, state->mode is one of:
-
- LEN -- ran out of enough output space or enough available input
- TYPE -- reached end of block code, inflate() to interpret next block
- BAD -- error in block data
-
- Notes:
-
- - The maximum input bits used by a length/distance pair is 15 bits for the
- length code, 5 bits for the length extra, 15 bits for the distance code,
- and 13 bits for the distance extra. This totals 48 bits, or six bytes.
- Therefore if strm->avail_in >= 6, then there is enough input to avoid
- checking for available input while decoding.
-
- - The maximum bytes that a single length/distance pair can output is 258
- bytes, which is the maximum length that can be coded. inflate_fast()
- requires strm->avail_out >= 258 for each loop to avoid checking for
- output space.
- */
-
-
-
- typedef struct inffast_ar {
-/* 64 32 x86 x86_64 */
-/* ar offset register */
-/* 0 0 */ void *esp; /* esp save */
-/* 8 4 */ void *ebp; /* ebp save */
-/* 16 8 */ unsigned char FAR *in; /* esi rsi local strm->next_in */
-/* 24 12 */ unsigned char FAR *last; /* r9 while in < last */
-/* 32 16 */ unsigned char FAR *out; /* edi rdi local strm->next_out */
-/* 40 20 */ unsigned char FAR *beg; /* inflate()'s init next_out */
-/* 48 24 */ unsigned char FAR *end; /* r10 while out < end */
-/* 56 28 */ unsigned char FAR *window;/* size of window, wsize!=0 */
-/* 64 32 */ code const FAR *lcode; /* ebp rbp local strm->lencode */
-/* 72 36 */ code const FAR *dcode; /* r11 local strm->distcode */
-/* 80 40 */ size_t /*unsigned long */hold; /* edx rdx local strm->hold */
-/* 88 44 */ unsigned bits; /* ebx rbx local strm->bits */
-/* 92 48 */ unsigned wsize; /* window size */
-/* 96 52 */ unsigned write; /* window write index */
-/*100 56 */ unsigned lmask; /* r12 mask for lcode */
-/*104 60 */ unsigned dmask; /* r13 mask for dcode */
-/*108 64 */ unsigned len; /* r14 match length */
-/*112 68 */ unsigned dist; /* r15 match distance */
-/*116 72 */ unsigned status; /* set when state chng*/
- } type_ar;
-#ifdef ASMINF
-
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start; /* inflate()'s starting value for strm->avail_out */
-{
- struct inflate_state FAR *state;
- type_ar ar;
- void inffas8664fnc(struct inffast_ar * par);
-
-
-
-#if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))
-#define PAD_AVAIL_IN 6
-#define PAD_AVAIL_OUT 258
-#else
-#define PAD_AVAIL_IN 5
-#define PAD_AVAIL_OUT 257
-#endif
-
- /* copy state to local variables */
- state = (struct inflate_state FAR *)strm->state;
-
- ar.in = strm->next_in;
- ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
- ar.out = strm->next_out;
- ar.beg = ar.out - (start - strm->avail_out);
- ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
- ar.wsize = state->wsize;
- ar.write = state->wnext;
- ar.window = state->window;
- ar.hold = state->hold;
- ar.bits = state->bits;
- ar.lcode = state->lencode;
- ar.dcode = state->distcode;
- ar.lmask = (1U << state->lenbits) - 1;
- ar.dmask = (1U << state->distbits) - 1;
-
- /* decode literals and length/distances until end-of-block or not enough
- input data or output space */
-
- /* align in on 1/2 hold size boundary */
- while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
- ar.hold += (unsigned long)*ar.in++ << ar.bits;
- ar.bits += 8;
- }
-
- inffas8664fnc(&ar);
-
- if (ar.status > 1) {
- if (ar.status == 2)
- strm->msg = "invalid literal/length code";
- else if (ar.status == 3)
- strm->msg = "invalid distance code";
- else
- strm->msg = "invalid distance too far back";
- state->mode = BAD;
- }
- else if ( ar.status == 1 ) {
- state->mode = TYPE;
- }
-
- /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
- ar.len = ar.bits >> 3;
- ar.in -= ar.len;
- ar.bits -= ar.len << 3;
- ar.hold &= (1U << ar.bits) - 1;
-
- /* update state and return */
- strm->next_in = ar.in;
- strm->next_out = ar.out;
- strm->avail_in = (unsigned)(ar.in < ar.last ?
- PAD_AVAIL_IN + (ar.last - ar.in) :
- PAD_AVAIL_IN - (ar.in - ar.last));
- strm->avail_out = (unsigned)(ar.out < ar.end ?
- PAD_AVAIL_OUT + (ar.end - ar.out) :
- PAD_AVAIL_OUT - (ar.out - ar.end));
- state->hold = (unsigned long)ar.hold;
- state->bits = ar.bits;
- return;
-}
-
-#endif

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64/inffasx64.asm Deleted

@@ -1,396 +0,0 @@
-; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding
-; version for AMD64 on Windows using Microsoft C compiler
-;
-; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
-; inffasx64.asm is called by inffas8664.c, which contain more info.
-
-
-; to compile this file, I use option
-; ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
-; with Microsoft Macro Assembler (x64) for AMD64
-;
-
-; This file compile with Microsoft Macro Assembler (x64) for AMD64
-;
-; ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
-;
-; (you can get Windows WDK with ml64 for AMD64 from
-; http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
-;
-
-
-.code
-inffas8664fnc PROC
-
-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
-;
-; All registers must be preserved across the call, except for
-; rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.
-
-
-	mov [rsp-8],rsi
-	mov [rsp-16],rdi
-	mov [rsp-24],r12
-	mov [rsp-32],r13
-	mov [rsp-40],r14
-	mov [rsp-48],r15
-	mov [rsp-56],rbx
-
-	mov rax,rcx
-
-	mov	[rax+8], rbp ; /* save regs rbp and rsp */
-	mov	[rax], rsp
-
-	mov	rsp, rax ; /* make rsp point to &ar */
-
-	mov	rsi, [rsp+16] ; /* rsi = in */
-	mov	rdi, [rsp+32] ; /* rdi = out */
-	mov	r9, [rsp+24] ; /* r9 = last */
-	mov	r10, [rsp+48] ; /* r10 = end */
-	mov	rbp, [rsp+64] ; /* rbp = lcode */
-	mov	r11, [rsp+72] ; /* r11 = dcode */
-	mov	rdx, [rsp+80] ; /* rdx = hold */
-	mov	ebx, [rsp+88] ; /* ebx = bits */
-	mov	r12d, [rsp+100] ; /* r12d = lmask */
-	mov	r13d, [rsp+104] ; /* r13d = dmask */
- ; /* r14d = len */
- ; /* r15d = dist */
-
-
-	cld
-	cmp	r10, rdi
-	je	L_one_time ; /* if only one decode left */
-	cmp	r9, rsi
-
- jne L_do_loop
-
-
-L_one_time:
-	mov	r8, r12 ; /* r8 = lmask */
-	cmp	bl, 32
-	ja	L_get_length_code_one_time
-
-	lodsd ; /* eax = *(uint *)in++ */
-	mov	cl, bl ; /* cl = bits, needs it for shifting */
-	add	bl, 32 ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax ; /* hold |= *((uint *)in)++ << bits */
-	jmp	L_get_length_code_one_time
-
-ALIGN 4
-L_while_test:
-	cmp	r10, rdi
-	jbe	L_break_loop
-	cmp	r9, rsi
-	jbe	L_break_loop
-
-L_do_loop:
-	mov	r8, r12 ; /* r8 = lmask */
-	cmp	bl, 32
-	ja	L_get_length_code ; /* if (32 < bits) */
-
-	lodsd ; /* eax = *(uint *)in++ */
-	mov	cl, bl ; /* cl = bits, needs it for shifting */
-	add	bl, 32 ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax ; /* hold |= *((uint *)in)++ << bits */
-
-L_get_length_code:
-	and	r8, rdx ; /* r8 &= hold */
-	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */
-
-	mov	cl, ah ; /* cl = this.bits */
-	sub	bl, ah ; /* bits -= this.bits */
-	shr	rdx, cl ; /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
-
-	mov	r8, r12 ; /* r8 = lmask */
-	shr	eax, 16 ; /* output this.val char */
-	stosb
-
-L_get_length_code_one_time:
-	and	r8, rdx ; /* r8 &= hold */
-	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */
-
-L_dolen:
-	mov	cl, ah ; /* cl = this.bits */
-	sub	bl, ah ; /* bits -= this.bits */
-	shr	rdx, cl ; /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
-
-	shr	eax, 16 ; /* output this.val char */
-	stosb
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_length_base:
-	mov	r14d, eax ; /* len = this */
-	shr	r14d, 16 ; /* len = this.val */
-	mov	cl, al
-
-	test	al, 16
-	jz	L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */
-	and	cl, 15 ; /* op &= 15 */
-	jz	L_decode_distance ; /* if (!op) */
-
-L_add_bits_to_len:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx ; /* eax &= hold */
-	shr	rdx, cl
-	add	r14d, eax ; /* len += hold & mask[op] */
-
-L_decode_distance:
-	mov	r8, r13 ; /* r8 = dmask */
-	cmp	bl, 32
-	ja	L_get_distance_code ; /* if (32 < bits) */
-
-	lodsd ; /* eax = *(uint *)in++ */
-	mov	cl, bl ; /* cl = bits, needs it for shifting */
-	add	bl, 32 ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax ; /* hold |= *((uint *)in)++ << bits */
-
-L_get_distance_code:
-	and	r8, rdx ; /* r8 &= hold */
-	mov	eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */
-
-L_dodist:
-	mov	r15d, eax ; /* dist = this */
-	shr	r15d, 16 ; /* dist = this.val */
-	mov	cl, ah
-	sub	bl, ah ; /* bits -= this.bits */
-	shr	rdx, cl ; /* hold >>= this.bits */
-	mov	cl, al ; /* cl = this.op */
-
-	test	al, 16 ; /* if ((op & 16) == 0) */
-	jz	L_test_for_second_level_dist
-	and	cl, 15 ; /* op &= 15 */
-	jz	L_check_dist_one
-
-L_add_bits_to_dist:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax ; /* (1 << op) - 1 */
-	and	eax, edx ; /* eax &= hold */
-	shr	rdx, cl
-	add	r15d, eax ; /* dist += hold & ((1 << op) - 1) */
-
-L_check_window:
-	mov	r8, rsi ; /* save in so from can use it's reg */
-	mov	rax, rdi
-	sub	rax, [rsp+40] ; /* nbytes = out - beg */
-
-	cmp	eax, r15d
-	jb	L_clip_window ; /* if (dist > nbytes) 4.2% */
-
-	mov	ecx, r14d ; /* ecx = len */
-	mov	rsi, rdi
-	sub	rsi, r15 ; /* from = out - dist */
-
-	sar	ecx, 1
-	jnc	L_copy_two ; /* if len % 2 == 0 */
-
-	rep movsw
-	mov	al, [rsi]
-	mov	[rdi], al
-	inc	rdi
-
-	mov	rsi, r8 ; /* move in back to %rsi, toss from */
-	jmp	L_while_test
-
-L_copy_two:
-	rep movsw
-	mov	rsi, r8 ; /* move in back to %rsi, toss from */
-	jmp	L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp	r15d, 1 ; /* if dist 1, is a memset */
-	jne	L_check_window
-	cmp	[rsp+40], rdi ; /* if out == beg, outside window */
-	je	L_check_window
-
-	mov	ecx, r14d ; /* ecx = len */
-	mov	al, [rdi-1]
-	mov	ah, al
-
-	sar	ecx, 1
-	jnc	L_set_two
-	mov	[rdi], al
-	inc	rdi
-
-L_set_two:
-	rep stosw
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-	test	al, 64
-	jnz	L_test_for_end_of_block ; /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx ; /* eax &= hold */
-	add	eax, r14d ; /* eax += len */
-	mov	eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/
-	jmp	L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-	test	al, 64
-	jnz	L_invalid_distance_code ; /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx ; /* eax &= hold */
-	add	eax, r15d ; /* eax += dist */
-	mov	eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/
-	jmp	L_dodist
-
-ALIGN 4
-L_clip_window:
-	mov	ecx, eax ; /* ecx = nbytes */
-	mov	eax, [rsp+92] ; /* eax = wsize, prepare for dist cmp */
-	neg	ecx ; /* nbytes = -nbytes */
-
-	cmp	eax, r15d
-	jb	L_invalid_distance_too_far ; /* if (dist > wsize) */
-
-	add	ecx, r15d ; /* nbytes = dist - nbytes */
-	cmp	dword ptr [rsp+96], 0
-	jne	L_wrap_around_window ; /* if (write != 0) */
-
-	mov	rsi, [rsp+56] ; /* from = window */
-	sub	eax, ecx ; /* eax -= nbytes */
-	add	rsi, rax ; /* from += wsize - nbytes */
-
-	mov	eax, r14d ; /* eax = len */
-	cmp	r14d, ecx
-	jbe	L_do_copy ; /* if (nbytes >= len) */
-
-	sub	eax, ecx ; /* eax -= nbytes */
-	rep movsb
-	mov	rsi, rdi
-	sub	rsi, r15 ; /* from = &out[ -dist ] */
-	jmp	L_do_copy
-
-ALIGN 4
-L_wrap_around_window:
-	mov	eax, [rsp+96] ; /* eax = write */
-	cmp	ecx, eax
-	jbe	L_contiguous_in_window ; /* if (write >= nbytes) */
-
-	mov	esi, [rsp+92] ; /* from = wsize */
-	add	rsi, [rsp+56] ; /* from += window */
-	add	rsi, rax ; /* from += write */
-	sub	rsi, rcx ; /* from -= nbytes */
-	sub	ecx, eax ; /* nbytes -= write */
-
-	mov	eax, r14d ; /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy ; /* if (nbytes >= len) */
-
-	sub	eax, ecx ; /* len -= nbytes */
-	rep movsb
-	mov	rsi, [rsp+56] ; /* from = window */
-	mov	ecx, [rsp+96] ; /* nbytes = write */
-	cmp	eax, ecx
-	jbe	L_do_copy ; /* if (nbytes >= len) */
-
-	sub	eax, ecx ; /* len -= nbytes */
-	rep movsb
-	mov	rsi, rdi
-	sub	rsi, r15 ; /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_contiguous_in_window:
-	mov	rsi, [rsp+56] ; /* rsi = window */
-	add	rsi, rax
-	sub	rsi, rcx ; /* from += write - nbytes */
-
-	mov	eax, r14d ; /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy ; /* if (nbytes >= len) */
-
-	sub	eax, ecx ; /* len -= nbytes */
-	rep movsb
-	mov	rsi, rdi
-	sub	rsi, r15 ; /* from = out - dist */
-	jmp	L_do_copy ; /* if (nbytes >= len) */
-
-ALIGN 4
-L_do_copy:
-	mov	ecx, eax ; /* ecx = len */
-	rep movsb
-
-	mov	rsi, r8 ; /* move in back to %esi, toss from */
-	jmp	L_while_test
-
-L_test_for_end_of_block:
-	test	al, 32
-	jz	L_invalid_literal_length_code
-	mov	dword ptr [rsp+116], 1
-	jmp	L_break_loop_with_status
-
-L_invalid_literal_length_code:
-	mov	dword ptr [rsp+116], 2
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_code:
-	mov	dword ptr [rsp+116], 3
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_too_far:
-	mov	dword ptr [rsp+116], 4
-	jmp	L_break_loop_with_status
-
-L_break_loop:
-	mov	dword ptr [rsp+116], 0
-
-L_break_loop_with_status:
-; /* put in, out, bits, and hold back into ar and pop esp */
-	mov	[rsp+16], rsi ; /* in */
-	mov	[rsp+32], rdi ; /* out */
-	mov	[rsp+88], ebx ; /* bits */
-	mov	[rsp+80], rdx ; /* hold */
-
-	mov	rax, [rsp] ; /* restore rbp and rsp */
-	mov	rbp, [rsp+8]
-	mov	rsp, rax
-
-
-
-	mov rsi,[rsp-8]
-	mov rdi,[rsp-16]
-	mov r12,[rsp-24]
-	mov r13,[rsp-32]
-	mov r14,[rsp-40]
-	mov r15,[rsp-48]
-	mov rbx,[rsp-56]
-
- ret 0
-; :
-; : "m" (ar)
-; : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
-; "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
-; );
-
-inffas8664fnc 	ENDP
-;_TEXT	ENDS
-END

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx64/readme.txt Deleted

@@ -1,31 +0,0 @@
-Summary
--------
-This directory contains ASM implementations of the functions
-longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t),
-for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits.
-
-gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits
-   assembly optimized version from Jean-loup Gailly original longest_match function
-
-inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing
-   original function from Mark Adler
-
-Use instructions
-----------------
-Assemble the .asm files using MASM and put the object files into the zlib source
-directory.  You can also get object files here:
-
-     http://www.winimage.com/zLibDll/zlib124_masm_obj.zip
-
-define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,
-and inffasx64.obj and gvmat64.obj as object to link.
-
-
-Build instructions
-------------------
-run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)
-
-ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK
-
-You can get Windows 2003 server DDK with ml64 and cl for AMD64 from
-  http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx86 Deleted

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx86/bld_ml32.bat Deleted

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx86/inffas32.asm Deleted

@@ -1,1080 +0,0 @@
-;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding
-; *
-; * inffas32.asm is derivated from inffas86.c, with translation of assembly code
-; *
-; * Copyright (C) 1995-2003 Mark Adler
-; * For conditions of distribution and use, see copyright notice in zlib.h
-; *
-; * Copyright (C) 2003 Chris Anderson <christop@charm.net>
-; * Please use the copyright conditions above.
-; *
-; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
-; * the gcc -S output of zlib-1.2.0/inffast.c. Zlib-1.2.0 is in beta release at
-; * the moment. I have successfully compiled and tested this code with gcc2.96,
-; * gcc3.2, icc5.0, msvc6.0. It is very close to the speed of inffast.S
-; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
-; * enabled. I will attempt to merge the MMX code into this version. Newer
-; * versions of this and inffast.S can be found at
-; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
-; *
-; * 2005 : modification by Gilles Vollant
-; */
-; For Visual C++ 4.x and higher and ML 6.x and higher
-; ml.exe is in directory \MASM611C of Win95 DDK
-; ml.exe is also distributed in http://www.masm32.com/masmdl.htm
-; and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/
-;
-;
-; compile with command line option
-; ml /coff /Zi /c /Flinffas32.lst inffas32.asm
-
-; if you define NO_GZIP (see inflate.h), compile with
-; ml /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm
-
-
-; zlib122sup is 0 fort zlib 1.2.2.1 and lower
-; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head
-; in inflate_state in inflate.h)
-zlib1222sup equ 8
-
-
-IFDEF GUNZIP
- INFLATE_MODE_TYPE equ 11
- INFLATE_MODE_BAD equ 26
-ELSE
- IFNDEF NO_GUNZIP
- INFLATE_MODE_TYPE equ 11
- INFLATE_MODE_BAD equ 26
- ELSE
- INFLATE_MODE_TYPE equ 3
- INFLATE_MODE_BAD equ 17
- ENDIF
-ENDIF
-
-
-; 75 "inffast.S"
-;FILE "inffast.S"
-
-;;;GLOBAL _inflate_fast
-
-;;;SECTION .text
-
-
-
-	.586p
-	.mmx
-
-	name	inflate_fast_x86
-	.MODEL	FLAT
-
-_DATA			segment
-inflate_fast_use_mmx:
-	dd	1
-
-
-_TEXT			segment
-
-
-
-ALIGN 4
-	db	'Fast decoding Code from Chris Anderson'
-	db	0
-
-ALIGN 4
-invalid_literal_length_code_msg:
-	db	'invalid literal/length code'
-	db	0
-
-ALIGN 4
-invalid_distance_code_msg:
-	db	'invalid distance code'
-	db	0
-
-ALIGN 4
-invalid_distance_too_far_msg:
-	db	'invalid distance too far back'
-	db	0
-
-
-ALIGN 4
-inflate_fast_mask:
-dd	0
-dd	1
-dd	3
-dd	7
-dd	15
-dd	31
-dd	63
-dd	127
-dd	255
-dd	511
-dd	1023
-dd	2047
-dd	4095
-dd	8191
-dd	16383
-dd	32767
-dd	65535
-dd	131071
-dd	262143
-dd	524287
-dd	1048575
-dd	2097151
-dd	4194303
-dd	8388607
-dd	16777215
-dd	33554431
-dd	67108863
-dd	134217727
-dd	268435455
-dd	536870911
-dd	1073741823
-dd	2147483647
-dd	4294967295
-
-
-mode_state	 equ	0	;/* state->mode	*/
-wsize_state	 equ	(32+zlib1222sup)	;/* state->wsize */
-write_state	 equ	(36+4+zlib1222sup)	;/* state->write */
-window_state	 equ	(40+4+zlib1222sup)	;/* state->window */
-hold_state	 equ	(44+4+zlib1222sup)	;/* state->hold	*/
-bits_state	 equ	(48+4+zlib1222sup)	;/* state->bits	*/
-lencode_state	 equ	(64+4+zlib1222sup)	;/* state->lencode */
-distcode_state	 equ	(68+4+zlib1222sup)	;/* state->distcode */
-lenbits_state	 equ	(72+4+zlib1222sup)	;/* state->lenbits */
-distbits_state	 equ	(76+4+zlib1222sup)	;/* state->distbits */
-
-
-;;SECTION .text
-; 205 "inffast.S"
-;GLOBAL	inflate_fast_use_mmx
-
-;SECTION .data
-
-
-; GLOBAL inflate_fast_use_mmx:object
-;.size inflate_fast_use_mmx, 4
-; 226 "inffast.S"
-;SECTION .text
-
-ALIGN 4
-_inflate_fast proc near
-.FPO (16, 4, 0, 0, 1, 0)
-	push edi
-	push esi
-	push ebp
-	push ebx
-	pushfd
-	sub esp,64
-	cld
-
-
-
-
-	mov esi, [esp+88]
-	mov edi, [esi+28]
-
-
-
-
-
-
-
-	mov edx, [esi+4]
-	mov eax, [esi+0]
-
-	add edx,eax
-	sub edx,11
-
-	mov [esp+44],eax
-	mov [esp+20],edx
-
-	mov ebp, [esp+92]
-	mov ecx, [esi+16]
-	mov ebx, [esi+12]
-
-	sub ebp,ecx
-	neg ebp
-	add ebp,ebx
-
-	sub ecx,257
-	add ecx,ebx
-
-	mov [esp+60],ebx
-	mov [esp+40],ebp
-	mov [esp+16],ecx
-; 285 "inffast.S"
-	mov eax, [edi+lencode_state]
-	mov ecx, [edi+distcode_state]
-
-	mov [esp+8],eax
-	mov [esp+12],ecx
-
-	mov eax,1
-	mov ecx, [edi+lenbits_state]
-	shl eax,cl
-	dec eax
-	mov [esp+0],eax
-
-	mov eax,1
-	mov ecx, [edi+distbits_state]
-	shl eax,cl
-	dec eax
-	mov [esp+4],eax
-
-	mov eax, [edi+wsize_state]
-	mov ecx, [edi+write_state]
-	mov edx, [edi+window_state]
-
-	mov [esp+52],eax
-	mov [esp+48],ecx
-	mov [esp+56],edx
-
-	mov ebp, [edi+hold_state]
-	mov ebx, [edi+bits_state]
-; 321 "inffast.S"
-	mov esi, [esp+44]
-	mov ecx, [esp+20]
-	cmp ecx,esi
-	ja L_align_long
-
-	add ecx,11
-	sub ecx,esi
-	mov eax,12
-	sub eax,ecx
-	lea edi, [esp+28]
-	rep movsb
-	mov ecx,eax
-	xor eax,eax
-	rep stosb
-	lea esi, [esp+28]
-	mov [esp+20],esi
-	jmp L_is_aligned
-
-
-L_align_long:
-	test esi,3
-	jz L_is_aligned
-	xor eax,eax
-	mov al, [esi]
-	inc esi
-	mov ecx,ebx
-	add ebx,8
-	shl eax,cl
-	or ebp,eax
-	jmp L_align_long
-
-L_is_aligned:
-	mov edi, [esp+60]
-; 366 "inffast.S"
-L_check_mmx:
-	cmp dword ptr [inflate_fast_use_mmx],2
-	je L_init_mmx
-	ja L_do_loop
-
-	push eax
-	push ebx
-	push ecx
-	push edx
-	pushfd
-	mov eax, [esp]
-	xor dword ptr [esp],0200000h
-
-
-
-
-	popfd
-	pushfd
-	pop edx
-	xor edx,eax
-	jz L_dont_use_mmx
-	xor eax,eax
-	cpuid
-	cmp ebx,0756e6547h
-	jne L_dont_use_mmx
-	cmp ecx,06c65746eh
-	jne L_dont_use_mmx
-	cmp edx,049656e69h
-	jne L_dont_use_mmx
-	mov eax,1
-	cpuid
-	shr eax,8
-	and eax,15
-	cmp eax,6
-	jne L_dont_use_mmx
-	test edx,0800000h
-	jnz L_use_mmx
-	jmp L_dont_use_mmx
-L_use_mmx:
-	mov dword ptr [inflate_fast_use_mmx],2
-	jmp L_check_mmx_pop
-L_dont_use_mmx:
-	mov dword ptr [inflate_fast_use_mmx],3
-L_check_mmx_pop:
-	pop edx
-	pop ecx
-	pop ebx
-	pop eax
-	jmp L_check_mmx
-; 426 "inffast.S"
-ALIGN 4
-L_do_loop:
-; 437 "inffast.S"
-	cmp bl,15
-	ja L_get_length_code
-
-	xor eax,eax
-	lodsw
-	mov cl,bl
-	add bl,16
-	shl eax,cl
-	or ebp,eax
-
-L_get_length_code:
-	mov edx, [esp+0]
-	mov ecx, [esp+8]
-	and edx,ebp
-	mov eax, [ecx+edx*4]
-
-L_dolen:
-
-
-
-
-
-
-	mov cl,ah
-	sub bl,ah
-	shr ebp,cl
-
-
-
-
-
-
-	test al,al
-	jnz L_test_for_length_base
-
-	shr eax,16
-	stosb
-
-L_while_test:
-
-
-	cmp [esp+16],edi
-	jbe L_break_loop
-
-	cmp [esp+20],esi
-	ja L_do_loop
-	jmp L_break_loop
-
-L_test_for_length_base:
-; 502 "inffast.S"
-	mov edx,eax
-	shr edx,16
-	mov cl,al
-
-	test al,16
-	jz L_test_for_second_level_length
-	and cl,15
-	jz L_save_len
-	cmp bl,cl
-	jae L_add_bits_to_len
-
-	mov ch,cl
-	xor eax,eax
-	lodsw
-	mov cl,bl
-	add bl,16
-	shl eax,cl
-	or ebp,eax
-	mov cl,ch
-
-L_add_bits_to_len:
-	mov eax,1
-	shl eax,cl
-	dec eax
-	sub bl,cl
-	and eax,ebp
-	shr ebp,cl
-	add edx,eax
-
-L_save_len:
-	mov [esp+24],edx
-
-
-L_decode_distance:
-; 549 "inffast.S"
-	cmp bl,15
-	ja L_get_distance_code
-
-	xor eax,eax
-	lodsw
-	mov cl,bl
-	add bl,16
-	shl eax,cl
-	or ebp,eax
-
-L_get_distance_code:
-	mov edx, [esp+4]
-	mov ecx, [esp+12]
-	and edx,ebp
-	mov eax, [ecx+edx*4]
-
-
-L_dodist:
-	mov edx,eax
-	shr edx,16
-	mov cl,ah
-	sub bl,ah
-	shr ebp,cl
-; 584 "inffast.S"
-	mov cl,al
-
-	test al,16
-	jz L_test_for_second_level_dist
-	and cl,15
-	jz L_check_dist_one
-	cmp bl,cl
-	jae L_add_bits_to_dist
-
-	mov ch,cl
-	xor eax,eax
-	lodsw
-	mov cl,bl
-	add bl,16
-	shl eax,cl
-	or ebp,eax
-	mov cl,ch
-
-L_add_bits_to_dist:
-	mov eax,1
-	shl eax,cl
-	dec eax
-	sub bl,cl
-	and eax,ebp
-	shr ebp,cl
-	add edx,eax
-	jmp L_check_window
-
-L_check_window:
-; 625 "inffast.S"
-	mov [esp+44],esi
-	mov eax,edi
-	sub eax, [esp+40]
-
-	cmp eax,edx
-	jb L_clip_window
-
-	mov ecx, [esp+24]
-	mov esi,edi
-	sub esi,edx
-
-	sub ecx,3
-	mov al, [esi]
-	mov [edi],al
-	mov al, [esi+1]
-	mov dl, [esi+2]
-	add esi,3
-	mov [edi+1],al
-	mov [edi+2],dl
-	add edi,3
-	rep movsb
-
-	mov esi, [esp+44]
-	jmp L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp edx,1
-	jne L_check_window
-	cmp [esp+40],edi
-	je L_check_window
-
-	dec edi
-	mov ecx, [esp+24]
-	mov al, [edi]
-	sub ecx,3
-
-	mov [edi+1],al
-	mov [edi+2],al
-	mov [edi+3],al
-	add edi,4
-	rep stosb
-
-	jmp L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-
-
-
-
-	test al,64
-	jnz L_test_for_end_of_block
-
-	mov eax,1
-	shl eax,cl
-	dec eax
-	and eax,ebp
-	add eax,edx
-	mov edx, [esp+8]
-	mov eax, [edx+eax*4]
-	jmp L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-
-
-
-
-	test al,64
-	jnz L_invalid_distance_code
-
-	mov eax,1
-	shl eax,cl
-	dec eax
-	and eax,ebp
-	add eax,edx
-	mov edx, [esp+12]
-	mov eax, [edx+eax*4]
-	jmp L_dodist
-
-ALIGN 4
-L_clip_window:
-; 721 "inffast.S"
-	mov ecx,eax
-	mov eax, [esp+52]
-	neg ecx
-	mov esi, [esp+56]
-
-	cmp eax,edx
-	jb L_invalid_distance_too_far
-
-	add ecx,edx
-	cmp dword ptr [esp+48],0
-	jne L_wrap_around_window
-
-	sub eax,ecx
-	add esi,eax
-; 749 "inffast.S"
-	mov eax, [esp+24]
-	cmp eax,ecx
-	jbe L_do_copy1
-
-	sub eax,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,edx
-	jmp L_do_copy1
-
-	cmp eax,ecx
-	jbe L_do_copy1
-
-	sub eax,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,edx
-	jmp L_do_copy1
-
-L_wrap_around_window:
-; 793 "inffast.S"
-	mov eax, [esp+48]
-	cmp ecx,eax
-	jbe L_contiguous_in_window
-
-	add esi, [esp+52]
-	add esi,eax
-	sub esi,ecx
-	sub ecx,eax
-
-
-	mov eax, [esp+24]
-	cmp eax,ecx
-	jbe L_do_copy1
-
-	sub eax,ecx
-	rep movsb
-	mov esi, [esp+56]
-	mov ecx, [esp+48]
-	cmp eax,ecx
-	jbe L_do_copy1
-
-	sub eax,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,edx
-	jmp L_do_copy1
-
-L_contiguous_in_window:
-; 836 "inffast.S"
-	add esi,eax
-	sub esi,ecx
-
-
-	mov eax, [esp+24]
-	cmp eax,ecx
-	jbe L_do_copy1
-
-	sub eax,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,edx
-
-L_do_copy1:
-; 862 "inffast.S"
-	mov ecx,eax
-	rep movsb
-
-	mov esi, [esp+44]
-	jmp L_while_test
-; 878 "inffast.S"
-ALIGN 4
-L_init_mmx:
-	emms
-
-
-
-
-
-	movd mm0,ebp
-	mov ebp,ebx
-; 896 "inffast.S"
-	movd mm4,dword ptr [esp+0]
-	movq mm3,mm4
-	movd mm5,dword ptr [esp+4]
-	movq mm2,mm5
-	pxor mm1,mm1
-	mov ebx, [esp+8]
-	jmp L_do_loop_mmx
-
-ALIGN 4
-L_do_loop_mmx:
-	psrlq mm0,mm1
-
-	cmp ebp,32
-	ja L_get_length_code_mmx
-
-	movd mm6,ebp
-	movd mm7,dword ptr [esi]
-	add esi,4
-	psllq mm7,mm6
-	add ebp,32
-	por mm0,mm7
-
-L_get_length_code_mmx:
-	pand mm4,mm0
-	movd eax,mm4
-	movq mm4,mm3
-	mov eax, [ebx+eax*4]
-
-L_dolen_mmx:
-	movzx ecx,ah
-	movd mm1,ecx
-	sub ebp,ecx
-
-	test al,al
-	jnz L_test_for_length_base_mmx
-
-	shr eax,16
-	stosb
-
-L_while_test_mmx:
-
-
-	cmp [esp+16],edi
-	jbe L_break_loop
-
-	cmp [esp+20],esi
-	ja L_do_loop_mmx
-	jmp L_break_loop
-
-L_test_for_length_base_mmx:
-
-	mov edx,eax
-	shr edx,16
-
-	test al,16
-	jz L_test_for_second_level_length_mmx
-	and eax,15
-	jz L_decode_distance_mmx
-
-	psrlq mm0,mm1
-	movd mm1,eax
-	movd ecx,mm0
-	sub ebp,eax
-	and ecx, [inflate_fast_mask+eax*4]
-	add edx,ecx
-
-L_decode_distance_mmx:
-	psrlq mm0,mm1
-
-	cmp ebp,32
-	ja L_get_dist_code_mmx
-
-	movd mm6,ebp
-	movd mm7,dword ptr [esi]
-	add esi,4
-	psllq mm7,mm6
-	add ebp,32
-	por mm0,mm7
-
-L_get_dist_code_mmx:
-	mov ebx, [esp+12]
-	pand mm5,mm0
-	movd eax,mm5
-	movq mm5,mm2
-	mov eax, [ebx+eax*4]
-
-L_dodist_mmx:
-
-	movzx ecx,ah
-	mov ebx,eax
-	shr ebx,16
-	sub ebp,ecx
-	movd mm1,ecx
-
-	test al,16
-	jz L_test_for_second_level_dist_mmx
-	and eax,15
-	jz L_check_dist_one_mmx
-
-L_add_bits_to_dist_mmx:
-	psrlq mm0,mm1
-	movd mm1,eax
-	movd ecx,mm0
-	sub ebp,eax
-	and ecx, [inflate_fast_mask+eax*4]
-	add ebx,ecx
-
-L_check_window_mmx:
-	mov [esp+44],esi
-	mov eax,edi
-	sub eax, [esp+40]
-
-	cmp eax,ebx
-	jb L_clip_window_mmx
-
-	mov ecx,edx
-	mov esi,edi
-	sub esi,ebx
-
-	sub ecx,3
-	mov al, [esi]
-	mov [edi],al
-	mov al, [esi+1]
-	mov dl, [esi+2]
-	add esi,3
-	mov [edi+1],al
-	mov [edi+2],dl
-	add edi,3
-	rep movsb
-
-	mov esi, [esp+44]
-	mov ebx, [esp+8]
-	jmp L_while_test_mmx
-
-ALIGN 4
-L_check_dist_one_mmx:
-	cmp ebx,1
-	jne L_check_window_mmx
-	cmp [esp+40],edi
-	je L_check_window_mmx
-
-	dec edi
-	mov ecx,edx
-	mov al, [edi]
-	sub ecx,3
-
-	mov [edi+1],al
-	mov [edi+2],al
-	mov [edi+3],al
-	add edi,4
-	rep stosb
-
-	mov ebx, [esp+8]
-	jmp L_while_test_mmx
-
-ALIGN 4
-L_test_for_second_level_length_mmx:
-	test al,64
-	jnz L_test_for_end_of_block
-
-	and eax,15
-	psrlq mm0,mm1
-	movd ecx,mm0
-	and ecx, [inflate_fast_mask+eax*4]
-	add ecx,edx
-	mov eax, [ebx+ecx*4]
-	jmp L_dolen_mmx
-
-ALIGN 4
-L_test_for_second_level_dist_mmx:
-	test al,64
-	jnz L_invalid_distance_code
-
-	and eax,15
-	psrlq mm0,mm1
-	movd ecx,mm0
-	and ecx, [inflate_fast_mask+eax*4]
-	mov eax, [esp+12]
-	add ecx,ebx
-	mov eax, [eax+ecx*4]
-	jmp L_dodist_mmx
-
-ALIGN 4
-L_clip_window_mmx:
-
-	mov ecx,eax
-	mov eax, [esp+52]
-	neg ecx
-	mov esi, [esp+56]
-
-	cmp eax,ebx
-	jb L_invalid_distance_too_far
-
-	add ecx,ebx
-	cmp dword ptr [esp+48],0
-	jne L_wrap_around_window_mmx
-
-	sub eax,ecx
-	add esi,eax
-
-	cmp edx,ecx
-	jbe L_do_copy1_mmx
-
-	sub edx,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,ebx
-	jmp L_do_copy1_mmx
-
-	cmp edx,ecx
-	jbe L_do_copy1_mmx
-
-	sub edx,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,ebx
-	jmp L_do_copy1_mmx
-
-L_wrap_around_window_mmx:
-
-	mov eax, [esp+48]
-	cmp ecx,eax
-	jbe L_contiguous_in_window_mmx
-
-	add esi, [esp+52]
-	add esi,eax
-	sub esi,ecx
-	sub ecx,eax
-
-
-	cmp edx,ecx
-	jbe L_do_copy1_mmx
-
-	sub edx,ecx
-	rep movsb
-	mov esi, [esp+56]
-	mov ecx, [esp+48]
-	cmp edx,ecx
-	jbe L_do_copy1_mmx
-
-	sub edx,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,ebx
-	jmp L_do_copy1_mmx
-
-L_contiguous_in_window_mmx:
-
-	add esi,eax
-	sub esi,ecx
-
-
-	cmp edx,ecx
-	jbe L_do_copy1_mmx
-
-	sub edx,ecx
-	rep movsb
-	mov esi,edi
-	sub esi,ebx
-
-L_do_copy1_mmx:
-
-
-	mov ecx,edx
-	rep movsb
-
-	mov esi, [esp+44]
-	mov ebx, [esp+8]
-	jmp L_while_test_mmx
-; 1174 "inffast.S"
-L_invalid_distance_code:
-
-
-
-
-
-	mov ecx, invalid_distance_code_msg
-	mov edx,INFLATE_MODE_BAD
-	jmp L_update_stream_state
-
-L_test_for_end_of_block:
-
-
-
-
-
-	test al,32
-	jz L_invalid_literal_length_code
-
-	mov ecx,0
-	mov edx,INFLATE_MODE_TYPE
-	jmp L_update_stream_state
-
-L_invalid_literal_length_code:
-
-
-
-
-
-	mov ecx, invalid_literal_length_code_msg
-	mov edx,INFLATE_MODE_BAD
-	jmp L_update_stream_state
-
-L_invalid_distance_too_far:
-
-
-
-	mov esi, [esp+44]
-	mov ecx, invalid_distance_too_far_msg
-	mov edx,INFLATE_MODE_BAD
-	jmp L_update_stream_state
-
-L_update_stream_state:
-
-	mov eax, [esp+88]
-	test ecx,ecx
-	jz L_skip_msg
-	mov [eax+24],ecx
-L_skip_msg:
-	mov eax, [eax+28]
-	mov [eax+mode_state],edx
-	jmp L_break_loop
-
-ALIGN 4
-L_break_loop:
-; 1243 "inffast.S"
-	cmp dword ptr [inflate_fast_use_mmx],2
-	jne L_update_next_in
-
-
-
-	mov ebx,ebp
-
-L_update_next_in:
-; 1266 "inffast.S"
-	mov eax, [esp+88]
-	mov ecx,ebx
-	mov edx, [eax+28]
-	shr ecx,3
-	sub esi,ecx
-	shl ecx,3
-	sub ebx,ecx
-	mov [eax+12],edi
-	mov [edx+bits_state],ebx
-	mov ecx,ebx
-
-	lea ebx, [esp+28]
-	cmp [esp+20],ebx
-	jne L_buf_not_used
-
-	sub esi,ebx
-	mov ebx, [eax+0]
-	mov [esp+20],ebx
-	add esi,ebx
-	mov ebx, [eax+4]
-	sub ebx,11
-	add [esp+20],ebx
-
-L_buf_not_used:
-	mov [eax+0],esi
-
-	mov ebx,1
-	shl ebx,cl
-	dec ebx
-
-
-
-
-
-	cmp dword ptr [inflate_fast_use_mmx],2
-	jne L_update_hold
-
-
-
-	psrlq mm0,mm1
-	movd ebp,mm0
-
-	emms
-
-L_update_hold:
-
-
-
-	and ebp,ebx
-	mov [edx+hold_state],ebp
-
-
-
-
-	mov ebx, [esp+20]
-	cmp ebx,esi
-	jbe L_last_is_smaller
-
-	sub ebx,esi
-	add ebx,11
-	mov [eax+4],ebx
-	jmp L_fixup_out
-L_last_is_smaller:
-	sub esi,ebx
-	neg esi
-	add esi,11
-	mov [eax+4],esi
-
-
-
-
-L_fixup_out:
-
-	mov ebx, [esp+16]
-	cmp ebx,edi
-	jbe L_end_is_smaller
-
-	sub ebx,edi
-	add ebx,257
-	mov [eax+16],ebx
-	jmp L_done
-L_end_is_smaller:
-	sub edi,ebx
-	neg edi
-	add edi,257
-	mov [eax+16],edi
-
-
-
-
-
-L_done:
-	add esp,64
-	popfd
-	pop ebx
-	pop ebp
-	pop esi
-	pop edi
-	ret
-_inflate_fast endp
-
-_TEXT	ends
-end

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx86/match686.asm Deleted

@@ -1,479 +0,0 @@
-; match686.asm -- Asm portion of the optimized longest_match for 32 bits x86
-; Copyright (C) 1995-1996 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
-; File written by Gilles Vollant, by converting match686.S from Brian Raiter
-; for MASM. This is as assembly version of longest_match
-; from Jean-loup Gailly in deflate.c
-;
-; http://www.zlib.net
-; http://www.winimage.com/zLibDll
-; http://www.muppetlabs.com/~breadbox/software/assembly.html
-;
-; For Visual C++ 4.x and higher and ML 6.x and higher
-; ml.exe is distributed in
-; http://www.microsoft.com/downloads/details.aspx?FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
-;
-; this file contain two implementation of longest_match
-;
-; this longest_match was written by Brian raiter (1998), optimized for Pentium Pro
-; (and the faster known version of match_init on modern Core 2 Duo and AMD Phenom)
-;
-; for using an assembly version of longest_match, you need define ASMV in project
-;
-; compile the asm file running
-; ml /coff /Zi /c /Flmatch686.lst match686.asm
-; and do not include match686.obj in your project
-;
-; note: contrib of zLib 1.2.3 and earlier contained both a deprecated version for
-; Pentium (prior Pentium Pro) and this version for Pentium Pro and modern processor
-; with autoselect (with cpu detection code)
-; if you want support the old pentium optimization, you can still use these version
-;
-; this file is not optimized for old pentium, but it compatible with all x86 32 bits
-; processor (starting 80386)
-;
-;
-; see below : zlib1222add must be adjuster if you use a zlib version < 1.2.2.2
-
-;uInt longest_match(s, cur_match)
-; deflate_state *s;
-; IPos cur_match; /* current match */
-
- NbStack equ 76
- cur_match equ dword ptr[esp+NbStack-0]
- str_s equ dword ptr[esp+NbStack-4]
-; 5 dword on top (ret,ebp,esi,edi,ebx)
- adrret equ dword ptr[esp+NbStack-8]
- pushebp equ dword ptr[esp+NbStack-12]
- pushedi equ dword ptr[esp+NbStack-16]
- pushesi equ dword ptr[esp+NbStack-20]
- pushebx equ dword ptr[esp+NbStack-24]
-
- chain_length equ dword ptr [esp+NbStack-28]
- limit equ dword ptr [esp+NbStack-32]
- best_len equ dword ptr [esp+NbStack-36]
- window equ dword ptr [esp+NbStack-40]
- prev equ dword ptr [esp+NbStack-44]
- scan_start equ word ptr [esp+NbStack-48]
- wmask equ dword ptr [esp+NbStack-52]
- match_start_ptr equ dword ptr [esp+NbStack-56]
- nice_match equ dword ptr [esp+NbStack-60]
- scan equ dword ptr [esp+NbStack-64]
-
- windowlen equ dword ptr [esp+NbStack-68]
- match_start equ dword ptr [esp+NbStack-72]
- strend equ dword ptr [esp+NbStack-76]
- NbStackAdd equ (NbStack-24)
-
- .386p
-
- name gvmatch
- .MODEL FLAT
-
-
-
-; all the +zlib1222add offsets are due to the addition of fields
-; in zlib in the deflate_state structure since the asm code was first written
-; (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-; (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-; if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-
- zlib1222add equ 8
-
-; Note : these value are good with a 8 bytes boundary pack structure
- dep_chain_length equ 74h+zlib1222add
- dep_window equ 30h+zlib1222add
- dep_strstart equ 64h+zlib1222add
- dep_prev_length equ 70h+zlib1222add
- dep_nice_match equ 88h+zlib1222add
- dep_w_size equ 24h+zlib1222add
- dep_prev equ 38h+zlib1222add
- dep_w_mask equ 2ch+zlib1222add
- dep_good_match equ 84h+zlib1222add
- dep_match_start equ 68h+zlib1222add
- dep_lookahead equ 6ch+zlib1222add
-
-
-_TEXT segment
-
-IFDEF NOUNDERLINE
- public longest_match
- public match_init
-ELSE
- public _longest_match
- public _match_init
-ENDIF
-
- MAX_MATCH equ 258
- MIN_MATCH equ 3
- MIN_LOOKAHEAD equ (MAX_MATCH+MIN_MATCH+1)
-
-
-
-MAX_MATCH equ 258
-MIN_MATCH equ 3
-MIN_LOOKAHEAD equ (MAX_MATCH + MIN_MATCH + 1)
-MAX_MATCH_8_ equ ((MAX_MATCH + 7) AND 0FFF0h)
-
-
-;;; stack frame offsets
-
-chainlenwmask equ esp + 0 ; high word: current chain len
- ; low word: s->wmask
-window equ esp + 4 ; local copy of s->window
-windowbestlen equ esp + 8 ; s->window + bestlen
-scanstart equ esp + 16 ; first two bytes of string
-scanend equ esp + 12 ; last two bytes of string
-scanalign equ esp + 20 ; dword-misalignment of string
-nicematch equ esp + 24 ; a good enough match size
-bestlen equ esp + 28 ; size of best match so far
-scan equ esp + 32 ; ptr to string wanting match
-
-LocalVarsSize equ 36
-; saved ebx byte esp + 36
-; saved edi byte esp + 40
-; saved esi byte esp + 44
-; saved ebp byte esp + 48
-; return address byte esp + 52
-deflatestate equ esp + 56 ; the function arguments
-curmatch equ esp + 60
-
-;;; Offsets for fields in the deflate_state structure. These numbers
-;;; are calculated from the definition of deflate_state, with the
-;;; assumption that the compiler will dword-align the fields. (Thus,
-;;; changing the definition of deflate_state could easily cause this
-;;; program to crash horribly, without so much as a warning at
-;;; compile time. Sigh.)
-
-dsWSize equ 36+zlib1222add
-dsWMask equ 44+zlib1222add
-dsWindow equ 48+zlib1222add
-dsPrev equ 56+zlib1222add
-dsMatchLen equ 88+zlib1222add
-dsPrevMatch equ 92+zlib1222add
-dsStrStart equ 100+zlib1222add
-dsMatchStart equ 104+zlib1222add
-dsLookahead equ 108+zlib1222add
-dsPrevLen equ 112+zlib1222add
-dsMaxChainLen equ 116+zlib1222add
-dsGoodMatch equ 132+zlib1222add
-dsNiceMatch equ 136+zlib1222add
-
-
-;;; match686.asm -- Pentium-Pro-optimized version of longest_match()
-;;; Written for zlib 1.1.2
-;;; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
-;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html
-;;;
-;;
-;; This software is provided 'as-is', without any express or implied
-;; warranty. In no event will the authors be held liable for any damages
-;; arising from the use of this software.
-;;
-;; Permission is granted to anyone to use this software for any purpose,
-;; including commercial applications, and to alter it and redistribute it
-;; freely, subject to the following restrictions:
-;;
-;; 1. The origin of this software must not be misrepresented; you must not
-;; claim that you wrote the original software. If you use this software
-;; in a product, an acknowledgment in the product documentation would be
-;; appreciated but is not required.
-;; 2. Altered source versions must be plainly marked as such, and must not be
-;; misrepresented as being the original software
-;; 3. This notice may not be removed or altered from any source distribution.
-;;
-
-;GLOBAL _longest_match, _match_init
-
-
-;SECTION .text
-
-;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
-
-;_longest_match:
- IFDEF NOUNDERLINE
- longest_match proc near
- ELSE
- _longest_match proc near
- ENDIF
-.FPO (9, 4, 0, 0, 1, 0)
-
-;;; Save registers that the compiler may be using, and adjust esp to
-;;; make room for our stack frame.
-
- push ebp
- push edi
- push esi
- push ebx
- sub esp, LocalVarsSize
-
-;;; Retrieve the function arguments. ecx will hold cur_match
-;;; throughout the entire function. edx will hold the pointer to the
-;;; deflate_state structure during the function's setup (before
-;;; entering the main loop.
-
- mov edx, [deflatestate]
- mov ecx, [curmatch]
-
-;;; uInt wmask = s->w_mask;
-;;; unsigned chain_length = s->max_chain_length;
-;;; if (s->prev_length >= s->good_match) {
-;;; chain_length >>= 2;
-;;; }
-
- mov eax, [edx + dsPrevLen]
- mov ebx, [edx + dsGoodMatch]
- cmp eax, ebx
- mov eax, [edx + dsWMask]
- mov ebx, [edx + dsMaxChainLen]
- jl LastMatchGood
- shr ebx, 2
-LastMatchGood:
-
-;;; chainlen is decremented once beforehand so that the function can
-;;; use the sign flag instead of the zero flag for the exit test.
-;;; It is then shifted into the high word, to make room for the wmask
-;;; value, which it will always accompany.
-
- dec ebx
- shl ebx, 16
- or ebx, eax
- mov [chainlenwmask], ebx
-
-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
- mov eax, [edx + dsNiceMatch]
- mov ebx, [edx + dsLookahead]
- cmp ebx, eax
- jl LookaheadLess
- mov ebx, eax
-LookaheadLess: mov [nicematch], ebx
-
-;;; register Bytef *scan = s->window + s->strstart;
-
- mov esi, [edx + dsWindow]
- mov [window], esi
- mov ebp, [edx + dsStrStart]
- lea edi, [esi + ebp]
- mov [scan], edi
-
-;;; Determine how many bytes the scan ptr is off from being
-;;; dword-aligned.
-
- mov eax, edi
- neg eax
- and eax, 3
- mov [scanalign], eax
-
-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-;;; s->strstart - (IPos)MAX_DIST(s) : NIL;
-
- mov eax, [edx + dsWSize]
- sub eax, MIN_LOOKAHEAD
- sub ebp, eax
- jg LimitPositive
- xor ebp, ebp
-LimitPositive:
-
-;;; int best_len = s->prev_length;
-
- mov eax, [edx + dsPrevLen]
- mov [bestlen], eax
-
-;;; Store the sum of s->window + best_len in esi locally, and in esi.
-
- add esi, eax
- mov [windowbestlen], esi
-
-;;; register ush scan_start = *(ushf*)scan;
-;;; register ush scan_end = *(ushf*)(scan+best_len-1);
-;;; Posf *prev = s->prev;
-
- movzx ebx, word ptr [edi]
- mov [scanstart], ebx
- movzx ebx, word ptr [edi + eax - 1]
- mov [scanend], ebx
- mov edi, [edx + dsPrev]
-
-;;; Jump into the main loop.
-
- mov edx, [chainlenwmask]
- jmp short LoopEntry
-
-align 4
-
-;;; do {
-;;; match = s->window + cur_match;
-;;; if (*(ushf*)(match+best_len-1) != scan_end ||
-;;; *(ushf*)match != scan_start) continue;
-;;; [...]
-;;; } while ((cur_match = prev[cur_match & wmask]) > limit
-;;; && --chain_length != 0);
-;;;
-;;; Here is the inner loop of the function. The function will spend the
-;;; majority of its time in this loop, and majority of that time will
-;;; be spent in the first ten instructions.
-;;;
-;;; Within this loop:
-;;; ebx = scanend
-;;; ecx = curmatch
-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-;;; esi = windowbestlen - i.e., (window + bestlen)
-;;; edi = prev
-;;; ebp = limit
-
-LookupLoop:
- and ecx, edx
- movzx ecx, word ptr [edi + ecx*2]
- cmp ecx, ebp
- jbe LeaveNow
- sub edx, 00010000h
- js LeaveNow
-LoopEntry: movzx eax, word ptr [esi + ecx - 1]
- cmp eax, ebx
- jnz LookupLoop
- mov eax, [window]
- movzx eax, word ptr [eax + ecx]
- cmp eax, [scanstart]
- jnz LookupLoop
-
-;;; Store the current value of chainlen.
-
- mov [chainlenwmask], edx
-
-;;; Point edi to the string under scrutiny, and esi to the string we
-;;; are hoping to match it up with. In actuality, esi and edi are
-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
-;;; initialized to -(MAX_MATCH_8 - scanalign).
-
- mov esi, [window]
- mov edi, [scan]
- add esi, ecx
- mov eax, [scanalign]
- mov edx, 0fffffef8h; -(MAX_MATCH_8)
- lea edi, [edi + eax + 0108h] ;MAX_MATCH_8]
- lea esi, [esi + eax + 0108h] ;MAX_MATCH_8]
-
-;;; Test the strings for equality, 8 bytes at a time. At the end,
-;;; adjust edx so that it is offset to the exact byte that mismatched.
-;;;
-;;; We already know at this point that the first three bytes of the
-;;; strings match each other, and they can be safely passed over before
-;;; starting the compare loop. So what this code does is skip over 0-3
-;;; bytes, as much as necessary in order to dword-align the edi
-;;; pointer. (esi will still be misaligned three times out of four.)
-;;;
-;;; It should be confessed that this loop usually does not represent
-;;; much of the total running time. Replacing it with a more
-;;; straightforward "rep cmpsb" would not drastically degrade
-;;; performance.
-
-LoopCmps:
- mov eax, [esi + edx]
- xor eax, [edi + edx]
- jnz LeaveLoopCmps
- mov eax, [esi + edx + 4]
- xor eax, [edi + edx + 4]
- jnz LeaveLoopCmps4
- add edx, 8
- jnz LoopCmps
- jmp short LenMaximum
-LeaveLoopCmps4: add edx, 4
-LeaveLoopCmps: test eax, 0000FFFFh
- jnz LenLower
- add edx, 2
- shr eax, 16
-LenLower: sub al, 1
- adc edx, 0
-
-;;; Calculate the length of the match. If it is longer than MAX_MATCH,
-;;; then automatically accept it as the best possible match and leave.
-
- lea eax, [edi + edx]
- mov edi, [scan]
- sub eax, edi
- cmp eax, MAX_MATCH
- jge LenMaximum
-
-;;; If the length of the match is not longer than the best match we
-;;; have so far, then forget it and return to the lookup loop.
-
- mov edx, [deflatestate]
- mov ebx, [bestlen]
- cmp eax, ebx
- jg LongerMatch
- mov esi, [windowbestlen]
- mov edi, [edx + dsPrev]
- mov ebx, [scanend]
- mov edx, [chainlenwmask]
- jmp LookupLoop
-
-;;; s->match_start = cur_match;
-;;; best_len = len;
-;;; if (len >= nice_match) break;
-;;; scan_end = *(ushf*)(scan+best_len-1);
-
-LongerMatch: mov ebx, [nicematch]
- mov [bestlen], eax
- mov [edx + dsMatchStart], ecx
- cmp eax, ebx
- jge LeaveNow
- mov esi, [window]
- add esi, eax
- mov [windowbestlen], esi
- movzx ebx, word ptr [edi + eax - 1]
- mov edi, [edx + dsPrev]
- mov [scanend], ebx
- mov edx, [chainlenwmask]
- jmp LookupLoop
-
-;;; Accept the current string, with the maximum possible length.
-
-LenMaximum: mov edx, [deflatestate]
- mov dword ptr [bestlen], MAX_MATCH
- mov [edx + dsMatchStart], ecx
-
-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-;;; return s->lookahead;
-
-LeaveNow:
- mov edx, [deflatestate]
- mov ebx, [bestlen]
- mov eax, [edx + dsLookahead]
- cmp ebx, eax
- jg LookaheadRet
- mov eax, ebx
-LookaheadRet:
-
-;;; Restore the stack and return from whence we came.
-
- add esp, LocalVarsSize
- pop ebx
- pop esi
- pop edi
- pop ebp
-
- ret
-; please don't remove this string !
-; Your can freely use match686 in any free or commercial app if you don't remove the string in the binary!
- db 0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah
-
-
- IFDEF NOUNDERLINE
- longest_match endp
- ELSE
- _longest_match endp
- ENDIF
-
- IFDEF NOUNDERLINE
- match_init proc near
- ret
- match_init endp
- ELSE
- _match_init proc near
- ret
- _match_init endp
- ENDIF
-
-
-_TEXT ends
-end

finalhe-1.4.tar.gz/deps/zlib/contrib/masmx86/readme.txt Deleted

finalhe-1.4.tar.gz/CHANGES -> finalhe-1.92.tar.gz/CHANGES Changed

@@ -1,3 +1,39 @@
+v1.92
+1. Added support for 3.73 with existing h-encore^2
+
+v1.91
+1. Added support for 3.72 with updated h-encore²
+
+v1.9
+1. Support 3.69-3.71 with h-encore²
+2. Fixed a bug which causes memcore not working on 3.61
+
+v1.81
+1. Remove deflate from h-encore to get payload loading slight faster
+2. Support 3.61/3.67 now, you won't be asked to update on these firmwares (#46)
+3. Reduced C2-12821-1 error (#47)
+4. Fixed mismatch firmware versions display on firmware update
+
+v1.8
+1. Support for memecore(h-encore 2.0 for VITA 3.60 support), compiled from [my fork](https://github.com/soarqin/h-encore), thanks to [CelesteBlue-dev](https://github.com/CelesteBlue-dev) for his port
+2. Can trim h-encore app to only 6.5MB now, thanks to [KuromeSan](https://github.com/KuromeSan)
+3. Fixed a bug that button is reset to be clickable when another info sync from PSVITA is received
+4. Fixed French language
+
+v1.71
+1. Updated official fix for h-encore 2.0
+
+v1.7
+1. Updated h-encore to 2.0
+
+v1.6
+1. Calculate Backup key from AID offline (#43), thanks to [KuromeSan's code](https://bitbucket.org/SilicaAndPina/cmakeyderiv)
+
+v1.5
+1. New feature: Check firmware version and support firmware update 3.65/3.68 through USB connection
+2. New feature: build prepared applications for transferring through Content Manager
+3. Added translation: Russian
+
 v1.4
 1. Embedded h-encore.zip into binary
 2. Added translation: Japanese

finalhe-1.4.tar.gz/CMakeLists.txt -> finalhe-1.92.tar.gz/CMakeLists.txt Changed

finalhe-1.4.tar.gz/CONTRIBUTORS.md -> finalhe-1.92.tar.gz/CONTRIBUTORS.md Changed

finalhe-1.4.tar.gz/CREDITS.md -> finalhe-1.92.tar.gz/CREDITS.md Changed

finalhe-1.4.tar.gz/README.md -> finalhe-1.92.tar.gz/README.md Changed

@@ -1,40 +1,62 @@
 # Final h-encore
-a tool to push h-encore exploit for PS VITA/PS TV automatically
 
-# CREDITS
+Push the h-encore exploit for PS VITA andPS TV through a Windows, macOS or Linux GUI.
+
+## Credits
+
 see [CREDITS.md](CREDITS.md)
 
-# Prebuilt binaries for windows/macOS
-Check [latest release](https://github.com/soarqin/finalhe/releases/latest)
+## Common usage
+
+1. Download a pre-built executable binary below.
+1. If you want to update PS Vita to firmware 3.60, 3.65 or 3.68 through USB connection, download related Update Packages [here](https://darthsternie.net/index.php/ps-vita-firmwares/) and extract the `PSP2UPDAT.PUP` to the same folder as this tool
+1. If you want to install VitaShell or enso by transferring in Content Manager, download prebuilt zip from `releases` tab and put in the same folder of this tool
+1. Connect your PS Vita to your computer via USB
+1. Run the executable and follow the on-screen directions
+
+### Prebuilt binaries
+
+Download a pre-built executable binary below and follow instructions. Supported firmwares: 3.60, 3.61, 3.65-3.72
+
+- For Windows get the [latest release](https://github.com/soarqin/finalhe/releases/latest)
+ - if you have not installed USB driver for PS Vita: install `QcmaDriver_winusb.exe` (also on the releases page) 
+- For macOS, the last pre-built [release is v1.5](https://github.com/soarqin/finalhe/releases/tag/v1.5)
+- For linux openSUSE
+ 1. add a home [repository](https://software.opensuse.org/package/finalhe) to your local software repositories:
+ - `sudo addrepo -f http://download.opensuse.org/repositories/home:/seilerphilipp/openSUSE_Leap_15.0/`
+ - note: if using Leap 42.3, replace the version in the url with `42.3`
+ 2. install package
+ - `sudo zypper install finalhe`
+ 3. Run "FinalHE"
+ - in your terminal type `FinalHE`
+
+## Build from source
 
-# Notes on windows
-Please install QcmaDriver_winusb.exe(can be downloaded from releases) if you have not installed USB driver for PS Vita
+### Prerequisites 
 
-# Prerequisites for build
-1. For OSX/macOS: install [brew](https://brew.sh), install libusb & qt through brew (```brew install libusb qt```)
-2. For Linux:
- 1. (Debian/Ubuntu) install build-essential, libxml2-dev, libusb-dev, zlib-dev or zlib1g-dev, qtbase5-dev, qttools5, cmake(if use cmake to build)
- 2. (Fedora/CentOS) group install "Development Tools", install libxml2-devel, libusb-devel, zlib-devel, qt5-qtbase-devel, qt5-qtbase, cmake3(if use cmake to build)
- 3. (Arch) install base-devel, libxml2, libusb, zlib, qt5, cmake(if use cmake to build)
+1. macOS: install [brew](https://brew.sh), install libusb & qt through brew (`brew install libusb qt`)
+2. Linux:
+ - Debian/Ubuntu: install build-essential, libxml2-dev, libusb-dev, zlib-dev or zlib1g-dev, qtbase5-dev, qttools5, cmake(if use cmake to build)
+ - Fedora/CentOS: group install "Development Tools", install libxml2-devel, libusb-devel, zlib-devel, qt5-qtbase-devel, qt5-qtbase, cmake3(if use cmake to build)
+ - openSUSE: install cmake >= 11.0, gcc-c++, zlib-devel, libxml2-devel, libQt5Widgets-devel, libQt5Network-devel, libqt5-linguist-devel, libusb-compat-devel
+ - Arch: install base-devel, libxml2, libusb, zlib, qt5, cmake (if using cmake to build)
 
-# Build from source
-You can choose either qmake or cmake to build
-1. cmake: just run cmake to generate Makefile for compiling, for OSX/macOS it cannot produce app bundle, and you need to specify CMAKE_PREFIX_PATH if Qt is not installed in default location:
-```
-cmake -DCMAKE_PREFIX_PATH=<Path of Qt Root> <Path of Project Root>
-```
-2. qmake: just run qmake to generate Makefile for compiling, run ```make lcopy``` in ```src``` folder to compile translations and copy them to binary folder.
+### Build from source
 
-# Contribute to translations
-1. For coders that using Qt:
- 1. If you are using qmake, add your language to this line in src/src.pro: ```TRANSLATIONS += ...```, and re-generate Makefile from qmake, the run ```make lupdate``` in src folder, you will get new generated .ts files in src/languages
+You can choose either `qmake` or `cmake` to build
 
- If you are using cmake, add your language to this line in src/CMakeLists.txt: ```set(TRANSLATION_FILES ...```, and re-generate Makefile/project from cmake, compile it, you will get new generated .ts files in src/languages
- 2. Open .ts files with Qt Linquist tool and translate strings into native language
- 3. If you are using qmake, run ```make lcopy``` in src folder and you will get compiled .qm files in languages folder
+- cmake: run `cmake` to generate Makefile for compiling
+ - macOS: it cannot produce app bundle, and you need to specify `CMAKE_PREFIX_PATH` if Qt is not installed in default location: `cmake -DCMAKE_PREFIX_PATH=<Path of Qt Root> <Path of Project Root>`
+- qmake: run `qmake` to generate Makefile for compiling, run `make lcopy` in `src` folder to compile translations and copy them to binary folder
 
- If you are using cmake, compile the project and you will get compiled .qm files in language folder
+## Contribute translations
 
-2. For non-coders:
+- For coders using Qt:
+ 1. If using qmake, add your language to this line in src/src.pro: `TRANSLATIONS += ...`, and re-generate Makefile from qmake, then run `make lupdate` in `src` folder, you will get new generated .ts files in src/languages
+ 1. If using cmake, add your language to this line in src/CMakeLists.txt: `set(TRANSLATION_FILES ...`, and re-generate Makefile/project from cmake, compile it, you will get new generated .ts files in src/languages
+ 1. Open .ts files with Qt Linquist tool and translate strings into native language
+ 1. If using qmake, run `make lcopy` in src folder and you will get compiled .qm files in languages folder
+ 1. If using cmake, compile the project and you will get compiled .qm files in language folder
+- For non-coders:
 1. Copy translations/en_US.ts to a new file with filename in [IETF language tag](https://datahub.io/core/language-codes/r/3.html) form (but replace "-" with "_")
- 2. Open the .ts file, it is just in xml format, go through all elements of ```<translation type="unfinished">``` to translate, and remove the property ```type="unfinished"``` from translated items
+ 1. Open the .ts file, it is just in xml format, go through all elements of `<translation type="unfinished">` to translate, and remove the property `type="unfinished"` from translated items

finalhe-1.92.tar.gz/cmake Added

finalhe-1.92.tar.gz/cmake/Modules Added

finalhe-1.92.tar.gz/cmake/Modules/FindIconv.cmake Added

@@ -0,0 +1,133 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindIconv
+---------
+
+This module finds the ``iconv()`` POSIX.1 functions on the system.
+These functions might be provided in the regular C library or externally
+in the form of an additional library.
+
+The following variables are provided to indicate iconv support:
+
+.. variable:: Iconv_FOUND
+
+ Variable indicating if the iconv support was found.
+
+.. variable:: Iconv_INCLUDE_DIRS
+
+ The directories containing the iconv headers.
+
+.. variable:: Iconv_LIBRARIES
+
+ The iconv libraries to be linked.
+
+.. variable:: Iconv_IS_BUILT_IN
+
+ A variable indicating whether iconv support is stemming from the
+ C library or not. Even if the C library provides `iconv()`, the presence of
+ an external `libiconv` implementation might lead to this being false.
+
+Additionally, the following :prop_tgt:`IMPORTED` target is being provided:
+
+.. variable:: Iconv::Iconv
+
+ Imported target for using iconv.
+
+The following cache variables may also be set:
+
+.. variable:: Iconv_INCLUDE_DIR
+
+ The directory containing the iconv headers.
+
+.. variable:: Iconv_LIBRARY
+
+ The iconv library (if not implicitly given in the C library).
+
+.. note::
+ On POSIX platforms, iconv might be part of the C library and the cache
+ variables ``Iconv_INCLUDE_DIR`` and ``Iconv_LIBRARY`` might be empty.
+
+#]=======================================================================]
+
+include(CMakePushCheckState)
+if(CMAKE_C_COMPILER_LOADED)
+ include(CheckCSourceCompiles)
+elseif(CMAKE_CXX_COMPILER_LOADED)
+ include(CheckCXXSourceCompiles)
+else()
+ # If neither C nor CXX are loaded, implicit iconv makes no sense.
+ set(Iconv_IS_BUILT_IN FALSE)
+endif()
+
+# iconv can only be provided in libc on a POSIX system.
+# If any cache variable is already set, we'll skip this test.
+if(NOT DEFINED Iconv_IS_BUILT_IN)
+ if(UNIX AND NOT DEFINED Iconv_INCLUDE_DIR AND NOT DEFINED Iconv_LIBRARY)
+ cmake_push_check_state(RESET)
+ # We always suppress the message here: Otherwise on supported systems
+ # not having iconv in their C library (e.g. those using libiconv)
+ # would always display a confusing "Looking for iconv - not found" message
+ set(CMAKE_FIND_QUIETLY TRUE)
+ # The following code will not work, but it's sufficient to see if it compiles.
+ # Note: libiconv will define the iconv functions as macros, so CheckSymbolExists
+ # will not yield correct results.
+ set(Iconv_IMPLICIT_TEST_CODE
+ "
+ #include <stddef.h>
+ #include <iconv.h>
+ int main() {
+ char *a, *b;
+ size_t i, j;
+ iconv_t ic;
+ ic = iconv_open(\"to\", \"from\");
+ iconv(ic, &a, &i, &b, &j);
+ iconv_close(ic);
+ }
+ "
+ )
+ if(CMAKE_C_COMPILER_LOADED)
+ check_c_source_compiles("${Iconv_IMPLICIT_TEST_CODE}" Iconv_IS_BUILT_IN)
+ else()
+ check_cxx_source_compiles("${Iconv_IMPLICIT_TEST_CODE}" Iconv_IS_BUILT_IN)
+ endif()
+ cmake_pop_check_state()
+ else()
+ set(Iconv_IS_BUILT_IN FALSE)
+ endif()
+endif()
+
+if(NOT Iconv_IS_BUILT_IN)
+ find_path(Iconv_INCLUDE_DIR
+ NAMES "iconv.h"
+ DOC "iconv include directory")
+ set(Iconv_LIBRARY_NAMES "iconv" "libiconv")
+else()
+ set(Iconv_INCLUDE_DIR "" CACHE FILEPATH "iconv include directory")
+ set(Iconv_LIBRARY_NAMES "c")
+endif()
+
+find_library(Iconv_LIBRARY
+ NAMES ${Iconv_LIBRARY_NAMES}
+ DOC "iconv library (potentially the C library)")
+
+mark_as_advanced(Iconv_INCLUDE_DIR)
+mark_as_advanced(Iconv_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+if(NOT Iconv_IS_BUILT_IN)
+ find_package_handle_standard_args(Iconv REQUIRED_VARS Iconv_LIBRARY Iconv_INCLUDE_DIR)
+else()
+ find_package_handle_standard_args(Iconv REQUIRED_VARS Iconv_LIBRARY)
+endif()
+
+if(Iconv_FOUND)
+ set(Iconv_INCLUDE_DIRS "${Iconv_INCLUDE_DIR}")
+ set(Iconv_LIBRARIES "${Iconv_LIBRARY}")
+ if(NOT TARGET Iconv::Iconv)
+ add_library(Iconv::Iconv INTERFACE IMPORTED)
+ endif()
+ set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${Iconv_INCLUDE_DIRS}")
+ set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES "${Iconv_LIBRARIES}")
+endif()

finalhe-1.4.tar.gz/deps/psvlib/img/backup.c -> finalhe-1.92.tar.gz/deps/psvlib/img/backup.c Changed

@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Yifan Lu
+/* Copyright (C) 2017 Yifan Lu0
 *
 * This software may be modified and distributed under the terms
 * of the MIT license. See the LICENSE file for details.
@@ -27,384 +27,415 @@
 
 #define MAX_PATH_LEN 1024
 
-void *encrypt_thread(void *pargs) {
- args_t *args = (args_t *)pargs;
- sha256_context ctx, tmp;
- uint8_t iv[AES_BLOCK_SIZE];
- uint8_t buffer[PSVIMG_BLOCK_SIZE + SHA256_BLOCK_SIZE + 0x10];
- ssize_t rd;
- union {
+typedef struct process_context_t {
+ sha256_context ctx;
+ aes_context aes;
+ uint8_t iv[AES_BLOCK_SIZE];
+ uint8_t buffer[PSVIMG_BLOCK_SIZE + SHA256_BLOCK_SIZE + 0x10];
+ size_t buffer_size;
+ FILE* out;
+
+ union {
 #pragma pack(push, 1)
- struct {
- uint32_t padding;
- uint32_t unused;
- uint64_t total;
- } ATTR_PACKED data;
+ struct {
+ uint32_t padding;
+ uint32_t unused;
+ uint64_t total;
+ } ATTR_PACKED;
 #pragma pack(pop)
- uint8_t raw[AES_BLOCK_SIZE];
- } footer;
-
- // write iv
- memcpy(iv, args->iv, AES_BLOCK_SIZE);
- aes256_encrypt(iv, args->key);
- write_block(args->out, iv, AES_BLOCK_SIZE);
-
- // encrypt blocks
- sha256_init(&ctx);
- sha256_starts(&ctx);
- footer.data.total = AES_BLOCK_SIZE; // from iv
- footer.data.padding = 0;
- footer.data.unused = 0;
- while ((rd = read_block(args->in, buffer, PSVIMG_BLOCK_SIZE)) > 0) {
- // generate hash
- sha256_update(&ctx, buffer, rd);
- sha256_copy(&tmp, &ctx);
- sha256_final(&tmp, &buffer[rd]);
- rd += SHA256_BLOCK_SIZE;
-
- // add padding
- if (footer.data.padding != 0) { // we should be reading 0x8000 blocks! only need padding once
- fprintf(stderr, "an internal error has occured!\n");
- goto end;
+ uint8_t raw[AES_BLOCK_SIZE];
+ } footer;
+} process_context_t;
+
+
+static void time_to_scetime(const time_t *time, SceDateTime *sce) {
+ struct tm *tmp;
+ tmp = localtime(time);
+ sce->second = htole32(tmp->tm_sec);
+ sce->minute = htole32(tmp->tm_min);
+ sce->hour = htole32(tmp->tm_hour);
+ sce->day = htole32(tmp->tm_mday);
+ sce->month = htole32(tmp->tm_mon + 1);
+ sce->year = htole32(tmp->tm_year + 1900);
+ sce->microsecond = htole32(0);
+}
+
+static int scestat(const char *path, SceIoStat *sce) {
+ struct stat st;
+
+ if (stat(path, &st) < 0) {
+ return -1;
+ }
+
+ sce->sst_mode = 0;
+ if (S_ISDIR(st.st_mode)) {
+ sce->sst_mode |= SCE_S_IFDIR;
+ } else {
+ sce->sst_mode |= SCE_S_IFREG;
+ }
+ if ((st.st_mode & S_IRUSR) == S_IRUSR) {
+ sce->sst_mode |= SCE_S_IRUSR;
+ }
+ if ((st.st_mode & S_IWUSR) == S_IWUSR) {
+ sce->sst_mode |= SCE_S_IWUSR;
+ }
+ if ((st.st_mode & S_IRGRP) == S_IRGRP) {
+ sce->sst_mode |= SCE_S_IRGRP;
+ }
+ if ((st.st_mode & S_IWGRP) == S_IWGRP) {
+ sce->sst_mode |= SCE_S_IWGRP;
 }
- if (rd & (AES_BLOCK_SIZE-1)) {
- footer.data.padding = AES_BLOCK_SIZE - (rd & (AES_BLOCK_SIZE-1));
- rd += footer.data.padding;
+ if ((st.st_mode & S_IROTH) == S_IROTH) {
+ sce->sst_mode |= SCE_S_IROTH;
 }
+ if ((st.st_mode & S_IWOTH) == S_IWOTH) {
+ sce->sst_mode |= SCE_S_IWOTH;
+ }
+ sce->sst_mode = htole32(sce->sst_mode);
+ sce->sst_attr = htole32(0);
+ sce->sst_size = htole64(st.st_size);
+ time_to_scetime(&st.st_ctime, &sce->sst_ctime);
+ time_to_scetime(&st.st_atime, &sce->sst_atime);
+ time_to_scetime(&st.st_mtime, &sce->sst_mtime);
+ memset(sce->sst_private, 0, sizeof(sce->sst_private));
+
+ return 0;
+}
 
- // encrypt
- aes256_cbc_encrypt(buffer, args->key, iv, rd / AES_BLOCK_SIZE);
+int encrypt_init(process_context_t* cont, const char* out_file, uint8_t iv[AES_BLOCK_SIZE], uint8_t key[32]) {
+ cont->out = fopen(out_file, "wb");
+ if (!cont->out) return -1;
 
- // save next iv
- memcpy(iv, &buffer[rd - AES_BLOCK_SIZE], AES_BLOCK_SIZE);
+ memset(cont->buffer, 0, sizeof(cont->buffer));
+ memcpy(cont->iv, iv, AES_BLOCK_SIZE);
+ aes_init(&cont->aes, key, 256);
+ aes_ecb_encrypt(&cont->aes, cont->iv, cont->iv);
+ fwrite(cont->iv, 1, AES_BLOCK_SIZE, cont->out);
 
- // write output
- write_block(args->out, buffer, rd);
+ sha256_init(&cont->ctx);
+ sha256_starts(&cont->ctx);
 
- footer.data.total += rd;
- }
+ cont->buffer_size = 0;
 
- if (rd < 0) {
- fprintf(stderr, "Read error occured!\n");
- goto end;
- }
+ cont->footer.total = AES_BLOCK_SIZE; // from iv
+ cont->footer.padding = 0;
+ cont->footer.unused = 0;
+ return 0;
+}
 
- // send footer
- footer.data.total += 0x10;
- footer.data.padding = htole32(footer.data.padding);
- footer.data.total = htole64(footer.data.total);
- aes256_cbc_encrypt(footer.raw, args->key, iv, 1);
- write_block(args->out, footer.raw, AES_BLOCK_SIZE);
+void encrypt_data(process_context_t* cont, const uint8_t* buffer, size_t size) {
+ while (cont->buffer_size + size >= PSVIMG_BLOCK_SIZE) {
+ sha256_context tmp;
 
-end:
- return NULL;
-}
+ size_t copy_size = PSVIMG_BLOCK_SIZE - cont->buffer_size;
+ memcpy(cont->buffer + cont->buffer_size, buffer, copy_size);
+ buffer += copy_size;
+ size -= copy_size;
+
+ // generate hash
+ sha256_update(&cont->ctx, cont->buffer, PSVIMG_BLOCK_SIZE);
+ sha256_copy(&tmp, &cont->ctx);
+ sha256_final(&tmp, cont->buffer + PSVIMG_BLOCK_SIZE);
+ aes_cbc_encrypt(&cont->aes, cont->iv, cont->buffer, PSVIMG_BLOCK_SIZE + SHA256_BLOCK_SIZE, cont->buffer);
+ fwrite(cont->buffer, 1, PSVIMG_BLOCK_SIZE + SHA256_BLOCK_SIZE, cont->out);
+ cont->footer.total += PSVIMG_BLOCK_SIZE + SHA256_BLOCK_SIZE;
 
-void *compress_thread(void *pargs) {
- args_t *args = (args_t *)pargs;
-
- int ret;
- unsigned have;
- z_stream strm;
- unsigned char in[PSVIMG_BLOCK_SIZE];
- unsigned char out[PSVIMG_BLOCK_SIZE];
- ssize_t rd;
-
- /* allocate deflate state */
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
- ret = deflateInit(&strm, Z_DEFAULT_COMPRESSION);
- if (ret != Z_OK) {
- fprintf(stderr, "error init zlib\n");
- goto end;
- }
-
- /* compress until end of file */
- do {
- strm.avail_in = rd = read_block(args->in, in, sizeof(in));
- if (rd < 0) {
- fprintf(stderr, "error reading\n");
- goto end;
+ cont->buffer_size = 0;
 }
- strm.next_in = in;
-
- /* run deflate() on input until output buffer not full, finish
- compression if all of source has been read in */
- do {
- strm.avail_out = PSVIMG_BLOCK_SIZE;
- strm.next_out = out;
- ret = deflate(&strm, Z_NO_FLUSH); /* no bad return value */
- if (ret == Z_STREAM_ERROR) { /* state not clobbered */
- fprintf(stderr, "zlib internal error\n");
- goto end;
- }
- have = PSVIMG_BLOCK_SIZE - strm.avail_out;
- if (write_block(args->out, out, have) < have) {
- fprintf(stderr, "error writing\n");
- goto end;
- }
- } while (strm.avail_out == 0);
- if (strm.avail_in != 0){ /* all input will be used */
- fprintf(stderr, "zlib internal error\n");
- goto end;
+ if (size > 0) {
+ memcpy(cont->buffer + cont->buffer_size, buffer, size);
+ cont->buffer_size += size;
 }
-
- /* done when last data in file processed */
- } while (rd > 0);
- if (deflate(&strm, Z_FINISH) == Z_STREAM_ERROR) { /* state not clobbered */
- fprintf(stderr, "zlib internal error\n");
- goto end;
- }
- have = PSVIMG_BLOCK_SIZE - strm.avail_out;
- if (write_block(args->out, out, have) < have) {
- fprintf(stderr, "error writing\n");
- goto end;
- }
-
- /* clean up and return */
- (void)deflateEnd(&strm);
-
-end:
- return NULL;
 }
 
-static void time_to_scetime(const time_t *time, SceDateTime *sce) {
- struct tm *tmp;
- tmp = localtime(time);
- sce->second = htole32(tmp->tm_sec);
- sce->minute = htole32(tmp->tm_min);
- sce->hour = htole32(tmp->tm_hour);
- sce->day = htole32(tmp->tm_mday);
- sce->month = htole32(tmp->tm_mon + 1);
- sce->year = htole32(tmp->tm_year + 1900);
- sce->microsecond = htole32(0);
+void encrypt_finish(process_context_t* cont) {
+ sha256_update(&cont->ctx, cont->buffer, cont->buffer_size);
+ sha256_final(&cont->ctx, cont->buffer + cont->buffer_size);
+ cont->buffer_size += SHA256_BLOCK_SIZE;
+ if (cont->buffer_size & (AES_BLOCK_SIZE - 1)) {
+ cont->footer.padding = AES_BLOCK_SIZE - (cont->buffer_size & (AES_BLOCK_SIZE - 1));
+ cont->buffer_size += cont->footer.padding;
+ }
+ aes_cbc_encrypt(&cont->aes, cont->iv, cont->buffer, cont->buffer_size, cont->buffer);
+ fwrite(cont->buffer, 1, cont->buffer_size, cont->out);
+ cont->footer.total += cont->buffer_size;
+ cont->buffer_size = 0;
+
+ cont->footer.total += 0x10;
+ cont->footer.padding = htole32(cont->footer.padding);
+ cont->footer.total = htole64(cont->footer.total);
+ aes_cbc_encrypt(&cont->aes, cont->iv, cont->footer.raw, AES_BLOCK_SIZE, cont->footer.raw);
+ fwrite(cont->footer.raw, 1, AES_BLOCK_SIZE, cont->out);
+
+ fclose(cont->out);
 }
 
-static int scestat(const char *path, SceIoStat *sce) {
- struct stat st;
+int compress_and_encrypt(const char* output, const uint8_t* data, size_t data_size, uint8_t iv[16], uint8_t key[32]) {
+ process_context_t cont;
 
- if (stat(path, &st) < 0) {
- return -1;
- }
-
- sce->sst_mode = 0;
- if (S_ISDIR(st.st_mode)) {
- sce->sst_mode |= SCE_S_IFDIR;
- } else {
- sce->sst_mode |= SCE_S_IFREG;
- }
- if ((st.st_mode & S_IRUSR) == S_IRUSR) {
- sce->sst_mode |= SCE_S_IRUSR;
- }
- if ((st.st_mode & S_IWUSR) == S_IWUSR) {
- sce->sst_mode |= SCE_S_IWUSR;
- }
- if ((st.st_mode & S_IRGRP) == S_IRGRP) {
- sce->sst_mode |= SCE_S_IRGRP;
- }
- if ((st.st_mode & S_IWGRP) == S_IWGRP) {
- sce->sst_mode |= SCE_S_IWGRP;
- }
- if ((st.st_mode & S_IROTH) == S_IROTH) {
- sce->sst_mode |= SCE_S_IROTH;
- }
- if ((st.st_mode & S_IWOTH) == S_IWOTH) {
- sce->sst_mode |= SCE_S_IWOTH;
- }
- sce->sst_mode = htole32(sce->sst_mode);
- sce->sst_attr = htole32(0);
- sce->sst_size = htole64(st.st_size);
- time_to_scetime(&st.st_ctime, &sce->sst_ctime);
- time_to_scetime(&st.st_atime, &sce->sst_atime);
- time_to_scetime(&st.st_mtime, &sce->sst_mtime);
- memset(sce->sst_private, 0, sizeof(sce->sst_private));
-
- return 0;
-}
+ int ret;
+ uint32_t have;
+ z_stream strm;
+ uint8_t in[PSVIMG_BLOCK_SIZE];
+ uint8_t out[PSVIMG_BLOCK_SIZE];
 
-static ssize_t add_all_files(int fd, const char *parent, const char *rel, const char *host);
-
-static ssize_t add_file(int fd, const char *parent, const char *rel, const char *host) {
- PsvImgHeader_t header;
- PsvImgTailer_t tailer;
- uint64_t fsize;
- int file;
- int padding;
-
- // create header
- memset(&header, PSVIMG_HEADER_FILLER, sizeof(header));
- header.systime = htole64(0);
- header.flags = htole64(0);
- if (scestat(host, &header.stat) < 0) {
- fprintf(stderr, "error getting stat for %s\n", host);
- return -1;
- }
- strncpy(header.path_parent, parent, sizeof(header.path_parent));
- header.unk_16C = htole32(1);
- strncpy(header.path_rel, rel, sizeof(header.path_rel));
- memcpy(header.end, PSVIMG_ENDOFHEADER, sizeof(header.end));
-
- // send header
- write_block(fd, &header, sizeof(header));
-
- // send file
- if (SCE_S_ISREG(le32toh(header.stat.sst_mode))) {
- fsize = le64toh(header.stat.sst_size);
- printf("packing file %s%s (%llx bytes)...\n", header.path_parent, header.path_rel, fsize);
- file = open(host, O_RDONLY | O_BINARY);
- if (file < 0) {
- fprintf(stderr, "error opening %s\n", host);
- return -1;
+ if (encrypt_init(&cont, output, iv, key) < 0) {
+ return -1;
 }
- if (copy_block(fd, file, fsize) < fsize) {
- fprintf(stderr, "error writing file data\n");
- close(file);
- return -1;
+
+ /* allocate deflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ ret = deflateInit(&strm, Z_DEFAULT_COMPRESSION);
+ if (ret != Z_OK) {
+ encrypt_finish(&cont);
+ return -1;
 }
- close(file);
- } else {
- fsize = 0;
- }
-
- // send padding
- if (fsize & (PSVIMG_ENTRY_ALIGN-1)) {
- padding = PSVIMG_ENTRY_ALIGN - (fsize & (PSVIMG_ENTRY_ALIGN-1));
- } else {
- padding = 0;
- }
- while (padding --> 0) {
- char ch = (padding == 0) ? '\n' : PSVIMG_PADDING_FILLER;
- write_block(fd, &ch, 1);
- }
-
- // send tailer
- memset(&tailer, PSVIMG_TAILER_FILLER, sizeof(tailer));
- tailer.flags = htole64(0);
- memcpy(tailer.end, PSVIMG_ENDOFTAILER, sizeof(tailer.end));
- write_block(fd, &tailer, sizeof(tailer));
-
- if (SCE_S_ISDIR(le32toh(header.stat.sst_mode))) {
- printf("packing directory %s%s...\n", header.path_parent, header.path_rel);
- return add_all_files(fd, parent, rel, host);
- } else {
- return (ssize_t)fsize;
- }
-}
 
-static ssize_t add_all_files(int fd, const char *parent, const char *rel, const char *host) {
- char new_rel[256];
- char new_host[MAX_PATH_LEN];
- DIR *dir;
- struct dirent *dent;
- ssize_t fsize, total;
+ /* compress until end of file */
+ while (data_size > 0) {
+ if (data_size > sizeof(in)) {
+ strm.avail_in = sizeof(in);
+ strm.next_in = (Bytef*)data;
+ data += sizeof(in);
+ data_size -= sizeof(in);
+ } else {
+ strm.avail_in = data_size;
+ strm.next_in = (Bytef*)data;
+ data += data_size;
+ data_size = 0;
+ }
+
+ do {
+ strm.avail_out = sizeof(out);
+ strm.next_out = out;
+ ret = deflate(&strm, Z_NO_FLUSH);
+ if (ret == Z_STREAM_ERROR) {
+ deflateEnd(&strm);
+ encrypt_finish(&cont);
+ return -1;
+ }
+ have = sizeof(out) - strm.avail_out;
+ encrypt_data(&cont, out, have);
+ } while (strm.avail_out == 0);
+ if (strm.avail_in != 0) {
+ deflateEnd(&strm);
+ encrypt_finish(&cont);
+ return -1;
+ }
+
+ /* done when last data in file processed */
+ }
+ strm.avail_out = sizeof(out);
+ strm.next_out = out;
+ if (deflate(&strm, Z_FINISH) == Z_STREAM_ERROR) { /* state not clobbered */
+ deflateEnd(&strm);
+ encrypt_finish(&cont);
+ return -1;
+ }
+ have = sizeof(out) - strm.avail_out;
+ encrypt_data(&cont, out, have);
 
- if ((dir = opendir(host)) == NULL) {
- fprintf(stderr, "cannot open %s\n", host);
- return -1;
- }
+ deflateEnd(&strm);
 
- total = 0;
- while ((dent = readdir(dir)) != NULL) {
- if (rel[0] == '\0' && strcmp(dent->d_name, "VITA_PATH.TXT") == 0) {
- // skip this file
- continue;
- }
+ encrypt_finish(&cont);
+ return 0;
+}
 
- if (strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0) {
- continue;
+static ssize_t pack_add_all_files(process_context_t* cont, const char *parent, const char *rel, const char *host);
+
+static ssize_t pack_add_file(process_context_t* cont, const char *parent, const char *rel, const char *host) {
+ PsvImgHeader_t header;
+ PsvImgTailer_t tailer;
+ uint64_t fsize;
+ int padding;
+
+ // create header
+ memset(&header, PSVIMG_HEADER_FILLER, sizeof(header));
+ header.systime = htole64(0);
+ header.flags = htole64(0);
+ if (scestat(host, &header.stat) < 0) {
+ fprintf(stderr, "error getting stat for %s\n", host);
+ return -1;
+ }
+ strncpy(header.path_parent, parent, sizeof(header.path_parent));
+ header.unk_16C = htole32(1);
+ strncpy(header.path_rel, rel, sizeof(header.path_rel));
+ memcpy(header.end, PSVIMG_ENDOFHEADER, sizeof(header.end));
+
+ encrypt_data(cont, (const uint8_t*)&header, sizeof(header));
+
+ // send file
+ if (SCE_S_ISREG(le32toh(header.stat.sst_mode))) {
+ FILE* file;
+ uint8_t block[PSVIMG_BLOCK_SIZE];
+ uint64_t total = 0ULL;
+ fsize = le64toh(header.stat.sst_size);
+ printf("packing file %s%s (%llx bytes)...\n", header.path_parent,
+ header.path_rel, fsize);
+ file = fopen(host, "rb");
+ if (file == NULL) {
+ fprintf(stderr, "error opening %s\n", host);
+ return -1;
+ }
+
+ while(!feof(file)) {
+ size_t sz = fread(block, 1, PSVIMG_BLOCK_SIZE, file);
+ if (sz) {
+ encrypt_data(cont, block, sz);
+ total += sz;
+ }
+ }
+ fclose(file);
+ } else {
+ fsize = 0;
 }
 
-#ifdef __APPLE__
- if (strcmp(dent->d_name, ".DS_Store") == 0) {
- continue; // ignore annoying OSX specific files
+ // send padding
+ if (fsize & (PSVIMG_ENTRY_ALIGN - 1)) {
+ padding = PSVIMG_ENTRY_ALIGN - (fsize & (PSVIMG_ENTRY_ALIGN - 1));
+ } else {
+ padding = 0;
 }
-#endif
+ while (padding-- > 0) {
+ char ch = (padding == 0) ? '\n' : PSVIMG_PADDING_FILLER;
+ encrypt_data(cont, (const uint8_t*)&ch, 1);
+ }
+
+ // send tailer
+ memset(&tailer, PSVIMG_TAILER_FILLER, sizeof(tailer));
+ tailer.flags = htole64(0);
+ memcpy(tailer.end, PSVIMG_ENDOFTAILER, sizeof(tailer.end));
+ encrypt_data(cont, (const uint8_t*)&tailer, sizeof(tailer));
 
- if (rel[0] == '\0' && strcmp(dent->d_name, "VITA_DATA.BIN") == 0) { // special file
- new_rel[0] = '\0';
+ if (SCE_S_ISDIR(le32toh(header.stat.sst_mode))) {
+ printf("packing directory %s%s...\n", header.path_parent,
+ header.path_rel);
+ return pack_add_all_files(cont, parent, rel, host);
 } else {
- if (snprintf(new_rel, sizeof(new_rel), "%s/%s", rel, dent->d_name) == sizeof(new_rel)) {
- fprintf(stderr, "path is too long! cannot add %s/%s\n", rel, dent->d_name);
- goto err;
- }
+ return (ssize_t)fsize;
+ }
+}
+
+static ssize_t pack_add_all_files(process_context_t* cont, const char *parent, const char *rel,
+ const char *host) {
+ char new_rel[256];
+ char new_host[MAX_PATH_LEN];
+ DIR *dir;
+ struct dirent *dent;
+ ssize_t fsize, total;
+
+ if ((dir = opendir(host)) == NULL) {
+ fprintf(stderr, "cannot open %s\n", host);
+ return -1;
 }
- snprintf(new_host, sizeof(new_host), "%s/%s", host, dent->d_name);
 
- dent = NULL; // so we don't actually reuse it
- // add file/directory to psvimg
- if ((fsize = add_file(fd, parent, new_rel, new_host)) < 0) {
- goto err;
+ total = 0;
+ while ((dent = readdir(dir)) != NULL) {
+ if (rel[0] == '\0' && strcmp(dent->d_name, "VITA_PATH.TXT") == 0) {
+ // skip this file
+ continue;
+ }
+
+ if (strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0) {
+ continue;
+ }
+
+#ifdef __APPLE__
+ if (strcmp(dent->d_name, ".DS_Store") == 0) {
+ continue; // ignore annoying OSX specific files
+ }
+#endif
+
+ if (rel[0] == '\0' &&
+ strcmp(dent->d_name, "VITA_DATA.BIN") == 0) { // special file
+ new_rel[0] = '\0';
+ } else {
+ if (snprintf(new_rel, sizeof(new_rel), "%s/%s", rel,
+ dent->d_name) == sizeof(new_rel)) {
+ fprintf(stderr, "path is too long! cannot add %s/%s\n", rel,
+ dent->d_name);
+ goto err;
+ }
+ }
+ snprintf(new_host, sizeof(new_host), "%s/%s", host, dent->d_name);
+
+ dent = NULL; // so we don't actually reuse it
+ // add file/directory to psvimg
+ if ((fsize = pack_add_file(cont, parent, new_rel, new_host)) < 0) {
+ goto err;
+ }
+ total += fsize;
 }
- total += fsize;
- }
 
- closedir(dir);
- return total;
+ closedir(dir);
+ return total;
 
 err:
- closedir(dir);
- return -1;
+ closedir(dir);
+ return -1;
 }
 
-void *pack_thread(void *pargs) {
- args_t *args = (args_t *)pargs;
- DIR *dir;
- struct dirent *dent;
- struct stat st;
- char parent[256];
- char host[MAX_PATH_LEN];
- char parent_file[MAX_PATH_LEN];
- int fd;
- ssize_t rd, wr;
- 
- if ((dir = opendir(args->prefix)) == NULL) {
- fprintf(stderr, "cannot open %s\n", args->prefix);
- goto end2;
- }
-
- while ((dent = readdir(dir)) != NULL) {
- if (strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0) {
- continue;
+int pack_and_encrypt(const char* output, uint64_t* content_size, const char* prefix, uint8_t iv[16], uint8_t key[32]) {
+ DIR *dir;
+ struct dirent *dent;
+ struct stat st;
+ char parent[256];
+ char host[MAX_PATH_LEN];
+ char parent_file[MAX_PATH_LEN];
+ FILE* fd;
+ ssize_t rd, wr;
+ process_context_t cont;
+
+ *content_size = 0ULL;
+ if ((dir = opendir(prefix)) == NULL) {
+ fprintf(stderr, "cannot open %s\n", prefix);
+ return -1;
 }
 
+ encrypt_init(&cont, output, iv, key);
+
+ while ((dent = readdir(dir)) != NULL) {
+ if (strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0) {
+ continue;
+ }
+
 #ifdef __APPLE__
- if (strcmp(dent->d_name, ".DS_Store") == 0) {
- continue; // ignore annoying OSX specific files
- }
+ if (strcmp(dent->d_name, ".DS_Store") == 0) {
+ continue; // ignore annoying OSX specific files
+ }
 #endif
 
- snprintf(host, sizeof(host), "%s/%s", args->prefix, dent->d_name);
- if (stat(host, &st) < 0) {
- fprintf(stderr, "internal error\n");
- goto end;
+ snprintf(host, sizeof(host), "%s/%s", prefix, dent->d_name);
+ if (stat(host, &st) < 0) {
+ fprintf(stderr, "internal error\n");
+ goto end;
+ }
+
+ if (S_ISDIR(st.st_mode)) {
+ snprintf(parent_file, sizeof(parent_file), "%s/%s", host, "VITA_PATH.TXT");
+ if ((fd = fopen(parent_file, "rb")) == 0) {
+ fprintf(stderr, "WARNING: skipping %s because VITA_PATH.TXT is not found!\n", host);
+ continue;
+ }
+ rd = fread(parent, 1, sizeof(parent) - 1, fd);
+ fclose(fd);
+ parent[rd] = '\0';
+ dent = NULL; // so we don't actually reuse it
+ printf("adding files for %s\n", parent);
+ if ((wr = pack_add_all_files(&cont, parent, "\0", host)) < 0) {
+ goto end;
+ }
+ *content_size += (uint64_t)wr;
+ } else {
+ fprintf(stderr, "WARNING: skipping %s because it is not a directory!\n", host);
+ }
 }
 
- if (S_ISDIR(st.st_mode)) {
- snprintf(parent_file, sizeof(parent_file), "%s/%s", host, "VITA_PATH.TXT");
- if ((fd = open(parent_file, O_RDONLY | O_BINARY)) < 0) {
- fprintf(stderr, "WARNING: skipping %s because VITA_PATH.TXT is not found!\n", host);
- continue;
- }
- if ((rd = read_block(fd, parent, sizeof(parent)-1)) < 0) {
- fprintf(stderr, "error reading %s\n", parent_file);
- goto end;
- }
- close(fd);
- parent[rd] = '\0';
- dent = NULL; // so we don't actually reuse it
- printf("adding files for %s\n", parent);
- if ((wr = add_all_files(args->out, parent, "\0", host)) < 0) {
- goto end;
- }
- args->content_size += wr;
- } else {
- fprintf(stderr, "WARNING: skipping %s because it is not a directory!\n", host);
- }
- }
- 
 end:
- closedir(dir);
-end2:
- return NULL;
+ closedir(dir);
+ encrypt_finish(&cont);
+
+ return 0;
 }

finalhe-1.4.tar.gz/deps/psvlib/img/backup.h -> finalhe-1.92.tar.gz/deps/psvlib/img/backup.h Changed

finalhe-1.4.tar.gz/deps/psvlib/img/crypto.h -> finalhe-1.92.tar.gz/deps/psvlib/img/crypto.h Changed

@@ -12,37 +12,6 @@
 #define SHA256_BLOCK_SIZE 32
 
 #include <aes.h>
-static inline void aes256_cbc_decrypt(uint8_t *buffer, uint8_t *key, uint8_t *iv, size_t blocks) {
- aes_context ctx;
-
- aes_init(&ctx, key, 256);
- for (int i = blocks-1; i >= 0; i--) {
- aes_ecb_decrypt(&ctx, &buffer[i * AES_BLOCK_SIZE], &buffer[i * AES_BLOCK_SIZE]);
- for (int j = 0; j < AES_BLOCK_SIZE; j++) {
- buffer[i*AES_BLOCK_SIZE + j] ^= (i == 0) ? iv[j] : buffer[(i-1)*AES_BLOCK_SIZE + j];
- }
- }
-}
-
-static inline void aes256_cbc_encrypt(uint8_t *buffer, uint8_t *key, uint8_t *iv, size_t blocks) {
- aes_context ctx;
-
- aes_init(&ctx, key, 256);
- for (int i = 0; i < blocks; i++) {
- for (int j = 0; j < AES_BLOCK_SIZE; j++) {
- buffer[i*AES_BLOCK_SIZE + j] ^= (i == 0) ? iv[j] : buffer[(i-1)*AES_BLOCK_SIZE + j];
- }
- aes_ecb_encrypt(&ctx, &buffer[i * AES_BLOCK_SIZE], &buffer[i * AES_BLOCK_SIZE]);
- }
-}
-
-static inline void aes256_encrypt(uint8_t *buffer, uint8_t *key) {
- aes_context ctx;
-
- aes_init(&ctx, key, 256);
- aes_ecb_encrypt(&ctx, buffer, buffer);
-}
-
 #include <sha256.h>
 
 #endif

finalhe-1.4.tar.gz/deps/psvlib/img/endian-utils.h -> finalhe-1.92.tar.gz/deps/psvlib/img/endian-utils.h Changed

@@ -1,6 +1,8 @@
 #ifndef ENDIAN_UTILS_H
 #define ENDIAN_UTILS_H
 
+#include <stdint.h>
+
 #ifdef __APPLE__
 
 #include <machine/endian.h>
@@ -33,13 +35,13 @@
 	((x >> 8) | (x << 8))
 
 #define	bswap32(x) (uint32_t) \
-	((x >> 24) | ((x >> 8) & 0xff00) | ((x << 8) & 0xff0000) | (x << 24))
+	((x >> 24) | ((x >> 8) & 0xff00U) | ((x << 8) & 0xff0000U) | (x << 24))
 
 #define	bswap64(x) (uint64_t) \
-	((x >> 56) | ((x >> 40) & 0xff00) | ((x >> 24) & 0xff0000) | \
-	((x >> 8) & 0xff000000) | ((x << 8) & ((uint64_t)0xff << 32)) | \
-	((x << 24) & ((uint64_t)0xff << 40)) | \
-	((x << 40) & ((uint64_t)0xff << 48)) | ((x << 56)))
+	((x >> 56) | ((x >> 40) & 0xff00ULL) | ((x >> 24) & 0xff0000ULL) | \
+	((x >> 8) & 0xff000000ULL) | ((x << 8) & (0xffULL << 32)) | \
+	((x << 24) & (0xffULL << 40)) | \
+	((x << 40) & (0xffULL << 48)) | ((x << 56)))
 
 /*
 * Host to big endian, host to little endian, big endian to host, and little
@@ -77,4 +79,64 @@
 
 #endif
 
+#define HTOBE16(x) (x) = htobe16(x)
+#define HTOBE32(x) (x) = htobe32(x)
+#define HTOBE64(x) (x) = htobe64(x)
+#define BE16TOH(x) (x) = be16toh(x)
+#define BE32TOH(x) (x) = be32toh(x)
+#define BE64TOH(x) (x) = be64toh(x)
+
+#define HTOLE16(x) (x) = htole16(x)
+#define HTOLE32(x) (x) = htole32(x)
+#define HTOLE64(x) (x) = htole64(x)
+#define LE16TOH(x) (x) = le16toh(x)
+#define LE32TOH(x) (x) = le32toh(x)
+#define LE64TOH(x) (x) = le64toh(x)
+
+/* Here are some macros to create integers from a byte array */
+/* These are used to get and put integers from/into a uint8_t array */
+/* with a specific endianness. This is the most portable way to generate */
+/* and read messages to a network or serial device. Each member of a */
+/* packet structure must be handled separately. */
+
+/* The i386 and compatibles can handle unaligned memory access, */
+/* so use the optimized macros above to do this job */
+#ifndef be16atoh
+# define be16atoh(x) be16toh(*(uint16_t*)(x))
+#endif
+#ifndef be32atoh
+# define be32atoh(x) be32toh(*(uint32_t*)(x))
+#endif
+#ifndef be64atoh
+# define be64atoh(x) be64toh(*(uint64_t*)(x))
+#endif
+#ifndef le16atoh
+# define le16atoh(x) le16toh(*(uint16_t*)(x))
+#endif
+#ifndef le32atoh
+# define le32atoh(x) le32toh(*(uint32_t*)(x))
+#endif
+#ifndef le64atoh
+# define le64atoh(x) le64toh(*(uint64_t*)(x))
+#endif
+
+#ifndef htob16a
+# define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x)
+#endif
+#ifndef htobe32a
+# define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x)
+#endif
+#ifndef htobe64a
+# define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x)
+#endif
+#ifndef htole16a
+# define htole16a(a,x) *(uint16_t*)(a) = htole16(x)
+#endif
+#ifndef htole32a
+# define htole32a(a,x) *(uint32_t*)(a) = htole32(x)
+#endif
+#ifndef htole64a
+# define htole64a(a,x) *(uint64_t*)(a) = htole64(x)
+#endif
+
 #endif

finalhe-1.4.tar.gz/deps/psvlib/img/img.pro -> finalhe-1.92.tar.gz/deps/psvlib/img/img.pro Changed

finalhe-1.4.tar.gz/deps/psvlib/img/psvimg-create.c -> finalhe-1.92.tar.gz/deps/psvlib/img/psvimg-create.c Changed

@@ -6,27 +6,18 @@
 
 #include "psvimg-create.h"
 
-#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include <direct.h>
-#include <io.h>
-#include <fcntl.h>
-#define pipe(n) _pipe(n, 64 * 1024, _O_BINARY)
 #define mkdir(n, m) _mkdir(n)
 #else
 #include <unistd.h>
 #endif
-#ifdef _WIN32
-#include "pthread-win32.h"
-#else
-#include <pthread.h>
-#endif
 #include "backup.h"
 #include "psvimg.h"
 #include "utils.h"
@@ -34,170 +25,98 @@
 #define MAX_PATH_LEN 1024
 
 static int is_backup(const char *title) {
- if (strcmp(title, "app") == 0 ||
- strcmp(title, "patch") == 0 ||
- strcmp(title, "addcont") == 0 ||
- strcmp(title, "savedata") == 0 ||
- strcmp(title, "appmeta") == 0 ||
- strcmp(title, "license") == 0 ||
- strcmp(title, "game") == 0) {
- return 0;
- } else {
- return 1;
- }
+ if (strcmp(title, "app") == 0 ||
+ strcmp(title, "patch") == 0 ||
+ strcmp(title, "addcont") == 0 ||
+ strcmp(title, "savedata") == 0 ||
+ strcmp(title, "appmeta") == 0 ||
+ strcmp(title, "license") == 0 ||
+ strcmp(title, "game") == 0) {
+ return 0;
+ } else {
+ return 1;
+ }
 }
 
 int psvimg_create(const char *inputdir, const char *outputdir, const char *key, const char *meta_name, int is_meta) {
- args_t args1, args2;
- struct stat st;
- int fds[4];
- char path[MAX_PATH_LEN];
- int mfd;
- PsvMd_t md;
- pthread_t th1;
-
- // TODO: support more types
- if (is_meta) {
- mfd = open(meta_name, O_RDONLY | O_BINARY);
- if (mfd < 0) {
- fprintf(stderr, "metadata");
- return 1;
- }
- if (read_block(mfd, &md, sizeof(md) - sizeof(md.add_data)) < sizeof(md) - sizeof(md.add_data)) {
- fprintf(stderr, "invalid metadata size\n");
- return 1;
+ uint8_t iv[16], keys[32];
+ struct stat st;
+ char path[MAX_PATH_LEN];
+ FILE* mfd;
+ PsvMd_t md;
+ uint64_t content_size;
+
+ srand((uint32_t)time(NULL));
+ if (is_meta) {
+ mfd = fopen(meta_name, "rb");
+ if (mfd == NULL) {
+ fprintf(stderr, "metadata");
+ return 1;
+ }
+ if (fread(&md, 1, sizeof(md) - sizeof(md.add_data), mfd) < sizeof(md) - sizeof(md.add_data)) {
+ fprintf(stderr, "invalid metadata size\n");
+ return 1;
+ }
+ if (md.type != 2) {
+ fprintf(stderr, "metadata type not supported\n");
+ fclose(mfd);
+ return 1;
+ }
+ if (fread(&md.add_data, 1, sizeof(md.add_data), mfd) < sizeof(md.add_data)) {
+ fprintf(stderr, "invalid metadata size\n");
+ fclose(mfd);
+ return 1;
+ }
+ fclose(mfd);
+ } else {
+ memset(&md, 0, sizeof(md));
+ strncpy(md.name, meta_name, sizeof(md.name));
+ md.magic = is_backup(md.name) ? PSVMD_BACKUP_MAGIC : PSVMD_CONTENT_MAGIC;
+ md.type = 2;
+ md.version = 2;
+ md.add_data = 1;
+ for (int i = 0; i < sizeof(md.iv); i++) {
+ md.iv[i] = rand() % 0xFF;
+ }
 }
- if (md.type != 2) {
- fprintf(stderr, "metadata type not supported\n");
- close(mfd);
- return 1;
+
+ if (parse_key(key, keys) < 0) {
+ fprintf(stderr, "invalid key\n");
+ return 1;
 }
- if (read_block(mfd, &md.add_data, sizeof(md.add_data)) < sizeof(md.add_data)) {
- fprintf(stderr, "invalid metadata size\n");
- close(mfd);
- return 1;
+
+ if (stat(outputdir, &st) < 0) {
+ mkdir(outputdir, 0700);
 }
- close(mfd);
- } else {
- memset(&md, 0, sizeof(md));
- strncpy(md.name, meta_name, sizeof(md.name));
- md.magic = is_backup(md.name) ? PSVMD_BACKUP_MAGIC : PSVMD_CONTENT_MAGIC;
- md.type = 2;
- md.version = 2;
- md.add_data = 1;
- srand(time(NULL));
- for (int i = 0; i < sizeof(md.iv); i++) {
- md.iv[i] = rand() % 0xFF;
+ snprintf(path, sizeof(path), "%s/%s.psvimg", outputdir, md.name);
+ memcpy(iv, md.iv, sizeof(iv));
+ pack_and_encrypt(path, &content_size, inputdir, iv, keys);
+ if (stat(path, &st) < 0) {
+ fprintf(stderr, "stat");
+ return 1;
 }
- }
-
- if (parse_key(key, args2.key) < 0) {
- fprintf(stderr, "invalid key\n");
- return 1;
- }
-
- if (pipe(fds) < 0) {
- fprintf(stderr, "pipe 1");
- return 1;
- }
-
- args1.in = 0;
- args1.prefix = inputdir;
- args1.content_size = 0;
- args1.out = fds[1];
-
- if (stat(outputdir, &st) < 0) {
- mkdir(outputdir, 0700);
- }
+ md.total_size = content_size;
+ md.psvimg_size = st.st_size;
 
- snprintf(path, sizeof(path), "%s/%s.psvimg", outputdir, md.name);
+ // now create the psvmd
+ snprintf(path, sizeof(path), "%s/%s.psvmd", outputdir, md.name);
 
- args2.in = fds[0];
- args2.out = open(path, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0644);
- if (args2.out < 0) {
- close(args1.out);
- close(args2.in);
- fprintf(stderr, "psvimg output");
- return 1;
- }
-
- memcpy(args2.iv, md.iv, sizeof(args2.iv));
-
- if (pthread_create(&th1, NULL, encrypt_thread, &args2) != 0) {
- fprintf(stderr, "unable to create thread");
- return 1;
- }
- pack_thread(&args1);
- close(args1.out);
- pthread_join(th1, NULL);
- close(args2.in);
- close(args2.out);
-
- if (stat(path, &st) < 0) {
- fprintf(stderr, "stat");
- return 1;
- }
- fprintf(stderr, "created %s (size: %lx, content size: %zx)\n", path, st.st_size, args1.content_size);
- md.total_size = args1.content_size;
- md.psvimg_size = st.st_size;
-
- // now create the psvmd
- snprintf(path, sizeof(path), "%s/%s.psvmd", outputdir, md.name);
-
- if (pipe(fds) < 0) {
- fprintf(stderr, "pipe 2");
- return 1;
- }
- if (pipe(&fds[2]) < 0) {
- fprintf(stderr, "pipe 3");
- return 1;
- }
-
- args1.in = fds[0];
- args1.out = fds[3];
-
- args2.in = fds[2];
- args2.out = open(path, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0644);
- if (args2.out < 0) {
- close(args1.in);
- close(args1.out);
- close(args2.in);
- fprintf(stderr, "psvmd output");
- return 1;
- }
- for (int i = 0; i < sizeof(md.iv); i++) {
- args2.iv[i] = rand() % 0xFF;
- }
-
- if (pthread_create(&th1, NULL, encrypt_thread, &args2) != 0) {
- close(args1.in);
- close(args1.out);
- close(args2.in);
- close(args2.out);
- fprintf(stderr, "unable to create thread");
- return 1;
- }
-
- write_block(fds[1], &md, sizeof(md));
- close(fds[1]);
- compress_thread(&args1);
- close(args1.in);
- close(args1.out);
-
- pthread_join(th1, NULL);
- close(args2.in);
- close(args2.out);
+ for (int i = 0; i < sizeof(md.iv); i++) {
+ iv[i] = rand() % 0xFF;
+ }
 
- fprintf(stderr, "created %s\n", path);
+ compress_and_encrypt(path, (const uint8_t*)&md, sizeof(md), iv, keys);
 
- // finally create the psvinf
- if (is_backup(md.name)) {
- snprintf(path, sizeof(path), "%s/%s.psvinf", outputdir, md.name);
- mfd = open(path, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0644);
- write_block(mfd, md.name, strnlen(md.name, 64) + 1);
- close(mfd);
 fprintf(stderr, "created %s\n", path);
- }
 
- return 0;
+ // finally create the psvinf
+ if (is_backup(md.name)) {
+ snprintf(path, sizeof(path), "%s/%s.psvinf", outputdir, md.name);
+ mfd = fopen(path, "wb");
+ fwrite(md.name, 1, strnlen(md.name, 64) + 1, mfd);
+ fclose(mfd);
+ fprintf(stderr, "created %s\n", path);
+ }
+
+ return 0;
 }

finalhe-1.4.tar.gz/deps/psvlib/img/utils.h -> finalhe-1.92.tar.gz/deps/psvlib/img/utils.h Changed

finalhe-1.4.tar.gz/deps/psvlib/pkg/pkg.pro -> finalhe-1.92.tar.gz/deps/psvlib/pkg/pkg.pro Changed

finalhe-1.4.tar.gz/deps/psvlib/pkg/pkg_zrif.c -> finalhe-1.92.tar.gz/deps/psvlib/pkg/pkg_zrif.c Changed

finalhe-1.4.tar.gz/deps/scrypto/aes.c -> finalhe-1.92.tar.gz/deps/scrypto/aes.c Changed

@@ -425,6 +425,47 @@
 aes_decrypt(ctx, input, output);
 }
 
+int aes_cbc_encrypt(const aes_context* ctx, uint8_t iv[16], const uint8_t* input, size_t length, uint8_t* output) {
+ int i;
+
+ if (length % 16)
+ return -1;
+ while (length > 0) {
+ for (i = 0; i < 16; i++)
+ output[i] = (unsigned char)(input[i] ^ iv[i]);
+
+ aes_ecb_encrypt(ctx, output, output);
+ memcpy(iv, output, 16);
+
+ input += 16;
+ output += 16;
+ length -= 16;
+ }
+ return 0;
+}
+
+int aes_cbc_decrypt(const aes_context* ctx, uint8_t iv[16], const uint8_t* input, size_t length, uint8_t* output) {
+ int i;
+ unsigned char temp[16];
+
+ if (length % 16)
+ return -1;
+ while (length > 0) {
+ memcpy(temp, input, 16);
+ aes_ecb_decrypt(ctx, input, output);
+
+ for (i = 0; i < 16; i++)
+ output[i] = (unsigned char)(output[i] ^ iv[i]);
+
+ memcpy(iv, temp, 16);
+
+ input += 16;
+ output += 16;
+ length -= 16;
+ }
+ return 0;
+}
+
 static inline void ctr_add(uint8_t* counter, uint64_t n)
 {
 for (int i=15; i>=0; i--)

finalhe-1.4.tar.gz/deps/scrypto/aes.h -> finalhe-1.92.tar.gz/deps/scrypto/aes.h Changed

finalhe-1.4.tar.gz/deps/vitamtp/datautils.c -> finalhe-1.92.tar.gz/deps/vitamtp/datautils.c Changed

finalhe-1.92.tar.gz/deps/vitamtp/endian-utils.h Added

@@ -0,0 +1,142 @@
+#ifndef ENDIAN_UTILS_H
+#define ENDIAN_UTILS_H
+
+#include <stdint.h>
+
+#ifdef __APPLE__
+
+#include <machine/endian.h>
+#include <libkern/OSByteOrder.h>
+
+#define htobe16(x) OSSwapHostToBigInt16(x)
+#define htole16(x) OSSwapHostToLittleInt16(x)
+#define be16toh(x) OSSwapBigToHostInt16(x)
+#define le16toh(x) OSSwapLittleToHostInt16(x)
+ 
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define be32toh(x) OSSwapBigToHostInt32(x)
+#define le32toh(x) OSSwapLittleToHostInt32(x)
+ 
+#define htobe64(x) OSSwapHostToBigInt64(x)
+#define htole64(x) OSSwapHostToLittleInt64(x)
+#define be64toh(x) OSSwapBigToHostInt64(x)
+#define le64toh(x) OSSwapLittleToHostInt64(x)
+
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+#define __LITTLE_ENDIAN LITTLE_ENDIAN
+#define __PDP_ENDIAN PDP_ENDIAN
+
+#else
+
+// Taken from FreeBSD
+#define	bswap16(x) (uint16_t) \
+	((x >> 8) | (x << 8))
+
+#define	bswap32(x) (uint32_t) \
+	((x >> 24) | ((x >> 8) & 0xff00U) | ((x << 8) & 0xff0000U) | (x << 24))
+
+#define	bswap64(x) (uint64_t) \
+	((x >> 56) | ((x >> 40) & 0xff00ULL) | ((x >> 24) & 0xff0000ULL) | \
+	((x >> 8) & 0xff000000ULL) | ((x << 8) & (0xffULL << 32)) | \
+	((x << 24) & (0xffULL << 40)) | \
+	((x << 40) & (0xffULL << 48)) | ((x << 56)))
+
+/*
+ * Host to big endian, host to little endian, big endian to host, and little
+ * endian to host byte order functions as detailed in byteorder(9).
+ */
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define	htobe16(x)	bswap16((uint16_t)(x))
+#define	htobe32(x)	bswap32((uint32_t)(x))
+#define	htobe64(x)	bswap64((uint64_t)(x))
+#define	htole16(x)	((uint16_t)(x))
+#define	htole32(x)	((uint32_t)(x))
+#define	htole64(x)	((uint64_t)(x))
+
+#define	be16toh(x)	bswap16((uint16_t)(x))
+#define	be32toh(x)	bswap32((uint32_t)(x))
+#define	be64toh(x)	bswap64((uint64_t)(x))
+#define	le16toh(x)	((uint16_t)(x))
+#define	le32toh(x)	((uint32_t)(x))
+#define	le64toh(x)	((uint64_t)(x))
+#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
+#define	htobe16(x)	((uint16_t)(x))
+#define	htobe32(x)	((uint32_t)(x))
+#define	htobe64(x)	((uint64_t)(x))
+#define	htole16(x)	bswap16((uint16_t)(x))
+#define	htole32(x)	bswap32((uint32_t)(x))
+#define	htole64(x)	bswap64((uint64_t)(x))
+
+#define	be16toh(x)	((uint16_t)(x))
+#define	be32toh(x)	((uint32_t)(x))
+#define	be64toh(x)	((uint64_t)(x))
+#define	le16toh(x)	bswap16((uint16_t)(x))
+#define	le32toh(x)	bswap32((uint32_t)(x))
+#define	le64toh(x)	bswap64((uint64_t)(x))
+#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
+
+#endif
+
+#define HTOBE16(x) (x) = htobe16(x)
+#define HTOBE32(x) (x) = htobe32(x)
+#define HTOBE64(x) (x) = htobe64(x)
+#define BE16TOH(x) (x) = be16toh(x)
+#define BE32TOH(x) (x) = be32toh(x)
+#define BE64TOH(x) (x) = be64toh(x)
+
+#define HTOLE16(x) (x) = htole16(x)
+#define HTOLE32(x) (x) = htole32(x)
+#define HTOLE64(x) (x) = htole64(x)
+#define LE16TOH(x) (x) = le16toh(x)
+#define LE32TOH(x) (x) = le32toh(x)
+#define LE64TOH(x) (x) = le64toh(x)
+
+/* Here are some macros to create integers from a byte array */
+/* These are used to get and put integers from/into a uint8_t array */
+/* with a specific endianness. This is the most portable way to generate */
+/* and read messages to a network or serial device. Each member of a */
+/* packet structure must be handled separately. */
+
+/* The i386 and compatibles can handle unaligned memory access, */
+/* so use the optimized macros above to do this job */
+#ifndef be16atoh
+# define be16atoh(x) be16toh(*(uint16_t*)(x))
+#endif
+#ifndef be32atoh
+# define be32atoh(x) be32toh(*(uint32_t*)(x))
+#endif
+#ifndef be64atoh
+# define be64atoh(x) be64toh(*(uint64_t*)(x))
+#endif
+#ifndef le16atoh
+# define le16atoh(x) le16toh(*(uint16_t*)(x))
+#endif
+#ifndef le32atoh
+# define le32atoh(x) le32toh(*(uint32_t*)(x))
+#endif
+#ifndef le64atoh
+# define le64atoh(x) le64toh(*(uint64_t*)(x))
+#endif
+
+#ifndef htob16a
+# define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x)
+#endif
+#ifndef htobe32a
+# define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x)
+#endif
+#ifndef htobe64a
+# define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x)
+#endif
+#ifndef htole16a
+# define htole16a(a,x) *(uint16_t*)(a) = htole16(x)
+#endif
+#ifndef htole32a
+# define htole32a(a,x) *(uint32_t*)(a) = htole32(x)
+#endif
+#ifndef htole64a
+# define htole64a(a,x) *(uint64_t*)(a) = htole64(x)
+#endif
+
+#endif

finalhe-1.4.tar.gz/deps/vitamtp/ptp.h -> finalhe-1.92.tar.gz/deps/vitamtp/ptp.h Changed

finalhe-1.4.tar.gz/deps/vitamtp/usb.c -> finalhe-1.92.tar.gz/deps/vitamtp/usb.c Changed

finalhe-1.4.tar.gz/deps/vitamtp/wireless.c -> finalhe-1.92.tar.gz/deps/vitamtp/wireless.c Changed

finalhe-1.4.tar.gz/deps/zlib/CMakeLists.txt -> finalhe-1.92.tar.gz/deps/zlib/CMakeLists.txt Changed

finalhe-1.92.tar.gz/deps/zlib/zlib.pro Added

finalhe-1.4.tar.gz/finalhe.pro -> finalhe-1.92.tar.gz/finalhe.pro Changed

finalhe-1.4.tar.gz/src/CMakeLists.txt -> finalhe-1.92.tar.gz/src/CMakeLists.txt Changed

@@ -5,10 +5,6 @@
     cmake_policy(SET CMP0071 NEW)
 endif ()
 
-set (VER_MAJOR 1)
-set (VER_MINOR 4)
-set (VER_STR \"${VER_MAJOR}.${VER_MINOR}\")
-
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
@@ -23,6 +19,7 @@
     downloader.cc downloader.hh
     finalhe.cc finalhe.hh
     package.cc package.hh
+    sforeader.cc sforeader.hh
     vita.cc vita.hh
     worker.cc worker.hh
 )
@@ -38,9 +35,13 @@
 
 set(TRANSLATION_FILES
     translations/cs_CZ.ts
+    translations/de_DE.ts
     translations/es_ES.ts
+    translations/fr_FR.ts
     translations/it_IT.ts
     translations/ja_JP.ts
+    translations/pt_BR.ts
+    translations/ru_RU.ts
     translations/tr_TR.ts
     translations/zh_CN.ts
     translations/zh_TW.ts
@@ -58,7 +59,7 @@
 
 qt5_wrap_ui(${CMAKE_CURRENT_BINARY_DIR}/ui_finalhe.h finalhe.ui)
 
-add_definitions(-DFINALHE_VERSION_STR=${VER_STR} -DUSING_STATIC_LIBICONV -DLIBXML_STATIC)
+add_definitions(-DUSING_STATIC_LIBICONV -DLIBXML_STATIC)
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 endif ()

finalhe-1.4.tar.gz/src/downloader.cc -> finalhe-1.92.tar.gz/src/downloader.cc Changed

finalhe-1.4.tar.gz/src/downloader.hh -> finalhe-1.92.tar.gz/src/downloader.hh Changed

finalhe-1.4.tar.gz/src/finalhe.cc -> finalhe-1.92.tar.gz/src/finalhe.cc Changed

@@ -1,7 +1,25 @@
+/*
+ * Final h-encore, Copyright (C) 2018 Soar Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "finalhe.hh"
 
 #include "package.hh"
 #include "vita.hh"
+#include "version.hh"
 
 #include <QLocale>
 #include <QDir>
@@ -12,14 +30,22 @@
 
 FinalHE::FinalHE(QWidget *parent): QMainWindow(parent) {
 ui.setupUi(this);
- setWindowTitle("Final h-encore " FINALHE_VERSION_STR);
+ setWindowTitle("Final h-encore v" FINALHE_VERSION_STR);
 setWindowIcon(QIcon(":/main/resources/images/finalhe.png"));
 setFixedSize(600, 400);
+ ui.centralWidget->setFixedSize(600, 400);
+ ui.extraItems->setFixedSize(200, 400);
+ ui.extraItems->hide();
+ ui.expandButton->setArrowType(Qt::RightArrow);
+ ui.expandButton->setFixedWidth(12);
 
 ui.textMTP->setStyleSheet("QLabel { color : blue; }");
 
 ui.progressBar->setMaximum(100);
 QDir baseDir, dir(qApp->applicationDirPath());
+#ifdef __APPLE__
+ dir.cdUp(); dir.cdUp(); dir.cdUp();
+#endif
 #ifdef _WIN32
 baseDir = dir;
 if (!baseDir.mkpath("data") || !(baseDir.cd("data"), baseDir.exists()))
@@ -29,13 +55,20 @@
 baseDir.mkpath("data");
 baseDir.cd("data");
 }
- vita = new VitaConn(baseDir.path(), this);
- pkg = new Package(baseDir.path(), this);
+ vita = new VitaConn(baseDir.path(), dir.path(), this);
+ pkg = new Package(baseDir.path(), dir.path(), this);
 int useSysLang = 0;
 QSettings settings;
 QString langLoad = settings.value("language").toString();
 ui.comboLang->addItem(trans.isEmpty() ? "English" : trans.translate("base", "English"));
- if (dir.cd("language")) {
+ dir = qApp->applicationDirPath();
+ if (
+#if defined(__APPLE__)
+ dir.cdUp() &&
+#elif defined(__unix__)
+ dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation),
+#endif
+ dir.cd("language")) {
 QStringList ll = dir.entryList({"*.qm"}, QDir::Filter::Files, QDir::SortFlag::IgnoreCase);
 for (auto &p: ll) {
 QString compPath = dir.filePath(p);
@@ -57,13 +90,18 @@
 
 pkg->setTrim(ui.checkTrim->checkState() == Qt::Checked);
 
+
 connect(ui.btnStart, SIGNAL(clicked()), this, SLOT(onStart()));
 	connect(ui.comboLang, SIGNAL(currentIndexChanged(int)), this, SLOT(langChange()));
 connect(ui.checkTrim, SIGNAL(stateChanged(int)), this, SLOT(trimState(int)));
- connect(vita, &VitaConn::gotAccountId, this, [this](QString accountId) { pkg->getBackupKey(accountId); });
+ connect(ui.expandButton, SIGNAL(clicked()), this, SLOT(toggleExpanding()));
+ connect(ui.extraItems, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(extraItemsChanged(QListWidgetItem*)));
+ connect(vita, &VitaConn::gotAccountId, this, [this](QString accountId) {
+ pkg->calcBackupKey(accountId);
+ enableStart();
+ });
 connect(vita, SIGNAL(receivedPin(QString, int)), this, SLOT(displayPin(QString, int)));
 connect(vita, SIGNAL(completedPin()), this, SLOT(clearPin()));
- connect(pkg, SIGNAL(gotBackupKey()), this, SLOT(enableStart()));
 connect(pkg, SIGNAL(createdPsvImgs()), vita, SLOT(buildData()));
 connect(vita, SIGNAL(builtData()), pkg, SLOT(finishBuildData()));
 
@@ -78,6 +116,7 @@
 ui.comboLang->setCurrentIndex(useSysLang);
 langChange();
 }
+ updateExpandArea();
 }
 
 FinalHE::~FinalHE() {
@@ -99,8 +138,131 @@
 emit pkg->startDownload();
 }
 
+void FinalHE::updateExpandArea() {
+ ui.extraItems->clear();
+ bool hasFirmware = false;
+ for (int i = 0; i < 3; ++i) {
+ bool has = false;
+ switch(i) {
+ case 0:
+ has = vita->has360Update(); break;
+ case 1:
+ has = vita->has365Update(); break;
+ case 2:
+ has = vita->has368Update(); break;
+ default: break;
+ }
+ if (has) {
+ auto *item = new QListWidgetItem(tr("Firmware %1").arg(i == 0 ? "3.60" : (i == 1 ? "3.65" : "3.68")));
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
+ if (!hasFirmware) {
+ auto *item0 = new QListWidgetItem(tr("-- Firmware update --"));
+ item0->setFlags(Qt::NoItemFlags);
+ ui.extraItems->addItem(item0);
+ hasFirmware = true;
+ } else
+ item->setCheckState(Qt::Unchecked);
+ item->setData(Qt::UserRole, i + 1);
+ ui.extraItems->addItem(item);
+ }
+ }
+ const auto &extraApps = pkg->getExtraApps();
+ bool hasExtra = false;
+ for (auto &p : extraApps) {
+ if (!hasExtra) {
+ auto *item0 = new QListWidgetItem(tr("-- Additional applications --"));
+ item0->setFlags(Qt::NoItemFlags);
+ ui.extraItems->addItem(item0);
+ hasExtra = true;
+ }
+ auto *item = new QListWidgetItem(p.name);
+ item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
+ ui.extraItems->addItem(item);
+ item->setData(Qt::UserRole, p.titleId);
+ bool defsel = p.titleId == "VITASHELL";
+ item->setCheckState(defsel ? Qt::Checked : Qt::Unchecked);
+ if (defsel) pkg->selectExtraApp(p.titleId, true);
+ }
+ if (hasFirmware || hasExtra) {
+#ifndef _WIN32
+ ui.centralWidget->setFixedSize(588, 400);
+#endif
+ ui.expandButton->show();
+ } else {
+ setFixedSize(600, 400);
+ ui.centralWidget->setFixedSize(600, 400);
+ ui.expandButton->hide();
+ ui.extraItems->hide();
+ }
+}
+
+bool FinalHE::checkFwUpdate() {
+ if (vita->getDeviceVersion().isEmpty()) return true;
+ if (vita->getDeviceVersion() < "3.60") {
+ ui.textPkg->setText(tr("Fimrware version is not supported by h-encore.") + "\n"
+ + tr("Update to %1 first.").arg("3.60/3.65/3.68") + "\n"
+ + ((vita->has360Update() || vita->has365Update() || vita->has368Update())
+ ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
+ : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
+ return false;
+ } else if (vita->getDeviceVersion() < "3.65") {
+ bool needUpdate = vita->getDeviceVersion() > "3.61";
+ int count = ui.extraItems->count();
+ for (int i = 0; i < count; ++i) {
+ auto *eitem = ui.extraItems->item(i);
+ if (eitem->flags() == Qt::NoItemFlags) continue;
+ bool ok;
+ int n = eitem->data(Qt::UserRole).toInt(&ok);
+ if (ok) {
+ if (n == 1) {
+ ui.extraItems->removeItemWidget(eitem);
+ delete eitem;
+ count = ui.extraItems->count();
+ --i;
+ } else if (needUpdate) {
+ eitem->setCheckState(n > 1 ? Qt::Checked : Qt::Unchecked);
+ }
+ }
+ }
+ if (needUpdate) {
+ ui.textPkg->setText(tr("Fimrware version is not supported by h-encore.") + "\n"
+ + tr("Update to %1 first.").arg("3.65/3.68") + "\n"
+ + (vita->has368Update()
+ ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
+ : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
+ return false;
+ }
+ } else if (vita->getDeviceVersion() < "3.68") {
+ int count = ui.extraItems->count();
+ for (int i = 0; i < count; ++i) {
+ auto *eitem = ui.extraItems->item(i);
+ if (eitem->flags() == Qt::NoItemFlags) continue;
+ bool ok;
+ int n = eitem->data(Qt::UserRole).toInt(&ok);
+ if (ok) {
+ if (n == 1 || n == 2) {
+ ui.extraItems->removeItemWidget(eitem);
+ delete eitem;
+ count = ui.extraItems->count();
+ --i;
+ }
+ }
+ }
+ }
+ return true;
+}
+
 void FinalHE::enableStart() {
- ui.btnStart->setEnabled(true);
+ if (checkFwUpdate()) {
+ if (vita->getDeviceVersion() <= "3.61")
+ pkg->setCoreType(ECoreType::Memecore);
+ else if (vita->getDeviceVersion() <= "3.68")
+ pkg->setCoreType(ECoreType::HEncore);
+ else if (vita->getDeviceVersion() <= "3.73")
+ pkg->setCoreType(ECoreType::HEncore2);
+ ui.textPkg->setText(tr("Click button to START!"));
+ ui.btnStart->setEnabled(true);
+ }
 }
 
 void FinalHE::trimState(int state) {
@@ -123,6 +285,62 @@
 ui.textPkg->setText(tr("Registered device."));
 }
 
+void FinalHE::toggleExpanding() {
+ if (expanding) {
+ setFixedSize(600, 400);
+ ui.extraItems->hide();
+ ui.expandButton->setArrowType(Qt::RightArrow);
+ expanding = false;
+ } else {
+#ifdef _WIN32
+ setFixedSize(812, 400);
+#else
+ setFixedSize(800, 400);
+#endif
+ ui.extraItems->show();
+ ui.expandButton->setArrowType(Qt::LeftArrow);
+ expanding = true;
+ }
+}
+
+void FinalHE::extraItemsChanged(QListWidgetItem *item) {
+ QVariant var = item->data(Qt::UserRole);
+ bool ok;
+ int fwidx = var.toInt(&ok);
+ bool checked = item->checkState() == Qt::Checked;
+ if (!ok) {
+ pkg->selectExtraApp(var.toString(), checked);
+ } else {
+ if (checked) {
+ switch (fwidx) {
+ case 1:
+ vita->setUse360Update();
+ break;
+ case 2:
+ vita->setUse365Update();
+ break;
+ case 3:
+ vita->setUse368Update();
+ break;
+ default:
+ vita->setUseNoUpdate();
+ break;
+ }
+ int count = ui.extraItems->count();
+ for (int i = 0; i < count; ++i) {
+ auto *eitem = ui.extraItems->item(i);
+ if (eitem->flags() == Qt::NoItemFlags || eitem == item) continue;
+ bool ok;
+ int n = eitem->data(Qt::UserRole).toInt(&ok);
+ if (ok && n > 0) {
+ eitem->setCheckState(Qt::Unchecked);
+ }
+ }
+ } else
+ vita->setUseNoUpdate();
+ }
+}
+
 void FinalHE::loadLanguage(const QString &s) {
 qApp->removeTranslator(&trans);
 if (trans.load(s)) {
@@ -130,4 +348,6 @@
 }
 ui.retranslateUi(this);
 ui.comboLang->setItemText(0, trans.isEmpty() ? "English" : trans.translate("base", "English"));
+ updateExpandArea();
+ checkFwUpdate();
 }

finalhe-1.4.tar.gz/src/finalhe.hh -> finalhe-1.92.tar.gz/src/finalhe.hh Changed

finalhe-1.4.tar.gz/src/finalhe.qrc -> finalhe-1.92.tar.gz/src/finalhe.qrc Changed

finalhe-1.4.tar.gz/src/finalhe.ui -> finalhe-1.92.tar.gz/src/finalhe.ui Changed

@@ -6,8 +6,8 @@
 <rect>
 <x>0</x>
 <y>0</y>
- <width>464</width>
- <height>329</height>
+ <width>468</width>
+ <height>324</height>
 </rect>
 </property>
 <property name="sizePolicy">
@@ -24,58 +24,39 @@
 <property name="locale">
 <locale language="C" country="AnyCountry"/>
 </property>
- <widget class="QWidget" name="centralWidget">
- <layout class="QVBoxLayout" name="verticalLayout">
+ <widget class="QWidget" name="parentWidget">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
 <property name="leftMargin">
- <number>4</number>
+ <number>0</number>
 </property>
 <property name="topMargin">
- <number>4</number>
+ <number>0</number>
 </property>
 <property name="rightMargin">
- <number>4</number>
+ <number>0</number>
 </property>
 <property name="bottomMargin">
- <number>4</number>
+ <number>0</number>
 </property>
- <item>
- <widget class="QWidget" name="widgetTop" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>6</number>
- </property>
+ <item alignment="Qt::AlignLeft">
+ <widget class="QWidget" name="centralWidget" native="true">
+ <layout class="QVBoxLayout" name="vertialLayout">
 <property name="leftMargin">
- <number>0</number>
+ <number>4</number>
 </property>
 <property name="topMargin">
- <number>0</number>
+ <number>4</number>
 </property>
 <property name="rightMargin">
- <number>0</number>
+ <number>4</number>
 </property>
 <property name="bottomMargin">
- <number>0</number>
+ <number>4</number>
 </property>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
+ <item alignment="Qt::AlignRight">
 <widget class="QComboBox" name="comboLang">
 <property name="sizePolicy">
 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -85,63 +66,116 @@
 </property>
 </widget>
 </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="widget" native="true">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QPushButton" name="btnStart">
- <property name="enabled">
- <bool>false</bool>
+ <item>
+ <widget class="QWidget" name="widget" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QPushButton" name="btnStart">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <pointsize>25</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string> Let's GO! </string>
+ </property>
+ </widget>
+ </item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QCheckBox" name="checkTrim">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ 
+ <weight>75</weight>
+ <bold>true</bold>
+ 
+ </property>
+ <property name="text">
+ <string>Trim h-encore to ~7MB</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
 </property>
+ </widget>
+ </item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QLabel" name="textMTP">
 <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
 <property name="font">
 
- <pointsize>25</pointsize>
 <weight>75</weight>
 <bold>true</bold>
 
 </property>
 <property name="text">
- <string> Let's GO! </string>
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
 </property>
 </widget>
 </item>
 <item alignment="Qt::AlignHCenter">
- <widget class="QCheckBox" name="checkTrim">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QLabel" name="textPkg">
+ <property name="text">
+ <string/>
 </property>
- <property name="font">
- 
- <weight>75</weight>
- <bold>true</bold>
- 
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
 </property>
- <property name="text">
- <string>Trim h-encore to ~13MB</string>
+ </widget>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="progressBar">
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="format">
+ <string notr="true">%p%</string>
 </property>
 </widget>
 </item>
@@ -149,66 +183,34 @@
 </widget>
 </item>
 <item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
+ <widget class="QListWidget" name="extraItems"/>
 </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QLabel" name="textMTP">
+ <item alignment="Qt::AlignRight">
+ <widget class="QToolButton" name="expandButton">
 <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
 <horstretch>0</horstretch>
 <verstretch>0</verstretch>
 </sizepolicy>
 </property>
- <property name="font">
- 
- <weight>75</weight>
- <bold>true</bold>
- 
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
 </property>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QLabel" name="textPkg">
 <property name="text">
- <string/>
+ <string notr="true"/>
 </property>
- <property name="textFormat">
- <enum>Qt::AutoText</enum>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonFollowStyle</enum>
 </property>
- </widget>
- </item>
- <item>
- <widget class="QProgressBar" name="progressBar">
- <property name="value">
- <number>0</number>
+ <property name="autoRaise">
+ <bool>true</bool>
 </property>
- <property name="format">
- <string notr="true">%p%</string>
+ <property name="arrowType">
+ <enum>Qt::RightArrow</enum>
 </property>
 </widget>
 </item>
 </layout>
- <zorder>widgetTop</zorder>
- <zorder>widget</zorder>
- <zorder>progressBar</zorder>
- <zorder>textPkg</zorder>
- <zorder>textMTP</zorder>
- <zorder>line</zorder>
- <zorder>line_2</zorder>
 </widget>
 </widget>
 <layoutdefault spacing="6" margin="11"/>

finalhe-1.4.tar.gz/src/main.cc -> finalhe-1.92.tar.gz/src/main.cc Changed

finalhe-1.4.tar.gz/src/package.cc -> finalhe-1.92.tar.gz/src/package.cc Changed

@@ -1,31 +1,57 @@
+/*
+ * Final h-encore, Copyright (C) 2018 Soar Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "package.hh"
 
 #include "worker.hh"
+#include "sforeader.hh"
 
 #include <sha256.h>
+#include <aes.h>
 #include <pkg.h>
 #include <psvimg-create.h>
 #include <miniz_zip.h>
 
 #include <QDir>
 #include <QDebug>
+#include <QSettings>
 
 const char *HENCORE_FULL_FILE = "h-encore-full.zip";
-const char *HENCORE_FULL_SHA256 = "3ea59bdf6e7d8f5aa96cabd4f0577fcf78822970f463680b0758a5aaa332452d";
+const char *HENCORE_FULL_SHA256 = "ebbcaa1472eb541a6ec10fd5f31a64d40dddfe1767929031a9d5176b3f859a1c";
+const char *HENCORE_2_FULL_FILE = "h-encore-2-full.zip";
+const char *HENCORE_2_FULL_SHA256 = "ebbcaa1472eb541a6ec10fd5f31a64d40dddfe1767929031a9d5176b3f859a1c";
+const char *MEMECORE_FULL_FILE = "memecore-full.zip";
+const char *MEMECORE_FULL_SHA256 = "c1c43f8a5c578da130ae109ef2cc2c1bfae5a472e424adb87b99ef1d8f919b97";
 
 const char *BSPKG_URL = "http://ares.dl.playstation.net/cdn/JP0741/PCSG90096_00/xGMrXOkORxWRyqzLMihZPqsXAbAXLzvAdJFqtPJLAZTgOcqJobxQAhLNbgiFydVlcmVOrpZKklOYxizQCRpiLfjeROuWivGXfwgkq.pkg";
 const char *BSPKG_FILE = "BitterSmile.pkg";
 const char *BSPKG_SHA256 = "280a734a0b40eedac2b3aad36d506cd4ab1a38cd069407e514387a49d81b9302";
 
-Package::Package(const QString &basePath, QObject *obj_parent): QObject(obj_parent), downloader(obj_parent) {
+Package::Package(const QString &basePath, const QString &appPath, QObject *obj_parent): QObject(obj_parent), downloader(obj_parent) {
 pkgBasePath = basePath;
+ appBasePath = appPath;
+ genExtraUnpackList();
 connect(&downloader, SIGNAL(finishedFile(QFile*)), this, SLOT(downloadFinished(QFile*)));
- connect(&downloader, SIGNAL(finishedGet(void*)), this, SLOT(fetchFinished(void*)));
 connect(&downloader, SIGNAL(downloadProgress(uint64_t, uint64_t)), this, SLOT(downloadProg(uint64_t, uint64_t)));
 connect(this, SIGNAL(startDownload()), SLOT(checkHencoreFull()));
 connect(this, SIGNAL(noHencoreFull()), SLOT(downloadDemo()));
- connect(this, SIGNAL(unpackedDemo()), SLOT(startUnpackHencore()));
- connect(this, SIGNAL(unpackedHencore()), SLOT(createPsvImgs()));
+ connect(this, SIGNAL(unpackedDemo()), SLOT(startUnpackZips()));
+ connect(this, SIGNAL(unpackedZip(QString)), SLOT(createPsvImgs(QString)));
+ connect(this, SIGNAL(unpackNext()), SLOT(doUnpackZip()));
 }
 
 Package::~Package() {
@@ -36,6 +62,16 @@
 emit setStatusText(tr("Launch Content Manager on PS Vita and connect to computer."));
 }
 
+void Package::selectExtraApp(const QString &titleId, bool select) {
+ if (select) {
+ auto ite = extraApps.find(titleId);
+ if (ite != extraApps.end())
+ selectedExtraApps[titleId] = &ite.value();
+ } else {
+ selectedExtraApps.remove(titleId);
+ }
+}
+
 void Package::get(const QString &url, QString &result) {
 downloader.doGet(url, &result);
 }
@@ -126,8 +162,16 @@
 } else {
 curr.cd("h-encore");
 curr.cd("app");
- curr.rename("PCSG90096", "ux0_temp_game_PCSG90096_app_PCSG90096");
- *(bool*)arg = true;
+ int count = 10;
+ while (count > 0) {
+ if (curr.rename("PCSG90096", "ux0_temp_game_PCSG90096_app_PCSG90096")) break;
+ QThread::msleep(500);
+ --count;
+ }
+ if (count == 0) {
+ qWarning("Failed to unpack %s!", filename);
+ emit setStatusText(tr("Failed to unpack %1").arg(filename));
+ } else *(bool*)arg = true;
 }
 QDir::setCurrent(oldDir);
 }, [this](void *arg) {
@@ -139,15 +183,26 @@
 }, &succ);
 }
 
-void Package::doUnpackHencore(const char * filename) {
+void Package::doUnpackZip() {
+ if (unzipQueue.isEmpty()) return;
+ auto p = unzipQueue.front();
+ auto filename = p.fullPath;
+ auto titleID = p.titleId;
+ unzipQueue.pop_front();
 static bool succ = false;
- Worker::start(this, [this, filename](void *arg) {
+ Worker::start(this, [this, filename, titleID](void *arg) {
 emit setPercent(0);
+ bool isHencore = titleID == "PCSG90096";
 *(bool*)arg = false;
- qDebug("Decompressing %s...", filename);
+ qDebug("Decompressing %s...", filename.toUtf8().constData());
 emit setStatusText(tr("Decompressing %1").arg(filename));
 QDir dir(pkgBasePath);
- QFile file(filename[0] == ':' ? QString(filename) : dir.filePath(filename));
+ if (!isHencore) {
+ dir.cdUp();
+ dir.mkpath("extra");
+ dir.cd("extra");
+ }
+ QFile file(filename);
 file.open(QFile::ReadOnly);
 mz_zip_archive arc;
 mz_zip_zero_struct(&arc);
@@ -159,8 +214,9 @@
 };
 if (!mz_zip_reader_init(&arc, file.size(), 0)) {
 file.close();
- qWarning("Unable to decompress %s!", filename);
+ qWarning("Unable to decompress %s!", filename.toUtf8().constData());
 emit setStatusText(tr("Failed to decompress %1").arg(filename));
+ unzipQueue.clear();
 return;
 }
 uint32_t num = mz_zip_reader_get_num_files(&arc);
@@ -183,24 +239,98 @@
 }
 mz_zip_reader_end(&arc);
 file.close();
- QFile::copy(pkgBasePath + "/h-encore/app/ux0_temp_game_PCSG90096_app_PCSG90096/sce_sys/package/temp.bin",
- pkgBasePath + "/h-encore/license/ux0_temp_game_PCSG90096_license_app_PCSG90096/6488b73b912a753a492e2714e9b38bc7.rif");
+ if (isHencore) {
+ QFile::copy(pkgBasePath + QString("/h-encore/app/ux0_temp_game_%1_app_%1/sce_sys/package/temp.bin").arg(titleID),
+ pkgBasePath + QString("/h-encore/license/ux0_temp_game_%1_license_app_%1/6488b73b912a753a492e2714e9b38bc7.rif").arg(titleID));
+ }
 emit setPercent(100);
 *(bool*)arg = true;
- }, [this](void *arg) {
+ }, [this, titleID](void *arg) {
 if (*(bool*)arg) {
 qDebug("Done.");
- emit unpackedHencore();
+ emit unpackedZip(titleID);
 }
 }, &succ);
 }
 
-void Package::startUnpackHencoreFull() {
- doUnpackHencore(HENCORE_FULL_FILE);
+void Package::genExtraUnpackList() {
+ /* search zips in app dir */
+ QDir dir(appBasePath);
+ QFileInfoList qsl = dir.entryInfoList({ "*.zip" }, QDir::Files, QDir::Name);
+ QString titleId;
+ QString name;
+ foreach(const QFileInfo &info, qsl) {
+ QString fullPath = dir.filePath(info.fileName());
+ if (checkValidAppZip(fullPath, titleId, name))
+ extraApps[titleId] = AppInfo{ fullPath, titleId, name };
+ }
+ dir = pkgBasePath;
+ if (!dir.cdUp() || !dir.cd("extra")) return;
+ /* remove old unzipped dirs */
+ qsl = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+ foreach(const QFileInfo &info, qsl) {
+ if (dir.cd(info.fileName())) {
+ dir.removeRecursively();
+ dir.cdUp();
+ }
+ }
+ /* search zips in `extra' */
+ qsl = dir.entryInfoList({"*.zip"}, QDir::Files, QDir::Name);
+ foreach(const QFileInfo &info, qsl) {
+ QString fullPath = dir.filePath(info.fileName());
+ if (checkValidAppZip(fullPath, titleId, name))
+ extraApps[titleId] = AppInfo{ fullPath, titleId, name };
+ }
 }
 
-void Package::startUnpackHencore() {
- doUnpackHencore(":/main/resources/raw/h-encore.zip");
+void Package::startUnpackZipsFull() {
+ unzipQueue.clear();
+ for (auto &p : selectedExtraApps) {
+ unzipQueue.push_back(*p);
+ }
+ QString filename;
+ QString name;
+ switch(coreType) {
+ case ECoreType::HEncore:
+ filename = HENCORE_FULL_FILE;
+ name = "h-encore";
+ break;
+ case ECoreType::HEncore2:
+ filename = HENCORE_2_FULL_FILE;
+ name = "h-encore²";
+ break;
+ case ECoreType::Memecore:
+ filename = MEMECORE_FULL_FILE;
+ name = "h-encore";
+ break;
+ }
+ unzipQueue.push_back(AppInfo{ QDir(pkgBasePath).filePath(filename), "PCSG90096", name });
+ emit unpackNext();
+}
+
+void Package::startUnpackZips() {
+ unzipQueue.clear();
+ for (auto &p : selectedExtraApps) {
+ unzipQueue.push_back(*p);
+ }
+ QString filename;
+ QString name;
+ switch(coreType) {
+ case ECoreType::HEncore:
+ filename = ":/main/resources/raw/h-encore.zip";
+ name = "h-encore";
+ break;
+ case ECoreType::HEncore2:
+ filename = ":/main/resources/raw/h-encore-2.zip";
+ name = "h-encore²";
+ break;
+ case ECoreType::Memecore:
+ filename = ":/main/resources/raw/memecore.zip";
+ name = "h-encore";
+ break;
+ }
+ unzipQueue.push_back(AppInfo{ filename, "PCSG90096", name });
+ emit unpackNext();
 }
 
 bool Package::verify(const QString &filepath, const char *sha256sum) {
@@ -242,15 +372,88 @@
 return false;
 }
 
-void Package::getBackupKey(const QString &aid) {
- if (accountId != aid) {
- accountId = aid;
- get(QString("http://cma.henkaku.xyz/?aid=%1").arg(aid), backupKey);
- qDebug("Fetching backup key from cma.henkaku.xyz...");
- emit setStatusText(tr("Fetching backup key from cma.henkaku.xyz"));
+void Package::createPsvImgSingleDir(const QString &titleID, const char *singleDir) {
+ QDir curr = QDir::current();
+ if (curr.exists(singleDir)) {
+ psvimg_create(singleDir, (titleID + "/" + singleDir).toUtf8().constData(), backupKey.toUtf8().constData(), singleDir, 0);
+ curr.cd(singleDir);
+ curr.removeRecursively();
 }
 }
 
+bool Package::checkValidAppZip(const QString & filepath, QString &titleId, QString &name) {
+ QFile file(filepath);
+ file.open(QFile::ReadOnly);
+ mz_zip_archive arc;
+ mz_zip_zero_struct(&arc);
+ arc.m_pIO_opaque = &file;
+ arc.m_pRead = [](void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)->size_t {
+ QFile *f = (QFile*)pOpaque;
+ if (!f->seek(file_ofs)) return 0;
+ return f->read((char*)pBuf, n);
+ };
+ if (!mz_zip_reader_init(&arc, file.size(), 0)) {
+ file.close();
+ return false;
+ }
+ uint32_t num = mz_zip_reader_get_num_files(&arc);
+ bool hasApp = false, hasAppMeta = false, hasTitle = false;
+ for (uint32_t i = 0; i < num; ++i) {
+ char zfilename[1024];
+ mz_zip_reader_get_filename(&arc, i, zfilename, 1024);
+ if (!mz_zip_reader_is_file_a_directory(&arc, i)) continue;
+ QString dirName = QString(zfilename);
+ if (dirName == "app/") {
+ hasApp = true;
+ } else if (dirName == "appmeta/") {
+ hasAppMeta = true;
+ } else if (dirName.length() == 10 && dirName.indexOf("/") == 9) {
+ titleId = dirName.left(9);
+ hasTitle = true;
+ }
+ if (hasApp && hasAppMeta && hasTitle) break;
+ }
+ int index = mz_zip_reader_locate_file(&arc, (titleId + "/sce_sys/param.sfo").toUtf8().constData(), NULL, 0);
+ if (index < 0) {
+ mz_zip_reader_end(&arc);
+ return false;
+ }
+ QByteArray data;
+ mz_zip_archive_file_stat stat;
+ mz_zip_reader_file_stat(&arc, index, &stat);
+ data.resize(stat.m_uncomp_size);
+ if (mz_zip_reader_extract_to_mem(&arc, index, data.data(), stat.m_uncomp_size, 0) == MZ_TRUE) {
+ SfoReader reader;
+ if (reader.load(data)) {
+ name = reader.value("TITLE", titleId.toUtf8().constData());
+ }
+ }
+ mz_zip_reader_end(&arc);
+ return hasApp && hasAppMeta && hasTitle;
+}
+
+void cmaKeygen(const uint8_t *input, uint8_t output[32]) {
+ static const uint8_t passphrase[] = "Sri Jayewardenepura Kotte";
+ static const uint8_t key[] = { 0xA9,0xFA,0x5A,0x62,0x79,0x9F,0xCC,0x4C,0x72,0x6B,0x4E,0x2C,0xE3,0x50,0x6D,0x38 };
+ sha256_context ctx;
+ aes_context aes;
+ sha256_init(&ctx);
+ sha256_starts(&ctx);
+ sha256_update(&ctx, input, 8);
+ sha256_update(&ctx, passphrase, 25);
+ sha256_final(&ctx, output);
+ aes_init_dec(&aes, key, 128);
+ aes_ecb_decrypt(&aes, output, output);
+ aes_ecb_decrypt(&aes, output + 16, output + 16);
+}
+
+void Package::calcBackupKey(const QString &aid) {
+ aidBytes = QByteArray::fromHex(aid.toLocal8Bit());
+ uint8_t output[32];
+ cmaKeygen((const uint8_t*)aidBytes.data(), output);
+ backupKey = QString(QByteArray((const char*)output, 32).toHex());
+}
+
 void Package::finishBuildData() {
 emit setPercent(100);
 emit setStatusText(tr("Everything is ready, now follow below steps on your PS Vita:\n"
@@ -264,11 +467,26 @@
 static bool succ = false;
 Worker::start(this, [this](void *arg) {
 QDir dir(pkgBasePath);
- QString filename = dir.filePath(HENCORE_FULL_FILE);
- *(bool*)arg = verify(filename, HENCORE_FULL_SHA256);
+ QString filename;
+ const char *hash;
+ switch(coreType) {
+ case ECoreType::HEncore:
+ filename = dir.filePath(HENCORE_FULL_FILE);
+ hash = HENCORE_FULL_SHA256;
+ break;
+ case ECoreType::HEncore2:
+ filename = dir.filePath(HENCORE_2_FULL_FILE);
+ hash = HENCORE_2_FULL_SHA256;
+ break;
+ case ECoreType::Memecore:
+ filename = dir.filePath(MEMECORE_FULL_FILE);
+ hash = MEMECORE_FULL_SHA256;
+ break;
+ }
+ *(bool*)arg = verify(filename, hash);
 }, [this](void *arg) {
 if (*(bool*)arg) {
- startUnpackHencoreFull();
+ startUnpackZipsFull();
 } else {
 emit noHencoreFull();
 }
@@ -279,58 +497,111 @@
 download(BSPKG_URL, BSPKG_FILE, BSPKG_SHA256);
 }
 
-void Package::createPsvImgs() {
- Worker::start(this, [this](void*) {
+void Package::createPsvImgs(QString titleID) {
+ Worker::start(this, [this, titleID](void*) {
+ bool isHencore = titleID == "PCSG90096";
 QString oldDir = QDir::currentPath();
 QDir curr(pkgBasePath);
- curr.cd("h-encore");
- QDir::setCurrent(curr.path());
- if (trimApp) {
- qDebug("Trimming package...");
- emit setStatusText(tr("Trimming package"));
- if (curr.cd("app") && curr.cd("ux0_temp_game_PCSG90096_app_PCSG90096")) {
- QDir cdir = curr;
- if (cdir.cd("resource") && cdir.cd("movie"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("sound"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("text") && cdir.cd("01"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("bg"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("ev"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("icon"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("stitle"))
- cdir.removeRecursively();
- cdir = curr;
- if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("tachie"))
- cdir.removeRecursively();
+ if (isHencore) {
+ curr.cd("h-encore");
+ QDir::setCurrent(curr.path());
+ if (trimApp) {
+ qDebug("Trimming package...");
+ emit setStatusText(tr("Trimming package"));
+ if (curr.cd("app") && curr.cd("ux0_temp_game_PCSG90096_app_PCSG90096")) {
+ QDir cdir = curr;
+ if (cdir.cd("sce_module")) {
+ cdir.remove("libface.suprx");
+ cdir.remove("libsmart.suprx");
+ cdir.remove("libult.suprx");
+ }
+ cdir = curr;
+ if (cdir.cd("sce_sys")) {
+ cdir.remove("icon0.png");
+ cdir.remove("pic0.png");
+ }
+ cdir = curr;
+ if (cdir.cd("sce_sys") && cdir.cd("about"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("sce_sys") && cdir.cd("livearea"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("sce_sys") && cdir.cd("manual"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("movie"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("sound"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("text"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("bg"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("ev"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("icon"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("stitle"))
+ cdir.removeRecursively();
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("sysc")) {
+ cdir.remove("kuro_waku.png");
+ cdir.remove("shiro_waku.png");
+ cdir.remove("sysc_bgm_mode_base.jpg");
+ cdir.remove("sysc_black.jpg");
+ cdir.remove("sysc_cg_mode_base.jpg");
+ cdir.remove("sysc_how_to_base.jpg");
+ cdir.remove("sysc_info_base.jpg");
+ cdir.remove("sysc_load_base.jpg");
+ cdir.remove("sysc_log_base.jpg");
+ cdir.remove("sysc_mabuta_1.png");
+ cdir.remove("sysc_mabuta_2.png");
+ cdir.remove("sysc_rain.png");
+ cdir.remove("sysc_save_base.jpg");
+ cdir.remove("sysc_sepia.jpg");
+ cdir.remove("sysc_shuuchuu.png");
+ cdir.remove("sysc_small_black.jpg");
+ cdir.remove("sysc_snow.png");
+ cdir.remove("sysc_tobira_l.png");
+ cdir.remove("sysc_tobira_r.png");
+ cdir.remove("sysc_white.jpg");
+ }
+ cdir = curr;
+ if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("tachie"))
+ cdir.removeRecursively();
+ }
+ qDebug("Done trimming.");
 }
- qDebug("Done trimming.");
+ } else {
+ curr.cdUp();
+ curr.cd("extra");
+ QDir::setCurrent(curr.path());
 }
- qDebug("Creating psvimg's...");
+ qDebug("Creating psvimg's for %s...", titleID.toUtf8().constData());
 emit setStatusText(tr("Createing psvimg's"));
 emit setPercent(0);
- psvimg_create("app", "PCSG90096/app", backupKey.toUtf8().constData(), "app", 0);
+ createPsvImgSingleDir(titleID, "app");
 emit setPercent(90);
- psvimg_create("appmeta", "PCSG90096/appmeta", backupKey.toUtf8().constData(), "appmeta", 0);
+ createPsvImgSingleDir(titleID, "appmeta");
 emit setPercent(93);
- psvimg_create("license", "PCSG90096/license", backupKey.toUtf8().constData(), "license", 0);
+ createPsvImgSingleDir(titleID, "license");
 emit setPercent(96);
- psvimg_create("savedata", "PCSG90096/savedata", backupKey.toUtf8().constData(), "savedata", 0);
+ createPsvImgSingleDir(titleID, "savedata");
 emit setPercent(99);
 QDir::setCurrent(oldDir);
- }, [this](void*) {
+ }, [this, titleID](void*) {
 qDebug("Done.");
- emit createdPsvImgs();
+ if (unzipQueue.isEmpty())
+ emit createdPsvImgs();
+ else
+ emit unpackNext();
 });
 }
 
@@ -339,21 +610,6 @@
 emit setPercent((int)(curr * 100ULL / total));
 }
 
-void Package::fetchFinished(void *arg) {
- QString *str = (QString*)arg;
- int index = str->indexOf(": ");
- if (index < 0) {
- str->clear();
- qWarning("Cannot get backup key from your AID");
- emit setStatusText(tr("Cannot get backup key from your AID.\nPlease check your network connection!"));
- return;
- }
- emit setStatusText(tr("Fetched backup key.\nClick button to START!"));
- qDebug("Done.");
- *str = str->mid(index + 6, 64);
- emit gotBackupKey();
-}
-
 void Package::downloadFinished(QFile *f) {
 QString filepath = f->fileName();
 QFileInfo fi(filepath);

finalhe-1.4.tar.gz/src/package.hh -> finalhe-1.92.tar.gz/src/package.hh Changed

@@ -1,55 +1,98 @@
+/*
+ * Final h-encore, Copyright (C) 2018 Soar Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "downloader.hh"
 
 #include <QString>
 #include <QObject>
+#include <QQueue>
+#include <QMap>
+
+struct AppInfo {
+ QString fullPath;
+ QString titleId;
+ QString name;
+};
+
+enum class ECoreType {
+ HEncore,
+ HEncore2,
+ Memecore,
+};
 
 class Package : public QObject {
 Q_OBJECT
 public:
- Package(const QString &basePath, QObject *obj_parent = 0);
+ Package(const QString &basePath, const QString &appPath, QObject *obj_parent = 0);
 virtual ~Package();
 
 inline void setTrim(bool t) { trimApp = t; }
 void tips();
+ inline const QMap<QString, AppInfo> &getExtraApps() { return extraApps; }
+ void selectExtraApp(const QString &titleId, bool select);
+ void calcBackupKey(const QString &aid);
+ inline void setCoreType(ECoreType t) { coreType = t; }
 
 signals:
 void startDownload();
 void noHencoreFull();
 void unpackedDemo();
- void unpackedHencore();
+ void unpackedZip(QString);
 void createdPsvImgs();
 void gotBackupKey();
 void setStatusText(QString);
 void setPercent(int);
+ void unpackNext();
 
 private:
 void get(const QString &url, QString &result);
 void download(const QString &url, const QString &localFilename, const char *sha256sum);
 void startDownload(const QString &url, const QString &localFilename);
 void startUnpackDemo(const char *filename);
- void doUnpackHencore(const char *filename);
- void startUnpackHencoreFull();
+ void genExtraUnpackList();
+ void startUnpackZipsFull();
 bool verify(const QString &filepath, const char *sha256sum);
+ void createPsvImgSingleDir(const QString &titleID, const char *singleDir);
+ bool checkValidAppZip(const QString &filepath, QString &titleId, QString &name);
 
 public slots:
- void getBackupKey(const QString &aid);
 void finishBuildData();
 
 private slots:
+ void doUnpackZip();
 void checkHencoreFull();
 void downloadDemo();
- void startUnpackHencore();
- void createPsvImgs();
+ void startUnpackZips();
+ void createPsvImgs(QString);
 void downloadProg(uint64_t, uint64_t);
 void downloadFinished(QFile*);
- void fetchFinished(void*);
 
 private:
 bool trimApp = false;
+ ECoreType coreType = ECoreType::HEncore;
+ QByteArray aidBytes;
 QString pkgBasePath;
+ QString appBasePath;
 Downloader downloader;
 QString accountId;
 QString backupKey;
+ QMap<QString, AppInfo> extraApps;
+ QMap<QString, AppInfo*> selectedExtraApps;
+ QQueue<AppInfo> unzipQueue;
 };

finalhe-1.92.tar.gz/src/resources/raw/h-encore-2.zip Added

finalhe-1.4.tar.gz/src/resources/raw/h-encore.zip -> finalhe-1.92.tar.gz/src/resources/raw/h-encore.zip Changed

finalhe-1.92.tar.gz/src/resources/raw/memecore.zip Added

finalhe-1.92.tar.gz/src/sforeader.cc Added

@@ -0,0 +1,61 @@
+/*
+ * QCMA: Cross-platform content manager assistant for the PS Vita
+ *
+ * Copyright (C) 2013 Codestation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "sforeader.hh"
+
+#include <QFile>
+
+SfoReader::SfoReader()
+{
+}
+
+bool SfoReader::load(const QString &path)
+{
+ QFile file(path);
+ if(file.open(QIODevice::ReadOnly)) {
+ QByteArray data = file.readAll();
+ file.close();
+ return load(data);
+ }
+ return false;
+}
+
+bool SfoReader::load(const QByteArray &input)
+{
+ if (input.size() <= sizeof(sfo_header)) return false;
+ data = input;
+ key_offset = data.constData();
+ header = (sfo_header *)key_offset;
+ index = (sfo_index *)(key_offset + sizeof(sfo_header));
+ return true;
+}
+
+const char *SfoReader::value(const char *key, const char *defaultValue)
+{
+ const char *data_end = key_offset + data.size();
+ const char *base_key = key_offset + header->key_offset;
+ for(uint i = 0; i < header->pair_count && base_key < data_end; i++) {
+ const char *curr_key = base_key + index[i].key_offset;
+ if (curr_key >= data_end) break;
+ if (strncmp(key, curr_key, data_end - curr_key) == 0) {
+ return key_offset + header->value_offset + index[i].data_offset;
+ }
+ }
+ return defaultValue;
+}

finalhe-1.92.tar.gz/src/sforeader.hh Added

@@ -0,0 +1,72 @@
+/*
+ * QCMA: Cross-platform content manager assistant for the PS Vita
+ *
+ * Copyright (C) 2013 Codestation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SFOREADER_H
+#define SFOREADER_H
+
+#include <QString>
+#include <QtEndian>
+
+template<class T> class uilsb
+{
+public:
+ operator T () const { return qFromLittleEndian<T>(data); }
+ const T operator=(const T v) {
+ qToLittleEndian<T>(v, data);
+ return v;
+ }
+
+private:
+ static const int nBytes = sizeof(T);
+ uchar data[nBytes];
+};
+
+class SfoReader
+{
+public:
+ SfoReader();
+ bool load(const QString &path);
+ bool load(const QByteArray &input);
+ const char *value(const char *key, const char *defaultValue);
+
+private:
+ typedef struct {
+ uilsb<quint16> key_offset;
+ uchar alignment;
+ uchar data_type;
+ uilsb<quint32> value_size;
+ uilsb<quint32> value_size_with_padding;
+ uilsb<quint32> data_offset;
+ } sfo_index;
+
+ typedef struct {
+ char id[4];
+ uilsb<quint32> version;
+ uilsb<quint32> key_offset;
+ uilsb<quint32> value_offset;
+ uilsb<quint32> pair_count;
+ } sfo_header;
+
+ QByteArray data;
+ const char *key_offset;
+ const sfo_header *header;
+ const sfo_index *index;
+};
+
+#endif // SFOREADER_H

finalhe-1.4.tar.gz/src/src.pro -> finalhe-1.92.tar.gz/src/src.pro Changed

@@ -3,20 +3,16 @@
 QT += gui widgets network
 TARGET = FinalHE
 
-VER_MAJOR = 1
-VER_MINOR = 4
-VER_STR = \\\"$${VER_MAJOR}.$${VER_MINOR}\\\"
-
 CODECFORSRC = UTF-8
 
 win32-msvc* {
     DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE
 }
-DEFINES += FINALHE_VERSION_STR=$${VER_STR}
 DEFINES += USING_STATIC_LIBICONV LIBXML_STATIC
 INCLUDEPATH = ../deps/vitamtp ../deps/psvlib/img ../deps/psvlib/pkg ../deps/miniz ../deps/scrypto
-SOURCES += main.cc downloader.cc finalhe.cc package.cc vita.cc worker.cc
-HEADERS += downloader.hh finalhe.hh package.hh vita.hh worker.hh
+SOURCES += main.cc \
+           downloader.cc finalhe.cc package.cc sforeader.cc vita.cc worker.cc
+HEADERS += downloader.hh finalhe.hh package.hh sforeader.hh vita.hh worker.hh
 LIBS += \
     -L../deps/vitamtp -lvitamtp \
     -L../deps/psvlib/img -lpsvimg \
@@ -30,7 +26,7 @@
         -L../deps/libxml2 -llibxml2 \
         -L../deps/iconv -liconv
     !CONFIG(static) {
-        LIBS += -L../deps/zlib -lzlib
+        LIBS += -L../deps/zlib -lzstatic
     }
 } else {
     QT_CONFIG -= no-pkg-config
@@ -47,6 +43,7 @@
 win32 {
     RC_FILE += finalhe.rc
     HEADERS += resource.h
+    LIBS += -ladvapi32 -lshlwapi -lws2_32
 }
 
 FORMS += finalhe.ui
@@ -59,9 +56,13 @@
     # en_US is only used as translation template, no need to be included in release
     translations/en_US.ts \
     translations/cs_CZ.ts \
+    translations/de_DE.ts \
     translations/es_ES.ts \
+    translations/fr_FR.ts \
     translations/it_IT.ts \
     translations/ja_JP.ts \
+    translations/pt_BR.ts \
+    translations/ru_RU.ts \
     translations/tr_TR.ts \
     translations/zh_CN.ts \
     translations/zh_TW.ts

finalhe-1.4.tar.gz/src/translations/cs_CZ.ts -> finalhe-1.92.tar.gz/src/translations/cs_CZ.ts Changed

@@ -4,22 +4,22 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>VAROVÁNÍ</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma je právě spuštěné, chcete ho zavřít?</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>Nepodařilo se ukončit Qcma, prosím, ukončete jej ručně a restartujte tuto aplikaci.</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>CHYBA</translation>
 </message>
@@ -28,14 +28,60 @@
 <translation type="vanished">K zapisování do této složky nemáte práva! Ukončuji.</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>Stiskněte tlačítko pro START!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>Registruji zařízení: %1
 Zadejte na Vaší Vitě následující PIN: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>Zařízení zaregistrované.</translation>
 </message>
@@ -43,55 +89,56 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation>Jdeme na to!</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>Zmenšit velikost h-encore na ~13MB</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Zmenšit velikost h-encore na ~7MB</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>Stahuji %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>Rozbaluji %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>Rozbalování selhalo %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>Dekomprimuji %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>Dekomprimace selhala %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>Ověřuji %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -104,68 +151,66 @@
 4. Spusťte &quot;h-encore&quot; a... hurá, je hotovo!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>Načítám záložní klíč z cma.henkaku.xyz</translation>
+ <translation type="vanished">Načítám záložní klíč z cma.henkaku.xyz</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>Záložní klíč načten.
+ <translation type="vanished">Záložní klíč načten.
 Stiskněte tlačítko pro START!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>Zmenšuji balíček</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>Spusťte na Vaší Vitě &quot;Content Manager&quot; a připojte Vitu k počítači.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>Vytvářím psvimg</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>Nepodařilo se získat záložní klíč z vašeho AID.
+ <translation type="vanished">Nepodařilo se získat záložní klíč z vašeho AID.
 Prosím, zkontrolujte připojení k síťi!</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>Čekám na spojení s PS Vitou...</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>Připojeno k PS Vitě [%1], čekám na ID účtu</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Připojeno k PS Vitě</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>Připojeno k PS Vitě [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>čekám na ID účtu</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>Anglicky</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>Česky</translation>
 </message>

finalhe-1.92.tar.gz/src/translations/de_DE.ts Added

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
+<context>
+ <name>FinalHE</name>
+ <message>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>Firmware %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>-- Firmware Aktualisierung --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- Zusätzliche Anwendungen --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>Firmware version wird von h-encore nicht unterstützt.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>Update zuerst auf %1.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>Auf der PS Vita:
+Einstellungen -&gt; System Update -&gt; System-Aktualisierung -&gt; Über einen PC aktualisieren</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>Um per USB upzudaten:
+Lege das Update Packet(.PUB) in das Verzeichnis des Programms und starte es neu</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>Drücke den Knopf um zu STARTEN!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
+ <source>Registering device: %1
+Input this PIN on PS Vita: %2</source>
+ <translation>Gerät registrieren: %1
+Gebe diesen PIN auf der PS Vita ein: %2</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="285"/>
+ <source>Registered device.</source>
+ <translation>Registriertes Gerät.</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>WARNING</source>
+ <translation>WARNUNG</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>Qcma is running, force close it now?</source>
+ <translation>Qcma läuft, Schließen erzwingen?</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>ERROR</source>
+ <translation>FEHLER</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
+ <translation>Kann Qcma nicht beenden, Bitte manuell beenden und dieses Tool neu starten.</translation>
+ </message>
+</context>
+<context>
+ <name>FinalHEClass</name>
+ <message>
+ <location filename="../finalhe.ui" line="103"/>
+ <source> Let&apos;s GO! </source>
+ <translation> Los gehts! </translation>
+ </message>
+ <message>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Kürze h-encore auf ~7MB</translation>
+ </message>
+</context>
+<context>
+ <name>Package</name>
+ <message>
+ <location filename="../package.cc" line="62"/>
+ <source>Launch Content Manager on PS Vita and connect to computer.</source>
+ <translation>Starte den Inhaltsmanger auf der PS Vita und verbinde sie mit dem Computer.</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="126"/>
+ <source>Downloading %1</source>
+ <translation>Herunterladen %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="147"/>
+ <source>Unpacking %1</source>
+ <translation>Entpacken %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
+ <source>Failed to unpack %1</source>
+ <translation>Entpacken fehlgeschlagen %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="198"/>
+ <source>Decompressing %1</source>
+ <translation>Dekomprimieren %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="218"/>
+ <source>Failed to decompress %1</source>
+ <translation>Dekomprimieren fehlgeschlagen %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="340"/>
+ <source>Verifying %1</source>
+ <translation>Verifizieren %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="369"/>
+ <source>sha256sum mismatch! Please check your network.</source>
+ <translation>sha256sum stimmt nicht überein! Bitte prüfe deine Netwerkverbindung.</translation>
+ </message>
+ <message>
+ <source>Fetching backup key from cma.henkaku.xyz</source>
+ <translation type="vanished">Lade Sicherungschlüssel von cma.henkaku.xyz</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="459"/>
+ <source>Everything is ready, now follow below steps on your PS Vita:
+1. Launch Content Manager and connect to your computer.
+2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Transfer &quot;h-encore&quot; to your PS Vita.
+4. Run &quot;h-encore&quot; and... Yay, that&apos;s it!</source>
+ <translation>Vorbereitung abgeschlossen. Befolge folgende Schritte auf deiner PS Vita:
+1. Starte den Inhaltsmanger und verbinde dich mit deinem Computer
+2.Wähle PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Übertrage &quot;h-encore&quot; auf deine PS Vita
+4. Starte &quot;h-encore&quot; und... Ja, das wars!</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="510"/>
+ <source>Trimming package</source>
+ <translation>Kürze Paket</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="588"/>
+ <source>Createing psvimg&apos;s</source>
+ <translation>Erstelle psvimgs</translation>
+ </message>
+ <message>
+ <source>Cannot get backup key from your AID.
+Please check your network connection!</source>
+ <translation type="vanished">Kann Sicherungsschlüssel nicht von deinem AID lesen.
+Bitte prüfe die Netzwerkverbindung!</translation>
+ </message>
+ <message>
+ <source>Fetched backup key.
+Click button to START!</source>
+ <translation type="vanished">Sicherungschlüssel heruntergeladen.
+Drücke den Knopf um zu STARTEN!</translation>
+ </message>
+</context>
+<context>
+ <name>VitaConn</name>
+ <message>
+ <location filename="../vita.cc" line="445"/>
+ <source>Waiting for connection to PS Vita...</source>
+ <translation>Warte auf eine Verbindung zur PS Vita...</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Mit PS Vita verbunden</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>Warte auf Account ID</translation>
+ </message>
+</context>
+<context>
+ <name>base</name>
+ <message>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
+ <source>English</source>
+ <translation>Englisch</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="78"/>
+ <source>LANGUAGE</source>
+ <translation>Deutsch</translation>
+ </message>
+</context>
+</TS>

finalhe-1.4.tar.gz/src/translations/en_US.ts -> finalhe-1.92.tar.gz/src/translations/en_US.ts Changed

@@ -4,33 +4,79 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation type="unfinished"></translation>
 </message>
@@ -38,65 +84,61 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
- <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -105,56 +147,45 @@
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation type="unfinished"></translation>
 </message>
- <message>
- <location filename="../package.cc" line="350"/>
- <source>Cannot get backup key from your AID.
-Please check your network connection!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../package.cc" line="353"/>
- <source>Fetched backup key.
-Click button to START!</source>
- <translation type="unfinished"></translation>
- </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
 <translation type="unfinished"></translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation type="unfinished"></translation>
 </message>

finalhe-1.4.tar.gz/src/translations/es_ES.ts -> finalhe-1.92.tar.gz/src/translations/es_ES.ts Changed

@@ -4,22 +4,22 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>ADVERTENCIA</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma está ejecutándose, ¿forzar su cierre?</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>Imposible cerrar Qcma, por favor, ciérrelo manualmente y reinicie esta herramienta.</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>ERROR</translation>
 </message>
@@ -28,14 +28,62 @@
 <translation type="vanished">¡No tienes permiso de escritura en esta carpeta! Finalizando.</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation type="unfinished">Firmware %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished">-- Actualización de Firmware --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation type="unfinished">-- Aplicaciones adicionales --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished">Versión de firmware no soportada por h-encore.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation type="unfinished">Primero, actualice %1.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation type="unfinished">Para actualizar por USB:
+Ponga el Paquete de Actualización (.PUP) en la carpeta de esta herramienta y reinicie esta aplicación.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation type="unfinished">En la PS Vita:
+Opciones -&gt; Actualización de Sistema -&gt; Actualizar Conectando al PC</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>¡Pulsa el botón para EMPEZAR!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>Registrando dispositivo: %1
 Inserte este PIN en su PS Vita: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>Dispositivo registrado.</translation>
 </message>
@@ -43,55 +91,56 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation>¡Empecemos!</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>Reducir h-encore a ~ 13 MB</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Reducir h-encore a ~ 7 MB</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>Descargando %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>Desempaquetando %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>Fallo al desempaquetar %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>Descomprimiendo %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>Fallo al descomprimir %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>Verificando %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">¡No coincide el sha256sum! Por favor, compruebe su conexión a internet.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -104,68 +153,66 @@
 4. Ejecuta &quot;h-encore&quot; y... Sí, ¡eso es todo!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>Recuperando clave de copia de seguridad de cma.henkaku.xyz</translation>
+ <translation type="vanished">Recuperando clave de copia de seguridad de cma.henkaku.xyz</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>Recuperada clave de copia de seguridad.
+ <translation type="vanished">Recuperada clave de copia de seguridad.
 ¡Pulsa el botón para EMPEZAR!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
- <translation>Reduciendo el tamaño</translation>
+ <translation>Reduciendo el tamaño del paquete</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>Usa el Gestor de Contenido en tu PS Vita y conéctala al PC.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>Creando el archivo psvimg</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>No se pudo obtener la clave de tu copia de seguridad de tu AID.
+ <translation type="vanished">No se pudo obtener la clave de tu copia de seguridad de tu AID.
 ¡Por favor, compruebe su conexión a internet!</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>Esperando conexión de PS Vita...</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>Conexión a PS Vita [%1], esperando ID de cuenta</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Conexión a PS Vita</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>Conexión a PS Vita [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>Esperando ID de cuenta</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>Inglés</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>Español</translation>
 </message>

finalhe-1.92.tar.gz/src/translations/fr_FR.ts Added

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+ <name>FinalHE</name>
+ <message>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>Firmware %1</translation>
+ </message>
+ <message>
+ <source>-- Mise à jour Firmware --</source>
+ <translation type="vanished">-- Mise à jour Firmware --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- Applications Additionelles --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>La version du Fimrware n&apos;est pas supporté par h-encore.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>Mettre à jour vers %1 d’abord.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>Sur La PS Vita:
+Paramètres -&gt; Mise à jour système -&gt; mettre à jour connexion au PC</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>Pour mettre a jour via USB:
+Mettre le fichier de mise à jour (.PUP) dans le dossier de cet applications &apos;et redémarrer la</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
+ <source>Registering device: %1
+Input this PIN on PS Vita: %2</source>
+ <translation>Registrement de l’appareil: %1
+Mettre ce PIN dans la PS Vita: %2</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="285"/>
+ <source>Registered device.</source>
+ <translation>Appareil enregistré.</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>WARNING</source>
+ <translation>AVERTISSEMENT</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>Qcma is running, force close it now?</source>
+ <translation>Qcma est en cours d’exécution , forcer la fermeture maintenant?</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>ERROR</source>
+ <translation>ERREUR</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
+ <translation>fermeture de Qcma impossible, veuillez le fermer manuellement et redémarrer cette application.</translation>
+ </message>
+</context>
+<context>
+ <name>FinalHEClass</name>
+ <message>
+ <location filename="../finalhe.ui" line="103"/>
+ <source> Let&apos;s GO! </source>
+ <translation> Allons&apos;-Y! </translation>
+ </message>
+ <message>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Reduction de h-encore à environs ~7MB</translation>
+ </message>
+</context>
+<context>
+ <name>Package</name>
+ <message>
+ <location filename="../package.cc" line="62"/>
+ <source>Launch Content Manager on PS Vita and connect to computer.</source>
+ <translation>Lancer le gestionnaire de contenu sur la PS Vita et connecter là au PC.</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="126"/>
+ <source>Downloading %1</source>
+ <translation>Téléchargement %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="147"/>
+ <source>Unpacking %1</source>
+ <translation>Dépaquetage %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
+ <source>Failed to unpack %1</source>
+ <translation>Échec du dépaquetage %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="198"/>
+ <source>Decompressing %1</source>
+ <translation>Décompression %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="218"/>
+ <source>Failed to decompress %1</source>
+ <translation>Échec de la décompression %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="340"/>
+ <source>Verifying %1</source>
+ <translation>Vérification %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="369"/>
+ <source>sha256sum mismatch! Please check your network.</source>
+ <translation>sha256sum incorrect! S&apos;il vous plaît vérifier votre réseau.</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="459"/>
+ <source>Everything is ready, now follow below steps on your PS Vita:
+1. Launch Content Manager and connect to your computer.
+2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Transfer &quot;h-encore&quot; to your PS Vita.
+4. Run &quot;h-encore&quot; and... Yay, that&apos;s it!</source>
+ <translation>Tout est prêt, suivez maintenant les étapes ci-dessous sur votre PS Vita:
+1. Lancez le gestionnaire de contenu et connectez-vous à votre ordinateur.
+2. Sélectionner &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Transférer &quot;h-encore&quot; à votre PS Vita.
+4. Exécuter &quot;h-encore&quot; et... Yay, C&apos;est&apos;Bon!</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="510"/>
+ <source>Trimming package</source>
+ <translation>Réduction du paquet</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="588"/>
+ <source>Createing psvimg&apos;s</source>
+ <translation>Création du psvimg&apos;s</translation>
+ </message>
+</context>
+<context>
+ <name>VitaConn</name>
+ <message>
+ <location filename="../vita.cc" line="445"/>
+ <source>Waiting for connection to PS Vita...</source>
+ <translation>Attente de la connexion à la PS Vita...</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Connecté à la PS Vita</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>En Attente de l&apos;ID du compte</translation>
+ </message>
+</context>
+<context>
+ <name>base</name>
+ <message>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
+ <source>English</source>
+ <translation>Anglaise</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="78"/>
+ <source>LANGUAGE</source>
+ <translation>Français</translation>
+ </message>
+</context>
+</TS>

finalhe-1.4.tar.gz/src/translations/it_IT.ts -> finalhe-1.92.tar.gz/src/translations/it_IT.ts Changed

@@ -4,22 +4,22 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>AVVERTIMENTO</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma è attualmente in esecuzione, si desidera chiuderlo?</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>Impossibile arrestare il Qcma, per favore chiudilo manualmente e riavvia l&apos;applicazione.</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>ERRORE</translation>
 </message>
@@ -28,14 +28,60 @@
 <translation type="vanished">Non hai permessi di scrittura su questa cartella! Uscire ora.</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>Fai clic sul pulsante START per iniziare!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>Registrazione dispositivo: %1
 Inserire questo PIN su PS Vita: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>Dispositivo registrato.</translation>
 </message>
@@ -43,55 +89,56 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation>Diamoci da fare!</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>Taglia h-encore a ~ 13 MB</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Taglia h-encore a ~ 7 MB</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>Sto scaricando %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>Spacchettamento %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>Impossibile decomprimere %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>Decompressione di %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>Non è riuscito a decomprimere %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>Verifica in corso di %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
 <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -104,68 +151,66 @@
 4. Avvia &quot;h-encore&quot; e... Si, questo è tutto!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>Recupero della chiave di backup da cma.henkaku.xyz</translation>
+ <translation type="vanished">Recupero della chiave di backup da cma.henkaku.xyz</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>Chiave di backup recuperata.
+ <translation type="vanished">Chiave di backup recuperata.
 Fai clic sul pulsante START per iniziare!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>Sto riducendo il pacchetto</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>Avvia Gestione Contenuto su PS Vita e connettiti al computer.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>Sto creando i file psvimg</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>Impossibile ottenere la chiave di backup dal tuo AID.
+ <translation type="vanished">Impossibile ottenere la chiave di backup dal tuo AID.
 Si prega di verificare la connessione di rete!</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>In attesa di connessione su PS Vita...</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>Connesso a PS Vita [%1], in attesa di ID account</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Connesso a PS Vita</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>Connesso alla PS Vita [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>in attesa di ID account</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>Inglese</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>Italiano</translation>
 </message>

finalhe-1.4.tar.gz/src/translations/ja_JP.ts -> finalhe-1.92.tar.gz/src/translations/ja_JP.ts Changed

@@ -4,22 +4,22 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>警告</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcmaは実行中です。強制終了しますか？</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>Qcmaが強制終了できません。Qcmaを手動で終了してこのソフトを再実行して下さい</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>エラー</translation>
 </message>
@@ -28,14 +28,62 @@
 <translation type="vanished">書き込み権限無し 終了します</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>ファームウェア %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>--ファームウェア アップデート--</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>--その他のアプリ―ケーション--</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>h-encoreはこのファームウェアをサポートしていません</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>最初に %1 にアップデート</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>USB経由でアップデートするには:
+アップデートパッケージ(.PUP)をこのツールのフォルダに入れてこのツールを再実行して下さい</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>PSVita側の作業
+設定 -&gt; システムアップデート -&gt; パソコンに接続してアップデートする と手順を踏んで下さい</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>スタートをクリックして開始して下さい</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>デバイス登録: %1
 PSVitaにPINコードを入力して下さい: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>登録されたデバイス</translation>
 </message>
@@ -43,128 +91,127 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation>スタート</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>h-encoreを約13MBに容量削減</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>h-encoreを約7MBに容量を削減</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>ダウンロード中: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
- <translation>複合化中: %1</translation>
+ <translation>展開中: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
- <translation>複合化できません %1</translation>
+ <translation>展開できません: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
- <translation>展開中: %1</translation>
+ <translation>解凍中: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
- <translation>展開できません %1</translation>
+ <translation>解凍できません: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>チェック中: %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
- <translation type="unfinished"></translation>
+ <translation>sha256sum 一致しません ネットワークを確認して下さい</translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
 3. Transfer &quot;h-encore&quot; to your PS Vita.
 4. Run &quot;h-encore&quot; and... Yay, that&apos;s it!</source>
- <translation>準備が完了したらPSVitaで以下の手順に従ってください:
+ <translation>準備が完了しました。PSVitaで以下の手順に従ってください:
 1. コンテンツ管理を実行してPCに接続
-2. 「パソコン->PS Vita」 ->「アプリケーション」 ->「PS Vita」を選択
-3. Vitaにh-encoreをコピー
-4. Vitaで &quot;h-encore&quot;を起動して完了</translation>
+2. 「パソコン-&gt;PS Vita」 -&gt;「アプリケーション」 -&gt;「PS Vita」を選択
+3. PSVitaにh-encoreをコピー
+4. PSVitaで &quot;h-encore&quot;を起動して完了</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>cma.henkaku.xyzからバックアップキーを取得中</translation>
+ <translation type="vanished">cma.henkaku.xyzからバックアップキーを取得中</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>バックアップキーの取得が完了しました
+ <translation type="vanished">バックアップキーの取得が完了しました
 スタートをクリックして開始して下さい</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>容量を削減中</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
- <translation>Vitaでコンテンツ管理を実行</translation>
+ <translation>PSVitaでコンテンツ管理を実行してPCと接続して下さい</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>psvimgを作成中</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>AIDからバックアップキーを取得できません。ネットワーク接続を確認して下さい</translation>
+ <translation type="vanished">AIDからバックアップキーを取得できません。ネットワーク接続を確認して下さい</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>PSVitaの接続を待機中</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>PSVita[%1]と接続中 アカウントIDを取得中</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>PSVitaと接続中</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>PSVita [%1] (%2) と接続集</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>アカウントIDを取得中</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
- <translation>英語</translation>
+ <translation>English</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>日本語</translation>
 </message>

finalhe-1.92.tar.gz/src/translations/pt_BR.ts Added

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt_BR">
+<context>
+ <name>FinalHE</name>
+ <message>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>Firmware %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>-- Atualização de Firmware --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- Aplicativos adicionais --</translation>
+ </message>
+ <message>
+ <source>Firmware version is not supported by h-encore.</source>
+ <translation type="vanished">Versão do firmware não suportada pelo h-encore.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>Atualize para a versão %1 primeiro.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>No PS Vita:
+Configurações -&gt; Atualização do Sistema -&gt; Atualizar conectando ao PC</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>Para atualizar pelo USB:
+Coloque o Pacote de Atualização (.PUP) na pasta tool&apos;s e reinicie a aplicação</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>Clique no botão para COMEÇAR!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
+ <source>Registering device: %1
+Input this PIN on PS Vita: %2</source>
+ <translation>Registrando dispositivo: %1
+Insira este PIN no PS Vita: %2</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="285"/>
+ <source>Registered device.</source>
+ <translation>Dispositivo registrado.</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>WARNING</source>
+ <translation>AVISO</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>Qcma is running, force close it now?</source>
+ <translation>Qcma está em execução, forçar encerramento?</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>ERROR</source>
+ <translation>ERRO</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
+ <translation>Não foi possível fechar o Qcma, por favor feche-o manualmente e reinicie esta aplicação.</translation>
+ </message>
+</context>
+<context>
+ <name>FinalHEClass</name>
+ <message>
+ <location filename="../finalhe.ui" line="103"/>
+ <source> Let&apos;s GO! </source>
+ <translation> Começar!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Reduzir h-encore para ~7MB</translation>
+ </message>
+</context>
+<context>
+ <name>Package</name>
+ <message>
+ <location filename="../package.cc" line="62"/>
+ <source>Launch Content Manager on PS Vita and connect to computer.</source>
+ <translation>Inicie o Gerenciador de Conteúdo no PS Vita e conecte-o ao computador.</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="126"/>
+ <source>Downloading %1</source>
+ <translation>Baixando %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="147"/>
+ <source>Unpacking %1</source>
+ <translation>Descompactando %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
+ <source>Failed to unpack %1</source>
+ <translation>Falha ao descompactar %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="198"/>
+ <source>Decompressing %1</source>
+ <translation>Extraindo %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="218"/>
+ <source>Failed to decompress %1</source>
+ <translation>Falha ao extrair %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="340"/>
+ <source>Verifying %1</source>
+ <translation>Verificando %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="369"/>
+ <source>sha256sum mismatch! Please check your network.</source>
+ <translation>sha256sum incompatível! Por favor verifique sua conexão com a internet.</translation>
+ </message>
+ <message>
+ <source>Fetching backup key from cma.henkaku.xyz</source>
+ <translation type="vanished">Buscando chave de cópia de segurança em cma.henkaku.xyz</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="459"/>
+ <source>Everything is ready, now follow below steps on your PS Vita:
+1. Launch Content Manager and connect to your computer.
+2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Transfer &quot;h-encore&quot; to your PS Vita.
+4. Run &quot;h-encore&quot; and... Yay, that&apos;s it!</source>
+ <translation>Tudo pronto, agora siga os passos abaixo no seu PS Vita:
+1. Inicie o Gerenciador de Conteúdo e conecte-o ao seu computador.
+2. Selecione &quot;PC -&gt; Sistema PS Vita&quot; -&gt; &quot;Aplicativos&quot; -&gt; &quot;PS Vita&quot;.
+3. Copie o &quot;h-encore&quot; para seu PS Vita.
+4. Execute o &quot;h-encore&quot; e... Yay, tudo pronto!</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="510"/>
+ <source>Trimming package</source>
+ <translation>Reduzindo o tamanho do pacote</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="588"/>
+ <source>Createing psvimg&apos;s</source>
+ <translation>Criando o arquivo psvimg</translation>
+ </message>
+ <message>
+ <source>Cannot get backup key from your AID.
+Please check your network connection!</source>
+ <translation type="vanished">Falha ao obter a chave de cópia de segurança de seu AID.
+Por favor verifique sua conexão com a internet!</translation>
+ </message>
+ <message>
+ <source>Fetched backup key.
+Click button to START!</source>
+ <translation type="vanished">Chave de cópia de segurança obtida.
+Clique no botão para COMEÇAR!</translation>
+ </message>
+</context>
+<context>
+ <name>VitaConn</name>
+ <message>
+ <location filename="../vita.cc" line="445"/>
+ <source>Waiting for connection to PS Vita...</source>
+ <translation>Esperando conexão com o PS Vita...</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Conectado ao PS Vita</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>Esperando o ID da conta</translation>
+ </message>
+</context>
+<context>
+ <name>base</name>
+ <message>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
+ <source>English</source>
+ <translation>Inglês</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="78"/>
+ <source>LANGUAGE</source>
+ <translation>Português BR</translation>
+ </message>
+</context>
+</TS>

finalhe-1.92.tar.gz/src/translations/ru_RU.ts Added

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru_RU">
+<context>
+ <name>FinalHE</name>
+ <message>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>Системное ПО %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>-- Обновление ПО --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- Дополнительные приложения --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>Версия ПО не поддерживается</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>Сначала обновите ПО до %1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>Поместите пакет обновления (.PUP) в папку этой программы и перезапустите finalhe</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>На PS Vita:
+Настройки -&gt; Обновление системы -&gt; Обновить путем подключения к компьютеру</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>нажмите Начать!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
+ <source>Registering device: %1
+Input this PIN on PS Vita: %2</source>
+ <translation>Регистрация устройства: %1
+ 	Введите этот PIN-код на PS Vita: %2</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="285"/>
+ <source>Registered device.</source>
+ <translation>Устройство зарегистрировано</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>WARNING</source>
+ <translation>Внимание!</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="93"/>
+ <source>Qcma is running, force close it now?</source>
+ <translation>QCMA в данный момент запущен, закрыть его принудительно?</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>ERROR</source>
+ <translation>Ошибка</translation>
+ </message>
+ <message>
+ <location filename="../main.cc" line="97"/>
+ <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
+ <translation>Невозможно закрыть QCMA, закройте его вручную и перезапустите finalhe.</translation>
+ </message>
+</context>
+<context>
+ <name>FinalHEClass</name>
+ <message>
+ <location filename="../finalhe.ui" line="103"/>
+ <source> Let&apos;s GO! </source>
+ <translation>Поехали!</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Обрезать h-encore до ~7МБ</translation>
+ </message>
+</context>
+<context>
+ <name>Package</name>
+ <message>
+ <location filename="../package.cc" line="62"/>
+ <source>Launch Content Manager on PS Vita and connect to computer.</source>
+ <translation>Откройте Управление данными на PS Vita и подключите ее к компьютеру</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="126"/>
+ <source>Downloading %1</source>
+ <translation>Загрузка %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="147"/>
+ <source>Unpacking %1</source>
+ <translation>Распаковка %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
+ <source>Failed to unpack %1</source>
+ <translation>Ошибка при распаковке %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="198"/>
+ <source>Decompressing %1</source>
+ <translation>Сжатие %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="218"/>
+ <source>Failed to decompress %1</source>
+ <translation>Ошибка при сжатии %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="340"/>
+ <source>Verifying %1</source>
+ <translation>Проверка %1</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="369"/>
+ <source>sha256sum mismatch! Please check your network.</source>
+ <translation>Несовпадение sha256sum! Проверьте подключение к интернету.</translation>
+ </message>
+ <message>
+ <source>Fetching backup key from cma.henkaku.xyz</source>
+ <translation type="vanished">Получение ключа от cma.henkaku.xyz</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="459"/>
+ <source>Everything is ready, now follow below steps on your PS Vita:
+1. Launch Content Manager and connect to your computer.
+2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
+3. Transfer &quot;h-encore&quot; to your PS Vita.
+4. Run &quot;h-encore&quot; and... Yay, that&apos;s it!</source>
+ <translation>Все готово, теперь следуйте этим шагам на вашей PS Vita:
+1. Запустите Управление данными и подключите Vita к компьютеру.
+2. Выберите &quot;Компьютер -&gt; Система PS Vita&quot; -&gt; &quot;Приложения&quot; -&gt; &quot;PS Vita&quot;.
+3. Перенесите &quot;h-encore&quot; на вашу PS Vita.
+4. Запустите &quot;h-encore&quot; и... Ура, все работает!</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="510"/>
+ <source>Trimming package</source>
+ <translation>Обрезается h-encore</translation>
+ </message>
+ <message>
+ <location filename="../package.cc" line="588"/>
+ <source>Createing psvimg&apos;s</source>
+ <translation>Создание psvimg</translation>
+ </message>
+ <message>
+ <source>Cannot get backup key from your AID.
+Please check your network connection!</source>
+ <translation type="vanished">Невозможно получить ключ. Проверьте подключение к интернету.</translation>
+ </message>
+ <message>
+ <source>Fetched backup key.
+Click button to START!</source>
+ <translation type="vanished">Ключ получен
+ 	нажмите Начать!</translation>
+ </message>
+</context>
+<context>
+ <name>VitaConn</name>
+ <message>
+ <location filename="../vita.cc" line="445"/>
+ <source>Waiting for connection to PS Vita...</source>
+ <translation>Ожидание подключения к PS Vita...</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>PS Vita подключена</translation>
+ </message>
+ <message>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>Ожидание AID</translation>
+ </message>
+</context>
+<context>
+ <name>base</name>
+ <message>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
+ <source>English</source>
+ <translation>Английский</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="78"/>
+ <source>LANGUAGE</source>
+ <translation>Русский</translation>
+ </message>
+</context>
+</TS>

finalhe-1.4.tar.gz/src/translations/tr_TR.ts -> finalhe-1.92.tar.gz/src/translations/tr_TR.ts Changed

@@ -4,34 +4,80 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>DİKKAT</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma arkaplanda çalışıyor, zorla kapatılsın mı?</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>Qcma kapatılamadı, lütfen elle kapatın ve bu programı yeniden başlatın.</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>HATA</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>Başlamak için düğmeye basın.</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>Cihaz kaydediliyor: %1
 Bu PIN&apos;i PS Vita cihazınızda girin: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>Cihaz kaydedildi.</translation>
 </message>
@@ -39,56 +85,57 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation>BAŞLA</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>Gereksiz dosyaları silerek h-encore boyutunu ~13MB&apos;ye düşür
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>Gereksiz dosyaları silerek h-encore boyutunu ~7MB&apos;ye düşür
 </translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>%1 indiriliyor</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>%1 arşivden çıkarılıyor</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>%1 arşivden çıkarılamadı</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>%1 decompress ediliyor</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>%1 decompress edilemedi</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>%1 doğrulanıyor</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
 <translation>sha256sum uyuşmadı. Lütfen internet bağlantınızı kontrol edin.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -102,68 +149,66 @@
 4. PS Vita&apos;nızda &quot;h-encore&quot;u çalıştırın vee... İşte bu kadar!</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>cma.henkaku.xyz adresinden yedek anahtarı alınıyor</translation>
+ <translation type="vanished">cma.henkaku.xyz adresinden yedek anahtarı alınıyor</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>Yedek anahtarı alındı.
+ <translation type="vanished">Yedek anahtarı alındı.
 Başlamak için düğmeye basın.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>Paketten gereksiz dosyalar siliniyor.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>PS Vita&apos;nızda İçerik Yöneticisi&apos;ni açın ve bilgisayara bağlayın.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>psvimg oluşturuluyor.</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>AID&apos;iniz kullanılarak yedek anahtarı alınamadı.
+ <translation type="vanished">AID&apos;iniz kullanılarak yedek anahtarı alınamadı.
 Lütfen internet bağlantınızı kontrol edin.</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>PS Vita&apos;ya bağlantı için bekleniyor.</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>Bağlanılan PS Vita: [%1], hesap ID bekleniyor.</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>Bağlanılan PS Vita</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>Bağlanılan PS Vita: [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>hesap ID bekleniyor</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>İngilizce</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>Türkçe</translation>
 </message>

finalhe-1.4.tar.gz/src/translations/zh_CN.ts -> finalhe-1.92.tar.gz/src/translations/zh_CN.ts Changed

@@ -4,38 +4,81 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>警告</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma正在运行，要强制关闭吗？</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>无法强制关闭Qcma，请手动关闭后再重启本工具</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>错误</translation>
 </message>
 <message>
- <source>You don&apos;t have write permission to this folder! Exit now.</source>
- <translation type="vanished">没有目录写入权限，关闭工具中 </translation>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>固件 %1</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>-- 固件更新 --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- 附加应用程序 --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>h-encore不支持的固件版本</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>请先更新到%1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>要通过USB更新:
+将更新包(.PUP)放在本工具所在目录内后重启工具</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>设定 -&gt; 系统升级 -&gt; 连接至电脑进行升级</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>现在点击按钮开始！</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>正在注册设备: %1
 请在PSV上输入PIN: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>设备注册成功</translation>
 </message>
@@ -43,55 +86,56 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation> 开始！</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>将h-encore瘦身到约13MB</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>将h-encore瘦身到约7MB</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>正在下载 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>正在解包 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>无法解包 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>正在解压 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>无法解压 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>正在校验 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
- <translation type="unfinished"></translation>
+ <translation>sha256sum不匹配！请检查网络状态</translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -104,67 +148,65 @@
 4. 在PSV上运行 &quot;h-encore&quot;，大功告成！</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>正在从cma.henkaku.xyz获得备份密钥</translation>
+ <translation type="vanished">正在从cma.henkaku.xyz获得备份密钥</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>已获得备份密钥
+ <translation type="vanished">已获得备份密钥
 现在点击按钮开始！</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>正在瘦身</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>在PSV上运行内容管理器并连接到计算机</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>正在创建psvimg</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>无法从用户ID获取备份密钥，请检查计算机的网络连接</translation>
+ <translation type="vanished">无法从用户ID获取备份密钥，请检查计算机的网络连接</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>等待连接到PSV……</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>已经连接到PSV [%1], 等待用户ID</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>已经连接到PSV</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>已经连接到PSV [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>等待用户ID</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>英语</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>简体中文</translation>
 </message>

finalhe-1.4.tar.gz/src/translations/zh_TW.ts -> finalhe-1.92.tar.gz/src/translations/zh_TW.ts Changed

@@ -4,38 +4,81 @@
 <context>
 <name>FinalHE</name>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>WARNING</source>
 <translation>警告</translation>
 </message>
 <message>
- <location filename="../main.cc" line="74"/>
+ <location filename="../main.cc" line="93"/>
 <source>Qcma is running, force close it now?</source>
 <translation>Qcma正在執行，要強制關閉嗎？</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>Unable to close Qcma, please close it manually and then restart this tool.</source>
 <translation>無法強制關閉Qcma，請手動關閉後再重新執行本工具</translation>
 </message>
 <message>
- <location filename="../main.cc" line="78"/>
+ <location filename="../main.cc" line="97"/>
 <source>ERROR</source>
 <translation>錯誤</translation>
 </message>
 <message>
- <source>You don&apos;t have write permission to this folder! Exit now.</source>
- <translation type="vanished">沒有檔案寫入權限，關閉工具中 </translation>
+ <location filename="../finalhe.cc" line="156"/>
+ <source>Firmware %1</source>
+ <translation>韌體 %1</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="119"/>
+ <location filename="../finalhe.cc" line="159"/>
+ <source>-- Firmware update --</source>
+ <translation>-- 韌體更新 --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="173"/>
+ <source>-- Additional applications --</source>
+ <translation>-- 額外應用程式 --</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="202"/>
+ <location filename="../finalhe.cc" line="228"/>
+ <source>Fimrware version is not supported by h-encore.</source>
+ <translation>h-encore無法支援的韌體版本</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="203"/>
+ <location filename="../finalhe.cc" line="229"/>
+ <source>Update to %1 first.</source>
+ <translation>請先更新到%1</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="206"/>
+ <location filename="../finalhe.cc" line="232"/>
+ <source>To update through USB:
+Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
+ <translation>要通過USB連結更新:
+將更新檔案(.PUP)放於本軟體所在資料夾内后重開軟體</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="205"/>
+ <location filename="../finalhe.cc" line="231"/>
+ <source>On PS Vita:
+Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
+ <translation>設定 -&gt; 系統更新 -&gt; 連接至個人電腦更新</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="263"/>
+ <source>Click button to START!</source>
+ <translation>現在點擊按鈕開始！</translation>
+ </message>
+ <message>
+ <location filename="../finalhe.cc" line="281"/>
 <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
 <translation>正在登記裝置: %1
 請在PSVita上輸入PIN: %2</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="123"/>
+ <location filename="../finalhe.cc" line="285"/>
 <source>Registered device.</source>
 <translation>裝置登記成功</translation>
 </message>
@@ -43,55 +86,56 @@
 <context>
 <name>FinalHEClass</name>
 <message>
- <location filename="../finalhe.ui" line="125"/>
+ <location filename="../finalhe.ui" line="103"/>
 <source> Let&apos;s GO! </source>
 <translation> 開始！</translation>
 </message>
 <message>
- <location filename="../finalhe.ui" line="144"/>
- <source>Trim h-encore to ~13MB</source>
- <translation>將h-encore縮減至約13MB</translation>
+ <location filename="../finalhe.ui" line="122"/>
+ <source>Trim h-encore to ~7MB</source>
+ <translation>將h-encore縮減至約7MB</translation>
 </message>
 </context>
 <context>
 <name>Package</name>
 <message>
- <location filename="../package.cc" line="96"/>
+ <location filename="../package.cc" line="126"/>
 <source>Downloading %1</source>
 <translation>正在下載 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="117"/>
+ <location filename="../package.cc" line="147"/>
 <source>Unpacking %1</source>
 <translation>正在解開 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="131"/>
+ <location filename="../package.cc" line="161"/>
+ <location filename="../package.cc" line="173"/>
 <source>Failed to unpack %1</source>
 <translation>無法解開 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="154"/>
+ <location filename="../package.cc" line="198"/>
 <source>Decompressing %1</source>
 <translation>正在解開壓縮檔案 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="169"/>
+ <location filename="../package.cc" line="218"/>
 <source>Failed to decompress %1</source>
 <translation>無法解開壓縮檔案 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="208"/>
+ <location filename="../package.cc" line="340"/>
 <source>Verifying %1</source>
 <translation>正在校驗 %1</translation>
 </message>
 <message>
- <location filename="../package.cc" line="237"/>
+ <location filename="../package.cc" line="369"/>
 <source>sha256sum mismatch! Please check your network.</source>
- <translation type="unfinished"></translation>
+ <translation>sha256sum不適配！請檢查網路狀況</translation>
 </message>
 <message>
- <location filename="../package.cc" line="254"/>
+ <location filename="../package.cc" line="459"/>
 <source>Everything is ready, now follow below steps on your PS Vita:
 1. Launch Content Manager and connect to your computer.
 2. Select &quot;PC -&gt; PS Vita System&quot; -&gt; &quot;Applications&quot; -&gt; &quot;PS Vita&quot;.
@@ -104,67 +148,65 @@
 4. 在PSV上執行 &quot;h-encore&quot;，大功告成！</translation>
 </message>
 <message>
- <location filename="../package.cc" line="248"/>
 <source>Fetching backup key from cma.henkaku.xyz</source>
- <translation>正在從cma.henkaku.xyz獲得備份密鑰</translation>
+ <translation type="vanished">正在從cma.henkaku.xyz獲得備份密鑰</translation>
 </message>
 <message>
- <location filename="../package.cc" line="353"/>
 <source>Fetched backup key.
 Click button to START!</source>
- <translation>已獲得備份密鑰
+ <translation type="vanished">已獲得備份密鑰
 現在點擊按鈕開始！</translation>
 </message>
 <message>
- <location filename="../package.cc" line="292"/>
+ <location filename="../package.cc" line="510"/>
 <source>Trimming package</source>
 <translation>正在縮減容量</translation>
 </message>
 <message>
- <location filename="../package.cc" line="40"/>
+ <location filename="../package.cc" line="62"/>
 <source>Launch Content Manager on PS Vita and connect to computer.</source>
 <translation>在PS Vita上執行內容管理器並連接到個人電腦</translation>
 </message>
 <message>
- <location filename="../package.cc" line="322"/>
+ <location filename="../package.cc" line="588"/>
 <source>Createing psvimg&apos;s</source>
 <translation>正在製作psvimg</translation>
 </message>
 <message>
- <location filename="../package.cc" line="350"/>
 <source>Cannot get backup key from your AID.
 Please check your network connection!</source>
- <translation>無法從用戶ID獲取備份密鑰，請檢查個人電腦的網絡連接</translation>
+ <translation type="vanished">無法從用戶ID獲取備份密鑰，請檢查個人電腦的網絡連接</translation>
 </message>
 </context>
 <context>
 <name>VitaConn</name>
 <message>
- <location filename="../vita.cc" line="356"/>
+ <location filename="../vita.cc" line="445"/>
 <source>Waiting for connection to PS Vita...</source>
 <translation>等待連接到PSV……</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="359"/>
- <source>Connected to PS Vita [%1], Waiting for account ID</source>
- <translation>已經連接到PSV [%1], 等待用戶ID</translation>
+ <location filename="../vita.cc" line="448"/>
+ <location filename="../vita.cc" line="450"/>
+ <source>Connected to PS Vita</source>
+ <translation>已經連接到PSV</translation>
 </message>
 <message>
- <location filename="../vita.cc" line="361"/>
- <source>Connected to PS Vita [%1] (%2)</source>
- <translation>已經連接到PSV [%1] (%2)</translation>
+ <location filename="../vita.cc" line="448"/>
+ <source>Waiting for account ID</source>
+ <translation>等待用戶ID</translation>
 </message>
 </context>
 <context>
 <name>base</name>
 <message>
- <location filename="../finalhe.cc" line="37"/>
- <location filename="../finalhe.cc" line="132"/>
+ <location filename="../finalhe.cc" line="63"/>
+ <location filename="../finalhe.cc" line="350"/>
 <source>English</source>
 <translation>英文</translation>
 </message>
 <message>
- <location filename="../finalhe.cc" line="45"/>
+ <location filename="../finalhe.cc" line="78"/>
 <source>LANGUAGE</source>
 <translation>繁體中文</translation>
 </message>

finalhe-1.92.tar.gz/src/version.hh Added

finalhe-1.4.tar.gz/src/vita.cc -> finalhe-1.92.tar.gz/src/vita.cc Changed

@@ -1,8 +1,26 @@
+/*
+ * Final h-encore, Copyright (C) 2018 Soar Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "vita.hh"
 
 #include "worker.hh"
 
 #include <vitamtp.h>
+#include <sha256.h>
 
 #include <QSettings>
 #include <QUuid>
@@ -27,6 +45,13 @@
 #include <sys/statvfs.h>
 #endif
 
+#define UPDATE_360_SHA256 "8cc2e2666626c4ff8f582bf209473526e825e2a5e38e39b259a8a46e25ef371c"
+#define UPDATE_360_SIZE 133676544
+#define UPDATE_365_SHA256 "86859b3071681268b6d0beb5ef691da874b6726e85b6f06a1cdf6a0e183e77c6"
+#define UPDATE_365_SIZE 133754368
+#define UPDATE_368_SHA256 "e39e13bbdb2d9413c3097e4ce23e9ac23f7202cbd35924527b7ad87302a7ba40"
+#define UPDATE_368_SIZE 133758464
+
 static inline int getVitaProtocolVersion() {
 return VITAMTP_PROTOCOL_FW_3_30;
 }
@@ -214,8 +239,58 @@
 static VitaConn *this_object = nullptr;
 static QString tempOnlineId;
 
-VitaConn::VitaConn(const QString& baseDir, QObject *obj_parent): QObject(obj_parent) {
- appBaseDir = baseDir;
+VitaConn::VitaConn(const QString &baseDir, const QString &appDir, QObject *obj_parent): QObject(obj_parent) {
+ pkgBaseDir = baseDir;
+ appBaseDir = appDir;
+
+ QDir dir(appDir);
+ QFileInfoList qsl = dir.entryInfoList({ "*.PUP" }, QDir::Files, QDir::Name);
+ foreach(const QFileInfo &info, qsl) {
+ QString fullPath = dir.filePath(info.fileName());
+ QFile file(fullPath);
+ if (file.open(QFile::ReadOnly)) {
+ if (file.size() != UPDATE_360_SIZE && file.size() != UPDATE_365_SIZE && file.size() != UPDATE_368_SIZE) {
+ file.close();
+ continue;
+ }
+ char header[8];
+ file.read(header, 8);
+ if (memcmp(header, "SCEUF\x00\x00\x01", 8) != 0) {
+ file.close();
+ continue;
+ }
+ file.seek(0);
+ qDebug("Verifying sha256sum for %s...", qUtf8Printable(fullPath));
+ sha256_context ctx;
+ sha256_init(&ctx);
+ sha256_starts(&ctx);
+ size_t bufsize = 2 * 1024 * 1024;
+ char *buf;
+ do {
+ bufsize >>= 1;
+ buf = new char[bufsize];
+ } while (buf == nullptr);
+ qint64 rsz;
+ while ((rsz = file.read(buf, bufsize)) > 0)
+ sha256_update(&ctx, (const uint8_t*)buf, rsz);
+ delete[] buf;
+ file.close();
+ uint8_t sum[32];
+ sha256_final(&ctx, sum);
+ QString res = QByteArray((const char*)sum, 32).toHex();
+ if (res == UPDATE_360_SHA256) {
+ Update360 = fullPath;
+ qDebug("Found 3.60 update: %s", qUtf8Printable(fullPath));
+ } else if (res == UPDATE_365_SHA256) {
+ Update365 = fullPath;
+ qDebug("Found 3.65 update: %s", qUtf8Printable(fullPath));
+ } else if (res == UPDATE_368_SHA256) {
+ Update368 = fullPath;
+ qDebug("Found 3.68 update: %s", qUtf8Printable(fullPath));
+ }
+ }
+ }
+
 VitaMTP_Init();
 VitaMTP_USB_Init();
 this_object = this;
@@ -299,13 +374,17 @@
 broadcast->setUnavailable();
 doConnect();
 broadcast->setAvailable();
- } else
+ continue;
+ } else {
 connMutex.unlock();
+ }
 vita_event_t evt;
 int res = VitaMTP_Read_Event(currDev, &evt);
 if (res < 0) {
 qDebug("Disconnected from %s", VitaMTP_Get_Identification(currDev));
 deviceDisconnect();
+ lastDeviceVersion.clear();
+ lastAccountId.clear();
 continue;
 }
 processEvent(&evt);
@@ -342,12 +421,22 @@
 
 void VitaConn::buildData() {
 QMutexLocker locker(&metaMutex);
- QDir dir(appBaseDir);
+ QDir dir(pkgBaseDir);
 dir.cd("h-encore");
 int ohfi = ohfiMax++;
 auto *thisMeta = metaAddFile(dir.path(), "PCSG90096", ohfi, VITA_OHFI_VITAAPP, VITA_OHFI_VITAAPP, true);
 recursiveScanRootDirectory(dir.path(), "PCSG90096", ohfi, VITA_OHFI_VITAAPP);
 thisMeta->updateSize();
+ dir = pkgBaseDir;
+ if (dir.cdUp() && dir.cd("extra")) {
+ QFileInfoList qsl = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+ foreach(const QFileInfo &info, qsl) {
+ ohfi = ohfiMax++;
+ auto *thisMeta = metaAddFile(dir.path(), info.fileName(), ohfi, VITA_OHFI_VITAAPP, VITA_OHFI_VITAAPP, true);
+ recursiveScanRootDirectory(dir.path(), info.fileName(), ohfi, VITA_OHFI_VITAAPP);
+ thisMeta->updateSize();
+ }
+ }
 emit builtData();
 }
 
@@ -356,9 +445,9 @@
 emit setStatusText(tr("Waiting for connection to PS Vita..."));
 } else {
 if (accountId.isEmpty()) {
- emit setStatusText(tr("Connected to PS Vita [%1], Waiting for account ID").arg(onlineId));
+ emit setStatusText(tr("Connected to PS Vita") + QString(" @%1: [%2]. ").arg(deviceVersion).arg(onlineId) + tr("Waiting for account ID"));
 } else {
- emit setStatusText(tr("Connected to PS Vita [%1] (%2)").arg(onlineId).arg(accountId));
+ emit setStatusText(tr("Connected to PS Vita") + QString(" @%1: [%2](%3)").arg(deviceVersion).arg(onlineId).arg(accountId));
 }
 }
 }
@@ -367,8 +456,7 @@
 int total_objects = 0;
 
 QDir dir(base_path + "/" + rel_path);
- dir.setSorting(QDir::Name);
- QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+ QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot, QDir::Name);
 
 foreach(const QFileInfo &info, qsl) {
 QString rel_name = rel_path.isNull() ? info.fileName() : rel_path + "/" + info.fileName();
@@ -405,6 +493,7 @@
 onlineId = info.onlineId;
 else
 onlineId = tempOnlineId;
+ deviceVersion = info.responderVersion;
 updateStatus();
 const initiator_info_t *iinfo = VitaMTP_Data_Initiator_New(QHostInfo::localHostName().toUtf8().data(), ::getVitaProtocolVersion());
 if (VitaMTP_SendInitiatorInfo(currDev, (initiator_info_t *)iinfo) != PTP_RC_OK) {
@@ -551,7 +640,6 @@
 
 QByteArray data;
 
- bool ignorefile = false;
 if (basename == "psp2-updatelist.xml") {
 qDebug("Found request for update list. Sending embedded xml file");
 QFile res(":/main/resources/xml/psp2-updatelist.xml");
@@ -573,39 +661,44 @@
 } else {
 qDebug("No country code found in URL, defaulting to \"us\"");
 }
- } else {
- /*
- qDebug("Reading from local file");
- data = file.readAll();
-
- if (basename == "psp2-updatelist.xml" && !ignorefile) {
- messageSent(tr("The PS Vita has requested an update check, sending local xml file and ignoring version settings"));
- } else {
- QString versiontype = settings.value("versiontype", "zero").toString();
- QString customVersion = settings.value("customversion", "00.000.000").toString();
-
- // verify that the update file is really the 3.60 pup
- // to prevent people updating to the wrong version and lose henkaku.
- if (ignorexml && basename == "PSP2UPDAT.PUP" &&
- (versiontype == "henkaku" ||
- (versiontype == "custom" &&
- customVersion == "03.600.000"))) {
- QCryptographicHash crypto(QCryptographicHash::Sha256);
- crypto.addData(data);
- QString result = crypto.result().toHex();
-
- if (result != hash360) {
- qWarning("3.60 PUP SHA256 mismatch");
- qWarning("> Actual: %s", qPrintable(result));
- qWarning("> Expected: %s", qPrintable(hash360));
- // notify the user
- messageSent(tr("The XML version is set to 3.60 but the PUP file hash doesn't match, cancel the update if you don't want this"));
- }
+ switch (useUpdate) {
+ case 1:
+ if (deviceVersion < "3.60") {
+ data.replace("00.000.000", "03.600.000");
+ data.replace("0.00", "3.60");
+ }
+ break;
+ case 2:
+ if (deviceVersion < "3.65") {
+ data.replace("00.000.000", "03.650.000");
+ data.replace("0.00", "3.65");
+ }
+ break;
+ case 3:
+ if (deviceVersion < "3.68") {
+ data.replace("00.000.000", "03.680.000");
+ data.replace("0.00", "3.68");
 }
+ break;
+ }
+ } else if (basename == "PSP2UPDAT.PUP") {
+ QFile file;
+ switch (useUpdate) {
+ case 1:
+ file.setFileName(Update360);
+ break;
+ case 2:
+ file.setFileName(Update365);
+ break;
+ case 3:
+ file.setFileName(Update368);
+ break;
+ }
+ if (file.open(QIODevice::ReadOnly)) {
+ data = file.readAll();
+ file.close();
 }
- */
 }
-
 qDebug("Sending %d bytes of data for HTTP request %s", data.size(), url);
 
 if (VitaMTP_SendHttpObjectFromURL(currDev, eventId, data.data(), data.size()) != PTP_RC_OK) {
@@ -627,7 +720,11 @@
 qDebug("Current account id: %s", settingsinfo->current_account.accountId);
 accountId = settingsinfo->current_account.accountId;
 updateStatus();
- emit gotAccountId(accountId);
+ if (accountId != lastAccountId || deviceVersion != lastDeviceVersion) {
+ lastAccountId = accountId;
+ lastDeviceVersion = deviceVersion;
+ emit gotAccountId(accountId);
+ }
 
 VitaMTP_Data_Free_Settings(settingsinfo);
 VitaMTP_ReportResult(currDev, eventId, PTP_RC_OK);
@@ -645,9 +742,7 @@
 VitaMTP_ReportResult(currDev, eventId, PTP_RC_VITA_Invalid_Context);
 return;
 }
- QDir dir(appBaseDir);
- dir.cd("h-encore");
- QString fullPath = dir.path() + "/" + ite->second.path;
+ QString fullPath = ite->second.fullPath;
 QFile file(fullPath);
 if (!file.open(QIODevice::ReadOnly)) {
 qWarning() << "Cannot read " << fullPath;
@@ -671,7 +766,7 @@
 quint64 total;
 quint64 free;
 
- if (!getDiskSpace(appBaseDir, &free, &total)) {
+ if (!getDiskSpace(pkgBaseDir, &free, &total)) {
 qWarning("Cannot get disk space");
 VitaMTP_ReportResult(currDev, eventId, PTP_RC_VITA_Invalid_Permission);
 return;
@@ -728,7 +823,7 @@
 accountId.clear();
 }
 
-VitaConn::MetaInfo *VitaConn::metaAddFile(const QString &basePath, const QString & relName, int ohfi, int ohfiParent, int ohfiRoot, bool isDir) {
+VitaConn::MetaInfo *VitaConn::metaAddFile(const QString &basePath, const QString &relName, int ohfi, int ohfiParent, int ohfiRoot, bool isDir) {
 QFileInfo info(basePath, relName);
 MetaInfo &minfo = metaMap[ohfi];
 minfo.ohfi = ohfi;
@@ -746,7 +841,9 @@
 minfo.size = info.size();
 minfo.dataType = App | File;
 }
+ minfo.fullPath = info.absoluteFilePath();
 metaMap[ohfiParent].subMeta[ohfi] = &minfo;
+ qDebug() << "Added" << info.fileName() << "as ohfi" << ohfi;
 return &minfo;
 }

finalhe-1.4.tar.gz/src/vita.hh -> finalhe-1.92.tar.gz/src/vita.hh Changed

@@ -1,3 +1,20 @@
+/*
+ * Final h-encore, Copyright (C) 2018 Soar Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <QObject>
@@ -29,13 +46,24 @@
 time_t dateTimeModified;
 uint64_t size;
 int dataType;
+
+ QString fullPath;
 std::map<int, MetaInfo*> subMeta;
 
 void updateSize();
 };
+
 public:
- VitaConn(const QString& baseDir, QObject *obj_parent = 0);
+ VitaConn(const QString &baseDir, const QString &appDir, QObject *obj_parent = 0);
 virtual ~VitaConn();
+ inline const QString &getDeviceVersion() { return deviceVersion; }
+ inline bool has360Update() { return !Update360.isEmpty(); }
+ inline bool has365Update() { return !Update365.isEmpty(); }
+ inline bool has368Update() { return !Update368.isEmpty(); }
+ inline void setUse360Update() { if (!Update360.isEmpty()) useUpdate = 1; }
+ inline void setUse365Update() { if (!Update365.isEmpty()) useUpdate = 2; }
+ inline void setUse368Update() { if (!Update368.isEmpty()) useUpdate = 3; }
+ inline void setUseNoUpdate() { if (!Update368.isEmpty()) useUpdate = 0; }
 
 public slots:
 void process();
@@ -58,10 +86,11 @@
 void buildMetaData(metadata_t **meta, int ohfiParent, uint32_t index, uint32_t num);
 
 private:
- QString appBaseDir;
+ QString pkgBaseDir, appBaseDir;
 vita_device_t *currDev = nullptr, *wirelessDev = nullptr;
 QString onlineId;
- QString accountId;
+ QString accountId, lastAccountId;
+ QString deviceVersion, lastDeviceVersion;
 int ohfiMax = 256;
 
 std::map<int, MetaInfo> metaMap;
@@ -70,5 +99,9 @@
 QThread *clientThread = nullptr;
 QThread *wirelessThread = nullptr;
 QSemaphore semaClient, semaWireless;
+
+ QString Update360, Update365, Update368;
+ int useUpdate = 0;
+
 bool running = false;
 };

finalhe-1.4.tar.gz/src/worker.cc -> finalhe-1.92.tar.gz/src/worker.cc Changed

finalhe-1.4.tar.gz/src/worker.hh -> finalhe-1.92.tar.gz/src/worker.hh Changed