Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9.1, 0.9.1.1, and 0.9.2

stable shellext: move remaining implementations of CShellExtOverlay to IconOverlay.cpp

Changeset e1aaec13a6ad…

Parent e8add5046b79…

by Adrian Buehlmann

Changes to 2 files · Browse files at e1aaec13a6ad Showing diff from parent e8add5046b79 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​IconOverlay.cpp Stacked
 
54
55
56
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
@@ -54,3 +54,53 @@
    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) +{ + *ppv = NULL; + if (IsEqualIID(riid, IID_IShellIconOverlayIdentifier) + || IsEqualIID(riid, IID_IUnknown) ) + { + *ppv = (IShellIconOverlayIdentifier*) this; + } + + if (*ppv) + { + AddRef(); + return NOERROR; + } + + return E_NOINTERFACE; +}
Change 1 of 2 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
 
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
 
135
136
137
 
 
 
 
 
 
 
 
 
 
 
 
 
138
139
140
 
153
154
155
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -135,19 +135,6 @@
 }     -CShellExtOverlay::CShellExtOverlay(char tortoiseClass) : - myTortoiseClass(tortoiseClass) -{ - m_cRef = 0L; - CShellExt::IncDllRef(); -} - - -CShellExtOverlay::~CShellExtOverlay() -{ - CShellExt::DecDllRef(); -} -  LPCRITICAL_SECTION CShellExt::GetCriticalSection()  {   return &g_critical_section; @@ -166,40 +153,3 @@
  ThgCriticalSection cs(CShellExt::GetCriticalSection());   g_cRefThisDll--;  } - - -STDMETHODIMP CShellExtOverlay::QueryInterface(REFIID riid, LPVOID FAR* ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, IID_IShellIconOverlayIdentifier) - || IsEqualIID(riid, IID_IUnknown) ) - { - *ppv = (IShellIconOverlayIdentifier*) this; - } - - if (*ppv) - { - AddRef(); - return NOERROR; - } - - return E_NOINTERFACE; -} - - -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; -}