Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Side by Side Diff: remoting/host/installer/win/chromoting.wxs

Issue 12390060: RdpDesktopSession COM class should only use raw interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/host/win/chromoting_lib_idl.templ » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3 3
4 <?define EventSourceName = "chromoting" ?> 4 <?define EventSourceName = "chromoting" ?>
5 <?define ServiceName = "chromoting" ?> 5 <?define ServiceName = "chromoting" ?>
6 6
7 <!-- TODO(alexeypa): There strings should be localized, 7 <!-- TODO(alexeypa): There strings should be localized,
8 see http://crbug.com/121785 --> 8 see http://crbug.com/121785 -->
9 <?if $(var.Branding) ~= Chrome ?> 9 <?if $(var.Branding) ~= Chrome ?>
10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?> 10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
(...skipping 16 matching lines...) Expand all
27 <?define HostBinary = "remoting_host.exe" ?> 27 <?define HostBinary = "remoting_host.exe" ?>
28 28
29 <?define ChromotingTypelib = "{b6396c45-b0cc-456b-9f49-f12964ee6df4}" ?> 29 <?define ChromotingTypelib = "{b6396c45-b0cc-456b-9f49-f12964ee6df4}" ?>
30 30
31 <!-- AppIDs used by the COM components. --> 31 <!-- AppIDs used by the COM components. -->
32 <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?> 32 <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
33 <?define RdpAppid = "{52e6fd1a-f16e-49c0-aacb-5436a915448b}" ?> 33 <?define RdpAppid = "{52e6fd1a-f16e-49c0-aacb-5436a915448b}" ?>
34 34
35 <?define ControllerClass = "ElevatedController Class" ?> 35 <?define ControllerClass = "ElevatedController Class" ?>
36 <?define ControllerProgid = 36 <?define ControllerProgid =
37 "ChromotingElevatedController.ElevatedController" ?> 37 "ChromotingElevatedController.ElevatedController" ?>
38
39 <?define IRdpDesktopSessionId = "{126c22bc-34ef-4cfb-83ef-9b8ada3391e8}" ?>
40 <?define IRdpDesktopSessionEventHandlerId =
41 "{987bca97-9d40-42fc-a00d-e6a701261af5}" ?>
38 42
39 <!-- 43 <!--
40 The long hex values below are security descriptors generated from SDDL 44 The long hex values below are security descriptors generated from SDDL
41 definition using the PowerShell script below: 45 definition using the PowerShell script below:
42 46
43 $sddl = "<SDDL definition goes here>" 47 $sddl = "<SDDL definition goes here>"
44 $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).Bina rySD 48 $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).Bina rySD
45 -join ($i | foreach {$_.ToString("X2")}) 49 -join ($i | foreach {$_.ToString("X2")})
46 --> 50 -->
47 51
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 <RegistryKey Key="LocalServer32" Action="create"> 360 <RegistryKey Key="LocalServer32" Action="create">
357 <RegistryValue Type="string" 361 <RegistryValue Type="string"
358 Value="[binaries]$(var.HostBinary) --type=rdp_des ktop_session"/> 362 Value="[binaries]$(var.HostBinary) --type=rdp_des ktop_session"/>
359 </RegistryKey> 363 </RegistryKey>
360 364
361 <RegistryKey Key="TypeLib" Action="create"> 365 <RegistryKey Key="TypeLib" Action="create">
362 <RegistryValue Type="string" 366 <RegistryValue Type="string"
363 Value="$(var.ChromotingTypelib)"/> 367 Value="$(var.ChromotingTypelib)"/>
364 </RegistryKey> 368 </RegistryKey>
365 </RegistryKey> 369 </RegistryKey>
370
371 <!-- IRdpDesktopSession PSFactory -->
372 <RegistryKey Key="$(var.IRdpDesktopSessionId)"
373 Action="create">
374 <RegistryValue Type="string"
375 Value="IRdpDesktopSession PSFactory"/>
376
377 <RegistryKey Key="InprocServer32" Action="create">
378 <RegistryValue Type="string"
379 Value="[binaries]$(var.CoreBinary)"/>
380 </RegistryKey>
381 </RegistryKey>
382
383 <!-- IRdpDesktopSessionEventHandler PSFactory -->
384 <RegistryKey Key="$(var.IRdpDesktopSessionEventHandlerId)"
385 Action="create">
386 <RegistryValue Type="string"
387 Value="IRdpDesktopSessionEventHandler PSFactory"/>
388
389 <RegistryKey Key="InprocServer32" Action="create">
390 <RegistryValue Type="string"
391 Value="[binaries]$(var.CoreBinary)"/>
392 </RegistryKey>
393 </RegistryKey>
366 </RegistryKey> 394 </RegistryKey>
367 395
368 <RegistryKey Key="Interface"> 396 <RegistryKey Key="Interface">
369 <!-- IRdpDesktopSession interface -->
370 <RegistryKey Key="{126c22bc-34ef-4cfb-83ef-9b8ada3391e8}"
371 Action="create">
372 <RegistryKey Key="ProxyStubClsid32" Action="create">
373 <RegistryValue Type="string"
374 Value="{00020424-0000-0000-C000-000000000046}"/>
375 </RegistryKey>
376
377 <RegistryKey Key="TypeLib" Action="create">
378 <RegistryValue Type="string"
379 Value="$(var.ChromotingTypelib)"/>
380 </RegistryKey>
381 </RegistryKey>
382
383 <!-- IDaemonControl2 interface --> 397 <!-- IDaemonControl2 interface -->
384 <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}" 398 <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}"
385 Action="create"> 399 Action="create">
386 <RegistryKey Key="ProxyStubClsid32" Action="create"> 400 <RegistryKey Key="ProxyStubClsid32" Action="create">
387 <RegistryValue Type="string" 401 <RegistryValue Type="string"
388 Value="{00020424-0000-0000-C000-000000000046}"/> 402 Value="{00020424-0000-0000-C000-000000000046}"/>
389 </RegistryKey> 403 </RegistryKey>
390 404
391 <RegistryKey Key="TypeLib" Action="create"> 405 <RegistryKey Key="TypeLib" Action="create">
392 <RegistryValue Type="string" 406 <RegistryValue Type="string"
393 Value="$(var.ChromotingTypelib)"/> 407 Value="$(var.ChromotingTypelib)"/>
394 </RegistryKey> 408 </RegistryKey>
395 </RegistryKey> 409 </RegistryKey>
396 410
397 <!-- IRdpDesktopSessionEventHandler interface --> 411 <!-- IDaemonControl interface -->
398 <RegistryKey Key="{987bca97-9d40-42fc-a00d-e6a701261af5}" 412 <RegistryKey Key="{e051a481-6345-4ba1-bdb1-cf7929955268}"
399 Action="create"> 413 Action="create">
400 <RegistryKey Key="ProxyStubClsid32" Action="create"> 414 <RegistryKey Key="ProxyStubClsid32" Action="create">
401 <RegistryValue Type="string" 415 <RegistryValue Type="string"
402 Value="{00020424-0000-0000-C000-000000000046}"/> 416 Value="{00020424-0000-0000-C000-000000000046}"/>
403 </RegistryKey> 417 </RegistryKey>
404 418
405 <RegistryKey Key="TypeLib" Action="create"> 419 <RegistryKey Key="TypeLib" Action="create">
406 <RegistryValue Type="string" 420 <RegistryValue Type="string"
407 Value="$(var.ChromotingTypelib)"/> 421 Value="$(var.ChromotingTypelib)"/>
408 </RegistryKey> 422 </RegistryKey>
409 </RegistryKey> 423 </RegistryKey>
410 424
411 <!-- IDaemonControl interface --> 425 <!-- IRdpDesktopSession interface -->
412 <RegistryKey Key="{e051a481-6345-4ba1-bdb1-cf7929955268}" 426 <RegistryKey Key="$(var.IRdpDesktopSessionId)"
413 Action="create"> 427 Action="create">
428 <RegistryValue Type="string"
429 Value="IRdpDesktopSession"/>
414 <RegistryKey Key="ProxyStubClsid32" Action="create"> 430 <RegistryKey Key="ProxyStubClsid32" Action="create">
415 <RegistryValue Type="string" 431 <RegistryValue Type="string"
416 Value="{00020424-0000-0000-C000-000000000046}"/> 432 Value="$(var.IRdpDesktopSessionId)"/>
433 </RegistryKey>
434 </RegistryKey>
435
436 <!-- IRdpDesktopSessionEventHandler interface -->
437 <RegistryKey Key="$(var.IRdpDesktopSessionEventHandlerId)"
438 Action="create">
439 <RegistryValue Type="string"
440 Value="IRdpDesktopSessionEventHandler"/>
441 <RegistryKey Key="ProxyStubClsid32" Action="create">
442 <RegistryValue Type="string"
443 Value="$(var.IRdpDesktopSessionEventHandlerId)"/>
417 </RegistryKey> 444 </RegistryKey>
418 445
419 <RegistryKey Key="TypeLib" Action="create"> 446 <RegistryKey Key="TypeLib" Action="create">
420 <RegistryValue Type="string" 447 <RegistryValue Type="string"
421 Value="$(var.ChromotingTypelib)"/> 448 Value="$(var.ChromotingTypelib)"/>
422 </RegistryKey> 449 </RegistryKey>
423 </RegistryKey> 450 </RegistryKey>
424 </RegistryKey> 451 </RegistryKey>
425 452
426 <RegistryKey Key="Typelib"> 453 <RegistryKey Key="Typelib">
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 <Custom Action="set_service_description" Before="InstallInitialize"> 608 <Custom Action="set_service_description" Before="InstallInitialize">
582 <![CDATA[VersionNT >= 600]]> 609 <![CDATA[VersionNT >= 600]]>
583 </Custom> 610 </Custom>
584 611
585 <!-- Schedule RemoveExistingProducts before installing any files. 612 <!-- Schedule RemoveExistingProducts before installing any files.
586 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> 613 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
587 <RemoveExistingProducts After="InstallInitialize" /> 614 <RemoveExistingProducts After="InstallInitialize" />
588 </InstallExecuteSequence> 615 </InstallExecuteSequence>
589 </Product> 616 </Product>
590 </Wix> 617 </Wix>
OLDNEW
« no previous file with comments | « no previous file | remoting/host/win/chromoting_lib_idl.templ » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698