Skip to content

Commit 490ac4f

Browse files
dmexdmex
committed
Plugins: Remove outdated comments; Improve code formatting;
1 parent 96c2a9e commit 490ac4f

File tree

12 files changed

+165
-83
lines changed

12 files changed

+165
-83
lines changed

‎plugins/ExtraPlugins/ExtraPlugins.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,25 @@
5454
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5555
<Link>
5656
<AdditionalDependencies>windowscodecs.lib;bcrypt.lib;winhttp.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
57-
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;uxtheme.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
57+
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
5858
</Link>
5959
</ItemDefinitionGroup>
6060
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6161
<Link>
6262
<AdditionalDependencies>windowscodecs.lib;bcrypt.lib;winhttp.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
63-
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;uxtheme.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
63+
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
6464
</Link>
6565
</ItemDefinitionGroup>
6666
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6767
<Link>
6868
<AdditionalDependencies>windowscodecs.lib;bcrypt.lib;winhttp.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
69-
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;uxtheme.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
69+
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
7070
</Link>
7171
</ItemDefinitionGroup>
7272
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7373
<Link>
7474
<AdditionalDependencies>windowscodecs.lib;bcrypt.lib;winhttp.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
75-
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;uxtheme.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
75+
<DelayLoadDLLs>bcrypt.dll;winhttp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
7676
</Link>
7777
</ItemDefinitionGroup>
7878
<ItemGroup>

‎plugins/ExtraPlugins/setup/updater.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,15 +438,14 @@ NTSTATUS UpdateDownloadThread(
438438

439439
if (WindowsVersion >= WINDOWS_8_1)
440440
{
441-
// Enable GZIP and DEFLATE support on Windows 8.1 and above using undocumented flags.
442441
ULONG httpFlags = WINHTTP_DECOMPRESSION_FLAG_GZIP | WINHTTP_DECOMPRESSION_FLAG_DEFLATE;
443442

444443
WinHttpSetOption(
445444
httpSessionHandle,
446445
WINHTTP_OPTION_DECOMPRESSION,
447446
&httpFlags,
448447
sizeof(ULONG)
449-
);
448+
);
450449
}
451450

452451
if (!(httpConnectionHandle = WinHttpConnect(

‎plugins/HardwareDevices/devices.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,10 @@ BOOLEAN QueryInterfaceRow(
352352
_Out_ PMIB_IF_ROW2 InterfaceRow
353353
);
354354

355+
PWSTR MediumTypeToString(
356+
_In_ NDIS_PHYSICAL_MEDIUM MediumType
357+
);
358+
355359
// netoptions.c
356360

357361
INT_PTR CALLBACK NetworkAdapterOptionsDlgProc(

‎plugins/HardwareDevices/diskgraph.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ VOID UpdateDiskDriveDialog(
5757
_Inout_ PDV_DISK_SYSINFO_CONTEXT Context
5858
)
5959
{
60-
if (Context->DiskEntry->DiskName)
61-
SetDlgItemText(Context->WindowHandle, IDC_DISKNAME, Context->DiskEntry->DiskName->Buffer);
60+
if (!PhIsNullOrEmptyString(Context->DiskEntry->DiskName))
61+
SetDlgItemText(Context->WindowHandle, IDC_DISKNAME, PhGetString(Context->DiskEntry->DiskName));
6262
else
6363
SetDlgItemText(Context->WindowHandle, IDC_DISKNAME, L"Unknown disk");
6464

65-
if (Context->DiskEntry->DiskIndexName)
66-
SetDlgItemText(Context->WindowHandle, IDC_DISKMOUNTPATH, Context->DiskEntry->DiskIndexName->Buffer);
65+
if (!PhIsNullOrEmptyString(Context->DiskEntry->DiskIndexName))
66+
SetDlgItemText(Context->WindowHandle, IDC_DISKMOUNTPATH, PhGetString(Context->DiskEntry->DiskIndexName));
6767
else
6868
SetDlgItemText(Context->WindowHandle, IDC_DISKMOUNTPATH, L"Unknown disk");
6969

@@ -89,7 +89,7 @@ VOID UpdateDiskIndexText(
8989
PhMoveReference(&Context->DiskEntry->DiskIndexName, PhFormatString(
9090
L"Disk %lu (%s)",
9191
Context->DiskEntry->DiskIndex,
92-
diskMountPoints->Buffer
92+
PhGetString(diskMountPoints)
9393
));
9494
}
9595
else

‎plugins/HardwareDevices/ndis.c

Lines changed: 107 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ NTSTATUS NetworkAdapterCreateHandle(
3131
_In_ PPH_STRING InterfaceGuid
3232
)
3333
{
34-
// NOTE: Do not cache this handle. The user will be unable to enable, disable or change adapter configuration.
3534
return PhCreateFileWin32(
3635
DeviceHandle,
3736
PhaConcatStrings(2, L"\\\\.\\", InterfaceGuid->Buffer)->Buffer,
@@ -56,7 +55,6 @@ BOOLEAN NetworkAdapterQuerySupported(
5655
BOOLEAN adapterLinkSpeedSupported = FALSE;
5756
PNDIS_OID ndisObjectIdentifiers;
5857

59-
// https://msdn.microsoft.com/en-us/library/ff569642.aspx
6058
opcode = OID_GEN_SUPPORTED_LIST;
6159

6260
// TODO: 4096 objects might be too small...
@@ -69,7 +67,7 @@ BOOLEAN NetworkAdapterQuerySupported(
6967
NULL,
7068
NULL,
7169
&isb,
72-
IOCTL_NDIS_QUERY_GLOBAL_STATS, // https://msdn.microsoft.com/en-us/library/windows/hardware/ff548975.aspx
70+
IOCTL_NDIS_QUERY_GLOBAL_STATS,
7371
&opcode,
7472
sizeof(NDIS_OID),
7573
ndisObjectIdentifiers,
@@ -124,7 +122,6 @@ BOOLEAN NetworkAdapterQueryNdisVersion(
124122
IO_STATUS_BLOCK isb;
125123
ULONG versionResult = 0;
126124

127-
// https://msdn.microsoft.com/en-us/library/ff569582.aspx
128125
opcode = OID_GEN_DRIVER_VERSION; // OID_GEN_VENDOR_DRIVER_VERSION
129126

130127
if (NT_SUCCESS(NtDeviceIoControlFile(
@@ -165,7 +162,6 @@ PPH_STRING NetworkAdapterQueryName(
165162
IO_STATUS_BLOCK isb;
166163
WCHAR adapterName[NDIS_IF_MAX_STRING_SIZE + 1] = L"";
167164

168-
// https://msdn.microsoft.com/en-us/library/ff569584.aspx
169165
opcode = OID_GEN_FRIENDLY_NAME;
170166

171167
if (NT_SUCCESS(NtDeviceIoControlFile(
@@ -225,15 +221,14 @@ NTSTATUS NetworkAdapterQueryStatistics(
225221
IO_STATUS_BLOCK isb;
226222
NDIS_STATISTICS_INFO result;
227223

228-
// https://msdn.microsoft.com/en-us/library/ff569640.aspx
229224
opcode = OID_GEN_STATISTICS;
230225

231226
memset(&result, 0, sizeof(NDIS_STATISTICS_INFO));
232227
result.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
233228
result.Header.Revision = NDIS_STATISTICS_INFO_REVISION_1;
234229
result.Header.Size = NDIS_SIZEOF_STATISTICS_INFO_REVISION_1;
235230

236-
status = NtDeviceIoControlFile(
231+
if (NT_SUCCESS(status = NtDeviceIoControlFile(
237232
DeviceHandle,
238233
NULL,
239234
NULL,
@@ -244,9 +239,10 @@ NTSTATUS NetworkAdapterQueryStatistics(
244239
sizeof(NDIS_OID),
245240
&result,
246241
sizeof(result)
247-
);
248-
249-
*Info = result;
242+
)))
243+
{
244+
*Info = result;
245+
}
250246

251247
return status;
252248
}
@@ -261,15 +257,14 @@ NTSTATUS NetworkAdapterQueryLinkState(
261257
IO_STATUS_BLOCK isb;
262258
NDIS_LINK_STATE result;
263259

264-
// https://msdn.microsoft.com/en-us/library/ff569595.aspx
265260
opcode = OID_GEN_LINK_STATE; // OID_GEN_MEDIA_CONNECT_STATUS;
266261

267262
memset(&result, 0, sizeof(NDIS_LINK_STATE));
268263
result.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
269264
result.Header.Revision = NDIS_LINK_STATE_REVISION_1;
270265
result.Header.Size = NDIS_SIZEOF_LINK_STATE_REVISION_1;
271266

272-
status = NtDeviceIoControlFile(
267+
if (NT_SUCCESS(status = NtDeviceIoControlFile(
273268
DeviceHandle,
274269
NULL,
275270
NULL,
@@ -280,9 +275,10 @@ NTSTATUS NetworkAdapterQueryLinkState(
280275
sizeof(NDIS_OID),
281276
&result,
282277
sizeof(result)
283-
);
284-
285-
*State = result;
278+
)))
279+
{
280+
*State = result;
281+
}
286282

287283
return status;
288284
}
@@ -294,10 +290,12 @@ BOOLEAN NetworkAdapterQueryMediaType(
294290
{
295291
NDIS_OID opcode;
296292
IO_STATUS_BLOCK isb;
297-
NDIS_PHYSICAL_MEDIUM adapterMediaType = NdisPhysicalMediumUnspecified;
293+
NDIS_MEDIUM adapterType;
294+
NDIS_PHYSICAL_MEDIUM adapterMediaType;
298295

299-
// https://msdn.microsoft.com/en-us/library/ff569622.aspx
300296
opcode = OID_GEN_PHYSICAL_MEDIUM_EX;
297+
adapterMediaType = NdisPhysicalMediumUnspecified;
298+
memset(&isb, 0, sizeof(IO_STATUS_BLOCK));
301299

302300
if (NT_SUCCESS(NtDeviceIoControlFile(
303301
DeviceHandle,
@@ -313,12 +311,9 @@ BOOLEAN NetworkAdapterQueryMediaType(
313311
)))
314312
{
315313
*Medium = adapterMediaType;
316-
}
317-
318-
if (adapterMediaType != NdisPhysicalMediumUnspecified)
319314
return TRUE;
315+
}
320316

321-
// https://msdn.microsoft.com/en-us/library/ff569621.aspx
322317
opcode = OID_GEN_PHYSICAL_MEDIUM;
323318
adapterMediaType = NdisPhysicalMediumUnspecified;
324319
memset(&isb, 0, sizeof(IO_STATUS_BLOCK));
@@ -337,13 +332,47 @@ BOOLEAN NetworkAdapterQueryMediaType(
337332
)))
338333
{
339334
*Medium = adapterMediaType;
335+
return TRUE;
340336
}
341337

342-
if (adapterMediaType != NdisPhysicalMediumUnspecified)
343-
return TRUE;
338+
opcode = OID_GEN_MEDIA_SUPPORTED; // OID_GEN_MEDIA_IN_USE
339+
adapterType = NdisMediumMax;
340+
memset(&isb, 0, sizeof(IO_STATUS_BLOCK));
341+
342+
if (NT_SUCCESS(NtDeviceIoControlFile(
343+
DeviceHandle,
344+
NULL,
345+
NULL,
346+
NULL,
347+
&isb,
348+
IOCTL_NDIS_QUERY_GLOBAL_STATS,
349+
&opcode,
350+
sizeof(NDIS_OID),
351+
&adapterType,
352+
sizeof(adapterType)
353+
)))
354+
{
355+
switch (adapterType)
356+
{
357+
case NdisMedium802_3:
358+
*Medium = NdisPhysicalMedium802_3;
359+
break;
360+
case NdisMedium802_5:
361+
*Medium = NdisPhysicalMedium802_5;
362+
break;
363+
case NdisMediumWirelessWan:
364+
*Medium = NdisPhysicalMediumWirelessLan;
365+
break;
366+
case NdisMediumWiMAX:
367+
*Medium = NdisPhysicalMediumWiMax;
368+
break;
369+
default:
370+
*Medium = NdisPhysicalMediumOther;
371+
break;
372+
}
344373

345-
//NDIS_MEDIUM adapterMediaType = NdisMediumMax;
346-
//opcode = OID_GEN_MEDIA_IN_USE;
374+
return TRUE;
375+
}
347376

348377
return FALSE;
349378
}
@@ -358,7 +387,6 @@ NTSTATUS NetworkAdapterQueryLinkSpeed(
358387
IO_STATUS_BLOCK isb;
359388
NDIS_LINK_SPEED result;
360389

361-
// https://msdn.microsoft.com/en-us/library/ff569593.aspx
362390
opcode = OID_GEN_LINK_SPEED;
363391

364392
memset(&result, 0, sizeof(NDIS_LINK_SPEED));
@@ -437,6 +465,59 @@ BOOLEAN QueryInterfaceRow(
437465
return result;
438466
}
439467

468+
469+
PWSTR MediumTypeToString(
470+
_In_ NDIS_PHYSICAL_MEDIUM MediumType
471+
)
472+
{
473+
switch (MediumType)
474+
{
475+
case NdisPhysicalMediumWirelessLan:
476+
return L"Wireless LAN";
477+
case NdisPhysicalMediumCableModem:
478+
return L"Cable Modem";
479+
case NdisPhysicalMediumPhoneLine:
480+
return L"Phone Line";
481+
case NdisPhysicalMediumPowerLine:
482+
return L"Power Line";
483+
case NdisPhysicalMediumDSL: // includes ADSL and UADSL (G.Lite)
484+
return L"DSL";
485+
case NdisPhysicalMediumFibreChannel:
486+
return L"Fibre";
487+
case NdisPhysicalMedium1394:
488+
return L"1394";
489+
case NdisPhysicalMediumWirelessWan:
490+
return L"Wireless WAN";
491+
case NdisPhysicalMediumNative802_11:
492+
return L"Native802_11";
493+
case NdisPhysicalMediumBluetooth:
494+
return L"Bluetooth";
495+
case NdisPhysicalMediumInfiniband:
496+
return L"Infiniband";
497+
case NdisPhysicalMediumWiMax:
498+
return L"WiMax";
499+
case NdisPhysicalMediumUWB:
500+
return L"UWB";
501+
case NdisPhysicalMedium802_3:
502+
return L"Ethernet";
503+
case NdisPhysicalMedium802_5:
504+
return L"802_5";
505+
case NdisPhysicalMediumIrda:
506+
return L"Infrared";
507+
case NdisPhysicalMediumWiredWAN:
508+
return L"Wired WAN";
509+
case NdisPhysicalMediumWiredCoWan:
510+
return L"Wired CoWan";
511+
case NdisPhysicalMediumOther:
512+
return L"Other";
513+
case NdisPhysicalMediumNative802_15_4:
514+
return L"Native802_15_";
515+
}
516+
517+
return L"N/A";
518+
}
519+
520+
440521
//BOOLEAN NetworkAdapterQueryInternet(
441522
// _Inout_ PDV_NETADAPTER_SYSINFO_CONTEXT Context,
442523
// _In_ PPH_STRING IpAddress

‎plugins/HardwareDevices/netdetails.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ VOID NetAdapterUpdateDetails(
353353

354354
if (PhGetIntegerSetting(SETTING_NAME_ENABLE_NDIS))
355355
{
356-
// Create the handle to the network device
357356
if (NT_SUCCESS(NetworkAdapterCreateHandle(&deviceHandle, Context->AdapterId.InterfaceGuid)))
358357
{
359358
if (!Context->CheckedDeviceSupport)

0 commit comments

Comments
 (0)