Merge pull request #27 from bcwilhite/master

dsccommunity · Jun 8, 2021 · c827c54 · c827c54
2 parents 5d1a5bf + 74eb631
commit c827c54
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- GPRegistryPolicyDsc
+  - Fixed REG_MULTI_SZ double null termination issue ([issue #25](https://github.com/dsccommunity/GPRegistryPolicyDsc/issues/25)).
+
 ## [1.2.0] - 2020-03-13
 
 ### Added

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -6,15 +6,17 @@
         }
     }
 
-    invokeBuild                 = 'latest'
+    InvokeBuild                 = 'latest'
     PSScriptAnalyzer            = 'latest'
-    pester                      = 'latest'
+    Pester                      = '4.10.1'
     Plaster                     = 'latest'
-    ModuleBuilder               = '1.0.0'
+    ModuleBuilder               = 'latest'
     ChangelogManagement         = 'latest'
     Sampler                     = 'latest'
+    'Sampler.GitHubTasks'       = 'latest'
     MarkdownLinkCheck           = 'latest'
     'DscResource.Test'          = 'latest'
     'DscResource.AnalyzerRules' = 'latest'
     xDscResourceDesigner        = 'latest'
+    'DscResource.DocGenerator'  = 'latest'
 }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,7 +44,7 @@ stages:
       - job: Test_HQRM
         displayName: 'HQRM'
         pool:
-          vmImage: 'win1803'
+          vmImage: 'windows-2019'
         timeoutInMinutes: 0
         steps:
           - task: DownloadBuildArtifacts@0

diff --git a/build.yaml b/build.yaml
@@ -2,7 +2,7 @@
 ####################################################
 #          ModuleBuilder Configuration             #
 ####################################################
-CopyDirectories:
+CopyPaths:
   - en-US
   - DSCResources
   - Modules
@@ -36,7 +36,7 @@ BuildWorkflow:
 
   publish:
     - Publish_release_to_GitHub
-    - publish_module_to_gallery # runs if nuget is not available
+    - publish_module_to_gallery
 
 
 ####################################################

diff --git a/source/Modules/GPRegistryPolicyFileParser/GPRegistryPolicyFileParser.psm1 b/source/Modules/GPRegistryPolicyFileParser/GPRegistryPolicyFileParser.psm1
@@ -305,12 +305,25 @@ function New-GPRegistrySettingsEntry
     # get data bytes then compute byte size based on data and type
     switch ($RegistryPolicy.ValueType)
     {
-        { @([RegType]::REG_SZ, [RegType]::REG_EXPAND_SZ, [RegType]::REG_MULTI_SZ) -contains $_ }
+        { @([RegType]::REG_SZ, [RegType]::REG_EXPAND_SZ) -contains $_ }
         {
             $dataBytes = [System.Text.Encoding]::Unicode.GetBytes($RegistryPolicy.ValueData + "`0")
             $dataSize = $dataBytes.Count
         }
 
+        ([RegType]::REG_MULTI_SZ)
+        {
+            <#
+                When REG_MULTI_SZ ValueData contains an array, we need to null terminate each item. Furthermore
+                "Data in the Data field to be interpreted as a sequence of characters terminated by two null Unicode
+                characters, and within that sequence zero or more null-terminated Unicode strings can exist."
+                https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-gpreg/5c092c22-bf6b-4e7f-b180-b20743d368f5
+            #>
+            $valueDataNullTermJoin = $RegistryPolicy.ValueData -join "`0"
+            $dataBytes = [System.Text.Encoding]::Unicode.GetBytes($valueDataNullTermJoin + "`0`0")
+            $dataSize = $dataBytes.Count
+        }
+
         ([RegType]::REG_BINARY)
         {
             $dataBytes = [System.Text.Encoding]::Unicode.GetBytes($RegistryPolicy.ValueData)