Skip to content

Commit c4aa010

Browse files
author
Benjamin Pasero
committed
sandbox - expose vscode-windows-registry from native host service
1 parent e85114b commit c4aa010

5 files changed

Lines changed: 27 additions & 18 deletions

File tree

‎src/vs/platform/native/common/native.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,7 @@ export interface ICommonNativeHostService {
135135

136136
// Connectivity
137137
resolveProxy(url: string): Promise<string | undefined>;
138+
139+
// Registry (windows only)
140+
windowsGetStringRegKey(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined>;
138141
}

‎src/vs/platform/native/electron-main/nativeHostMainService.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,21 @@ export class NativeHostMainService implements INativeHostMainService {
527527

528528
//#endregion
529529

530+
//#region Registry (windows)
531+
532+
async windowsGetStringRegKey(windowId: number | undefined, hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined> {
533+
if (!isWindows) {
534+
return undefined;
535+
}
536+
537+
const Registry = await import('vscode-windows-registry');
538+
try {
539+
return Registry.GetStringRegKey(hive, path, name);
540+
} catch {
541+
return undefined;
542+
}
543+
}
544+
530545
private windowById(windowId: number | undefined): ICodeWindow | undefined {
531546
if (typeof windowId !== 'number') {
532547
return undefined;

‎src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { IRequestService } from 'vs/platform/request/common/request';
1717
import { isWindows } from 'vs/base/common/platform';
1818
import { getRemotes, AllowedSecondLevelDomains, getDomainsOfRemotes } from 'vs/platform/extensionManagement/common/configRemotes';
1919
import { IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
20+
import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
2021

2122
export function getHashedRemotesFromConfig(text: string, stripEndingDotGit: boolean = false): string[] {
2223
return getRemotes(text, stripEndingDotGit).map(r => {
@@ -33,7 +34,8 @@ export class WorkspaceTags implements IWorkbenchContribution {
3334
@IRequestService private readonly requestService: IRequestService,
3435
@ITextFileService private readonly textFileService: ITextFileService,
3536
@IWorkspaceTagsService private readonly workspaceTagsService: IWorkspaceTagsService,
36-
@IDiagnosticsService private readonly diagnosticsService: IDiagnosticsService
37+
@IDiagnosticsService private readonly diagnosticsService: IDiagnosticsService,
38+
@INativeHostService private readonly nativeHostService: INativeHostService
3739
) {
3840
if (this.telemetryService.isOptedIn) {
3941
this.report();
@@ -61,13 +63,7 @@ export class WorkspaceTags implements IWorkbenchContribution {
6163
return;
6264
}
6365

64-
const Registry = await import('vscode-windows-registry');
65-
66-
let value;
67-
try {
68-
value = Registry.GetStringRegKey('HKEY_LOCAL_MACHINE', 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion', 'EditionID');
69-
} catch { }
70-
66+
let value = await this.nativeHostService.windowsGetStringRegKey('HKEY_LOCAL_MACHINE', 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion', 'EditionID');
7167
if (value === undefined) {
7268
value = 'Unknown';
7369
}

‎src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1515
import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
1616
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
1717
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
18+
import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
1819

1920
interface AccessibilityMetrics {
2021
enabled: boolean;
@@ -33,7 +34,8 @@ export class NativeAccessibilityService extends AccessibilityService implements
3334
@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService,
3435
@IContextKeyService contextKeyService: IContextKeyService,
3536
@IConfigurationService configurationService: IConfigurationService,
36-
@ITelemetryService private readonly _telemetryService: ITelemetryService
37+
@ITelemetryService private readonly _telemetryService: ITelemetryService,
38+
@INativeHostService private readonly nativeHostService: INativeHostService
3739
) {
3840
super(contextKeyService, configurationService);
3941
this.setAccessibilitySupport(environmentService.configuration.accessibilitySupport ? AccessibilitySupport.Enabled : AccessibilitySupport.Disabled);
@@ -44,15 +46,7 @@ export class NativeAccessibilityService extends AccessibilityService implements
4446
return false;
4547
}
4648

47-
const Registry = await import('vscode-windows-registry');
48-
49-
let value: string | undefined = undefined;
50-
try {
51-
value = Registry.GetStringRegKey('HKEY_CURRENT_USER', 'Control Panel\\Accessibility\\Keyboard Preference', 'On');
52-
} catch {
53-
return false;
54-
}
55-
49+
const value = await this.nativeHostService.windowsGetStringRegKey('HKEY_CURRENT_USER', 'Control Panel\\Accessibility\\Keyboard Preference', 'On');
5650
return value === '1';
5751
}
5852

‎src/vs/workbench/test/electron-browser/workbenchTestServices.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ export class TestNativeHostService implements INativeHostService {
230230
async readClipboardBuffer(format: string): Promise<Uint8Array> { return Uint8Array.from([]); }
231231
async hasClipboard(format: string, type?: 'selection' | 'clipboard' | undefined): Promise<boolean> { return false; }
232232
async sendInputEvent(event: MouseInputEvent): Promise<void> { }
233+
async windowsGetStringRegKey(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined> { return undefined; }
233234
}
234235

235236
export function workbenchInstantiationService(): ITestInstantiationService {

0 commit comments

Comments
 (0)