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

fogcreek shellext: renamed local variables for consistency, part 3

Changeset e3e4cac77219…

Parent 03316fb2ce1d…

by David Golub

Changes to one file · Browse files at e3e4cac77219 Showing diff from parent 03316fb2ce1d Diff from another changeset...

Change 1 of 4 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
142
143
144
145
146
 
 
147
148
 
149
150
151
 
 
152
153
154
155
156
157
158
159
 
 
160
161
162
 
206
207
208
209
210
 
 
211
212
213
 
214
215
216
 
219
220
221
222
223
 
 
224
225
226
 
227
228
229
 
254
255
256
257
258
 
 
259
260
261
 
262
263
264
 
142
143
144
 
 
145
146
147
 
148
149
 
 
150
151
152
153
154
155
156
157
 
 
158
159
160
161
162
 
206
207
208
 
 
209
210
211
212
 
213
214
215
216
 
219
220
221
 
 
222
223
224
225
 
226
227
228
229
 
254
255
256
 
 
257
258
259
260
 
261
262
263
264
@@ -142,21 +142,21 @@
    ATLTRACE(L"GetCMenuTranslation: '%s'\n", (LPCWSTR)strSubKey);   - HKEY hkey = 0; - LONG rv = RegOpenKeyExW(HKEY_CURRENT_USER, strSubKey, 0, KEY_READ, &hkey); + HKEY hKey = 0; + LONG lRes = RegOpenKeyExW(HKEY_CURRENT_USER, strSubKey, 0, KEY_READ, &hKey);   - if (rv == ERROR_SUCCESS && hkey) + if (lRes == ERROR_SUCCESS && hKey)   { - GetRegSZValueW(hkey, L"menuText", strMenuText); - GetRegSZValueW(hkey, L"helpText", strHelpText); + GetRegSZValueW(hKey, L"menuText", strMenuText); + GetRegSZValueW(hKey, L"helpText", strHelpText);   }   else   {   ATLTRACE(L"GetCMenuTranslation: RegOpenKeyExW('%s') failed\n", (LPCWSTR)strSubKey);   }   - if (hkey) - RegCloseKey(hkey); + if (hKey) + RegCloseKey(hKey);  }    void CTortoiseHgCmenuBase::InitMenuMaps(const CMenuDescription *pMenuDescs, int nCount) @@ -206,11 +206,11 @@
    if (CSysInfo::Instance().IsVistaOrLater())   { - HBITMAP hBmp = GetTortoiseIconBitmap(strIconName); - if (hBmp) + HBITMAP hBitmap = GetTortoiseIconBitmap(strIconName); + if (hBitmap)   {   mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = hBmp; + mii.hbmpItem = hBitmap;   }   else   { @@ -219,11 +219,11 @@
  }   else   { - HICON h = GetTortoiseIcon(strIconName); - if (h) + HICON hIcon = GetTortoiseIcon(strIconName); + if (hIcon)   {   mii.fMask |= MIIM_BITMAP | MIIM_DATA; - mii.dwItemData = (ULONG_PTR) h; + mii.dwItemData = (ULONG_PTR) hIcon;   mii.hbmpItem = HBMMENU_CALLBACK;   }   else @@ -254,11 +254,11 @@
    if (CSysInfo::Instance().IsVistaOrLater())   { - HBITMAP hBmp = GetTortoiseIconBitmap(strIconName); - if (hBmp) + HBITMAP hBitmap = GetTortoiseIconBitmap(strIconName); + if (hBitmap)   {   mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = hBmp; + mii.hbmpItem = hBitmap;   }   else   {