From d6c88c52c85958146776160850a06d7730fae1b0 Mon Sep 17 00:00:00 2001
From: ramon18 <ramon18@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 24 Jul 2003 00:34:59 +0000
Subject: [PATCH] removed IMAGE_FILE_RELOCS_STRIPPED

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2767 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/nsExec/nsexec.c |   7 +++++--
 Plugins/nsExec.dll      | Bin 6144 -> 6144 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c
index 977837ad..2e1fa1d5 100644
--- a/Contrib/nsExec/nsexec.c
+++ b/Contrib/nsExec/nsexec.c
@@ -112,7 +112,7 @@ void ExecScript(int log) {
     {
       pNTHeaders = (PIMAGE_NT_HEADERS)((BYTE*)pNTHeaders + ((PIMAGE_DOS_HEADER)pNTHeaders)->e_lfanew);
       pNTHeaders->FileHeader.Characteristics = IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_LOCAL_SYMS_STRIPPED | 
-        IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED;
+        IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE;
       pNTHeaders->OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI;
       pNTHeaders->OptionalHeader.AddressOfEntryPoint = (DWORD)WinMain - (DWORD)g_hInst;  
       UnmapViewOfFile(pNTHeaders);
@@ -123,7 +123,10 @@ void ExecScript(int log) {
 
   g_to = 0; // default is no timeout
   g_hwndList = FindWindowEx(FindWindowEx(g_hwndParent,NULL,"#32770",NULL),NULL,"SysListView32",NULL);
-  pExec = g_exec + nComSpecSize - 2; *pExec = ' '; pExec++;
+  pExec = g_exec + nComSpecSize;
+  while ( !*(pExec-1) ) pExec--;
+  *pExec = ' '; 
+  pExec++;
   popstring(pExec);
   if ( my_strstr(pExec, "/TIMEOUT=") ) {
     char *szTimeout = pExec + 9;
diff --git a/Plugins/nsExec.dll b/Plugins/nsExec.dll
index c69136b52ca0a8ab47e211fc1abbdc1fc2247eca..a15f639c006e9960b22a8a70b2b3c98548967be2 100644
GIT binary patch
delta 504
zcmZoLXfT*?gV{q<e&X$~jPjc=GPW|SKlv}3puivy9NhgQIEyL#zi14QXMMOth1tPo
zr?&)yKtS4Y2Qj|MwXBMaPbSZ2H56q&*6I4f!$P9uM|bIqV{8g;VV$KfCf{M5%K6~)
z>dx3Vouxk}SFx!wewn<0Er9XC<d1CDKvI|8H1J7d?FVK?28I$&%h(_MEn-Xz485*D
zf&+qsga4Pl`7de$v>Gf^22}K4)B?!ubbSI=lJTFJfgvNpfI$GP(f}yc?fPT#W_FN0
zH`!(6zWf(e0SflEGq5l)WH|-=F9nJy07a}1ce;L=EX+~Nb*GE5gUQSDzwe#N6F9no
zzLDYdWc)EXjdKzAga6k-=3ei1eKA>>ON9$+8qko<j$GTAH}Q$EfWmFFxR5PN{aZs0
zBN3wsMhlEK867gZX7t#I#aPl<$2h<^+&I;^+jy4o8sn|T2aPWnUpIbc{K1&fMA$^t
zM9;+0#M30gB;F*$q}*hV$zqe$CPz%3m<X6kn97+NncAAVnEIJUn^u~3nocl1ZhFr2
ziRo)o1~Wx7bu(QvV>4&7AhT?<LbDoevu?A=W(&-gnQb%MZFa=$uGvSkKW3cfs^&K4
ae&%%+Jr=7iu3Egb_-Mgwxw(*ui4gz{JGwjo

delta 521
zcmZoLXfT*?gIV*U+{D{o8O1hVWNc+tfAL>5L4iRaIJo;qa28Yef6*8q&-!qQ3bTXF
zPA3Tlfq=B*4r2V1YgrW;Ure6QYRJ=DV({-6n}S<dXX%~EPg$pOKKZ=5Gxkkq>6gjP
zY^sbuCa+`*V0<$97n?PZG-Edne9>6@ftitkp@h>i_6vWD7!w0Suj`lKfZ*WZ|D|vK
zi<$s!1k02G75x{r0CGEBUx1Zl{AXrh$cQjt5CE$*07`Ycewn<7UDf&r^N;_c8X(6W
zFSfI`4FIYsV*BRG!BlGSzZ58?0+i})XJBDq$Z`q*izt8;AMSMhF<FMAnCn3oV+WI$
z=YQV^lV@^t1O2AT>B;zIaz5uG?kE4RgRHyW?Rsaj43`QQ)HI+Wo4vTUF;6t$+{7os
z0t(2@;zG78^-m1{8*&@98%;M_X|&VmtkEr_-$nw)%Es=-e#SAzO~w<A7aOlJ-eG*)
z_?+=w<LAadjJZr?OjJ!QOdL%7O~Op#P4Y}8o6Is<WU|}jwh6l_zp1FHrm2akwW+IV
zkZFNwgK4|zKGUP7w@n|Jem9jclQUB>(=xL%^E68`%P=d}Hfu8LGMjET*KDoXCbQjU
mSIl0ReKun-moYascQr4yXtr2namM0-#S4pH7Mly1m>2=&EWyJ7