git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3418 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-01-26 03:38:17 +00:00
parent d9d0eab327
commit d6076fa59b
4 changed files with 7 additions and 7 deletions

View file

@ -2,7 +2,7 @@
\H{v2.0rc3} 2.0 Release Candidate 3 \H{v2.0rc3} 2.0 Release Candidate 3
Released on January 24th, 2004 Released on January 26th, 2004
\S1{v2.0rc3-cl} Changelog \S1{v2.0rc3-cl} Changelog
@ -26,7 +26,7 @@ Released on January 24th, 2004
\S2{} Utilities and Plug-ins \S2{} Utilities and Plug-ins
\b \L{../Contrib/Makensisw/Readme.txt}{MakeNSISW}: Fixed resize bug, added double click handling in settings window \b \L{../Contrib/Makensisw/Readme.txt}{MakeNSISW}: Fixed resize bug, fixed some UI issues in the settings dialog
\b NSIS Update: Improved UI \b NSIS Update: Improved UI

View file

@ -4,10 +4,10 @@
!define VER_MAJOR 2 !define VER_MAJOR 2
!define VER_MINOR 0 !define VER_MINOR 0
!define VER_REVISION 0 !define VER_REVISION 0
!define VER_BUILD 15 !define VER_BUILD 16
!define VER_FILE "20rc2" !define VER_FILE "20rc3"
!define VER_DISPLAY "2.0 release candidate 2" !define VER_DISPLAY "2.0 release candidate 3"
;-------------------------------- ;--------------------------------
;Compile CVS Data Setup ;Compile CVS Data Setup

View file

@ -1,4 +1,4 @@
const char *NSIS_VERSION="v2.0rc2"; const char *NSIS_VERSION="v2.0rc3";
/* /*
Nullsoft Scriptable Install System (NSIS) Nullsoft Scriptable Install System (NSIS)

View file

@ -2077,7 +2077,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (k == -1) PRINTHELP() if (k == -1) PRINTHELP()
SCRIPT_MSG("XPStyle: %s\n", line.gettoken_str(1)); SCRIPT_MSG("XPStyle: %s\n", line.gettoken_str(1));
init_res_editor(); init_res_editor();
char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0rc2</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>"; char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0rc3</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>";
res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (unsigned char*)szXPManifest, k ? 0 : lstrlen(szXPManifest)); res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (unsigned char*)szXPManifest, k ? 0 : lstrlen(szXPManifest));
} }
catch (exception& err) { catch (exception& err) {