[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/source

[Maxime de Roucy]

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   18 +++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit b25bef87eece6d5ed0492b374e5bf6cc4beefcbe
Author: Maxime de Roucy <mderoucy at linagora.com>
Date:   Mon Dec 22 13:57:55 2014 +0100

    fdo#67534 Fix "Property Handler" shared lock
    
    As explained in the following link, access mode should be set to
    "EnableShareDenyNone" to avoid blocking others process to access the
    file opened by the Property Handler.
    http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
    
    Reviewed-on: https://gerrit.libreoffice.org/13596
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    
    Conflicts:
    	scp2/source/winexplorerext/registryitem_winexplorerext.scp
    
    Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
    Reviewed-on: https://gerrit.libreoffice.org/14300
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..ccd1dba 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -339,6 +339,15 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
     Value = "%PRODUCTNAME Property Handler";
 End
 
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    ComponentCondition = "VersionNT >= 600";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Name = "EnableShareDenyNone";
+    Value = "#1";
+End
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +356,15 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
     Value = "%PRODUCTNAME Property Handler";
 End
 
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT >= 600";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Name = "EnableShareDenyNone";
+    Value = "#1";
+End
+
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext;