From e6f549adee365b495c11d342076992ec5bfacd19 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 8 Jun 2013 19:10:42 +0000 Subject: [PATCH] Add !finalize %1 fix to changelog and shut up MinGW git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6376 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/history.but | 2 ++ Source/build.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Docs/src/history.but b/Docs/src/history.but index 45ffb49b..ff441570 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -12,6 +12,8 @@ Released on ?, 2013 \S2{} Minor Changes +\b Fixed !finalize %1 + \b Fixed !searchparse \b Minor MakeNSISW fixes and tweaks diff --git a/Source/build.cpp b/Source/build.cpp index e898a822..ff19264a 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -2954,7 +2954,7 @@ int CEXEBuild::write_output(void) ERROR_MSG(_T("Error: can't allocate memory for finalize command\n")); return PS_ERROR; } - *((UINT_PTR*)&arg) -= (UINT_PTR)cmdstr, *((UINT_PTR*)&arg) += (UINT_PTR)cmdstrbuf; + *((unsigned char**)&arg) -= (UINT_PTR)cmdstr, *((unsigned char**)&arg) += (UINT_PTR)cmdstrbuf; _tcscpy(cmdstrbuf,cmdstr); cmdstr = cmdstrbuf; memmove(arg+cchbldoutfile, arg+2, (_tcslen(arg+2)+1)*sizeof(TCHAR));