niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice().

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53387
This commit is contained in:
Zebediah Figura 2022-11-16 19:50:46 -06:00 • committed by Alexandre Julliard
parent 3a254079b9
commit b682102db4
2 changed files with 8 additions and 6 deletions
dlls
ntoskrnl.exe/tests
ntoskrnl.c
setupapi
devinst.c

9
dlls/ntoskrnl.exe/tests/ntoskrnl.c
View file

@ -1820,12 +1820,9 @@ static void test_pnp_driver(struct testsign_context *ctx)
ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS,
&type, (BYTE *)&dword, sizeof(dword), NULL); &type, (BYTE *)&dword, sizeof(dword), NULL);
todo_wine ok(ret, "got error %#lx\n", GetLastError()); ok(ret, "got error %#lx\n", GetLastError());
if (ret) ok(!dword, "got flags %#lx\n", dword);
{ ok(type == REG_DWORD, "got type %lu\n", type);
ok(!dword, "got flags %#lx\n", dword);
ok(type == REG_DWORD, "got type %lu\n", type);
}
/* Tests. */ /* Tests. */

5
dlls/setupapi/devinst.c
View file

@ -5163,6 +5163,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0};
static const WCHAR rootW[] = {'r','o','o','t','\\',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0};
WCHAR section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; WCHAR section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart;
static const DWORD config_flags = 0;
UINT install_flags = SPINST_ALL; UINT install_flags = SPINST_ALL;
HKEY driver_key, device_key; HKEY driver_key, device_key;
SC_HANDLE manager, service; SC_HANDLE manager, service;
@ -5210,6 +5211,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
return FALSE; return FALSE;
} }
if (!SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CONFIGFLAGS,
(BYTE *)&config_flags, sizeof(config_flags)))
ERR("Failed to set config flags, error %#lx.\n", GetLastError());
if (device->params.Flags & DI_NOFILECOPY) if (device->params.Flags & DI_NOFILECOPY)
install_flags &= ~SPINST_FILES; install_flags &= ~SPINST_FILES;