diff --git a/src/p_w16ne.cpp b/src/p_w16ne.cpp deleted file mode 100644 index 5e782ba5..00000000 --- a/src/p_w16ne.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/* p_w16ne.cpp -- - - This file is part of the UPX executable compressor. - - Copyright (C) 1996-2016 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996-2016 Laszlo Molnar - All Rights Reserved. - - UPX and the UCL library are free software; you can redistribute them - and/or modify them under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 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; see the file COPYING. - If not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - Markus F.X.J. Oberhumer Laszlo Molnar - - */ - - -#include "conf.h" -#include "file.h" -#include "filter.h" -#include "packer.h" -#include "p_w16ne.h" -#include "linker.h" - - -/************************************************************************* -// -**************************************************************************/ - -PackW16Ne::PackW16Ne(InputFile *f) : - super(f) -{ - bele = &N_BELE_RTP::le_policy; -} - - -const int *PackW16Ne::getCompressionMethods(int method, int level) const -{ - bool small = false; - return Packer::getDefaultCompressionMethods_8(method, level, small); -} - - -const int *PackW16Ne::getFilters() const -{ - return NULL; -} - - -void PackW16Ne::buildLoader(const Filter *ft) -{ - // prepare loader -// initLoader(nrv_loader,sizeof(nrv_loader)); -// addLoader("..."); - if (ft->id) - { - assert(ft->calls > 0); -// addLoader("..."); - } -// -} - - -Linker* PackW16Ne::newLinker() const -{ - return new ElfLinkerX86; -} - - -/************************************************************************* -// -**************************************************************************/ - -int PackW16Ne::readFileHeader() -{ - // FIXME: identify a win16/ne executable, so that the call - // for contribution below will get thrown - return 0; - //return UPX_F_WIN16_NE; -} - - -bool PackW16Ne::canPack() -{ - if (!readFileHeader()) - return false; - throwCantPack("win16/ne is not supported yet; your contribution is welcome"); - return false; -} - - -/************************************************************************* -// -**************************************************************************/ - -void PackW16Ne::pack(OutputFile *) -{ - throwCantPack("not yet implemented"); -} - - -/************************************************************************* -// -**************************************************************************/ - -int PackW16Ne::canUnpack() -{ - if (!readFileHeader()) - return false; - return false; -} - - -/************************************************************************* -// -**************************************************************************/ - -void PackW16Ne::unpack(OutputFile *) -{ - throwCantUnpack("not yet implemented"); -} - -/* vim:set ts=4 sw=4 et: */ diff --git a/src/p_w16ne.h b/src/p_w16ne.h deleted file mode 100644 index 990e1dee..00000000 --- a/src/p_w16ne.h +++ /dev/null @@ -1,66 +0,0 @@ -/* p_w16ne.h -- - - This file is part of the UPX executable compressor. - - Copyright (C) 1996-2016 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996-2016 Laszlo Molnar - All Rights Reserved. - - UPX and the UCL library are free software; you can redistribute them - and/or modify them under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 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; see the file COPYING. - If not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - Markus F.X.J. Oberhumer Laszlo Molnar - - */ - - -#ifndef __UPX_P_W16NE_H -#define __UPX_P_W16NE_H 1 - - -/************************************************************************* -// win16/ne -**************************************************************************/ - -class PackW16Ne : public Packer -{ - typedef Packer super; -public: - PackW16Ne(InputFile *f); - 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 char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; } - virtual const char *getFullName(const options_t *) const { return "i286-win16.ne"; } - virtual const int *getCompressionMethods(int method, int level) const; - virtual const int *getFilters() const; - - virtual void pack(OutputFile *fo); - virtual void unpack(OutputFile *fo); - - virtual bool canPack(); - virtual int canUnpack(); - -protected: - virtual int readFileHeader(void); - - virtual void buildLoader(const Filter *ft); - virtual Linker* newLinker() const; -}; - - -#endif /* already included */ - -/* vim:set ts=4 sw=4 et: */ diff --git a/src/packmast.cpp b/src/packmast.cpp index 6ff4f706..55dedb69 100644 --- a/src/packmast.cpp +++ b/src/packmast.cpp @@ -48,7 +48,6 @@ #include "p_wcle.h" #include "p_tmt.h" #include "p_vxd.h" -#include "p_w16ne.h" #include "p_w32pe.h" #include "p_w64pep.h" #include "p_vmlinz.h" @@ -174,11 +173,6 @@ Packer* PackMaster::visitAllPackers(visit_func_t func, InputFile *f, const optio if ((p = func(new PackVxd(f), user)) != NULL) return p; delete p; p = NULL; -#endif -#if 0 - if ((p = func(new PackW16Ne(f), user)) != NULL) - return p; - delete p; p = NULL; #endif if ((p = func(new PackW64Pep(f), user)) != NULL) return p;