Merge pull request #275 from desktop/support-expand-sz

Add support for REG_EXPAND_SZ type
desktop · Mar 5, 2024 · 8183fca · 8183fca
2 parents b91b280 + 5cafcee
commit 8183fca
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/lib/registry.ts b/lib/registry.ts
@@ -173,6 +173,7 @@ export function setValue(
 
   if (
     valueType != RegistryValueType.REG_SZ &&
+    valueType != RegistryValueType.REG_EXPAND_SZ &&
     valueType != RegistryValueType.REG_DWORD
   ) {
     // not implemented yet

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "registry-js",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "A simple and opinionated library for working with the Windows registry",
   "main": "dist/lib/index.js",
   "typings": "dist/lib/index.d.ts",

diff --git a/src/main.cc b/src/main.cc
@@ -426,7 +426,7 @@ Napi::Value SetValue(const Napi::CallbackInfo& info)
   {
     long setValue = ERROR_INVALID_HANDLE;
 
-    if (wcscmp(valueType, L"REG_SZ") == 0)
+    if (wcscmp(valueType, L"REG_SZ") == 0 || wcscmp(valueType, L"REG_EXPAND_SZ") == 0)
     {
       std::string typeArg = info[4].As<Napi::String>();
       auto valueData = utf8ToWideChar(typeArg);
@@ -436,11 +436,12 @@ Napi::Value SetValue(const Napi::CallbackInfo& info)
         return env.Undefined();
       }
       int datalength = static_cast<int>(wcslen(valueData) * sizeof(valueData[0]));
+      DWORD regType = wcscmp(valueType, L"REG_SZ") == 0 ? REG_SZ : REG_EXPAND_SZ;
       setValue = RegSetValueEx(
           hOpenKey,
           valueName,
           0,
-          REG_SZ,
+          regType,
           (const BYTE *)valueData,
           datalength);
     }

diff --git a/test/registry-test.ts b/test/registry-test.ts
@@ -75,7 +75,7 @@ if (process.platform === 'win32') {
         HKEY.HKEY_CURRENT_USER,
         'SOFTWARE\\Microsoft\\Windows\\CurrentVersion',
         'ValueTest',
-        RegistryValueType.REG_EXPAND_SZ,
+        RegistryValueType.REG_MULTI_SZ,
         'Value'
       )
       expect(result).toBeFalsy()
@@ -130,6 +130,33 @@ if (process.platform === 'win32') {
       expect(programFilesDir!.type).toBe('REG_SZ')
       expect(programFilesDir!.data).toBe('Value 123 ! test@test.com (456)')
     })
+
+    it('can set REG_EXPAND_SZ value for a registry key', () => {
+      let result = false
+      try {
+        result = setValue(
+          HKEY.HKEY_CURRENT_USER,
+          'SOFTWARE\\Microsoft\\Windows\\CurrentVersion',
+          'ValueTestExpandSz',
+          RegistryValueType.REG_EXPAND_SZ,
+          'Value 123 ! test@test.com (456);%NVM_HOME%;%NVM_SYMLINK%'
+        )
+      } catch (e) {
+        console.log(e)
+      }
+      expect(result).toBeTruthy()
+
+      const values = enumerateValues(
+        HKEY.HKEY_CURRENT_USER,
+        'SOFTWARE\\Microsoft\\Windows\\CurrentVersion'
+      )
+
+      const value = values.find(v => v.name == 'ValueTestExpandSz')
+      expect(value!.type).toBe('REG_EXPAND_SZ')
+      expect(value!.data).toBe(
+        'Value 123 ! test@test.com (456);%NVM_HOME%;%NVM_SYMLINK%'
+      )
+    })
   })
 
   describe('createKey', () => {