mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Bumped version in getVersion() for all formats.

Browse Source 
committer: mfx <mfx> 1031846916 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2002-09-12 16:08:36 +00:00
parent 74a2d9486b
commit e225d77146
18 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_com.h
View File

@ -39,7 +39,7 @@ class PackCom : public Packer
typedef Packer super;
public:
PackCom(InputFile *f) : super(f) { }
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_COM; }
virtual const char *getName() const { return "dos/com"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_djgpp2.h
View File

@ -40,7 +40,7 @@ class PackDjgpp2 : public Packer
public:
PackDjgpp2(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
virtual const char *getName() const { return "djgpp2/coff"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_exe.h
View File

@ -39,7 +39,7 @@ class PackExe : public Packer
typedef Packer super;
public:
PackExe(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_EXE; }
virtual const char *getName() const { return "dos/exe"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_lx_elf.h
View File

@ -41,7 +41,7 @@ class PackLinuxI386elf : public PackLinuxI386
public:
PackLinuxI386elf(InputFile *f);
virtual ~PackLinuxI386elf();
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_LINUX_ELF_i386; }
virtual const char *getName() const { return "linux/elf386"; }
virtual const int *getFilters() const;

2
src/p_lx_sh.h
View File

@ -41,7 +41,7 @@ class PackLinuxI386sh : public PackLinuxI386
public:
PackLinuxI386sh(InputFile *f);
virtual ~PackLinuxI386sh();
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_LINUX_SH_i386; }
virtual const char *getName() const { return "linux/sh386"; }
virtual const int *getFilters() const { return NULL; }

2
src/p_psx.h
View File

@ -38,7 +38,7 @@ class PackPsx : public Packer
typedef Packer super;
public:
PackPsx(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_PSX_EXE; }
virtual const char *getName() const { return "ps/exe"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_sys.h
View File

@ -39,7 +39,7 @@ class PackSys : public PackCom
typedef PackCom super;
public:
PackSys(InputFile *f) : super(f) { }
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_DOS_SYS; }
virtual const char *getName() const { return "dos/sys"; }

2
src/p_tmt.h
View File

@ -39,7 +39,7 @@ class PackTmt : public Packer
typedef Packer super;
public:
PackTmt(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_TMT_ADAM; }
virtual const char *getName() const { return "tmt/adam"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_tos.h
View File

@ -39,7 +39,7 @@ class PackTos : public Packer
typedef Packer super;
public:
PackTos(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_ATARI_TOS; }
virtual const char *getName() const { return "atari/tos"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_unix.h
View File

@ -41,7 +41,7 @@ class PackUnix : public Packer
protected:
PackUnix(InputFile *f);
public:
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual const int *getFilters() const { return NULL; }
virtual int getStrategy(Filter &);

2
src/p_vmlinz.h
View File

@ -39,7 +39,7 @@ class PackVmlinuzI386 : public Packer
typedef Packer super;
public:
PackVmlinuzI386(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_VMLINUZ_i386; }
virtual const char *getName() const { return "vmlinuz/386"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_vxd.h
View File

@ -40,7 +40,7 @@ class PackVxd : public PackWcle
public:
PackVxd(InputFile *f);
~PackVxd();
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_VXD_LE; }
virtual const char *getName() const { return "vxd/le"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_w16ne.h
View File

@ -39,7 +39,7 @@ class PackW16Ne : public Packer
typedef Packer super;
public:
PackW16Ne(InputFile *f);
virtual int getVersion() const { return 11; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_WIN16_NE; }
virtual const char *getName() const { return "win16/ne"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_w32pe.h
View File

@ -47,7 +47,7 @@ class PackW32Pe : public Packer
public:
PackW32Pe(InputFile *f);
~PackW32Pe();
virtual int getVersion() const { return 12; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_WIN32_PE; }
virtual const char *getName() const { return isrtm ? "rtm32/pe" : "win32/pe"; }
virtual const int *getCompressionMethods(int method, int level) const;

2
src/p_wcle.h
View File

@ -39,7 +39,7 @@ class PackWcle : public Packer, public LeFile
typedef Packer super;
public:
PackWcle(InputFile *f) : super(f), LeFile(f){};
virtual int getVersion() const { return 12; }
virtual int getVersion() const { return 13; }
virtual int getFormat() const { return UPX_F_WC_LE; }
virtual const char *getName() const { return "watcom/le"; }
virtual const int *getCompressionMethods(int method, int level) const;

6
src/packer.cpp
View File

@ -630,7 +630,7 @@ bool Packer::getPackHeader(void *b, int blen)
#endif
}
if (!isValidCompressionMethod(ph.method))
throwCantUnpack("unknown compression method");
throwCantUnpack("unknown compression method (try a newer version of UPX)");
// Some formats might be able to unpack "subformats". Ask them.
if (!testUnpackFormat(ph.format))
@ -912,12 +912,12 @@ unsigned Packer::unoptimizeReloc32(upx_byte **in, upx_byte *image,
/*************************************************************************
// compression method util [static]
// compression method util
**************************************************************************/
bool Packer::isValidCompressionMethod(int method)
{
return (method >= M_NRV2B_LE32 && method <= M_NRV2D_LE16);
return (method >= M_NRV2B_LE32 && method <= M_NRV2E_LE16);
}

1
src/packmast.cpp
View File

@ -252,6 +252,7 @@ static void assertPacker(const Packer *p)
assert(p->getFormat() <= 255);
assert(p->getVersion() >= 11);
assert(p->getVersion() < 255);
assert(p->getVersion() == 13);
assert(strlen(p->getName()) <= 13);
}

2
src/s_djgpp2.cpp
View File

@ -198,6 +198,7 @@ static void setCursor(screen_t *this, int x, int y)
}
/*
// I added ScreenGetCursor, because when upx prints something longer than
// 1 line (an error message for example), the this->data->cursor_y can
// have a bad value - ml1050
@ -206,6 +207,7 @@ static void setCursor(screen_t *this, int x, int y)
// Laszlo: when does this happen ? This probably indicates a
// bug in c_screen.cpp(print0) I've introduced with
// the 2 passes implementation.
*/
static void getCursor(const screen_t *this, int *x, int *y)
{