From: Stefan Kueng <tortoisesvn@gmail.com>
Date: Fri, 3 Dec 2010 21:58:54 +0000 (+0100)
Subject: Windows: afs_shl_ext Show icon mount point overlay
X-Git-Tag: upstream/1.6.0.pre2^2~119
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7f2e16f7788674619e4a75f59ce785c51771c0cc;p=packages%2Fo%2Fopenafs.git

Windows: afs_shl_ext Show icon mount point overlay

Reviewed-on: http://gerrit.openafs.org/3444
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Stefan Kueng <tortoisesvn@gmail.com>
Reviewed-by: Stefan Kueng <tortoisesvn@gmail.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit 92183f4ac31f20862a992b8b3d52dcbe0ebb7eb9)

Change-Id: I966cc9bbb03a5682f3227238c635fb5634502c8c
Reviewed-on: http://gerrit.openafs.org/3785
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/WINNT/client_exp/shell_ext.cpp b/src/WINNT/client_exp/shell_ext.cpp
index f821b3493..d2e573fa9 100644
--- a/src/WINNT/client_exp/shell_ext.cpp
+++ b/src/WINNT/client_exp/shell_ext.cpp
@@ -698,7 +698,7 @@ STDMETHODIMP CShellExt::XIconExt::GetOverlayInfo(LPWSTR pwszIconFile
     _tcsncpy(pwszIconFile, szModule, cchMax);
 #endif
     *pIndex = 30;
-    *pdwFlags = ISIOI_ICONFILE | ISIOI_ICONINDEX;
+    *pdwFlags = ISIOI_ICONFILE|ISIOI_ICONINDEX;
     return S_OK;
 }
 
@@ -718,8 +718,9 @@ STDMETHODIMP CShellExt::XIconExt::IsMemberOf(LPCWSTR pwszPath,DWORD dwAttrib)
 #else
     WideCharToMultiByte( CP_ACP,0,pwszPath,-1,szPath,MAX_PATH,NULL,NULL);
 #endif
-    if (IsSymlink(szPath))
-	return S_OK;
+    if (IsSymlink(szPath) || IsMountPoint(szPath)) {
+        return S_OK;
+    }
     return S_FALSE;
 }