configmgr/source/winreg.cxx | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
New commits: commit de9dafb827a11f62f507257a2ce37e7220508949 Author: Tamás Zolnai <[email protected]> Date: Wed Mar 8 12:54:02 2017 +0100 tdf#106283: Registry settings are not read properly on Windows Read also a type value from registry so user can specify a type for a property of an extensible group. Reviewed-on: https://gerrit.libreoffice.org/34961 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 145accd9a5b55070959d40c9314d870dffa5e4bc) Change-Id: I4105ba559a64ce96bfe5a390660ad7f349ba894c diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx index b6baa7f..5a1d897 100644 --- a/configmgr/source/winreg.cxx +++ b/configmgr/source/winreg.cxx @@ -69,6 +69,18 @@ namespace { // </node> // </node> // </item> +// +// Third example (property of an extensible group -> needs type): +// [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.Office.Jobs\Jobs\org.openoffice.Office.Jobs:Job['UpdateCheck']\Arguments\AutoCheckEnabled] +// "Value"="false" +// "Final"=dword:00000001 +// "Type"="xs:boolean" +// becomes the following in configuration: +// <item oor:path="/org.openoffice.Office.Jobs/Jobs/org.openoffice.Office.Jobs:Job['UpdateCheck']/Arguments"> +// <prop oor:name="AutoCheckEnabled" oor:type="xs::boolean" oor:finalized="true"> +// <value>false</value> +// </prop> +// </item> void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, TempFile &aFileHandle) { @@ -111,6 +123,7 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, TempFile &aFileHandle) bool bFinal = false; OUString aValue; + OUString aType; for(DWORD i = 0; i < nValues; ++i) { @@ -120,9 +133,12 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, TempFile &aFileHandle) RegEnumValueW(hCurKey, i, pValueName, &nValueNameLen, NULL, NULL, (LPBYTE)pValue, &nValueLen); const wchar_t wsValue[] = L"Value"; const wchar_t wsFinal[] = L"Final"; + const wchar_t wsType[] = L"Type"; if(!wcscmp(pValueName, wsValue)) aValue = OUString(pValue); + if (!wcscmp(pValueName, wsType)) + aType = OUString(pValue); if(!wcscmp(pValueName, wsFinal) && *(DWORD*)pValue == 1) bFinal = true; } @@ -172,6 +188,12 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, TempFile &aFileHandle) writeData(aFileHandle, "<prop oor:name=\""); writeAttributeValue(aFileHandle, aProp); writeData(aFileHandle, "\""); + if(!aType.isEmpty()) + { + writeData(aFileHandle, " oor:type=\""); + writeAttributeValue(aFileHandle, aType); + writeData(aFileHandle, "\""); + } if(bFinal) writeData(aFileHandle, " oor:finalized=\"true\""); writeData(aFileHandle, "><value>");
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
