b3d52c01e8
* chore: bump node in DEPS to v20.16.0
* test: skip unstable shadow realm gc tests
https://github.com/nodejs/node/pull/52855
* test: extend env for `test-node-output-errors`
https://github.com/nodejs/node/pull/53535
* src: fix typo in env.cc
https://github.com/nodejs/node/pull/53418
* src: reset `process.versions` during pre-execution
https://github.com/nodejs/node/pull/53444
* chore: fixup patch indices
* src,permission: --allow-wasi & prevent WASI exec
https://github.com/nodejs/node/pull/53124
* tls: use SSL_get_peer_tmp_key
https://github.com/nodejs/node/pull/53366
* deps: update c-ares to 1.29.0
https://github.com/nodejs/node/pull/53155
* src: account for OpenSSL unexpected version
* crypto: fix propagation of "memory limit exceeded"
https://github.com/nodejs/node/pull/53300
* process: add process.getBuiltinModule(id)
https://github.com/nodejs/node/pull/52762
* windows 32bit: config change callback needs to be stdcall
8f265c9d51
* fix: building with UNICODE
https://github.com/c-ares/c-ares/pull/802
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Keeley Hammond <khammond@slack-corp.com>
|
|
Date: Thu, 25 Jul 2024 15:29:12 -0700
|
|
Subject: fix: building with UNICODE
|
|
|
|
Use the unicode version of 'RegOpenKeyEx' to avoid compilation error on string type.
|
|
|
|
Backport of https://github.com/c-ares/c-ares/pull/802.
|
|
|
|
diff --git a/deps/cares/src/lib/ares_event_configchg.c b/deps/cares/src/lib/ares_event_configchg.c
|
|
index c9b39f7b3358f37e61fb95e440695a9b590c2090..b33141ce3a30dd92509de8a4aff1a7fc76a5b915 100644
|
|
--- a/deps/cares/src/lib/ares_event_configchg.c
|
|
+++ b/deps/cares/src/lib/ares_event_configchg.c
|
|
@@ -319,15 +319,15 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
|
/* Monitor HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\Interfaces
|
|
* and HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces
|
|
* for changes via RegNotifyChangeKeyValue() */
|
|
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
|
|
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
|
|
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
|
|
+ L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
|
|
0, KEY_NOTIFY, &c->regip4) != ERROR_SUCCESS) {
|
|
status = ARES_ESERVFAIL;
|
|
goto done;
|
|
}
|
|
|
|
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
|
|
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters\\Interfaces",
|
|
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
|
|
+ L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters\\Interfaces",
|
|
0, KEY_NOTIFY, &c->regip6) != ERROR_SUCCESS) {
|
|
status = ARES_ESERVFAIL;
|
|
goto done;
|