diff options
| -rw-r--r-- | remoting/host/elevated_controller_module_win.cc | 6 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/remoting/host/elevated_controller_module_win.cc b/remoting/host/elevated_controller_module_win.cc index f4cc407..6f7c8a2 100644 --- a/remoting/host/elevated_controller_module_win.cc +++ b/remoting/host/elevated_controller_module_win.cc @@ -31,6 +31,12 @@ remoting::ElevatedControllerModuleWin _AtlModule; int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int command) { CommandLine::Init(0, NULL); + // Register and initialize common controls. + INITCOMMONCONTROLSEX info; + info.dwSize = sizeof(info); + info.dwICC = ICC_STANDARD_CLASSES; + InitCommonControlsEx(&info); + // This object instance is required by Chrome code (for example, // FilePath, LazyInstance, MessageLoop). base::AtExitManager exit_manager; diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index d196b812..ad2400b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -429,9 +429,21 @@ 'host/verify_config_window_win.h', '<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc' ], + 'link_settings': { + 'libraries': [ + '-lcomctl32.lib', + ], + }, 'msvs_settings': { 'VCLinkerTool': { - 'AdditionalOptions': ["/MANIFESTUAC:level='requireAdministrator'"], + 'AdditionalOptions': [ + "/MANIFESTUAC:level='requireAdministrator'", + "\"/manifestdependency:type='win32' " + "name='Microsoft.Windows.Common-Controls' " + "version='6.0.0.0' " + "processorArchitecture='*' " + "publicKeyToken='6595b64144ccf1df' language='*'\"", + ], # 2 == /SUBSYSTEM:WINDOWS 'SubSystem': '2', }, |