system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 10:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntoskrnl: Avoid calling RtlInitUnicodeString on a static constant.

Browse source
This commit is contained in:
Alex Henrie 2023-02-14 19:54:25 -07:00 committed by Alexandre Julliard
parent 9cbbcb409c
commit e60e8af0a9
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/ntoskrnl.exe/pnp.c
View file

@ -720,8 +720,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
'C','o','n','t','r','o','l','\\', 'C','o','n','t','r','o','l','\\',
'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0};
static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0};
static const WCHAR linkedW[] = {'L','i','n','k','e','d',0};
static const WCHAR slashW[] = {'\\',0}; static const WCHAR slashW[] = {'\\',0};
static const WCHAR hashW[] = {'#',0}; static const WCHAR hashW[] = {'#',0};
@ -732,6 +730,8 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable
HANDLE iface_key, control_key; HANDLE iface_key, control_key;
OBJECT_ATTRIBUTES attr = {0}; OBJECT_ATTRIBUTES attr = {0};
struct wine_rb_entry *entry; struct wine_rb_entry *entry;
UNICODE_STRING control = RTL_CONSTANT_STRING( L"Control" );
UNICODE_STRING linked = RTL_CONSTANT_STRING( L"Linked" );
UNICODE_STRING string; UNICODE_STRING string;
DWORD data = enable; DWORD data = enable;
NTSTATUS ret; NTSTATUS ret;
@ -780,14 +780,14 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable
return ret; return ret;
attr.RootDirectory = iface_key; attr.RootDirectory = iface_key;
RtlInitUnicodeString( &string, controlW ); attr.ObjectName = &control;
ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL ); ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, REG_OPTION_VOLATILE, NULL );
NtClose( iface_key ); NtClose( iface_key );
if (ret) if (ret)
return ret; return ret;
RtlInitUnicodeString( &string, linkedW ); attr.ObjectName = &linked;
ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); ret = NtSetValueKey( control_key, &linked, 0, REG_DWORD, &data, sizeof(data) );
if (ret) if (ret)
{ {
NtClose( control_key ); NtClose( control_key );
@ -800,7 +800,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable
ret = IoDeleteSymbolicLink( name ); ret = IoDeleteSymbolicLink( name );
if (ret) if (ret)
{ {
NtDeleteValueKey( control_key, &string ); NtDeleteValueKey( control_key, &linked );
NtClose( control_key ); NtClose( control_key );
return ret; return ret;
} }
@ -1141,15 +1141,13 @@ static DWORD CALLBACK device_enum_thread_proc(void *arg)
void pnp_manager_start(void) void pnp_manager_start(void)
{ {
static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0};
WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; WCHAR endpoint[] = L"\\pipe\\wine_plugplay";
WCHAR protseq[] = L"ncacn_np"; WCHAR protseq[] = L"ncacn_np";
UNICODE_STRING driver_nameU; UNICODE_STRING driver_nameU = RTL_CONSTANT_STRING( L"\\Driver\\PnpManager" );
RPC_WSTR binding_str; RPC_WSTR binding_str;
NTSTATUS status; NTSTATUS status;
RPC_STATUS err; RPC_STATUS err;
RtlInitUnicodeString( &driver_nameU, driver_nameW );
if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry )))
ERR("Failed to create PnP manager driver, status %#lx.\n", status); ERR("Failed to create PnP manager driver, status %#lx.\n", status);