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

fogcreek shellext: perform file I/O using CAtlFile, part 2

Changeset f331c3c3903d…

Parent ef6ea1af6f56…

by David Golub

Changes to 6 files · Browse files at f331c3c3903d Showing diff from parent ef6ea1af6f56 Diff from another changeset...

Change 1 of 3 Show Entire File win32/​shellext/​DirectoryStatus.cpp Stacked
 
57
58
59
60
61
 
 
 
62
63
64
 
80
81
82
83
 
84
85
86
 
112
113
114
115
 
116
117
118
 
57
58
59
 
 
60
61
62
63
64
65
 
81
82
83
 
84
85
86
87
 
113
114
115
 
116
117
118
119
@@ -57,8 +57,9 @@
    CString strStatusPath = strHgRoot + "\\.hg\\thgstatus";   - FILE *pFile = fopenReadRenameAllowed(strStatusPath); - if (!pFile) + CAtlFile file; + if (FAILED(file.Create(strStatusPath, GENERIC_READ, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING)))   {   ATLTRACE("CDirectoryStatus::read: can't open '%s'\n", (LPCTSTR)strStatusPath);   CString p = (strCwd.GetLength() < strHgRoot.GetLength() ? strHgRoot : strCwd); @@ -80,7 +81,7 @@
    for (;;)   { - if (fread(&chStatus, sizeof(char), 1, pFile) != 1) goto close; + if (FAILED(file.Read(&chStatus, sizeof(char)))) goto close;   if (chStatus == '\n') break;   strLine.AppendChar(chStatus);   if (strLine.GetLength() > 1000) @@ -112,7 +113,7 @@
  }    close: - fclose(pFile); + file.Close();     ATLTRACE("DirectoryStatus::read(%d): done. %d entries read. noicons_ = %d\n",   m_listEntries.GetCount(), m_bNoIcons);
Change 1 of 2 Show Entire File win32/​shellext/​Direntry.cpp Stacked
 
20
21
22
23
 
24
25
 
26
27
28
29
30
31
32
 
 
 
 
33
34
35
 
37
38
39
40
 
41
42
43
44
45
 
46
47
48
 
20
21
22
 
23
24
 
25
26
27
28
 
 
 
 
29
30
31
32
33
34
35
 
37
38
39
 
40
41
42
43
44
 
45
46
47
48
@@ -20,16 +20,16 @@
 #include "Direntry.h"  #include "Winstat.h"   -int CDirentry::Read(FILE* pFile, CString& strRelPath) +bool CDirentry::Read(CAtlFile& rFile, CString& strRelPath)  { - if (fread(&m_chState, sizeof(char), 1, pFile) != 1) return 0; + if (FAILED(rFile.Read(&m_chState, sizeof(char)))) return false;     unsigned nLength = 0;   - fread(&m_uMode, sizeof(unsigned), 1, pFile); - fread(&m_uSize, sizeof(unsigned), 1, pFile); - fread(&m_uMTime, sizeof(unsigned), 1, pFile); - fread(&nLength, sizeof(unsigned), 1, pFile); + rFile.Read(&m_uMode, sizeof(unsigned)); + rFile.Read(&m_uSize, sizeof(unsigned)); + rFile.Read(&m_uMTime, sizeof(unsigned)); + rFile.Read(&nLength, sizeof(unsigned));     m_uMode = ntohl(m_uMode);   m_uSize = ntohl(m_uSize); @@ -37,12 +37,12 @@
  nLength = ntohl(nLength);     LPSTR lpszBuf = strRelPath.GetBuffer(nLength); - fread(lpszBuf, sizeof(char), nLength, pFile); + rFile.Read(lpszBuf, nLength * sizeof(char));   strRelPath.ReleaseBuffer(nLength);     strRelPath = strRelPath.MakeLower();   - return 1; + return true;  }    char CDirentry::Status(const CWinstat& stat) const
Change 1 of 1 Show Entire File win32/​shellext/​Direntry.h Stacked
 
30
31
32
33
 
34
35
36
 
30
31
32
 
33
34
35
36
@@ -30,7 +30,7 @@
    CString m_strName;   - int Read(FILE* pFile, CString& strRelPath); + bool Read(CAtlFile& rFile, CString& strRelPath);   char Status(const CWinstat& stat) const;     bool Unset() const
Change 1 of 3 Show Entire File win32/​shellext/​Dirstate.cpp Stacked
 
24
25
26
27
28
 
 
 
29
30
31
 
33
34
35
36
37
 
 
38
39
40
41
 
42
43
44
 
46
47
48
49
50
 
51
52
53
 
24
25
26
 
 
27
28
29
30
31
32
 
34
35
36
 
 
37
38
39
40
41
 
42
43
44
45
 
47
48
49
 
 
50
51
52
53
@@ -24,8 +24,9 @@
 {   bUnset = false;   - FILE *pFile = fopenReadRenameAllowed(strPath); - if (!pFile) + CAtlFile file; + if (FAILED(file.Create(strPath, GENERIC_READ, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING)))   {   ATLTRACE("Dirstate::read: can't open '%s'\n", (LPCTSTR)strPath);   return CAutoPtr<CDirstate>(NULL); @@ -33,12 +34,12 @@
    CAutoPtr<CDirstate> pd(new CDirstate());   - fread(&pd->m_szParent1, sizeof(char), HASH_LENGTH, pFile); - fread(&pd->m_szParent2, sizeof(char), HASH_LENGTH, pFile); + file.Read(&pd->m_szParent1, HASH_LENGTH * sizeof(char)); + file.Read(&pd->m_szParent2, HASH_LENGTH * sizeof(char));     CDirentry e;   CString strRelPath; - while (e.Read(pFile, strRelPath)) + while (e.Read(file, strRelPath))   {   if (e.Unset()) bUnset = true;   if (e.m_chState == 'a') ++pd->m_nNumAdded; @@ -46,8 +47,7 @@
  pd->Add(strRelPath, e);   }   - fclose(pFile); - + file.Close();   return pd;  }  
Change 1 of 1 Show Changes Only win32/​shellext/​TortoiseUtils.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
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
159
160
161
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
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
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
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
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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
 // Copyright (C) 2011 Fog Creek Software  //  // This program is free software: you can redistribute it and/or modify  // it under the terms of the GNU General Public License as published by  // the Free Software Foundation, either version 2 of the License, or  // (at your option) any later version.  //  // This program is distributed in the hope that it will be useful,  // but WITHOUT ANY WARRANTY; without even the implied warranty of  // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  // GNU General Public License for more details.  //  // You should have received a copy of the GNU General Public License  // along with this program. If not, see <http://www.gnu.org/licenses/>.    #include "stdafx.h"    #include "TortoiseUtils.h"    #include <io.h>  #include <fcntl.h>    CString GetTHgProgRoot()  {   LPCTSTR lpszKeyName = "Software\\TortoiseHg";   HKEY hKey = HKEY_LOCAL_MACHINE;   TCHAR lpszValue[MAX_PATH] = "";   LONG lpcbLonger = MAX_PATH * sizeof(TCHAR);     if (::RegQueryValue(hKey, lpszKeyName, lpszValue, &lpcbLonger) != ERROR_SUCCESS)   {   return "";   }     return lpszValue;  }    // Start an external command  // Note: if the command is a batch file and the [full] path to the  // batch contains spaces, the path must be double-quoted.  // (see http://www.encocoservices.com/createprocess.html)  bool LaunchCommand(const CString& strCommand, const CString& strCwd)  {   ATLTRACE("LaunchCommand: %s\n", (LPCTSTR)strCommand);   ATLTRACE("LaunchCommand: in '%s'\n", (LPCTSTR)strCwd);   PROCESS_INFORMATION pi;   memset(&pi, 0, sizeof(PROCESS_INFORMATION));     STARTUPINFOA si;   memset(&si, 0, sizeof(STARTUPINFO));     BOOL bRes = ::CreateProcess(   NULL, // No module name, use command line   (LPTSTR)(LPCTSTR)strCommand,   NULL, // Process handle not inherited   NULL, // Thread handle not inherited   FALSE,   CREATE_NO_WINDOW,   NULL, // use parent's environment   strCwd,   &si,   &pi);     if (bRes == 0)   {   ATLTRACE("LaunchCommand: failed to launch\n");   return false;   }     ::CloseHandle(pi.hProcess);   ::CloseHandle(pi.hThread);   return true;  }    CString GetTemporaryFile(LPCTSTR strPrefix)  {   char szTempDir[MAX_PATH + 1];   char szTempFile[MAX_PATH + 1];     if (::GetTempPath(MAX_PATH, szTempDir) == 0)   {   ATLTRACE("GetTemporaryFile: Failed to find temporary path\n");   }   else if (::GetTempFileName(szTempDir, strPrefix, 0, szTempFile) != 0)   {   return szTempFile;   }   else   {   ATLTRACE("GetTemporaryFile: Failed to get temporary file\n");   }     return "";  }    CString DirName(const CString& strFileName)  {   if (strFileName.IsEmpty()) return strFileName;   int nPos = strFileName.ReverseFind('\\');   if (nPos == -1) return "";   CString strDirName = strFileName.Left(nPos);   if (!strDirName.IsEmpty() && strDirName[strDirName.GetLength()-1] == ':')   {   strDirName.AppendChar('\\');   }   return strDirName;  }    CString BaseName(const CString& strFileName)  {   if (strFileName.IsEmpty()) return strFileName;   int nPos = strFileName.ReverseFind('\\');   if (nPos == -1) return strFileName;   return strFileName.Mid(nPos+1);  }    // not reentrant  HICON GetTortoiseIcon(const CString& strIconName)  {   typedef CAtlMap<CString, HICON> CIconCache;   static CIconCache iconcache;     CString thgdir = GetTHgProgRoot();   if (thgdir.IsEmpty())   {   ATLTRACE("GetTortoiseIcon: THG root is empty\n");   return 0;   }     CString strIconPath = thgdir + "\\icons\\" + strIconName;     const CIconCache::CPair* p = iconcache.Lookup(strIconName);   if (p != NULL) return p->m_value;     if (iconcache.GetCount() > 200)   {   ATLTRACE("**** GetTortoiseIcon: error: too many icons in cache\n");   return 0;   }     HICON hIcon = (HICON)::LoadImage(0, strIconPath, IMAGE_ICON,   16, 16, LR_LOADFROMFILE);   if (!hIcon)   {   ATLTRACE("GetTortoiseIcon: can't find '%s'\n", (LPCTSTR)strIconPath);   return 0;   }     iconcache[strIconPath] = hIcon;     ATLTRACE("GetTortoiseIcon: added '%s' to iconcache_ (%d icons in cache)\n",   (LPCTSTR)strIconPath, iconcache.GetCount());     return hIcon;  }    CString GetHgRepoRoot(LPCTSTR lpszPath)  {   ATLTRACE("GetHgRepoRoot('%s')\n", lpszPath);     CString strPath = (::PathIsUNCServerShare(lpszPath) || ::PathIsDirectory(lpszPath)) ?   lpszPath : DirName(lpszPath);   for (;;)   {   CString strHgDir = strPath + "\\.hg";   if (::PathIsUNCServerShare(strHgDir))   {   ATLTRACE("GetHgRepoRoot: tdir is UNC share '%s'\n", (LPCTSTR)strHgDir);   strPath.Empty();   break;   }   else if (::PathIsDirectory(strHgDir))   {   break;   }   CString strOldPath = strPath;   strPath = DirName(strPath);   if (strPath == strOldPath)   {   strPath.Empty();   break;   }   }     ATLTRACE("GetHgRepoRoot: returning '%s'\n", (LPCTSTR)strPath);   return strPath;  }    bool IsHgRepo(LPCTSTR lpszPath)  {   return !GetHgRepoRoot(lpszPath).IsEmpty();  }   -// open a file for reading, allowing renames and deletes by other -// processes while we have it open -FILE* fopenReadRenameAllowed(LPCTSTR lpszPath) -{ - HANDLE hFile = ::CreateFile(lpszPath, GENERIC_READ, - FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, - 0, OPEN_EXISTING, 0, 0); - - if (hFile == INVALID_HANDLE_VALUE) return 0; - - // get C runtime file descriptor from file handle - int fd = _open_osfhandle((intptr_t)hFile, _O_RDONLY); - if (fd == -1) - { - ATLTRACE("fopenReadRenameAllowed: _open_osfhandle failed\n"); - ::CloseHandle(hFile); - return 0; - } - - // get C runtime FILE from file descriptor - FILE* pFile = _fdopen(fd, "r"); - if (pFile == 0) - { - ATLTRACE("fopenReadRenameAllowed: _fdopen failed\n"); - _close(fd); - return 0; - } - - return pFile; -} -  // read string value from registry, wide version  bool GetRegSZValueW(HKEY hKey, LPCWSTR lpszName, CStringW& strRes)  {   strRes = L"";   if (!hKey) return 0;     DWORD cbData = 600;   LPWSTR lpszData = strRes.GetBuffer(cbData);   LONG lRes = ::RegQueryValueExW(hKey, lpszName, 0, 0, (LPBYTE)lpszData, &cbData);   strRes.ReleaseBuffer(cbData);     if (lRes == ERROR_SUCCESS) return true;   ATLTRACE(L"GetRegSZValueW('%s') failed\n", lpszName);   return false;  }    // true if a starts with b  bool StartsWith(const CString& strWhole, const CString& strPrefix)  {   if (strWhole.IsEmpty() || strPrefix.IsEmpty()) return false;   if (strPrefix.GetLength() > strWhole.GetLength()) return false;     for (int i = 0; i < strPrefix.GetLength(); ++i)   {   if (strWhole[i] != strPrefix[i]) return false;   }     return true;  }    void Tokenize(CString str, CAtlList<CString>& rTokens, LPCTSTR lpszDelimiters)  {   int nPos = 0;   CString strToken = str.Tokenize(lpszDelimiters, nPos);   while (!strToken.IsEmpty())   {   rTokens.AddTail(strToken);   strToken = str.Tokenize(lpszDelimiters, nPos);   }  }
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseUtils.h Stacked
 
23
24
25
26
27
28
29
 
23
24
25
 
26
27
28
@@ -23,7 +23,6 @@
 HICON GetTortoiseIcon(const CString& strIconName);  CString GetHgRepoRoot(LPCTSTR lpszPath);  bool IsHgRepo(const CString& lpszPath); -FILE* fopenReadRenameAllowed(LPCTSTR lpszPath);  bool GetRegSZValueW(HKEY hKey, LPCWSTR lpszName, CStringW& strRes);  bool StartsWith(const CString& strWhole, const CString& strPrefix);  void Tokenize(CString str, CAtlList<CString>& rTokens, LPCTSTR lpszDelimiters = " ");