Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek wix: add keyboard hook to registry during setup

Changeset 7ac07220428c…

Parent 8ee2db8769a2…

by David Golub

Changes to 4 files · Browse files at 7ac07220428c Showing diff from parent 8ee2db8769a2 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​ThgCLSIDs.wxi Stacked
 
5
6
7
 
8
9
10
 
5
6
7
8
9
10
11
@@ -5,6 +5,7 @@
  <?define CLSID_TortoiseHgAdded = {AF42ADAB-8C2E-4285-B746-99B31094708E} ?>   <?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 OverlayCLSIDList =   {869C8877-2C3C-438D-844B-31B86BFE5E8A};{AF42ADAB-8C2E-4285-B746-99B31094708E};{CDA1C89D-E9B5-4981-A857-82DD932EA2FD};{9E3D4EC9-0624-4393-8B48-204C217ED1FF}   ?>
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
61
62
63
 
 
 
64
65
66
 
61
62
63
64
65
66
67
68
69
@@ -61,6 +61,9 @@
  <?define OverlaysShellRegistrationX64.guid = {9A678A1C-72D3-4713-AD8A-E7C08ED64DC9} ?>   <?define OverlayServerEXE.guid = {62C58746-BE5D-45F0-8AB7-2FE2AB9C57B0} ?>   + <?define KeyboardShellRegistrationX86.guid = {C179A394-03AF-4D3E-8C2E-3E4E00A7351B} ?> + <?define KeyboardShellRegistrationX64.guid = {992E4949-6F6E-4553-B8E1-723F770CCF81} ?> +   <?define ExtensionVersions.guid = {4ADF436B-9B25-4D95-B6AC-88717F5A037A} ?>   <?define COPYING.guid = {09DEF174-D0AB-4E8B-8A4E-1AD5B7E4C9BD} ?>  
Change 1 of 1 Show Entire File win32/​wix/​shell-register-keyboard.wxi Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
@@ -0,0 +1,17 @@
+<Include> + <!-- keyboard hook component --> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + /> + + <!-- register browser helper object --> + <RegistryValue + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\${var.CLSID_TortoiseHgKeyboard}' + Type='string' Value='TortoiseHg' + /> +</Include>
Change 1 of 6 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
138
139
140
 
 
 
141
142
143
 
152
153
154
 
 
 
 
155
156
157
 
169
170
171
 
 
 
 
172
173
174
 
184
185
186
 
 
 
 
187
188
189
 
395
396
397
 
398
399
400
 
416
417
418
 
419
420
421
 
138
139
140
141
142
143
144
145
146
 
155
156
157
158
159
160
161
162
163
164
 
176
177
178
179
180
181
182
183
184
185
 
195
196
197
198
199
200
201
202
203
204
 
410
411
412
413
414
415
416
 
432
433
434
435
436
437
438
@@ -138,6 +138,9 @@
  <RegistryValue   Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32' + Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>   <?foreach CLSID in $(var.OverlayCLSIDList) ?>   <RegistryValue   Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' @@ -152,6 +155,10 @@
  Guid='$(var.OverlaysShellRegistrationX64.guid)'>   <?include shell-register-overlays.wxi ?>   </Component> + <Component Id='KeyboardShellRegistration' Win64='yes' + Guid='$(var.KeyboardShellRegistrationX64.guid)'> + <?include shell-register-keyboard.wxi ?> + </Component>   <?else?>   <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>   <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes' @@ -169,6 +176,10 @@
  Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   /> + <RegistryValue + Root='HKLM' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32' + Type='string' Value='[INSTALLDIR]ThgShellx86.dll' + />   <?foreach CLSID in $(var.OverlayCLSIDList) ?>   <RegistryValue   Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' @@ -184,6 +195,10 @@
  Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'>   <?include shell-register-overlays.wxi ?>   </Component> + <Component Id='KeyboardShellRegistration' Win64='no' + Guid='$(var.KeyboardShellRegistrationX86.guid)'> + <?include shell-register-keyboard.wxi ?> + </Component>   <?endif?>     <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'> @@ -395,6 +410,7 @@
  <ComponentRef Id='OverlayServerEXE' />   <MergeRef Id='TortoiseOverlaysMergeX64' />   <ComponentRef Id='OverlaysShellRegistrationX64' /> + <ComponentRef Id='KeyboardShellRegistrationX64' />   </Feature>   </Feature>   <?endif?> @@ -416,6 +432,7 @@
  <ComponentRef Id='OverlayServerEXE' />   <MergeRef Id='TortoiseOverlaysMergeX86' />   <ComponentRef Id='OverlaysShellRegistrationX86' /> + <ComponentRef Id='KeyboardShellRegistrationX86' />   </Feature>   </Feature>   <Feature Id='Locales' Level='1'