diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 05:48:47 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 05:48:47 +0000 |
| commit | 2c67e3c431018bc5851b86a3b96667fac65424e3 (patch) | |
| tree | 404d8af8d8ed32c578e697bc25625eaccbb17689 | |
| parent | 1f04a1464b67b9cc2931997dfd0030196d878273 (diff) | |
| download | chromium_src-2c67e3c431018bc5851b86a3b96667fac65424e3.zip chromium_src-2c67e3c431018bc5851b86a3b96667fac65424e3.tar.gz chromium_src-2c67e3c431018bc5851b86a3b96667fac65424e3.tar.bz2 | |
Fixed crash in cloud_print_service_setup.exe, binary needs _AtlModule.
Use SUBSYSTEM:WINDOWS to avoid console shows up.
TBR=gene, need official build by tomorrow.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14328054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196326 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cloud_print/service/service.gyp | 2 | ||||
| -rw-r--r-- | cloud_print/service/win/cloud_print_service_config.cc | 6 | ||||
| -rw-r--r-- | cloud_print/service/win/installer.cc | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp index 966dae6..d1ac611 100644 --- a/cloud_print/service/service.gyp +++ b/cloud_print/service/service.gyp @@ -166,7 +166,7 @@ ], 'msvs_settings': { 'VCLinkerTool': { - 'SubSystem': '1', # Set /SUBSYSTEM:CONSOLE + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 'UACExecutionLevel': '2', # /level='requireAdministrator' 'AdditionalDependencies': [ 'secur32.lib', diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index fcfe636..c6430cf 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -413,11 +413,11 @@ void SetupDialog::Uninstall() { UpdateState(); } -class CloudPrintServiceSetupModule - : public ATL::CAtlExeModuleT<CloudPrintServiceSetupModule> { +class CloudPrintServiceConfigModule + : public ATL::CAtlExeModuleT<CloudPrintServiceConfigModule> { }; -CloudPrintServiceSetupModule _AtlModule; +CloudPrintServiceConfigModule _AtlModule; int WINAPI WinMain(__in HINSTANCE hInstance, __in HINSTANCE hPrevInstance, diff --git a/cloud_print/service/win/installer.cc b/cloud_print/service/win/installer.cc index 57a1819..88a3193 100644 --- a/cloud_print/service/win/installer.cc +++ b/cloud_print/service/win/installer.cc @@ -125,8 +125,17 @@ HRESULT ProcessInstallerSwitches() { return S_FALSE; } -int main(int argc, char** argv) { - CommandLine::Init(argc, argv); +class CloudPrintServiceSetupModule + : public ATL::CAtlExeModuleT<CloudPrintServiceSetupModule> { +}; + +CloudPrintServiceSetupModule _AtlModule; + +int WINAPI WinMain(__in HINSTANCE hInstance, + __in HINSTANCE hPrevInstance, + __in LPSTR lpCmdLine, + __in int nCmdShow) { base::AtExitManager at_exit; + CommandLine::Init(0, NULL); return ProcessInstallerSwitches(); } |