]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Windows: afs_shl_ext Show icon mount point overlay
authorStefan Kueng <tortoisesvn@gmail.com>
Fri, 3 Dec 2010 21:58:54 +0000 (22:58 +0100)
committerDerrick Brashear <shadow@dementia.org>
Mon, 31 Jan 2011 20:21:53 +0000 (12:21 -0800)
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>
src/WINNT/client_exp/shell_ext.cpp

index f821b349319cb7960c01bbddc5196f9e7989c834..d2e573fa9b345fd418c5f53991e320740bb80f57 100644 (file)
@@ -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;
 }