Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

shellext: remove implementation of GetOverlayInfo

Besides that the implementation was broken, it is irrelevant,
as the icons are determined by the TortoiseOverlays shim
anyway.

Our GetOverlayInfo is called by the shim, but the return
value seems not to be needed.

Changeset f1e5f994edbc…

Parent bc8ce9f33b50…

by Adrian Buehlmann

Changes to one file · Browse files at f1e5f994edbc Showing diff from parent bc8ce9f33b50 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​IconOverlay.cpp Stacked
 
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
 
7
8
9
 
 
10
11
12
13
14
15
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
16
17
18
19
20
21
22
23
24
@@ -7,32 +7,18 @@
 #include <shlwapi.h>     -STDMETHODIMP CShellExt::GetOverlayInfo(LPWSTR pwszIconFile, int cchMax, - int *pIndex, DWORD *pdwFlags) +STDMETHODIMP CShellExt::GetOverlayInfo( + LPWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags)  { + TDEBUG_TRACE("CShellExt::GetOverlayInfo: myTortoiseClass = " << myTortoiseClass); + // icons are determined by TortoiseOverlays shim   *pIndex = 0; - *pdwFlags = ISIOI_ICONFILE; - - // get installation path - std::string dir = GetTHgProgRoot(); - if (dir.empty()) - { - TDEBUG_TRACE("GetOverlayInfo: THG root is empty"); - wcsncpy(pwszIconFile, L"", cchMax); - return S_OK; - } - - // find icon per overlay type - std::wstring dirWide = MultibyteToWide(dir); - wcsncpy(pwszIconFile, dirWide.c_str(), cchMax); - cchMax -= static_cast<int>(dirWide.size()) + 1; - - std::string path = WideToMultibyte(pwszIconFile); - TDEBUG_TRACE("GetOverlayInfo: icon path = " << path); - + *pdwFlags = 0; + *pwszIconFile = 0;   return S_OK;  }   +  STDMETHODIMP CShellExt::GetPriority(int *pPriority)  {   *pPriority = 1;