@@ -122,7 +122,6 @@ using v8::ObjectTemplate;
122
122
using v8::Promise;
123
123
using v8::PromiseRejectMessage;
124
124
using v8::PropertyCallbackInfo;
125
- using v8::PropertyHandlerFlags;
126
125
using v8::ScriptOrigin;
127
126
using v8::SealHandleScope;
128
127
using v8::String;
@@ -2685,7 +2684,7 @@ static void EnvGetter(Local<Name> property,
2685
2684
return info.GetReturnValue ().Set (String::NewFromUtf8 (isolate, val));
2686
2685
}
2687
2686
#else // _WIN32
2688
- String::Value key (property);
2687
+ node::TwoByteValue key (isolate, property);
2689
2688
WCHAR buffer[32767 ]; // The maximum size allowed for environment variables.
2690
2689
DWORD result = GetEnvironmentVariableW (reinterpret_cast <WCHAR*>(*key),
2691
2690
buffer,
@@ -2711,8 +2710,8 @@ static void EnvSetter(Local<Name> property,
2711
2710
node::Utf8Value val (info.GetIsolate (), value);
2712
2711
setenv (*key, *val, 1 );
2713
2712
#else // _WIN32
2714
- String::Value key (property);
2715
- String::Value val (value);
2713
+ node::TwoByteValue key (info. GetIsolate (), property);
2714
+ node::TwoByteValue val (info. GetIsolate (), value);
2716
2715
WCHAR* key_ptr = reinterpret_cast <WCHAR*>(*key);
2717
2716
// Environment variables that start with '=' are read-only.
2718
2717
if (key_ptr[0 ] != L' =' ) {
@@ -2732,7 +2731,7 @@ static void EnvQuery(Local<Name> property,
2732
2731
if (getenv (*key))
2733
2732
rc = 0 ;
2734
2733
#else // _WIN32
2735
- String::Value key (property);
2734
+ node::TwoByteValue key (info. GetIsolate (), property);
2736
2735
WCHAR* key_ptr = reinterpret_cast <WCHAR*>(*key);
2737
2736
if (GetEnvironmentVariableW (key_ptr, nullptr , 0 ) > 0 ||
2738
2737
GetLastError () == ERROR_SUCCESS) {
@@ -2756,7 +2755,7 @@ static void EnvDeleter(Local<Name> property,
2756
2755
node::Utf8Value key (info.GetIsolate (), property);
2757
2756
unsetenv (*key);
2758
2757
#else
2759
- String::Value key (property);
2758
+ node::TwoByteValue key (info. GetIsolate (), property);
2760
2759
WCHAR* key_ptr = reinterpret_cast <WCHAR*>(*key);
2761
2760
SetEnvironmentVariableW (key_ptr, nullptr );
2762
2761
#endif
@@ -3155,8 +3154,7 @@ void SetupProcessObject(Environment* env,
3155
3154
EnvQuery,
3156
3155
EnvDeleter,
3157
3156
EnvEnumerator,
3158
- env->as_external (),
3159
- PropertyHandlerFlags::kOnlyInterceptStrings ));
3157
+ env->as_external ()));
3160
3158
3161
3159
Local<Object> process_env =
3162
3160
process_env_template->NewInstance (env->context ()).ToLocalChecked ();
0 commit comments