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

shellext: formatting/white space cleanup in ShellExt.cpp

Changeset bdeea56e8ddb

Parent 08d67a948ac0

by Adrian Buehlmann

Changes to one file · Browse files at bdeea56e8ddb Showing diff from parent 08d67a948ac0 Diff from another changeset...

 
16
17
18
19
20
 
 
21
22
 
23
24
25
 
32
33
34
35
36
 
 
 
 
37
38
39
 
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
 
114
115
116
 
117
118
119
120
121
 
122
123
124
125
 
 
 
126
127
128
129
130
131
132
 
 
 
133
134
135
136
 
137
138
 
139
140
141
142
143
144
145
 
146
147
148
 
 
149
150
151
152
153
154
155
 
 
156
157
158
 
162
163
164
165
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
 
195
196
197
 
198
199
200
 
205
206
207
 
208
209
210
211
212
213
214
 
 
215
216
217
218
219
220
221
 
222
223
224
 
244
245
246
247
 
248
249
250
251
252
253
 
254
255
256
257
 
 
258
259
260
261
262
263
264
 
 
265
266
267
 
272
273
274
 
275
276
277
 
 
278
279
280
 
 
281
282
283
284
 
 
285
286
287
288
289
290
291
292
 
 
293
294
295
 
16
17
18
 
 
19
20
21
 
22
23
24
25
 
32
33
34
 
 
35
36
37
38
39
40
41
 
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
 
124
125
126
127
128
129
130
131
 
132
133
134
 
 
135
136
137
138
139
140
141
142
 
 
143
144
145
146
147
148
 
149
150
 
151
152
 
153
154
155
156
 
157
158
 
 
159
160
161
162
163
164
165
 
 
166
167
168
169
170
 
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
 
209
210
211
212
213
214
215
 
220
221
222
223
224
225
226
227
228
 
 
229
230
231
232
233
234
235
236
 
237
238
239
240
 
260
261
262
 
263
264
265
266
267
268
 
269
270
271
 
 
272
273
274
275
276
277
278
 
 
279
280
281
282
283
 
288
289
290
291
292
 
 
293
294
295
 
 
296
297
298
299
 
 
300
301
302
303
304
305
306
307
 
 
308
309
310
311
312
@@ -16,10 +16,10 @@
 DEFINE_GUID(CLSID_TortoiseHg5, 0xb456dba5L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg6, 0xb456dba6L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);   -UINT g_cRefThisDll = 0; -HINSTANCE g_hmodThisDll = NULL; +UINT g_cRefThisDll = 0; +HINSTANCE g_hmodThisDll = NULL;   -HMENU hSubMenu = 0; +HMENU hSubMenu = 0;    CRITICAL_SECTION g_critical_section;   @@ -32,8 +32,10 @@
  LPTSTR lpszData;  } REGSTRUCT, *LPREGSTRUCT;   -VOID _LoadResources(); -VOID _UnloadResources(); + +VOID _LoadResources(); +VOID _UnloadResources(); +    extern "C"  int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) @@ -41,71 +43,79 @@
  TDEBUG_TRACE("DllMain");     if (dwReason == DLL_PROCESS_ATTACH) - { + {   TDEBUG_TRACE("DllMain: DLL_PROCESS_ATTACH");   g_hmodThisDll = hInstance;   ::InitializeCriticalSection(&g_critical_section); - _LoadResources(); - } - else if (dwReason == DLL_PROCESS_DETACH) + _LoadResources(); + } + else if (dwReason == DLL_PROCESS_DETACH)   {   TDEBUG_TRACE("DllMain: DLL_PROCESS_ATTACH");   ::DeleteCriticalSection(&g_critical_section); - _UnloadResources(); + _UnloadResources();   }     return 1;  }   +  STDAPI DllCanUnloadNow(void)  {   TDEBUG_TRACE("DllCanUnloadNow");   return (g_cRefThisDll == 0 ? S_OK : S_FALSE);  }   +  STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppvOut)  { - LPWSTR pwszShellExt; - StringFromIID(rclsid, &pwszShellExt); + LPWSTR pwszShellExt; + StringFromIID(rclsid, &pwszShellExt);   TDEBUG_TRACE("DllGetClassObject clsid = " << WideToMultibyte(pwszShellExt));   *ppvOut = NULL;     if (IsEqualIID(rclsid, CLSID_TortoiseHg0))   { - CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_UNCHANGED); + CDllRegSxClassFactory *pcf = + new CDllRegSxClassFactory(TORTOISE_OLE_UNCHANGED);   TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg0");   return pcf->QueryInterface(riid, ppvOut);   }   else if (IsEqualIID(rclsid, CLSID_TortoiseHg1))   { - CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_ADDED); + CDllRegSxClassFactory *pcf = + new CDllRegSxClassFactory(TORTOISE_OLE_ADDED);   TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg1");   return pcf->QueryInterface(riid, ppvOut);   }   else if (IsEqualIID(rclsid, CLSID_TortoiseHg2))   { - CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_MODIFIED); + CDllRegSxClassFactory *pcf = + new CDllRegSxClassFactory(TORTOISE_OLE_MODIFIED);   TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg2");   return pcf->QueryInterface(riid, ppvOut);   }   else if (IsEqualIID(rclsid, CLSID_TortoiseHg6))   { - CDllRegSxClassFactory *pcf = new CDllRegSxClassFactory(TORTOISE_OLE_NOTINREPO); + CDllRegSxClassFactory *pcf = + new CDllRegSxClassFactory(TORTOISE_OLE_NOTINREPO);   TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg6");   return pcf->QueryInterface(riid, ppvOut);   } - +   return CLASS_E_CLASSNOTAVAILABLE;  }   +  VOID _LoadResources(VOID)  {  }   +  VOID _UnloadResources(VOID)  { - if (hSubMenu) - DestroyMenu(hSubMenu); + if (hSubMenu) + DestroyMenu(hSubMenu);  }     @@ -114,45 +124,47 @@
  return &g_critical_section;  }   +  CDllRegSxClassFactory::CDllRegSxClassFactory(TortoiseOLEClass classToMake)  {   ThgCriticalSection cs(GetCriticalSection());   m_cRef = 0L; - g_cRefThisDll++; + g_cRefThisDll++;   myclassToMake = classToMake;  } - -CDllRegSxClassFactory::~CDllRegSxClassFactory() + + +CDllRegSxClassFactory::~CDllRegSxClassFactory()  {   ThgCriticalSection cs(GetCriticalSection());   g_cRefThisDll--;  }   -STDMETHODIMP -CDllRegSxClassFactory::QueryInterface(REFIID riid, LPVOID FAR *ppv) + +STDMETHODIMP CDllRegSxClassFactory::QueryInterface( + REFIID riid, LPVOID FAR* ppv)  {   *ppv = NULL;   - if(IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IClassFactory)) + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IClassFactory))   { - *ppv = (LPCLASSFACTORY)this; + *ppv = (LPCLASSFACTORY) this;   AddRef(); -   return NOERROR;   }     return E_NOINTERFACE; -} +}   -STDMETHODIMP_(ULONG) -CDllRegSxClassFactory::AddRef() + +STDMETHODIMP_(ULONG) CDllRegSxClassFactory::AddRef()  {   ThgCriticalSection cs(GetCriticalSection());   return ++m_cRef;  }   -STDMETHODIMP_(ULONG) -CDllRegSxClassFactory::Release() + +STDMETHODIMP_(ULONG) CDllRegSxClassFactory::Release()  {   ThgCriticalSection cs(GetCriticalSection());   if (--m_cRef) @@ -162,29 +174,31 @@
  return 0L;  }   -STDMETHODIMP -CDllRegSxClassFactory::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) + +STDMETHODIMP CDllRegSxClassFactory::CreateInstance( + LPUNKNOWN pUnkOuter, REFIID riid, LPVOID* ppvObj)  {   *ppvObj = NULL;     if (pUnkOuter) - return CLASS_E_NOAGGREGATION; + return CLASS_E_NOAGGREGATION;     LPCSHELLEXT pShellExt = new CShellExt(myclassToMake);   if (NULL == pShellExt) - return E_OUTOFMEMORY; + return E_OUTOFMEMORY;     return pShellExt->QueryInterface(riid, ppvObj);  }   -STDMETHODIMP -CDllRegSxClassFactory::LockServer(BOOL fLock) + +STDMETHODIMP CDllRegSxClassFactory::LockServer(BOOL fLock)  {   return NOERROR;  }   +  CShellExt::CShellExt(TortoiseOLEClass tortoiseClass) - : m_ppszFileUserClickedOn(0) + : m_ppszFileUserClickedOn(0)  {   ThgCriticalSection cs(GetCriticalSection());   @@ -195,6 +209,7 @@
  g_cRefThisDll++;  }   +  CShellExt::~CShellExt()  {   ThgCriticalSection cs(GetCriticalSection()); @@ -205,20 +220,21 @@
  g_cRefThisDll--;  }   +  LPCRITICAL_SECTION CShellExt::GetCriticalSection()  {   return &g_critical_section;  }   -STDMETHODIMP -CShellExt::QueryInterface(REFIID riid, LPVOID FAR *ppv) + +STDMETHODIMP CShellExt::QueryInterface(REFIID riid, LPVOID FAR* ppv)  {   std::string clsname = "UNKNOWN CLSID";     *ppv = NULL;   if (IsEqualIID(riid, IID_IShellExtInit) || IsEqualIID(riid, IID_IUnknown))   { - *ppv = (LPSHELLEXTINIT)this; + *ppv = (LPSHELLEXTINIT)this;   clsname = "IID_IShellExtInit";   }   else if (IsEqualIID(riid, IID_IContextMenu)) @@ -244,24 +260,24 @@
    TDEBUG_TRACE("CShellExt::QueryInterface: " << clsname);   - if(*ppv) + if (*ppv)   {   AddRef();   return NOERROR;   }   - return E_NOINTERFACE; + return E_NOINTERFACE;  }   -STDMETHODIMP_(ULONG) -CShellExt::AddRef() + +STDMETHODIMP_(ULONG) CShellExt::AddRef()  {   ThgCriticalSection cs(GetCriticalSection());   return ++m_cRef;  }   -STDMETHODIMP_(ULONG) -CShellExt::Release() + +STDMETHODIMP_(ULONG) CShellExt::Release()  {   ThgCriticalSection cs(GetCriticalSection());   @@ -272,24 +288,25 @@
  return 0L;  }   +  #if 0 -STDMETHODIMP -CShellExt::Initialize(LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey) +STDMETHODIMP CShellExt::Initialize( + LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey)  { - if (m_pDataObj) - m_pDataObj->Release(); + if (m_pDataObj) + m_pDataObj->Release();   if (pDataObj)   { - m_pDataObj = pDataObj; - pDataObj->AddRef(); + m_pDataObj = pDataObj; + pDataObj->AddRef();   }   return NOERROR;  }    #else   -STDMETHODIMP -CShellExt::Initialize(LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey) +STDMETHODIMP CShellExt::Initialize( + LPCITEMIDLIST pIDFolder, LPDATAOBJECT pDataObj, HKEY hRegKey)  {   TCHAR name[MAX_PATH+1];