diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-02-18 22:24:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-02-18 22:24:21 +0000 |
| commit | b3998250287545c0108b5f08091f84308312e2f4 (patch) | |
| tree | 36819914c54796d67161331a733965f9d93c2839 /packaging/nsis/wireshark.nsi | |
| parent | 09315279976c5931b4af5b3218c6da90ac2daafe (diff) | |
Guy pointed out that we were still checking for the Microsoft Layer for
Unicode, which is only needed for platforms we no longer support.
svn path=/trunk/; revision=27485
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 56f796f013..a16256da7b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -210,25 +210,17 @@ ShowUninstDetails show !define UPDATEICONS_UNIQUE ${__LINE__} - IfFileExists "$SYSDIR\shell32.dll" UpdateIcons.next1_${UPDATEICONS_UNIQUE} UpdateIcons.error1_${UPDATEICONS_UNIQUE} -UpdateIcons.next1_${UPDATEICONS_UNIQUE}: - GetDllVersion "$SYSDIR\shell32.dll" $R0 $R1 - IntOp $R2 $R0 / 0x00010000 - IntCmp $R2 4 UpdateIcons.next2_${UPDATEICONS_UNIQUE} UpdateIcons.error2_${UPDATEICONS_UNIQUE} -UpdateIcons.next2_${UPDATEICONS_UNIQUE}: + IfFileExists "$SYSDIR\shell32.dll" UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE} UpdateIcons.error_shell32_${UPDATEICONS_UNIQUE} +UpdateIcons.ok_shell32_${UPDATEICONS_UNIQUE}: System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} -UpdateIcons.error1_${UPDATEICONS_UNIQUE}: +UpdateIcons.error_shell32_${UPDATEICONS_UNIQUE}: MessageBox MB_OK|MB_ICONSTOP \ "Can't find 'shell32.dll' library. Impossible to update icons" \ /SD IDOK Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} -UpdateIcons.error2_${UPDATEICONS_UNIQUE}: - MessageBox MB_OK|MB_ICONINFORMATION \ - "You should install the free 'Microsoft Layer for Unicode' to update Wireshark capture file icons" \ - /SD IDOK - Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} + UpdateIcons.quit_${UPDATEICONS_UNIQUE}: !undef UPDATEICONS_UNIQUE Pop $R2 |