Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updated from 1.05 release.

Browse Source 
committer: mfx <mfx> 980367939 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2001-01-24 20:25:39 +00:00
parent d5dd445a06
commit 7371c219b1
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_w32pe.cpp
+9 -8
View File
@@ -45,15 +45,16 @@ static const
#define FILLVAL 0
// keep the namespace clean
// it would be better to use inner classes except for Interval, which
// could be used elsewhere too
// Some defines to keep the namespace clean.
// It would be better to use inner classes except for Interval, which
// could be used elsewhere too.
#define Interval PackW32Pe_Interval
#define Reloc PackW32Pe_Reloc
#define Resource PackW32Pe_Resource
#define import_desc PackW32Pe_import_desc
#define Export PackW32Pe_Export
#define tls PackW32Pe_tls
/*************************************************************************
@@ -356,8 +357,7 @@ void Reloc::finish(upx_byte *&p,unsigned &siz)
}
p = start;
siz = ptr_diff(rel1,start) &~ 3;
siz -= 4;
rel->pagestart = 0; // terminating 0
siz -= 8;
assert(siz > 0);
start = 0; // safety
}
@@ -918,8 +918,9 @@ void PackW32Pe::processTls(Interval *iv) // pass 1
return;
const tls * const tlsp = (const tls*) (ibuf + IDADDR(PEDIR_TLS));
if (tlsp->callbacks) // note: callbacks are not implemented on windoze 9x
throwCantPack("tls callbacks are not supported");
// note: TLS callbacks are not implemented in Windows 95/98/ME
if (tlsp->callbacks)
throwCantPack("TLS callbacks are not supported");
unsigned tlsdatastart = tlsp->datastart - ih.imagebase;
unsigned tlsdataend = tlsp->dataend - ih.imagebase;
@@ -969,7 +970,7 @@ void PackW32Pe::processTls(Reloc *rel,const Interval *iv,unsigned newaddr) // pa
tlsp->datastart = newaddr + sizeof(tls) + ih.imagebase;
tlsp->dataend = newaddr + sotls + ih.imagebase;
tlsp->callbacks = 0; // note: callbacks are not implemented on windoze 9x
tlsp->callbacks = 0; // note: TLS callbacks are not implemented in Windows 95/98/ME
}