Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 0e82cd84600b…

Parents 691bd7e30f06…

Parents 924d8da7e140…

by Adrian Buehlmann

Changes to 6 files · Browse files at 0e82cd84600b Showing diff from parent 691bd7e30f06 924d8da7e140 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
1
2
3
4
 
 
5
6
7
 
 
8
9
10
 
 
11
12
13
 
 
14
15
16
 
 
17
18
19
20
21
22
23
24
25
26
 
 
 
 
 
 
 
 
27
28
29
30
31
32
 
 
 
 
33
34
35
36
 
37
38
 
39
40
 
41
42
 
43
44
 
45
 
1
2
 
 
3
4
5
 
 
6
7
8
 
 
9
10
11
 
 
12
13
14
 
 
15
16
17
18
 
 
 
 
 
 
 
 
19
20
21
22
23
24
25
26
27
28
 
 
 
 
29
30
31
32
33
34
35
 
36
37
 
38
39
 
40
41
 
42
43
 
44
45
@@ -1,45 +1,45 @@
 <Include>   <!-- cmenu COM component --> - <RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <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\{869C8877-2C3C-438D-844B-31B86BFE5E8A}' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\{869C8877-2C3C-438D-844B-31B86BFE5E8A}\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <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' />   <!-- Added overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\{AF42ADAB-8C2E-4285-B746-99B31094708E}' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\{AF42ADAB-8C2E-4285-B746-99B31094708E}\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <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' />   <!-- Modified overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <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' />   <!-- Unversioned overlay COM component --> - <RegistryValue Root='HKCR' Key='CLSID\{9E3D4EC9-0624-4393-8B48-204C217ED1FF}' Type='string' Value='TortoiseHg' /> - <RegistryValue Root='HKCR' Key='CLSID\{9E3D4EC9-0624-4393-8B48-204C217ED1FF}\InProcServer32' Type='string' Name='ThreadingModel' Value='Apartment' /> + <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' />     <!-- cmenu registration --> - <RegistryValue Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> - <RegistryValue Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' /> + <RegistryValue Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <RegistryValue Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' /> + <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='{869C8877-2C3C-438D-844B-31B86BFE5E8A}' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Added' Type='string' Name='TortoiseHgMsi' Value='{AF42ADAB-8C2E-4285-B746-99B31094708E}' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Modified' Type='string' Name='TortoiseHgMsi' Value='{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}' /> - <RegistryValue Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' Type='string' Name='TortoiseHgMsi' Value='{9E3D4EC9-0624-4393-8B48-204C217ED1FF}' /> + <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)' />     <!-- Mark all as approved -->   <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='{46605027-5B8C-4DCE-BFE0-051B7972D64C}' Value='TortoiseHg' /> + Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' />   <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='{869C8877-2C3C-438D-844B-31B86BFE5E8A}' Value='TortoiseHg' /> + Name='$(var.CLSID_TortoiseHg0)' Value='TortoiseHg' />   <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='{AF42ADAB-8C2E-4285-B746-99B31094708E}' Value='TortoiseHg' /> + Name='$(var.CLSID_TortoiseHg1)' Value='TortoiseHg' />   <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}' Value='TortoiseHg' /> + Name='$(var.CLSID_TortoiseHg2)' Value='TortoiseHg' />   <RegistryValue Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' Type='string' - Name='{9E3D4EC9-0624-4393-8B48-204C217ED1FF}' Value='TortoiseHg' /> + Name='$(var.CLSID_TortoiseHg6)' Value='TortoiseHg' />  </Include>
Change 1 of 3 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
23
24
25
26
27
28
29
30
31
 
 
32
33
34
 
141
142
143
144
 
145
146
147
148
 
149
150
151
152
 
153
154
155
156
 
157
158
159
160
 
161
162
163
 
289
290
291
292
 
293
294
295
296
 
297
298
299
300
 
301
302
303
304
 
305
306
307
308
 
309
310
311
 
23
24
25
 
 
 
 
 
 
26
27
28
29
30
 
137
138
139
 
140
141
142
143
 
144
145
146
147
 
148
149
150
151
 
152
153
154
155
 
156
157
158
159
 
285
286
287
 
288
289
290
291
 
292
293
294
295
 
296
297
298
299
 
300
301
302
303
 
304
305
306
307
@@ -23,12 +23,8 @@
  <?define VCRedistSrcDir = C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC ?>     <!-- shell extension CLSID's --> - <?define CLSID_TortoiseHgCmenu = 46605027-5B8C-4DCE-BFE0-051B7972D64C ?> - <?define CLSID_TortoiseHg0 = 869C8877-2C3C-438D-844B-31B86BFE5E8A ?> - <?define CLSID_TortoiseHg1 = AF42ADAB-8C2E-4285-B746-99B31094708E ?> - <?define CLSID_TortoiseHg2 = CDA1C89D-E9B5-4981-A857-82DD932EA2FD ?> - <?define CLSID_TortoiseHg6 = 9E3D4EC9-0624-4393-8B48-204C217ED1FF ?> - + <?include ../../win32/shellext/ThgCLSIDs.wxi ?> +   <Product Name='TortoiseHg $(var.Version) ($(var.Platform))'   Id='$(var.ProductId)'   Version='$(var.Version)' @@ -141,23 +137,23 @@
  Type='string' Value='[INSTALLDIR]'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHgCmenu)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg0)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg1)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg2)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg6)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <?include shell-register.wxi ?> @@ -289,23 +285,23 @@
  Type='string' Value='[INSTALLDIR]'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHgCmenu)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg0)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg0)\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg1)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg1)\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg2)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg2)\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg6)}\InProcServer32' + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHg6)\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <?include shell-register.wxi ?>
Change 1 of 1 Show Entire File win32/​shellext/​Makefile.nmake Stacked
 
46
47
48
49
 
50
51
 
52
53
54
 
46
47
48
 
49
50
51
52
53
54
55
@@ -46,9 +46,10 @@
 all: $(THGSHELL_TARGET) $(TERMINATE_TARGET)    clean: - del *.obj *.dll *.exe *.lib *.exp *.manifest *.res parentid.h + del *.obj *.dll *.exe *.lib *.exp *.manifest *.res parentid.h ThgCLSIDs.wxi    $(THGSHELL_TARGET): $(OBJECTS_THGSGELL) + cl /EP ThgCLSIDs-template.wxi > ThgCLSIDs.wxi   create-parentid-h.cmd   rc /dTHG_SHELL_FNAME="$@" $(THG_EXTRA_RCFLAGS) shellext.rc   link /OUT:$@ $(LDFLAGS_THGSHELL) $** shellext.res
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
6
7
8
 
9
10
11
12
13
14
15
 
 
 
 
 
 
 
 
16
17
18
 
6
7
8
9
10
11
 
 
 
 
 
12
13
14
15
16
17
18
19
20
21
22
@@ -6,13 +6,17 @@
 #include "ThgClassFactory.h"  #include "CShellExtCMenu.h"  #include "CShellExtOverlay.h" +#include "ThgCLSIDs.h"     -#define CLSID_TortoiseHgCmenu L"{46605027-5B8C-4DCE-BFE0-051B7972D64C}" -#define CLSID_TortoiseHg0 L"{869C8877-2C3C-438D-844B-31B86BFE5E8A}" -#define CLSID_TortoiseHg1 L"{AF42ADAB-8C2E-4285-B746-99B31094708E}" -#define CLSID_TortoiseHg2 L"{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}" -#define CLSID_TortoiseHg6 L"{9E3D4EC9-0624-4393-8B48-204C217ED1FF}" +#define TOLSTR(x) L ## #x +#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)      UINT g_cRefThisDll = 0;
Change 1 of 1 Show Entire File win32/​shellext/​ThgCLSIDs-template.wxi Stacked
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
@@ -0,0 +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 ?> +</Include>
Change 1 of 1 Show Entire File win32/​shellext/​ThgCLSIDs.h Stacked
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
@@ -0,0 +1,10 @@
+#ifndef _THGCLSID_H_ +#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} + +#endif