Changeset 5e4f957b4207…
Parent cf64fbb6c784…
by
Changes to 5 files · Browse files at 5e4f957b4207 Showing diff from parent cf64fbb6c784 Diff from another changeset...
@@ -3,17 +3,17 @@ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)' Type='string' Value='TortoiseHg' />
<RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
<!-- Normal overlay COM component -->
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)' Type='string' Value='TortoiseHg' />
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)' Type='string' Value='TortoiseHg' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
<!-- Added overlay COM component -->
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)' Type='string' Value='TortoiseHg' />
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)' Type='string' Value='TortoiseHg' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
<!-- Modified overlay COM component -->
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)' Type='string' Value='TortoiseHg' />
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)' Type='string' Value='TortoiseHg' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
<!-- Unversioned overlay COM component -->
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)' Type='string' Value='TortoiseHg' />
- <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)' Type='string' Value='TortoiseHg' />
+ <RegistryValue Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' />
<!-- cmenu registration -->
<RegistryValue Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' />
@@ -26,20 +26,20 @@ <RegistryValue Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' />
<!-- register overlay components with TortoiseOverlays -->
- <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Normal' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHg0)' />
- <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Added' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHg1)' />
- <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Modified' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHg2)' />
- <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHg6)' />
+ <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Normal' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)' />
+ <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Added' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)' />
+ <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Modified' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)' />
+ <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)' />
<!-- Mark all as approved -->
<RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string'
Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' />
<RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string'
- Name='$(var.CLSID_TortoiseHg0)' Value='TortoiseHg' />
+ Name='$(var.CLSID_TortoiseHgNormal)' Value='TortoiseHg' />
<RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string'
- Name='$(var.CLSID_TortoiseHg1)' Value='TortoiseHg' />
+ Name='$(var.CLSID_TortoiseHgAdded)' Value='TortoiseHg' />
<RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string'
- Name='$(var.CLSID_TortoiseHg2)' Value='TortoiseHg' />
+ Name='$(var.CLSID_TortoiseHgModified)' Value='TortoiseHg' />
<RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string'
- Name='$(var.CLSID_TortoiseHg6)' Value='TortoiseHg' />
+ Name='$(var.CLSID_TortoiseHgUnversioned)' Value='TortoiseHg' />
</Include>
|
@@ -141,19 +141,19 @@ Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<?include shell-register.wxi ?>
@@ -289,19 +289,19 @@ Type='string' Value='[Common64]ThgShellx64.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32'
Type='string' Value='[Common64]ThgShellx64.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32'
Type='string' Value='[Common64]ThgShellx64.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32'
Type='string' Value='[Common64]ThgShellx64.dll'
/>
<RegistryValue
- Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\InProcServer32'
Type='string' Value='[Common64]ThgShellx64.dll'
/>
<?include shell-register.wxi ?>
|
@@ -13,10 +13,10 @@ #define TOLSTR2(x) TOLSTR(x)
#define CLSID_TortoiseHgCmenu TOLSTR2(THG_CLSID_TortoiseHgCmenu)
-#define CLSID_TortoiseHg0 TOLSTR2(THG_CLSID_TortoiseHg0)
-#define CLSID_TortoiseHg1 TOLSTR2(THG_CLSID_TortoiseHg1)
-#define CLSID_TortoiseHg2 TOLSTR2(THG_CLSID_TortoiseHg2)
-#define CLSID_TortoiseHg6 TOLSTR2(THG_CLSID_TortoiseHg6)
+#define CLSID_TortoiseHgNormal TOLSTR2(THG_CLSID_TortoiseHgNormal)
+#define CLSID_TortoiseHgAdded TOLSTR2(THG_CLSID_TortoiseHgAdded)
+#define CLSID_TortoiseHgModified TOLSTR2(THG_CLSID_TortoiseHgModified)
+#define CLSID_TortoiseHgUnversioned TOLSTR2(THG_CLSID_TortoiseHgUnversioned)
UINT g_cRefThisDll = 0;
@@ -95,31 +95,31 @@ TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgCmenu");
return pcf->QueryInterface(riid, ppvOut);
}
- else if (clsid == CLSID_TortoiseHg0)
+ else if (clsid == CLSID_TortoiseHgNormal)
{
FactOvl *pcf = new FactOvl('C'); // clean
- TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg0");
+ TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgNormal");
++InitStatus::inst().unchanged_;
return pcf->QueryInterface(riid, ppvOut);
}
- else if (clsid == CLSID_TortoiseHg1)
+ else if (clsid == CLSID_TortoiseHgAdded)
{
FactOvl *pcf = new FactOvl('A'); // added
- TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg1");
+ TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgAdded");
++InitStatus::inst().added_;
return pcf->QueryInterface(riid, ppvOut);
}
- else if (clsid == CLSID_TortoiseHg2)
+ else if (clsid == CLSID_TortoiseHgModified)
{
FactOvl *pcf = new FactOvl('M'); // modified
- TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg2");
+ TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgModified");
++InitStatus::inst().modified_;
return pcf->QueryInterface(riid, ppvOut);
}
- else if (clsid == CLSID_TortoiseHg6)
+ else if (clsid == CLSID_TortoiseHgUnversioned)
{
FactOvl *pcf = new FactOvl('?'); // not in repo
- TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHg6");
+ TDEBUG_TRACE("DllGetClassObject clsname = " << "CLSID_TortoiseHgUnversioned");
++InitStatus::inst().notinrepo_;
return pcf->QueryInterface(riid, ppvOut);
}
|
@@ -1,8 +1,8 @@ #include "ThgCLSIDs.h"
<Include>
<?define CLSID_TortoiseHgCmenu = THG_CLSID_TortoiseHgCmenu ?>
- <?define CLSID_TortoiseHg0 = THG_CLSID_TortoiseHg0 ?>
- <?define CLSID_TortoiseHg1 = THG_CLSID_TortoiseHg1 ?>
- <?define CLSID_TortoiseHg2 = THG_CLSID_TortoiseHg2 ?>
- <?define CLSID_TortoiseHg6 = THG_CLSID_TortoiseHg6 ?>
+ <?define CLSID_TortoiseHgNormal = THG_CLSID_TortoiseHgNormal ?>
+ <?define CLSID_TortoiseHgAdded = THG_CLSID_TortoiseHgAdded ?>
+ <?define CLSID_TortoiseHgModified = THG_CLSID_TortoiseHgModified ?>
+ <?define CLSID_TortoiseHgUnversioned = THG_CLSID_TortoiseHgUnversioned ?>
</Include>
|
@@ -2,9 +2,9 @@ #define _THGCLSID_H_
#define THG_CLSID_TortoiseHgCmenu {46605027-5B8C-4DCE-BFE0-051B7972D64C}
-#define THG_CLSID_TortoiseHg0 {869C8877-2C3C-438D-844B-31B86BFE5E8A}
-#define THG_CLSID_TortoiseHg1 {AF42ADAB-8C2E-4285-B746-99B31094708E}
-#define THG_CLSID_TortoiseHg2 {CDA1C89D-E9B5-4981-A857-82DD932EA2FD}
-#define THG_CLSID_TortoiseHg6 {9E3D4EC9-0624-4393-8B48-204C217ED1FF}
+#define THG_CLSID_TortoiseHgNormal {869C8877-2C3C-438D-844B-31B86BFE5E8A}
+#define THG_CLSID_TortoiseHgAdded {AF42ADAB-8C2E-4285-B746-99B31094708E}
+#define THG_CLSID_TortoiseHgModified {CDA1C89D-E9B5-4981-A857-82DD932EA2FD}
+#define THG_CLSID_TortoiseHgUnversioned {9E3D4EC9-0624-4393-8B48-204C217ED1FF}
#endif
|
Loading...