Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: use simpler problem status checking

Browse Source 
This reworks commit e51b49604b.

Link: https://www.reddit.com/r/WireGuard/comments/n6yocf/unable_to_create_wintun_on_windows_7_laptop_with/
Reported-by: Alirz
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2021-05-10 11:10:35 +02:00
parent 1efbd14c2c
commit 3c8b92e80e
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/adapter.c
View File

@ -1724,19 +1724,8 @@ static _Return_type_success_(return != NULL) WINTUN_ADAPTER *CreateAdapter(
for (int Tries = 0; Tries < 1000; ++Tries) for (int Tries = 0; Tries < 1000; ++Tries)
{ {
DEVPROPTYPE PropertyType; DEVPROPTYPE PropertyType;
INT32 ProblemCode;
NTSTATUS ProblemStatus; NTSTATUS ProblemStatus;
if (SetupDiGetDevicePropertyW( if (SetupDiGetDevicePropertyW(
DevInfo,
&DevInfoData,
&DEVPKEY_Device_ProblemCode,
&PropertyType,
(PBYTE)&ProblemCode,
sizeof(ProblemCode),
NULL,
0) &&
PropertyType == DEVPROP_TYPE_INT32 && ProblemCode &&
SetupDiGetDevicePropertyW(
DevInfo, DevInfo,
&DevInfoData, &DevInfoData,
&DEVPKEY_Device_ProblemStatus, &DEVPKEY_Device_ProblemStatus,
@ -1749,8 +1738,20 @@ static _Return_type_success_(return != NULL) WINTUN_ADAPTER *CreateAdapter(
{ {
if (ProblemStatus != STATUS_PNP_DEVICE_CONFIGURATION_PENDING || Tries == 999) if (ProblemStatus != STATUS_PNP_DEVICE_CONFIGURATION_PENDING || Tries == 999)
{ {
LastError = RtlNtStatusToDosError(ProblemStatus); INT32 ProblemCode;
if (!SetupDiGetDevicePropertyW(
DevInfo,
&DevInfoData,
&DEVPKEY_Device_ProblemCode,
&PropertyType,
(PBYTE)&ProblemCode,
sizeof(ProblemCode),
NULL,
0) ||
PropertyType != DEVPROP_TYPE_INT32)
ProblemCode = 0;
LOG_ERROR(LastError, L"Failed to setup adapter (code: 0x%x, status: 0x%x)", ProblemCode, ProblemStatus); LOG_ERROR(LastError, L"Failed to setup adapter (code: 0x%x, status: 0x%x)", ProblemCode, ProblemStatus);
LastError = RtlNtStatusToDosError(ProblemStatus);
if (LastError == ERROR_SUCCESS) if (LastError == ERROR_SUCCESS)
LastError = ERROR_NOT_READY; LastError = ERROR_NOT_READY;
goto cleanupTcpipAdapterRegKey; goto cleanupTcpipAdapterRegKey;