Changeset 511644b607d4…
Parent 218eb60d7e2e…
by
Changes to 5 files · Browse files at 511644b607d4 Showing diff from parent 218eb60d7e2e Diff from another changeset...
@@ -16,7 +16,7 @@ {
'CopyHookHandlers'
{
- 'TortoiseCopyHook' = s '{61047697-7E8B-46FE-9CF8-2CE603EB3017}'
+ 'TortoiseHgCopyHook' = s '{61047697-7E8B-46FE-9CF8-2CE603EB3017}'
}
}
}
|
@@ -6,6 +6,7 @@ <?define CLSID_TortoiseHgModified = {CDA1C89D-E9B5-4981-A857-82DD932EA2FD} ?>
<?define CLSID_TortoiseHgUnversioned = {9E3D4EC9-0624-4393-8B48-204C217ED1FF} ?>
<?define CLSID_TortoiseHgKeyboard = {36BFF16B-4EA0-4D91-9D2C-39941CF0BFE4} ?>
+ <?define CLSID_TortoiseHgCopyHook = {61047697-7E8B-46FE-9CF8-2CE603EB3017} ?>
<?define OverlayCLSIDList =
{869C8877-2C3C-438D-844B-31B86BFE5E8A};{AF42ADAB-8C2E-4285-B746-99B31094708E};{CDA1C89D-E9B5-4981-A857-82DD932EA2FD};{9E3D4EC9-0624-4393-8B48-204C217ED1FF}
?>
|
@@ -64,6 +64,9 @@ <?define KeyboardShellRegistrationX86.guid = {C179A394-03AF-4D3E-8C2E-3E4E00A7351B} ?>
<?define KeyboardShellRegistrationX64.guid = {992E4949-6F6E-4553-B8E1-723F770CCF81} ?>
+ <?define CopyHookShellRegistrationX86.guid = {D0151D2D-BAF3-48CF-8273-955D4F101FFA} ?>
+ <?define CopyHookShellRegistrationX64.guid = {13DBBAEC-F52C-418E-AE1F-8210E01EF8DB} ?>
+
<?define ExtensionVersions.guid = {4ADF436B-9B25-4D95-B6AC-88717F5A037A} ?>
<?define COPYING.guid = {09DEF174-D0AB-4E8B-8A4E-1AD5B7E4C9BD} ?>
|
|
@@ -0,0 +1,17 @@ + <Include>
+ <!-- copy hook component -->
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCopyHook)'
+ Type='string' Value='TortoiseHg'
+ />
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCopyHook)\InProcServer32'
+ Type='string' Name='ThreadingModel' Value='Apartment'
+ />
+
+ <!-- register copy hook handler -->
+ <RegistryValue
+ Root='HKCR' Key='Directory\shellex\CopyHookHandlers\TortoiseHgCopyHook'
+ Type='string' Value='$(var.CLSID_TortoiseHgCopyHook)'
+ />
+</Include>
|
@@ -141,6 +141,9 @@ <RegistryValue
Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCopyHook)\InProcServer32'
+ Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
<?foreach CLSID in $(var.OverlayCLSIDList) ?>
<RegistryValue
Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
@@ -159,6 +162,10 @@ Guid='$(var.KeyboardShellRegistrationX64.guid)'>
<?include shell-register-keyboard.wxi ?>
</Component>
+ <Component Id='CopyHookShellRegistrationX64' Win64='yes'
+ Guid='$(var.CopyHookShellRegistrationX64.guid)'>
+ <?include shell-register-copyhook.wxi ?>
+ </Component>
<?else?>
<Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>
<File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'
@@ -177,7 +184,11 @@ Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<RegistryValue
- Root='HKLM' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
+ Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
+ />
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCopyHook)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
<?foreach CLSID in $(var.OverlayCLSIDList) ?>
@@ -199,6 +210,10 @@ Guid='$(var.KeyboardShellRegistrationX86.guid)'>
<?include shell-register-keyboard.wxi ?>
</Component>
+ <Component Id='CopyHookShellRegistrationX86' Win64='no'
+ Guid='$(var.CopyHookShellRegistrationX86.guid)'>
+ <?include shell-register-copyhook.wxi ?>
+ </Component>
<?endif?>
<Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
@@ -351,6 +366,10 @@ Guid='$(var.KeyboardShellRegistrationX86.guid)' Win64='no'>
<?include shell-register-keyboard.wxi ?>
</Component>
+ <Component Id='CopyHookShellRegistrationX86'
+ Guid='$(var.CopyHookShellRegistrationX86.guid)' Win64='no'>
+ <?include shell-register-copyhook.wxi ?>
+ </Component>
</Directory>
</Directory>
<?endif?>
@@ -415,6 +434,7 @@ <MergeRef Id='TortoiseOverlaysMergeX64' />
<ComponentRef Id='OverlaysShellRegistrationX64' />
<ComponentRef Id='KeyboardShellRegistrationX64' />
+ <ComponentRef Id='CopyHookShellRegistrationX64' />
</Feature>
</Feature>
<?endif?>
|
Loading...