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

fogcreek shellext: added common control manifest

Changeset 15c620efc0e9…

Parent ba0dec2f344e…

by David Golub

Changes to 3 files · Browse files at 15c620efc0e9 Showing diff from parent ba0dec2f344e Diff from another changeset...

Change 1 of 1 Show Changes Only win32/​shellext/​THgShell.cpp 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
46
47
 
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
 // Copyright (C) 2011 Fog Creek Software  //  // This program is free software: you can redistribute it and/or modify  // it under the terms of the GNU General Public License as published by  // the Free Software Foundation, either version 2 of the License, or  // (at your option) any later version.  //  // This program is distributed in the hope that it will be useful,  // but WITHOUT ANY WARRANTY; without even the implied warranty of  // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  // GNU General Public License for more details.  //  // You should have received a copy of the GNU General Public License  // along with this program. If not, see <http://www.gnu.org/licenses/>.    #include "stdafx.h"  #include <initguid.h>  #include "THgShell_h.h"  #include "THgShell_i.c"    #include "TortoiseUtils.h"  #include "StringUtils.h"  #include "TortoiseHgCmenu.h"  #include "TortoiseHgDropHandler.h"  #include "TortoiseHgOverlay.h"  #include "TortoiseHgKeyboard.h"  #include "TortoiseHgCopyHook.h"    CComModule _Module;    BEGIN_OBJECT_MAP(ObjectMap)   OBJECT_ENTRY(CLSID_TortoiseHgCmenu, CTortoiseHgCmenu)   OBJECT_ENTRY(CLSID_TortoiseHgDropHandler, CTortoiseHgDropHandler)   OBJECT_ENTRY(CLSID_TortoiseHgNormal, CTortoiseHgNormal)   OBJECT_ENTRY(CLSID_TortoiseHgAdded, CTortoiseHgAdded)   OBJECT_ENTRY(CLSID_TortoiseHgModified, CTortoiseHgModified)   OBJECT_ENTRY(CLSID_TortoiseHgUnversioned, CTortoiseHgUnversioned)   OBJECT_ENTRY(CLSID_TortoiseHgKeyboard, CTortoiseHgKeyboard)   OBJECT_ENTRY(CLSID_TortoiseHgCopyHook, CTortoiseHgCopyHook)  END_OBJECT_MAP()    BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)  {   if (dwReason == DLL_PROCESS_ATTACH)   {   ATLTRACE("DllMain: DLL_PROCESS_ATTACH\n");   _Module.Init(ObjectMap, hInstance, &LIBID_THgShell); + ::InitCommonControls();   }   else if (dwReason == DLL_PROCESS_DETACH)   {   ATLTRACE("DllMain: DLL_PROCESS_ATTACH\n");   _Module.Term();   }     return 1;  }    STDAPI DllCanUnloadNow(void)  {   ATLTRACE("DllCanUnloadNow\n");   return _Module.GetLockCount() == 0 ? S_OK : S_FALSE;  }    STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)  {   ATLTRACE("DllGetClassObject\n");   return _Module.GetClassObject(rclsid, riid, ppv);  }    STDAPI DllRegisterServer(void)  {   ATLTRACE("DllRegisterServer\n");   return _Module.RegisterServer();  }    STDAPI DllUnregisterServer(void)  {   ATLTRACE("DllUnregisterServer\n");   return _Module.UnregisterServer();  }
Change 1 of 1 Show Entire File win32/​shellext/​THgShell.vcxproj Stacked
 
190
191
192
193
 
194
195
196
 
190
191
192
 
193
194
195
196
@@ -190,7 +190,7 @@
  <GenerateDebugInformation>true</GenerateDebugInformation>   <EnableCOMDATFolding>true</EnableCOMDATFolding>   <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>   <ModuleDefinitionFile>THgShell.def</ModuleDefinitionFile>   </Link>   <CustomBuildStep>
Change 1 of 1 Show Entire File win32/​shellext/​stdafx.h Stacked
 
19
20
21
 
 
 
 
 
 
22
23
24
 
19
20
21
22
23
24
25
26
27
28
29
30
@@ -19,6 +19,12 @@
 // member in MENUITEMINFO.  #define WINVER 0x0500   +// Enable visual styles of Windows XP. +#define ISOLATION_AWARE_ENABLED 1 +#pragma comment(linker, "/manifestdependency:\"type='win32' " \ + "name='Microsoft.Windows.Common-Controls' version='6.0.0.0' " \ + "processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +  #include "resource.h"    #include <atlbase.h>