Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.1, 2.1.2, and tip

stable shellext: additionally use GetDriveType for local disks check (closes #842)

Changeset 9d58ecd48e43…

Parent eb890e5a314e…

by Adrian Buehlmann

Changes to one file · Browse files at 9d58ecd48e43 Showing diff from parent eb890e5a314e Diff from another changeset...

Change 1 of 1 Show Changes Only win32/​shellext/​CShellExtOverlay.cpp Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
 
 
 
 
 
 
 
 
 
 
 
 
 
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
 
 
 
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
 #include "stdafx.h"  #include "ShellExt.h"  #include "TortoiseUtils.h"  #include "StringUtils.h"  #include "QueryDirstate.h"  #include "RegistryConfig.h"  #include "CShellExtOverlay.h"    #include <shlwapi.h>      STDMETHODIMP CShellExtOverlay::GetOverlayInfo(   LPWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags)  {   TDEBUG_TRACE("CShellExtOverlay::GetOverlayInfo: myTortoiseClass = " << myTortoiseClass);   // icons are determined by TortoiseOverlays shim   *pIndex = 0;   *pdwFlags = 0;   *pwszIconFile = 0;   return S_OK;  }      STDMETHODIMP CShellExtOverlay::GetPriority(int *pPriority)  {   *pPriority = 1;   return S_OK;  }      STDMETHODIMP CShellExtOverlay::IsMemberOf(LPCWSTR pwszPath, DWORD /* dwAttrib */)  {   ThgCriticalSection cs(CShellExt::GetCriticalSection());     std::string cval;   if (GetRegistryConfig("EnableOverlays", cval) != 0 && cval == "0")   return S_FALSE;     // This overlay handler processes all filenames in lowercase, so that a path   // "C:\FOO\BAR\Baz.TXT" will be considered equal to "C:\foo\bar\baz.txt"   // (note that mercurial preserves the case of filenames in .hg/dirstate)     std::wstring lowerpath(pwszPath);   ::CharLowerW(const_cast<wchar_t*>(lowerpath.c_str()));     std::string path = WideToMultibyte(lowerpath.c_str());   - if (GetRegistryConfig("LocalDisksOnly", cval) != 0 && cval != "0" - && PathIsNetworkPath(path.c_str())) - return S_FALSE; + if (GetRegistryConfig("LocalDisksOnly", cval) != 0 && cval != "0") + { + if (::PathIsNetworkPath(path.c_str())) + return S_FALSE; + + if (path.size() > 2 && path[1] == ':') + { + std::string t = "C:\\"; + t[0] = path[0]; + if (::GetDriveType(t.c_str()) == 4) + return S_FALSE; + } + }     char filterStatus = 0;   if (myTortoiseClass == 'A')   filterStatus = 'A';     char status = 0;   if (!HgQueryDirstate(myTortoiseClass, path, filterStatus, status))   return S_FALSE;     if (status == myTortoiseClass)   return S_OK;     return S_FALSE;  }      CShellExtOverlay::CShellExtOverlay(char tortoiseClass) :   myTortoiseClass(tortoiseClass)  {   m_cRef = 0L;   CShellExt::IncDllRef();  }      CShellExtOverlay::~CShellExtOverlay()  {   CShellExt::DecDllRef();  }      STDMETHODIMP_(ULONG) CShellExtOverlay::AddRef()  {   ThgCriticalSection cs(CShellExt::GetCriticalSection());   return ++m_cRef;  }      STDMETHODIMP_(ULONG) CShellExtOverlay::Release()  {   ThgCriticalSection cs(CShellExt::GetCriticalSection());   if(--m_cRef)   return m_cRef;   delete this;   return 0L;  }      STDMETHODIMP CShellExtOverlay::QueryInterface(REFIID riid, LPVOID FAR* ppv)  {   if (ppv == 0)   return E_POINTER;     *ppv = NULL;     if (IsEqualIID(riid, IID_IShellIconOverlayIdentifier)   || IsEqualIID(riid, IID_IUnknown) )   {   *ppv = (IShellIconOverlayIdentifier*) this;   }     if (*ppv)   {   AddRef();   return S_OK;   }     return E_NOINTERFACE;  }