update aPLib v1.1.0 + x64

This commit is contained in:
NtQuery 2014-03-05 11:35:22 +01:00
parent 23b12636c2
commit 8984545393
6 changed files with 23 additions and 19 deletions

View File

@ -416,7 +416,6 @@ __declspec(dllexport) bool TITCALL StaticMemoryDecompress(void* Source, DWORD So
if(Algorithm == UE_STATIC_APLIB) if(Algorithm == UE_STATIC_APLIB)
{ {
#if !defined (_WIN64)
if(aP_depack_asm_safe(Source, SourceSize, Destination, DestinationSize) != APLIB_ERROR) if(aP_depack_asm_safe(Source, SourceSize, Destination, DestinationSize) != APLIB_ERROR)
{ {
return true; return true;
@ -425,7 +424,6 @@ __declspec(dllexport) bool TITCALL StaticMemoryDecompress(void* Source, DWORD So
{ {
return true; return true;
} }
#endif
} }
else if(Algorithm == UE_STATIC_LZMA) else if(Algorithm == UE_STATIC_LZMA)
{ {

View File

@ -1,9 +1,9 @@
/* /*
* aPLib compression library - the smaller the better :) * aPLib compression library - the smaller the better :)
* *
* MS COFF format header file * COFF format header file
* *
* Copyright (c) 1998-2005 by Joergen Ibsen / Jibz * Copyright (c) 1998-2014 Joergen Ibsen
* All Rights Reserved * All Rights Reserved
* *
* http://www.ibsensoftware.com/ * http://www.ibsensoftware.com/
@ -11,50 +11,57 @@
#ifndef APLIB_H_INCLUDED #ifndef APLIB_H_INCLUDED
#define APLIB_H_INCLUDED #define APLIB_H_INCLUDED
#pragma comment(lib, "aplib.lib")
#ifdef _WIN64
#pragma comment(lib,"aplib_x64.lib")
#define APLIB_CONVENTION
#else
#pragma comment(lib,"aplib_x86.lib")
#define APLIB_CONVENTION __cdecl
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef APLIB_ERROR #ifndef APLIB_ERROR
# define APLIB_ERROR (-1) # define APLIB_ERROR ((unsigned int) (-1))
#endif #endif
unsigned int __cdecl aP_pack(const void *source, unsigned int APLIB_CONVENTION aP_pack(const void *source,
void *destination, void *destination,
unsigned int length, unsigned int length,
void *workmem, void *workmem,
int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *), int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *),
void *cbparam); void *cbparam);
unsigned int __cdecl aP_workmem_size(unsigned int inputsize); unsigned int APLIB_CONVENTION aP_workmem_size(unsigned int inputsize);
unsigned int __cdecl aP_max_packed_size(unsigned int inputsize); unsigned int APLIB_CONVENTION aP_max_packed_size(unsigned int inputsize);
unsigned int __cdecl aP_depack_asm(const void *source, void *destination); unsigned int APLIB_CONVENTION aP_depack_asm(const void *source, void *destination);
unsigned int __cdecl aP_depack_asm_fast(const void *source, void *destination); unsigned int APLIB_CONVENTION aP_depack_asm_fast(const void *source, void *destination);
unsigned int __cdecl aP_depack_asm_safe(const void *source, unsigned int APLIB_CONVENTION aP_depack_asm_safe(const void *source,
unsigned int srclen, unsigned int srclen,
void *destination, void *destination,
unsigned int dstlen); unsigned int dstlen);
unsigned int __cdecl aP_crc32(const void *source, unsigned int length); unsigned int APLIB_CONVENTION aP_crc32(const void *source, unsigned int length);
unsigned int __cdecl aPsafe_pack(const void *source, unsigned int APLIB_CONVENTION aPsafe_pack(const void *source,
void *destination, void *destination,
unsigned int length, unsigned int length,
void *workmem, void *workmem,
int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *), int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *),
void *cbparam); void *cbparam);
unsigned int __cdecl aPsafe_check(const void *source); unsigned int APLIB_CONVENTION aPsafe_check(const void *source);
unsigned int __cdecl aPsafe_get_orig_size(const void *source); unsigned int APLIB_CONVENTION aPsafe_get_orig_size(const void *source);
unsigned int __cdecl aPsafe_depack(const void *source, unsigned int APLIB_CONVENTION aPsafe_depack(const void *source,
unsigned int srclen, unsigned int srclen,
void *destination, void *destination,
unsigned int dstlen); unsigned int dstlen);

Binary file not shown.

BIN
TitanEngine/aplib_x64.lib Normal file

Binary file not shown.

BIN
TitanEngine/aplib_x86.lib Normal file

Binary file not shown.

View File

@ -14,9 +14,8 @@
#include <windows.h> #include <windows.h>
#include <Winternl.h> #include <Winternl.h>
#if !defined(_WIN64)
#include "aplib.h" #include "aplib.h"
#endif
#include "LzmaDec.h" #include "LzmaDec.h"
#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) // ntsubauth #define STATUS_SUCCESS ((NTSTATUS)0x00000000L) // ntsubauth