Remove trailing whitespace.

This commit is contained in:
Markus F.X.J. Oberhumer
2010-06-06 22:40:10 +02:00
parent 801f92b7e7
commit 8f8aaca818
4 changed files with 12 additions and 12 deletions
+4 -4
View File
@@ -218,7 +218,7 @@ void PackW32Pe::processTls(Interval *iv) // pass 1
//fprintf(stderr, "TLS callbacks: 0x%0x -> 0x%0x\n", (int)tlsp->callbacks, v); //fprintf(stderr, "TLS callbacks: 0x%0x -> 0x%0x\n", (int)tlsp->callbacks, v);
throwCantPack("TLS callbacks are not supported"); throwCantPack("TLS callbacks are not supported");
} }
#endif #endif
if(v != 0) if(v != 0)
{ {
//count number of callbacks, just for information string - Stefan Widmann //count number of callbacks, just for information string - Stefan Widmann
@@ -839,11 +839,11 @@ void PackW32Pe::pack(OutputFile *fo)
} }
} }
//remove certificate directory entry //remove certificate directory entry
if (IDSIZE(PEDIR_SEC)) if (IDSIZE(PEDIR_SEC))
IDSIZE(PEDIR_SEC) = IDADDR(PEDIR_SEC) = 0; IDSIZE(PEDIR_SEC) = IDADDR(PEDIR_SEC) = 0;
//check CLR Runtime Header directory entry //check CLR Runtime Header directory entry
if (IDSIZE(PEDIR_COMRT)) if (IDSIZE(PEDIR_COMRT))
throwCantPack(".NET files (win32/.net) are not yet supported"); throwCantPack(".NET files (win32/.net) are not yet supported");
@@ -871,7 +871,7 @@ void PackW32Pe::pack(OutputFile *fo)
#if 0 //subsystem check moved to switch ... case above - Stefan Widmann #if 0 //subsystem check moved to switch ... case above - Stefan Widmann
if (!opt->force && ih.subsystem == 1) if (!opt->force && ih.subsystem == 1)
throwCantPack("subsystem 'native' is not supported (try --force)"); throwCantPack("subsystem 'native' is not supported (try --force)");
#endif #endif
if (ih.filealign < 0x200) if (ih.filealign < 0x200)
throwCantPack("filealign < 0x200 is not yet supported"); throwCantPack("filealign < 0x200 is not yet supported");
+2 -2
View File
@@ -63,7 +63,7 @@ protected:
virtual void processTls(Interval *); //NEW: TLS callback handling - Stefan Widmann virtual void processTls(Interval *); //NEW: TLS callback handling - Stefan Widmann
void processTls(Reloc *, const Interval *, unsigned); //NEW: TLS callback handling - Stefan Widmann void processTls(Reloc *, const Interval *, unsigned); //NEW: TLS callback handling - Stefan Widmann
void processLoadConf(Reloc *, const Interval *, unsigned); void processLoadConf(Reloc *, const Interval *, unsigned);
void processLoadConf(Interval *); void processLoadConf(Interval *);
upx_byte *oloadconf; upx_byte *oloadconf;
@@ -71,7 +71,7 @@ protected:
unsigned tlscb_ptr; //NEW: TLS callback handling - Stefan Widmann unsigned tlscb_ptr; //NEW: TLS callback handling - Stefan Widmann
//unsigned tlscb_off; //NEW: TLS callback handling - Stefan Widmann //unsigned tlscb_off; //NEW: TLS callback handling - Stefan Widmann
bool isrtm; bool isrtm;
bool use_dep_hack; bool use_dep_hack;
bool use_clear_dirty_stack; bool use_clear_dirty_stack;
+1 -1
View File
@@ -214,7 +214,7 @@ protected:
DLL_FLAG = 0x2000, DLL_FLAG = 0x2000,
FBIG_ENDIAN = 0x8000 FBIG_ENDIAN = 0x8000
}; };
//NEW: DLL characteristics definition for ASLR, ... - Stefan Widmann //NEW: DLL characteristics definition for ASLR, ... - Stefan Widmann
enum { enum {
IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE = 0x0040, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE = 0x0040,
+5 -5
View File
@@ -135,7 +135,7 @@ next_imp:
add ebx, 4 add ebx, 4
jmps next_func jmps next_func
imp_failed: imp_failed:
section PEIERDLL section PEIERDLL
popa popa
xor eax, eax xor eax, eax
@@ -222,7 +222,7 @@ section PEDEPHAK
pedep9: pedep9:
pop eax //;restore stack pop eax //;restore stack
//;NEW: TLS callback support - Stefan Widmann //;NEW: TLS callback support - Stefan Widmann
section PETLSC section PETLSC
lea ebx, [esi + tls_module_base] //;load module base to ebx lea ebx, [esi + tls_module_base] //;load module base to ebx
lea eax, [esi + tls_callbacks_ptr] //;load pointer to original callback chain lea eax, [esi + tls_callbacks_ptr] //;load pointer to original callback chain
@@ -267,12 +267,12 @@ section PERETURN
section PEDOJUMP section PEDOJUMP
jmp original_entry jmp original_entry
section PETLSC2 section PETLSC2
//;TLS_CALLBACK(hModule, reason, reserved) //;TLS_CALLBACK(hModule, reason, reserved)
tls_handler_start: tls_handler_start:
push esi push esi
.byte 0xBE //mov esi, XXXXXXXX .byte 0xBE //mov esi, XXXXXXXX
tlsc_chain_ptr: tlsc_chain_ptr:
.byte 0, 0, 0, 0 .byte 0, 0, 0, 0
cld //;you never know, this code gets called by the PE loader cld //;you never know, this code gets called by the PE loader
walk_tlsc_chain2: walk_tlsc_chain2:
@@ -290,7 +290,7 @@ push_loop:
done_callbacks: done_callbacks:
pop esi pop esi
ret 0x0C ret 0x0C
// ============= // =============
// ============= CUT HERE // ============= CUT HERE
// ============= // =============