diff options
| author | Andras Timar <atimar@suse.com> | 2012-06-05 13:37:30 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-06-05 13:42:14 +0200 |
| commit | 6d9be05a6fb251ed0cbcbcefd55ed174b1e8e39d (patch) | |
| tree | f48806ee5c7fdf3c770ec7429d2de7b7ffe9ec32 /scp2/inc | |
| parent | 22a29c2060355626ff0cba6c6d0ae70b8e2bbad3 (diff) | |
fdo#47805 rework handling of 64-bit registry entries
64-bit registry entries were entered via a custom action, which
did not always work. By default the custom action ran with user
privileges, which were not sufficient to write the registry.
It is not necessary to use custom actions for this task. Windows
installer supports it well.
Change-Id: Id65458c363c2b90b3e7d166b4c836bfb1ff19bf4
Diffstat (limited to 'scp2/inc')
| -rwxr-xr-x | scp2/inc/macros.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d776797cf91c..893e675e3ad8 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -505,12 +505,18 @@ End #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ - ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \ + ModuleID = gid_Module_Optional_Winexplorerext; \ ComponentCondition = "VersionNT >= 600"; \ - Styles = (X64); \ Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ - Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + End \ +\ + RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = gid_Module_Optional_Winexplorerext_x64; \ + ComponentCondition = "VersionNT64 >= 600"; \ + Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ + Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End #else |