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 201f11bcbc8a…

Parents 962142268aca…

Parents 41263f8967cb…

by Adrian Buehlmann

Changes to 2 files · Browse files at 201f11bcbc8a Showing diff from parent 962142268aca 41263f8967cb Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
22
23
24
 
 
 
 
 
 
 
25
26
27
 
134
135
136
137
 
138
139
140
141
 
142
143
144
145
 
146
147
148
149
 
150
151
152
153
 
154
155
156
 
282
283
284
285
 
286
287
288
289
 
290
291
292
293
 
294
295
296
297
 
298
299
300
301
 
302
303
304
 
22
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
@@ -22,6 +22,13 @@
    <?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 ?> +   <Product Name='TortoiseHg $(var.Version) ($(var.Platform))'   Id='$(var.ProductId)'   Version='$(var.Version)' @@ -134,23 +141,23 @@
  Type='string' Value='[INSTALLDIR]'   />   <RegistryValue - Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHgCmenu)}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{869C8877-2C3C-438D-844B-31B86BFE5E8A}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg0)}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{AF42ADAB-8C2E-4285-B746-99B31094708E}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg1)}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg2)}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{9E3D4EC9-0624-4393-8B48-204C217ED1FF}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg6)}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <?include shell-register.wxi ?> @@ -282,23 +289,23 @@
  Type='string' Value='[INSTALLDIR]'   />   <RegistryValue - Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHgCmenu)}\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{869C8877-2C3C-438D-844B-31B86BFE5E8A}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg0)}\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{AF42ADAB-8C2E-4285-B746-99B31094708E}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg1)}\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{CDA1C89D-E9B5-4981-A857-82DD932EA2FD}\InProcServer32' + Root='HKCR' Key='CLSID\{$(var.CLSID_TortoiseHg2)}\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll'   />   <RegistryValue - Root='HKCR' Key='CLSID\{9E3D4EC9-0624-4393-8B48-204C217ED1FF}\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/​ShellExt.cpp Stacked
 
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
 
12
13
14
 
 
15
16
17
18
19
20
 
 
 
 
 
 
 
 
 
21
22
23
@@ -12,23 +12,12 @@
 #define INITGUID  #include <initguid.h>   -#ifdef THG_MSI_INSTALL -// GUIDs used by WiX msi installer  DEFINE_GUID(CLSID_TortoiseHgCmenu, 0x46605027L, 0x5B8C, 0x4DCE, 0xBF, 0xE0, 0x05, 0x1B, 0x79, 0x72, 0xD6, 0x4C);    DEFINE_GUID(CLSID_TortoiseHg0, 0x869C8877L, 0x2C3C, 0x438D, 0x84, 0x4B, 0x31, 0xB8, 0x6B, 0xFE, 0x5E, 0x8A);  DEFINE_GUID(CLSID_TortoiseHg1, 0xAF42ADABL, 0x8C2E, 0x4285, 0xB7, 0x46, 0x99, 0xB3, 0x10, 0x94, 0x70, 0x8E);  DEFINE_GUID(CLSID_TortoiseHg2, 0xCDA1C89DL, 0xE9B5, 0x4981, 0xA8, 0x57, 0x82, 0xDD, 0x93, 0x2E, 0xA2, 0xFD);  DEFINE_GUID(CLSID_TortoiseHg6, 0x9E3D4EC9L, 0x0624, 0x4393, 0x8B, 0x48, 0x20, 0x4C, 0x21, 0x7E, 0xD1, 0xFF); -#else -// GUIDs used by innosetup installer -DEFINE_GUID(CLSID_TortoiseHgCmenu, 0xb456db9fL, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); - -DEFINE_GUID(CLSID_TortoiseHg0, 0xb456dba0L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg1, 0xb456dba1L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg2, 0xb456dba2L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg6, 0xb456dba6L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -#endif    UINT g_cRefThisDll = 0;  HINSTANCE g_hmodThisDll = NULL;