From 7b33e4d596016889bb06027e05836298f46c43d1 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 21 Nov 2002 17:29:26 +0000
Subject: [PATCH] Now works with latest changes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1799 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/ExDLL/exdll.h                       |   1 +
 Contrib/InstallOptions/InstallerOptions.cpp |   4 ++--
 Contrib/StartMenu/StartMenu.c               |   2 +-
 Plugins/InstallOptions.dll                  | Bin 11264 -> 11264 bytes
 Plugins/StartMenu.dll                       | Bin 6656 -> 6656 bytes
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Contrib/ExDLL/exdll.h b/Contrib/ExDLL/exdll.h
index 301ec31f..4f57e38c 100644
--- a/Contrib/ExDLL/exdll.h
+++ b/Contrib/ExDLL/exdll.h
@@ -11,6 +11,7 @@
 
 // For page showing plug-ins
 #define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+#define NOTIFY_BYE_BYE 'x'
 
 typedef struct _stack_t {
   struct _stack_t *next;
diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index f448e4ae..4b31efda 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -697,9 +697,9 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
     HANDLE_MSG(hwndDlg, WM_COMMAND, WMCommandProc);
     return 0;
     case WM_USER+666:
-      if (wParam == 0xD1E || wParam == -1 || ValidateFields()) {
+      if (wParam == NOTIFY_BYE_BYE || wParam == -1 || ValidateFields()) {
         if (wParam == -1) g_is_back++;
-        if (wParam == 0xD1E) g_is_cancel++;
+        if (wParam == NOTIFY_BYE_BYE) g_is_cancel++;
         g_done++;
         PostMessage(hwndDlg,WM_CLOSE,0,0);
       }
diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c
index 7458c5fa..1dc57ae6 100644
--- a/Contrib/StartMenu/StartMenu.c
+++ b/Contrib/StartMenu/StartMenu.c
@@ -276,7 +276,7 @@ BOOL CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     break;
     case WM_USER+666:
       g_done = 1;
-      if (wParam == 0xD1E)
+      if (wParam == NOTIFY_BYE_BYE)
         pushstring("cancel");
       else
       {
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 74d1406d83e0e5c2e06acade20063994042d2ad5..3166da133be4912da636c14229b418e06ea3b1ae 100644
GIT binary patch
delta 771
zcmZwEZAep57{Kv+)vc!KMxmA=OVi4i@}8F)wsVeGDR5C4N-q*5rDjCghnlrg(VC{A
zWp*>lL~{^^VThv?l2p<Riqe7{Xo5tx%A6wN%V@XhXFnYHKfmYObBfc8)9={59SbAX
z!=e1K>V+Zxm2Hq$Yxt+K-8Y&qw0Zm0d-0>P)&FgRwxpcnIEy3Flx8%VQnqKRI8Ix7
z+hY}ZI*Z$E3b42pQ-I^soT8L;o6MdmPpzotjoi{!ZVt%OOu7}t(yK$=a<KLk4{U|n
z3^l(`9to`H&2oOwK=_*pMN!0pgPhLMv7E(A*|MA^OKFvJgSQ;d_dugDh0|5|-}C4#
zpKis}<KxI)iPty|ti(FU&XstzLoZJSNAQcb!1aIlYC+W&(yLlJkle2i)7*^UxFOHe
z+otu0HAM}EW<#r?%kaT4ZkRIY$u_csFp^BNNGYi#cgX|NK$=Jkc}e=nAhDA%@{>5p
zJaLm%)Sm{@P#R97sYnS;q{%dmrqc|XP0!Lxw18fx<+O^{(#P}(eL*{EKm9`O^f#TN
zv(!aZ%%80*VtN+IVi{w**<N;ton$vyC97pt_MF*R7jv>jHl5%jZICugQBs^lq$KHx
zlp~#!?n`yjoWyPN{2kA6YQZd&2o*xB&@OZe?}U%SurMb45}d-U;1Ya*ABY0+AO)NT
zxxfs{KozJ1R?r5D+CeuM0AIl<7zdMJ2DktZeW4Bp!3Y=!6JaVm0dwGacomkxDp&&_
z!AAHD+F%EK4g27G_!-*a5BL|(Ko|5vIuwG!&{h<OcA+G+A00)R=mNToEJ#KVQ8Q{q
zJ*Xeq(I|4F1>{D)iFhN9z_A$Mc$|gL;Cy@ySK%65kDG8SZpYv7cRYb-u^X$zwPK_g
XBVv(>d&E>RTf8V<5$j~{n1BBP(^WDl

delta 756
zcmZvZYe-XJ9LC?%(%QUi2s$ymB+Js&&U-mQd*9b1g0es?2`|w_NG!#O%B4b@mUdOk
zaR!B<wla;d3oc2@M9~byzz9<?p%P@M6xJ-0^fdkKhd=zD-}CMHS7ujc*N<zyhK|}M
zLWLaL-!Y-r`9bj33Qv@AU5s$asqtyrAWSLu{RWe=^wl*0fGXEEYlg*QO^-X~1%Upt
z&Esmy4LxCg0MHeyf0e3Q{ar(URJFR-TH;CPyj8D73oy_XrPV)IH?yLuRRadxo1+Bi
z^MqJuss5<9uwNMqY!Zr;;-Hbpo;g)jrLuj%;Bu~E<tjc}!|GLRRPv2cLa}no7?hIZ
z(GE)*Fx2?jJzd?#Ue(&?>$0q;4KBEz-s}odW{oCc!D$Gd6*@u&yjB-c-i2?~-ZTO5
z*>fi6e0YYoqQ(5w{KDLC9x>0D-DVSwqnIYqRGLq3P#e8X8)*w|rycY)9ipG;B%P*n
z)J>PEhWWAp7Q!OgcD9R|St3hjsVs{fVY#e;oo46RMRt|dF*|E!57}e(iuJK!HqIv5
z54OOT7~nb{z=JEeiN|orlemSa@q_$0ui-Y{%-gt=cku!4<|_Z4pq0bq9df)(<U~0|
zJ|q{)XXLxGL;fd&2+yws0DQ!9@w!+qc8c9%pZH$<D1H&A#qXk9ToM7)LIaG493Frt
z;aOM?YoQ%FU>kf1E4txZI0`4=6r6>>;35Rb8|hIX+Jd4HLCGi+<)K1Ugep)ivZDrc
z54ED_s0+P8{b&e{pfNOwX3$TxhydP%193Qx!m*g(1e}7?@nL)dm*6sd4d1~{_!;iR
zgLoKE;wkLLD_BGHi6nwV6G(OwPV&hqQc125J82*fNIU5y-Q*i_k$JL2G?Gp-N->fs
W?U9nCy;7!BAeBlNB!{Bex%?mF_aof^

diff --git a/Plugins/StartMenu.dll b/Plugins/StartMenu.dll
index bdeb8a0063c98a8c38d24757cbd6a61b6c0421a4..d6ff6e87e807583a82923d22d021246144dfd927 100644
GIT binary patch
delta 345
zcmXZUO(?@*9KiAC?`0F=pIkVYIiTic`n^1l;=n-;b6IlWWHom1b}%nVQyW=`kP`>5
z2L}iLyp+&tg_N4Z5J^fQEhljxE566i;X8sOIP+j#|GKLd|2>EdYno;fA~g<qe;Aq5
zv@7k^xY2CM#Z{UR^}R!-!DJyaN4JxNfR8%=us#r^jtZfBb<ew9=+8AqxjAAozSGS~
ziSfT-&YCj$EKmqlPzw%lLNmC)1B2j$C0GRmLU0BVh{7#ALkzMp7Yopil~{*PY{ho$
z#D4VS3hv-Bp5i6m;uFU36E#X93zbndIjDtP)J=U9pb6TbE!w363egEg=!G&l$ITYD
zF>xci*~bA6@-#2-BCqi#Z}UDMahT8flCSxZf4D?CWSi`gUg?u#a#GI9J$Wd@GAiGs
euJTopYEVt8MY&Xu8dei(UK#2_-K)9fgz;bPNps==

delta 347
zcmXZVO(?@*9KiAC&unFx#leNuCI|2IdwHG%=0bLwi{!w`<n7?Kke698D@K;&gadML
zU`<|1XthFWHEAhvP%DIsi;ETC<LB~qqZ^l=tR0SMwfOHzn5;%kFGPA0EPogaXxhE@
z9*k?nX~lL;h=!rbQeT=7nKL1s5b#|;Jz=(F2;rmNN?{&0cYam~bD}0#Vu<PwOgdd^
z@(?s+E$F9gPzZLY11B^=E4ZKs#=!#{unmV0h8u`M93J5nz90wlumAz8(1A_Zj@{UY
zV>pXjc!ZaDjd%En3H-tz)RB>FR7thuq&9NV0F9ED{IpB^bWCRyrYnlk8)b2>i)~!S
zikrEUJ?!OqUgkAk=N;bT5TEh|NBEZS_<>(oljYJWyJWu{ksj%ji*iMt$a5Kyarq&$
eRlX`xjjBbpDVG{lZsk|2>QF`1vkGjc%>4rTH*o?0