• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision26865 (tree)
Zeit2015-10-04 22:16:02
Autorstefankueng

Log Message

Merged revision(s) r26851, r26852, r26853, r26854, r26855, r26856, r26857, r26858, r26859, , r26861, r26862 from trunk:
* Set unicode mode for the ini file.
* Unescape and trim entered urls in the project monitor.
* the "break locks" checkbox in the cleanup dialog is now unchecked by default, and remembers its state between sessions.
* Reset the readonly flag when copying files during a vendor drop.
* Get the last error before trying to stop the progress dialog, because that command set the last error to something else.
* Use WiX 3.10.
* Create the applications folder before copying files there.
* only clear what's built.
* Build a separate 32-bit version of the svn dll which is used only on x64 OS for the 32-bit apps file-open/save dialogs. The dll is built to link statically against the CRT and the apr libs. Also all networking stuff is omitted since the shell extension doesn't need those - it keeps the dll small.
* Ensure the settings are read from the x64 registry hive even for the 32-bit shell extension.
* Use the shell cache instead of reading directly from the registry.

Ändern Zusammenfassung

Diff

--- branches/1.9.x/build.txt (revision 26864)
+++ branches/1.9.x/build.txt (revision 26865)
@@ -33,7 +33,7 @@
3333 - Perl http://strawberryperl.com/releases.html
3434 or
3535 http://www.activestate.com/Products/ActivePerl/
36-- WiX 3.9(\b 1) http://wixtoolset.org/
36+- WiX 3.10(\b 1) http://wixtoolset.org/
3737 - NAnt 0.92(\b 1) http://nant.sourceforge.net
3838
3939 (\b 1) Add the paths of the binaries to the PATH environment variable. You may have to
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/build.txt:r26851-26859,26861-26862
--- branches/1.9.x/src/Changelog.txt (revision 26864)
+++ branches/1.9.x/src/Changelog.txt (revision 26865)
@@ -11,6 +11,16 @@
1111 - BUG: Adjusting externals to the HEAD revision used
1212 always the same revision if multiple externals were
1313 selected. (Stefan)
14+- BUG: unicode data was not saved properly in the project
15+ monitor. (Stefan)
16+- BUG: Project monitor accepted escaped urls. Automatically
17+ unescapes them now. (Stefan)
18+- CHG: the "break locks" checkbox in the cleanup dialog
19+ is now unchecked by default, and remembers its
20+ state between sessions. (Stefan)
21+- BUG: The "create vendor branch" command failed to copy
22+ over files that have the svn:needs-lock property
23+ set or are otherwise set as readonly. (Stefan)
1424
1525 Version 1.9.2
1626 - BUG: Performance issue if dragging lots of files
--- branches/1.9.x/src/SVN/SVNBase.cpp (revision 26864)
+++ branches/1.9.x/src/SVN/SVNBase.cpp (revision 26865)
@@ -39,7 +39,9 @@
3939 #include "svn_client.h"
4040 #pragma warning(pop)
4141
42+#ifndef TSVN_STATICSHELL
4243 extern "C" void TSVN_ClearLastUsedAuthCache();
44+#endif
4345
4446 SVNBase::SVNBase()
4547 : Err(NULL)
@@ -258,6 +260,7 @@
258260
259261 void SVNBase::ClearCAPIAuthCacheOnError() const
260262 {
263+#ifndef TSVN_STATICSHELL
261264 if (Err != NULL)
262265 {
263266 if ( (SVN_ERROR_IN_CATEGORY(Err->apr_err, SVN_ERR_AUTHN_CATEGORY_START)) ||
@@ -266,6 +269,7 @@
266269 (Err->apr_err == SVN_ERR_RA_CANNOT_CREATE_SESSION))
267270 TSVN_ClearLastUsedAuthCache();
268271 }
272+#endif
269273 }
270274
271275 #endif
--- branches/1.9.x/src/TortoiseProc/CleanupDlg.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseProc/CleanupDlg.cpp (revision 26865)
@@ -42,6 +42,7 @@
4242 , m_regExternals(L"Software\\TortoiseSVN\\CleanupExternals", TRUE)
4343 , m_regFixTimestamps(L"Software\\TortoiseSVN\\CleanupFixTimeStamps", FALSE)
4444 , m_regVacuum(L"Software\\TortoiseSVN\\CleanupVacuum", FALSE)
45+ , m_regBreakLocks(L"Software\\TortoiseSVN\\CleanupBreakLocks", FALSE)
4546 {
4647 }
4748
@@ -109,7 +110,7 @@
109110 AdjustControlSize(IDC_VACUUM);
110111
111112 m_bCleanup = true;
112- m_bBreakLocks = true;
113+ m_bBreakLocks = m_regBreakLocks;
113114 m_bExternals = m_regExternals;
114115 m_bRefreshShell= m_regRefreshShell;
115116 m_bFixTimestamps = m_regFixTimestamps;
@@ -132,6 +133,7 @@
132133 m_regRefreshShell = m_bRefreshShell;
133134 m_regFixTimestamps = m_bFixTimestamps;
134135 m_regVacuum = m_bVacuum;
136+ m_regBreakLocks = m_bBreakLocks;
135137 }
136138
137139 void CCleanupDlg::OnBnClickedHelp()
--- branches/1.9.x/src/TortoiseProc/CleanupDlg.h (revision 26864)
+++ branches/1.9.x/src/TortoiseProc/CleanupDlg.h (revision 26865)
@@ -60,4 +60,5 @@
6060 CRegDWORD m_regExternals;
6161 CRegDWORD m_regFixTimestamps;
6262 CRegDWORD m_regVacuum;
63+ CRegDWORD m_regBreakLocks;
6364 };
--- branches/1.9.x/src/TortoiseProc/Commands/DropVendorCommand.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseProc/Commands/DropVendorCommand.cpp (revision 26865)
@@ -103,10 +103,10 @@
103103 versionedFiles.erase(found);
104104 if (!it->second)
105105 {
106- if (!CopyFile(srcPath, dstPath, FALSE))
106+ if (!CopyFileHandleReadOnly(srcPath, dstPath))
107107 {
108+ CFormatMessageWrapper error;
108109 progress.Stop();
109- CFormatMessageWrapper error;
110110 CString sErr;
111111 sErr.Format(IDS_ERR_COPYFAILED, (LPCWSTR)srcPath, (LPCWSTR)dstPath, (LPCWSTR)error);
112112 MessageBox(progress.GetHwnd(), sErr, L"TortoiseSVN", MB_ICONERROR);
@@ -132,10 +132,10 @@
132132 }
133133 if (!it->second)
134134 {
135- if (!CopyFile(srcPath, dstPath, FALSE))
135+ if (!CopyFileHandleReadOnly(srcPath, dstPath))
136136 {
137+ CFormatMessageWrapper error;
137138 progress.Stop();
138- CFormatMessageWrapper error;
139139 CString sErr;
140140 sErr.Format(IDS_ERR_COPYFAILED, (LPCWSTR)srcPath, (LPCWSTR)dstPath, (LPCWSTR)error);
141141 MessageBox(progress.GetHwnd(), sErr, L"TortoiseSVN", MB_ICONERROR);
@@ -168,10 +168,10 @@
168168 CTSVNPathList plist = CTSVNPathList(CTSVNPath(dstPath));
169169 if (!it->second)
170170 {
171- if (!CopyFile(srcPath, dstPath, FALSE))
171+ if (!CopyFileHandleReadOnly(srcPath, dstPath))
172172 {
173+ CFormatMessageWrapper error;
173174 progress.Stop();
174- CFormatMessageWrapper error;
175175 CString sErr;
176176 sErr.Format(IDS_ERR_COPYFAILED, (LPCWSTR)srcPath, (LPCWSTR)dstPath, (LPCWSTR)error);
177177 MessageBox(progress.GetHwnd(), sErr, L"TortoiseSVN", MB_ICONERROR);
@@ -235,3 +235,18 @@
235235
236236 return TRUE;
237237 }
238+
239+bool DropVendorCommand::CopyFileHandleReadOnly(LPCWSTR lpExistingFilename, LPCWSTR lpNewFilename)
240+{
241+ if (!CopyFile(lpExistingFilename, lpNewFilename, FALSE))
242+ {
243+ // try again with the readonly attribute removed
244+ auto attribs = ::GetFileAttributes(lpNewFilename);
245+ OnOutOfScope(::SetFileAttributes(lpNewFilename, attribs));
246+
247+ ::SetFileAttributes(lpNewFilename, FILE_ATTRIBUTE_NORMAL);
248+ if (!CopyFile(lpExistingFilename, lpNewFilename, FALSE))
249+ return false;
250+ }
251+ return true;
252+}
--- branches/1.9.x/src/TortoiseProc/Commands/DropVendorCommand.h (revision 26864)
+++ branches/1.9.x/src/TortoiseProc/Commands/DropVendorCommand.h (revision 26865)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2013 - TortoiseSVN
3+// Copyright (C) 2013, 2015 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -30,6 +30,8 @@
3030 * Executes the command.
3131 */
3232 virtual bool Execute() override;
33+private:
34+ bool CopyFileHandleReadOnly(LPCWSTR lpExistingFilename, LPCWSTR lpNewFilename);
3335 };
3436
3537
--- branches/1.9.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 26865)
@@ -7823,6 +7823,7 @@
78237823 CString sDataFilePath = CPathUtils::GetAppDataDirectory();
78247824 sDataFilePath += L"\\MonitoringData.ini";
78257825 m_monitoringFile.SetMultiLine();
7826+ m_monitoringFile.SetUnicode();
78267827 if (PathFileExists(sDataFilePath))
78277828 {
78287829 int retrycount = 5;
@@ -8248,7 +8249,15 @@
82488249 if (pProject == nullptr)
82498250 pEditProject = new MonitorItem();
82508251 pEditProject->Name = dlg.m_sName;
8251- pEditProject->WCPathOrUrl = dlg.m_sPathOrURL;
8252+ if (SVN::PathIsURL(CTSVNPath(dlg.m_sPathOrURL)))
8253+ pEditProject->WCPathOrUrl = CPathUtils::PathUnescape(dlg.m_sPathOrURL);
8254+ else
8255+ pEditProject->WCPathOrUrl = dlg.m_sPathOrURL;
8256+ if (!pEditProject->WCPathOrUrl.IsEmpty())
8257+ {
8258+ // remove quotes in case the user put the url/path in quotes
8259+ pEditProject->WCPathOrUrl.Trim(L"\" \t");
8260+ }
82528261 pEditProject->interval = dlg.m_monitorInterval;
82538262 pEditProject->username = CStringUtils::Encrypt(dlg.m_sUsername);
82548263 pEditProject->password = CStringUtils::Encrypt(dlg.m_sPassword);
--- branches/1.9.x/src/TortoiseShell/ColumnProvider.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseShell/ColumnProvider.cpp (revision 26865)
@@ -218,7 +218,7 @@
218218 {
219219 case 0: // SVN Status
220220 GetMainColumnStatus(path, pscd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
221- SVNStatus::GetStatusString(g_hResInst, filestatus, buf, _countof(buf), (WORD)CRegStdDWORD(L"Software\\TortoiseSVN\\LanguageID", MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)));
221+ SVNStatus::GetStatusString(g_hResInst, filestatus, buf, _countof(buf), (WORD)g_ShellCache.GetLangID());
222222 szInfo = buf;
223223 break;
224224 case 1: // SVN Revision
--- branches/1.9.x/src/TortoiseShell/ContextMenu.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseShell/ContextMenu.cpp (revision 26865)
@@ -259,7 +259,7 @@
259259 {
260260 if (m_State == FileStateDropHandler)
261261 {
262- if (!CRegStdDWORD(L"Software\\TortoiseSVN\\EnableDragContextMenu", TRUE))
262+ if (!CRegStdDWORD(L"Software\\TortoiseSVN\\EnableDragContextMenu", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY))
263263 {
264264 ReleaseStgMedium(&medium);
265265 return S_OK;
@@ -862,7 +862,7 @@
862862
863863 STDMETHODIMP CShellExt::QueryDropContext(UINT uFlags, UINT idCmdFirst, HMENU hMenu, UINT &indexMenu)
864864 {
865- if (!CRegStdDWORD(L"Software\\TortoiseSVN\\EnableDragContextMenu", TRUE))
865+ if (!CRegStdDWORD(L"Software\\TortoiseSVN\\EnableDragContextMenu", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY))
866866 return S_OK;
867867
868868 PreserveChdir preserveChdir;
@@ -1103,7 +1103,7 @@
11031103 bool bMenuEntryAdded = false;
11041104 // insert separator at start
11051105 InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL); idCmd++;
1106- bool bShowIcons = !!DWORD(CRegStdDWORD(L"Software\\TortoiseSVN\\ShowContextMenuIcons", TRUE));
1106+ bool bShowIcons = !!DWORD(CRegStdDWORD(L"Software\\TortoiseSVN\\ShowContextMenuIcons", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY));
11071107 for (int menuIndex = 0; menuInfo[menuIndex].command != ShellMenuLastEntry; menuIndex++)
11081108 {
11091109 MenuInfo& menuItem = menuInfo[menuIndex];
@@ -1654,7 +1654,7 @@
16541654 }
16551655 if (!uuidSource.empty())
16561656 {
1657- CRegStdDWORD groupSetting = CRegStdDWORD(L"Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo", 3);
1657+ CRegStdDWORD groupSetting = CRegStdDWORD(L"Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo", 3, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
16581658 switch (DWORD(groupSetting))
16591659 {
16601660 case 1:
@@ -1737,7 +1737,7 @@
17371737 svnCmd += buf;
17381738 if (!uuidSource.empty())
17391739 {
1740- CRegStdDWORD groupSetting = CRegStdDWORD(L"Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo", 3);
1740+ CRegStdDWORD groupSetting = CRegStdDWORD(L"Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo", 3, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
17411741 switch (DWORD(groupSetting))
17421742 {
17431743 case 1:
--- branches/1.9.x/src/TortoiseShell/ShellCache.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseShell/ShellCache.cpp (revision 26865)
@@ -23,23 +23,23 @@
2323
2424 ShellCache::ShellCache()
2525 {
26- cachetype = CRegStdDWORD(L"Software\\TortoiseSVN\\CacheType", GetSystemMetrics(SM_REMOTESESSION) ? dll : exe);
27- showrecursive = CRegStdDWORD(L"Software\\TortoiseSVN\\RecursiveOverlay", TRUE);
28- folderoverlay = CRegStdDWORD(L"Software\\TortoiseSVN\\FolderOverlay", TRUE);
29- driveremote = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRemote");
26+ cachetype = CRegStdDWORD(L"Software\\TortoiseSVN\\CacheType", GetSystemMetrics(SM_REMOTESESSION) ? dll : exe, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
27+ showrecursive = CRegStdDWORD(L"Software\\TortoiseSVN\\RecursiveOverlay", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
28+ folderoverlay = CRegStdDWORD(L"Software\\TortoiseSVN\\FolderOverlay", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
29+ driveremote = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRemote", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
3030 drivefixed = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskFixed", TRUE);
31- drivecdrom = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskCDROM");
32- driveremove = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRemovable");
33- drivefloppy = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskFloppy");
34- driveram = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRAM");
35- driveunknown = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskUnknown");
36- shellmenuaccelerators = CRegStdDWORD(L"Software\\TortoiseSVN\\ShellMenuAccelerators", TRUE);
37- unversionedasmodified = CRegStdDWORD(L"Software\\TortoiseSVN\\UnversionedAsModified", FALSE);
38- ignoreoncommitignored = CRegStdDWORD(L"Software\\TortoiseSVN\\IgnoreOnCommitIgnored", TRUE);
39- hidemenusforunversioneditems = CRegStdDWORD(L"Software\\TortoiseSVN\\HideMenusForUnversionedItems", FALSE);
40- getlocktop = CRegStdDWORD(L"Software\\TortoiseSVN\\GetLockTop", TRUE);
41- excludedasnormal = CRegStdDWORD(L"Software\\TortoiseSVN\\ShowExcludedFoldersAsNormal", FALSE);
42- alwaysextended = CRegStdDWORD(L"Software\\TortoiseSVN\\AlwaysExtendedMenu", FALSE);
31+ drivecdrom = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskCDROM", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
32+ driveremove = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRemovable", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
33+ drivefloppy = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskFloppy", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
34+ driveram = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskRAM", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
35+ driveunknown = CRegStdDWORD(L"Software\\TortoiseSVN\\DriveMaskUnknown", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
36+ shellmenuaccelerators = CRegStdDWORD(L"Software\\TortoiseSVN\\ShellMenuAccelerators", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
37+ unversionedasmodified = CRegStdDWORD(L"Software\\TortoiseSVN\\UnversionedAsModified", FALSE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
38+ ignoreoncommitignored = CRegStdDWORD(L"Software\\TortoiseSVN\\IgnoreOnCommitIgnored", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
39+ hidemenusforunversioneditems = CRegStdDWORD(L"Software\\TortoiseSVN\\HideMenusForUnversionedItems", FALSE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
40+ getlocktop = CRegStdDWORD(L"Software\\TortoiseSVN\\GetLockTop", TRUE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
41+ excludedasnormal = CRegStdDWORD(L"Software\\TortoiseSVN\\ShowExcludedFoldersAsNormal", FALSE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
42+ alwaysextended = CRegStdDWORD(L"Software\\TortoiseSVN\\AlwaysExtendedMenu", FALSE, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
4343 cachetypeticker = GetTickCount64();
4444 recursiveticker = cachetypeticker;
4545 folderoverlayticker = cachetypeticker;
@@ -60,12 +60,12 @@
6060 menumaskticker = cachetypeticker;
6161 blockstatusticker = cachetypeticker;
6262 excontextticker = 0;
63- menulayoutlow = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntries", MENUCHECKOUT | MENUUPDATE | MENUCOMMIT);
64- menulayouthigh = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntrieshigh", 0);
65- menumasklow_lm = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskLow", 0, FALSE, HKEY_LOCAL_MACHINE);
66- menumaskhigh_lm = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh", 0, FALSE, HKEY_LOCAL_MACHINE);
67- menumasklow_cu = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskLow", 0);
68- menumaskhigh_cu = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh", 0);
63+ menulayoutlow = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntries", MENUCHECKOUT | MENUUPDATE | MENUCOMMIT, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
64+ menulayouthigh = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntrieshigh", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
65+ menumasklow_lm = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskLow", 0, FALSE, HKEY_LOCAL_MACHINE, KEY_WOW64_64KEY);
66+ menumaskhigh_lm = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh", 0, FALSE, HKEY_LOCAL_MACHINE, KEY_WOW64_64KEY);
67+ menumasklow_cu = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskLow", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
68+ menumaskhigh_cu = CRegStdDWORD(L"Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh", 0, false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
6969 langid = CRegStdDWORD(L"Software\\TortoiseSVN\\LanguageID", 1033);
7070 blockstatus = CRegStdDWORD(L"Software\\TortoiseSVN\\BlockStatus", 0);
7171 columnseverywhere = CRegStdDWORD(L"Software\\TortoiseSVN\\ColumnsEveryWhere", FALSE);
@@ -87,7 +87,7 @@
8787 columnrevformat.Grouping = _wtoi(szBuffer);
8888 GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, &szBuffer[0], _countof(szBuffer));
8989 columnrevformat.NegativeOrder = _wtoi(szBuffer);
90- nocontextpaths = CRegStdString(L"Software\\TortoiseSVN\\NoContextPaths", L"");
90+ nocontextpaths = CRegStdString(L"Software\\TortoiseSVN\\NoContextPaths", L"", false, HKEY_CURRENT_USER, KEY_WOW64_64KEY);
9191 drivetypepathcache[0] = 0;
9292 m_critSec.Init();
9393 }
@@ -708,8 +708,8 @@
708708 // construction
709709
710710 ShellCache::CPathFilter::CPathFilter()
711- : excludelist (L"Software\\TortoiseSVN\\OverlayExcludeList")
712- , includelist (L"Software\\TortoiseSVN\\OverlayIncludeList")
711+ : excludelist(L"Software\\TortoiseSVN\\OverlayExcludeList", L"", false, HKEY_CURRENT_USER, KEY_WOW64_64KEY)
712+ , includelist(L"Software\\TortoiseSVN\\OverlayIncludeList", L"", false, HKEY_CURRENT_USER, KEY_WOW64_64KEY)
713713 {
714714 Refresh();
715715 }
--- branches/1.9.x/src/TortoiseShell/ShellExt.cpp (revision 26864)
+++ branches/1.9.x/src/TortoiseShell/ShellExt.cpp (revision 26865)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2014 - TortoiseSVN
3+// Copyright (C) 2003-2015 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -92,8 +92,9 @@
9292 if (dirpointA)
9393 *dirpointA = 0;
9494 strcat_s(langdirA, "\\Languages");
95+#ifdef ENABLE_NLS
9596 bindtextdomain ("subversion", langdirA);
96-
97+#endif
9798 BOOL bIsWow = FALSE;
9899 IsWow64Process(GetCurrentProcess(), &bIsWow);
99100
Show on old repository browser