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

fogcreek shellext: fix VS 2010 compiler warnings

Changeset 51696426ef23…

Parent 18f5f8604f16…

by David Golub

Changes to 7 files · Browse files at 51696426ef23 Showing diff from parent 18f5f8604f16 Diff from another changeset...

Change 1 of 2 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
686
687
688
689
 
690
691
692
 
696
697
698
699
 
700
701
702
 
686
687
688
 
689
690
691
692
 
696
697
698
 
699
700
701
702
@@ -686,7 +686,7 @@
  std::wstring wpsz = MultibyteToWide(psz);   const wchar_t* const src = pszw ? pszw : wpsz.c_str();   - wcsncpy(dest, src, cchMax-1); + wcsncpy_s(dest, cchMax, src, cchMax-1);   *(dest + cchMax-1) = 0;     size = wcslen(src); @@ -696,7 +696,7 @@
  }   else   { - strncpy(pszName, psz, cchMax-1); + strncpy_s(pszName, cchMax, psz, cchMax-1);   *(pszName + cchMax-1) = 0;     size = strlen(psz);
Change 1 of 1 Show Entire File win32/​shellext/​Directory.cpp Stacked
 
218
219
220
221
 
222
223
224
225
226
227
228
 
 
229
230
231
 
218
219
220
 
221
222
223
224
225
226
 
 
227
228
229
230
231
@@ -218,14 +218,14 @@
    time_t t;   std::string s; - char* ctime_res = 0; + char ctime_res[26];     for (FilesT::const_iterator i = files_.begin(); i != files_.end(); ++i)   {   std::string p = (!base.empty() ? base + "/" + i->name : i->name);   t = i->mtime; - ctime_res = ctime(&t); - if (ctime_res) { + errno_t err = ctime_s(ctime_res, 26, &t); + if (err == 0) {   s = ctime_res;   s.resize(s.size() - 1); // strip ending '\n'   }
Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
91
92
93
94
 
95
96
97
 
91
92
93
 
94
95
96
97
@@ -91,7 +91,7 @@
  last = cur;   return 0;   } - int pos; + size_t pos;   if ((pos = p.find("\\.kbf\\")) != std::string::npos)   {   p.resize(pos);
Change 1 of 1 Show Entire File win32/​shellext/​Thgstatus.cpp Stacked
 
46
47
48
49
 
50
51
52
 
46
47
48
 
49
50
51
52
@@ -46,7 +46,7 @@
  TDEBUG_TRACE("Thgstatus::update: sending '" << request << "' to " << pname);     fSuccess = ::CallNamedPipeA( - pname.c_str(), (void*)request.c_str(), request.size(), 0, 0, &cbRead, + pname.c_str(), (void*)request.c_str(), (DWORD)request.size(), 0, 0, &cbRead,   NMPWAIT_NOWAIT   );  
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseUtils.cpp Stacked
 
241
242
243
244
 
245
246
247
 
241
242
243
 
244
245
246
247
@@ -241,7 +241,7 @@
  return 0;     std::vector<BYTE> Data(600); - DWORD cbData = Data.size(); + DWORD cbData = (DWORD)Data.size();     LONG rv = ::RegQueryValueExW(hkey, name, 0, 0, &Data[0], &cbData);  
Change 1 of 1 Show Entire File win32/​shellext/​Winstat.h Stacked
 
20
21
22
23
24
25
 
 
 
26
27
28
 
20
21
22
 
 
 
23
24
25
26
27
28
@@ -20,9 +20,9 @@
 class Winstat  {  public: - unsigned size; - unsigned mtime; - bool isdir; + unsigned __int64 size; + unsigned __int64 mtime; + bool isdir;     int lstat(const char* file);  };
Change 1 of 1 Show Entire File win32/​shellext/​dirstate.cpp Stacked
 
79
80
81
82
83
84
85
86
87
 
79
80
81
 
 
 
82
83
84
@@ -79,9 +79,6 @@
  printf("error: could not read .hg/dirstate\n");   return;   } - time_t t; - char *s; - unsigned ix;   printf("parent1: %s\n", revhash_string(pd->parent1));   printf("parent2: %s\n", revhash_string(pd->parent2));   printf("entries: %d\n\n", pd->size());