From 9adf1acb506069c5b2ac6568badabd06b53d0390 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 22 Jun 2003 13:44:02 +0000
Subject: [PATCH] Find all directories and make sure found entries are
 directories

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2666 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/StartMenu/StartMenu.c |  31 +++++++++++++++++++------------
 Plugins/StartMenu.dll         | Bin 6656 -> 6656 bytes
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c
index f578c126..6521e4ff 100644
--- a/Contrib/StartMenu/StartMenu.c
+++ b/Contrib/StartMenu/StartMenu.c
@@ -334,20 +334,27 @@ void AddFolderFromReg(HKEY rootKey)
     RegCloseKey(hKey);
   }
 
-  lstrcat(buf, "\\*.");
+  lstrcat(buf, "\\*.*");
   hSearch = FindFirstFile(buf, &FileData);
-  if (hSearch != INVALID_HANDLE_VALUE) do
+  if (hSearch != INVALID_HANDLE_VALUE) 
   {
-    if (*(WORD*)FileData.cFileName != *(WORD*)".")
+    do
     {
-      if (*(WORD*)FileData.cFileName != *(WORD*)".." || FileData.cFileName[2])
+      if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
       {
-        if (SendMessage(hwDirList, LB_FINDSTRINGEXACT, -1, (LPARAM)FileData.cFileName) == LB_ERR)
-          SendMessage(hwDirList, LB_ADDSTRING, 0, (LPARAM)FileData.cFileName);
-        /*idx = */
-        /*SendMessage(hwDirList, LB_SETITEMDATA, (WPARAM)idx,
-          (LPARAM)ExtractAssociatedIcon(g_hInstance, FileData.cFileName, (WORD*)&idx));*/
-      }
-    }
-  } while (FindNextFile(hSearch, &FileData));
+        if (*(WORD*)FileData.cFileName != *(WORD*)".")
+        {
+          if (*(WORD*)FileData.cFileName != *(WORD*)".." || FileData.cFileName[2])
+          {
+            if (SendMessage(hwDirList, LB_FINDSTRINGEXACT, -1, (LPARAM)FileData.cFileName) == LB_ERR)
+              SendMessage(hwDirList, LB_ADDSTRING, 0, (LPARAM)FileData.cFileName);
+            /*idx = */
+            /*SendMessage(hwDirList, LB_SETITEMDATA, (WPARAM)idx,
+              (LPARAM)ExtractAssociatedIcon(g_hInstance, FileData.cFileName, (WORD*)&idx));*/
+          }
+        }
+	  }
+    } while (FindNextFile(hSearch, &FileData));
+    FindClose(hSearch);
+  }
 }
\ No newline at end of file
diff --git a/Plugins/StartMenu.dll b/Plugins/StartMenu.dll
index 4f500fae717fcaff4e2da615b6efd4b30f16d52b..d7678f8769e7dad7b3ad16d5a7beb37761927b9b 100644
GIT binary patch
delta 1421
zcmc(fe{54#6vyxF)?ap$*TKW-kaf1n2CQ+DJ=0=`LpHV;VqPp=@#luD$y-y{+}^^5
zi>tZ`q%2uE{INtdGx!JmGsQ)RiG=b)jm8)v8bV?WiAxL)l7<AbAo2RWuN%|9{L`C!
zcF*~qd(S=Z+}oua(hU>orfkwN_p`^CU8Z|B55K)goBa{<TQxgpf5Kc=y4RZ5Z%A45
z^WD1*xhGpy?$KKq+s^Im>)h?^Z+qNIfU#D_*c83M{kBm~AKEq+``~A*D(Dh-@oKut
zt9hKbZ6CigGh{o<SMTsKWh{66qbHd%P-)yPVk|1uNqVlhp4U>k_~g?KSRgbR7wUG{
z8^xjKK;2W{n5FS0xeapMxLd}QXfh$Rv?kX!L(FJRWY{C#h}?H`yg8u6VliE)I(=rZ
z4jhI$mK*R$9pVJsaL}x0ig`+C7dOcyM~^rvc^mm0Pn5|zGNlH>8AtmeF4P+8a)kLB
z`oIz7FVpu9Ki^4tM+ZMhx--H@Y25iZPtzG^keAcEa}6IRmurLjpiGm`G!9b4<wv~J
z<#U=+d$gAhxEeZBu*HB&TrsYr7t&HEAsO@Vj$hkc2o|J2q?D6&-d}Y?N^}2ObyG?w
zWc#dDRN*$cK@;w0z4D93Tk^Wlth}m8^X|BJ_`Yi8ff{|Fb)-wykV6(@%IdD%+oW5H
zP^FV(LbFa$2N%7<cIl-X<xX~5{vEKNzJ`)<Xd%9Q9NUT-RoM%xC{%lSyk$X`WnZR;
zJ^R<nYc?yAE}>aVuNY}u#-gJR(<x8bC0m87?4(<s_iM^!s<ElRgwWfC8i1Esct;5H
zjf|FtbH@rPW|XE&URmjbg2!+qF4Q`h9j|_S0nhj9$gh6JZh=ccj`LNp!5sJ;+yf<#
zF?Is;F^~rnK#o4>?}AA%4ZZ|j;1_TM+yf6H?<1fVgg_g35hTHWKYNKChH(r`105S8
zpcec9tg(2QwAVsYe2D);yNG>w|11xdh7CVd=F3*C{=Yx3?LR;7i=tG&*|)oQXbbvX
zu=n(KZ(+B2YpUn9U8!w-i3B=JAFl{L^hqJU%f#BR*tYJyU0YK<{R#SgMU0=MMn&Tz
z)UQ<YEWM|6@EHB6tn<EYizduCmiFw^d-@rxBh6dCa%@@Mkr<TuHqnsxz&iY++bo;-
z3>wHWFA;(t0Zp>83NC6USayMby2``(`k4}S!Nx~t?B%cXl5?T&Lf1pZ;Z@<vFy7aj
Fe*^s<k8J<|

delta 1421
zcmc(fUrZcD9LIliaCdtgl|6JTgjx>o45(a$mNkbxDzzYLnr16KP7^Jdg4tqYv0cK|
zG-0(+XwFNZ121R|ran{?|FoA{Y}$yasnz&k(uZO+h6f)&XhZ4?0qyvmJ+6&D`06B|
zo%w#}H^2Su?CjcgcHM~G-#l^b3R|5U&r$rxx$!(l&yPQZ{%z=d^zoUQaYBFPubWPP
z`{zZce}3OyQ?8|dHKUnm2XoU?4Sid4Q?qnWg`atd3gB#X+)=U1M`5BCsQ37bEab8o
z|G>35KL|ZqQO18{3cH{G#41?}XRbbWD|6WO6<covNgbR%_2J{B_LiF~c|@&38{<3k
zYgrYy^FMmB1_45s^Fn(D<IUoDQ@Cc!x7NBu&TfL8FjtC6ZSC$7x~<FDMwlr*#!YuD
z5S8n0q?^KOJRUcMwu7H@SB8h-4o>&_r4RER$ohy?OR9B7=-)gclZ>43l(Qxt^lU1Y
zb)?prm`-`xjx(W!d8enImGJjH5%vQA!4qP;`I4ud4RFI7V>VBFA7e-OC2xdP^9An)
zmgI`^sBb`~SxPlnJf?&&-=PG(J<@w%KOa)+I!ug3uOhCS^VkbH(#Bw!3s9$Kw`M1^
z*6-4qmUZ5VT9npr|A@LFt<!S*oG4!Avsfn|@jVxiPn2$6GKB8r)q41XFA+%Iah*JH
zTMJtHJ7f*h$YM@9yDQf=8jd40DY{AM&RsNXO=Xu$WjDx`G$pUS?x|UnjGJcX@7|8K
zqee~cg;Nx&y_RlXHe}h?c&Y!*jq){HW!;L<ozUy1jhC?|v?M>{uUF(&;Z?rGZ~0G_
zSIbm`ledL1+JqK_N-ZB1!g?*GAA#WK3tukWfC0|HyX||vyNu&H-~WAx=vQzN$abNE
z=qmUW%z<Sv3C6%LU>L}@=Ru-_U;s>j)4%{%!3>xKE5L)iB_Isyz|)`&yb6*bO3*L{
z6Cj4*Do_G00NMTwI-PSVfTu!-*9ws4=U9icPKzMdZo;GBXvO;f`_Ufx&qw<rZ~r0d
z;NG6Y+lVs!WKk*mlAkY%_&>?|uUOlNuNKAG$9$Kn<LeqyE7=MDncB|Ucv0Ztz)@Fg
zmzCJ}dgp;Y<G>-JTK;UH_TFQ6-Q8VD<e)7)9T<wp&B^`HHsP<upmS6~SA!aWQ%jAR
qhT_YNk1+M@eSXF$Q>ZPwn4NK#yuo}^(XXSk(bcG*zg61rBKjMsxrl23