merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / ShellCache.h

diff --git a/src/TortoiseShell/ShellCache.h b/src/TortoiseShell/ShellCache.h
index a565d98..aef24ed 100644 (file)
--- a/src/TortoiseShell/ShellCache.h
+++ b/src/TortoiseShell/ShellCache.h
@@ -86,6 +86,11 @@ public:
                excontextticker = cachetypeticker;\r
                menulayoutlow = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"),              MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT);\r
                menulayouthigh = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), (MENUSYNC|MENUCREATEREPOS|MENUCLONE|MENUCOMMIT)>>32);\r
+\r
+               unsigned __int64 ext=(MENUSVNIGNORE|MENUREFLOG|MENUREFBROWSE|MENUSTASHAPPLY|MENUDELUNVERSIONED|MENUSUBSYNC|MENUCREATEPATCH);\r
+               menuextlow      = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuExtEntriesLow"), ext&0xFFFFFFFF  );\r
+               menuexthigh = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuExtEntriesHigh"),       ext>>32   );\r
+\r
                menumasklow_lm = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskLow"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
                menumaskhigh_lm = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskHigh"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
                menumasklow_cu = CRegStdWORD(_T("Software\\TortoiseGit\\ContextMenuEntriesMaskLow"), 0);\r
@@ -176,6 +181,20 @@ public:
                temp |= unsigned __int64(DWORD(menulayoutlow));\r
                return temp;\r
        }\r
+\r
+       unsigned __int64 GetMenuExt()\r
+       {\r
+               if ((GetTickCount() - REGISTRYTIMEOUT) > exticker)\r
+               {\r
+                       exticker = GetTickCount();\r
+                       menuextlow.read();\r
+                       menuexthigh.read();\r
+               }\r
+               unsigned __int64 temp = unsigned __int64(DWORD(menuexthigh))<<32;\r
+               temp |= unsigned __int64(DWORD(menuextlow));\r
+               return temp;\r
+       }\r
+\r
        unsigned __int64 GetMenuMask()\r
        {\r
                if ((GetTickCount() - REGISTRYTIMEOUT) > menumaskticker)\r
@@ -589,7 +608,7 @@ private:
                BOOL bHasAdminDir;\r
                stdstring sProjectRoot;\r
        };\r
-\r
+public:\r
        CRegStdWORD cachetype;\r
        CRegStdWORD blockstatus;\r
        CRegStdWORD langid;\r
@@ -603,8 +622,10 @@ private:
        CRegStdWORD drivefloppy;\r
        CRegStdWORD driveram;\r
        CRegStdWORD driveunknown;\r
-       CRegStdWORD menulayoutlow;\r
+       CRegStdWORD menulayoutlow; /* Fist level mask */\r
        CRegStdWORD menulayouthigh;\r
+       CRegStdWORD menuextlow;    /* ext menu mask */\r
+       CRegStdWORD menuexthigh;\r
        CRegStdWORD simplecontext;\r
        CRegStdWORD menumasklow_lm;\r
        CRegStdWORD menumaskhigh_lm;\r
@@ -628,6 +649,7 @@ private:
        DWORD driveticker;\r
        DWORD drivetypeticker;\r
        DWORD layoutticker;\r
+       DWORD exticker;\r
        DWORD menumaskticker;\r
        DWORD langticker;\r
        DWORD blockstatusticker;\r