X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseShell%2FShellCache.h;h=b97284aad10a6d87b45628ca74a6bdddf066f372;hb=83879923308caebe192924b1f693b0f510aa1fd1;hp=7f82dc8580be804e1ccd74a6ef1dd6a7fed5d991;hpb=f54b7391af6795b085ddf3c9fb60f097f14f3ac7;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/TortoiseShell/ShellCache.h b/src/TortoiseShell/ShellCache.h
index 7f82dc8..b97284a 100644
--- a/src/TortoiseShell/ShellCache.h
+++ b/src/TortoiseShell/ShellCache.h
@@ -20,6 +20,7 @@
 #include "registry.h"
 #include "Globals.h"
 #include "GitAdminDir.h"
+#include "Git.h"
 
 #define REGISTRYTIMEOUT 2000
 #define EXCLUDELISTTIMEOUT 5000
@@ -42,11 +43,12 @@ public:
 	{
 		none,
 		exe,
-		dll
+		dll,
+		dllFull,// same as dll except it uses commandline git tool with all status modes supported
 	};
 	ShellCache()
 	{
-		cachetype = CRegStdWORD(_T("Software\\TortoiseGit\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? dll : dll);
+		cachetype = CRegStdWORD(_T("Software\\TortoiseGit\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? dll : exe);
 		showrecursive = CRegStdWORD(_T("Software\\TortoiseGit\\RecursiveOverlay"), TRUE);
 		folderoverlay = CRegStdWORD(_T("Software\\TortoiseGit\\FolderOverlay"), TRUE);
 		driveremote = CRegStdWORD(_T("Software\\TortoiseGit\\DriveMaskRemote"));
@@ -82,8 +84,8 @@ public:
 		getlocktopticker = cachetypeticker;
 		excludedasnormalticker = cachetypeticker;
 		excontextticker = cachetypeticker;
-		menulayoutlow = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"),		  MENUCREATEREPOS|MENUCLONE|MENUUPDATE|MENUCOMMIT);
-		menulayouthigh = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUCREATEREPOS|MENUCLONE|MENUUPDATE|MENUCOMMIT)>>32);
+		menulayoutlow = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"),		  MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);
+		menulayouthigh = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);
 		menumasklow_lm = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskLow"), 0, FALSE, HKEY_LOCAL_MACHINE);
 		menumaskhigh_lm = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskHigh"), 0, FALSE, HKEY_LOCAL_MACHINE);
 		menumasklow_cu = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskLow"), 0);
@@ -151,7 +153,11 @@ public:
 			cachetypeticker = GetTickCount();
 			cachetype.read();
 		}
-		return CacheType(DWORD((cachetype)));
+		//return CacheType(DWORD((cachetype)));
+		/*TEMP: until TGitCache done*/
+//		if(CGit::IsVista())
+//			return none;
+		return CacheType(DWORD((cachetype))) == exe ? dll : CacheType(DWORD((cachetype)));
 	}
 	DWORD BlockStatus()
 	{