Skip to content

Commit

Permalink
Another migration
Browse files Browse the repository at this point in the history
  • Loading branch information
@nefarius
nefarius committed Aug 8, 2024
1 parent 783893e commit 3fa2395
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 103 deletions.
1 change: 0 additions & 1 deletion NefConUtil.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@
<ItemGroup>
<ClInclude Include=".\src\Devcon.h" />
<ClInclude Include=".\src\framework.h" />
<ClInclude Include=".\src\LibraryHelper.hpp" />
<ClInclude Include=".\src\NefConSetup.h" />
<ClInclude Include=".\src\NefConUtil.h" />
<ClInclude Include=".\src\colorwin.hpp" />
Expand Down
3 changes: 0 additions & 3 deletions NefConUtil.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
<ClInclude Include=".\src\framework.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include=".\src\LibraryHelper.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include=".\src\NefConSetup.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
36 changes: 18 additions & 18 deletions src/Devcon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
#include <nefarius/neflib/HDEVINFOHandleGuard.hpp>
#include <nefarius/neflib/HKEYHandleGuard.hpp>
#include <nefarius/neflib/INFHandleGuard.hpp>
#include <nefarius/neflib/LibraryHelper.hpp>
#include <nefarius/neflib/MultiStringArray.hpp>

#include "LibraryHelper.hpp"

using namespace nefarius::utilities;

Expand Down Expand Up @@ -234,7 +234,7 @@ std::expected<void, Win32Error> devcon::create(const std::wstring& className, co
std::expected<void, Win32Error> devcon::update(const std::wstring& hardwareId, const std::wstring& fullInfPath,
bool* rebootRequired, bool force)
{
nefarius::util::Newdev newdev;
Newdev newdev;
DWORD flags = 0;
BOOL reboot = FALSE;
WCHAR normalisedInfPath[MAX_PATH] = {};
Expand All @@ -258,11 +258,11 @@ std::expected<void, Win32Error> devcon::update(const std::wstring& hardwareId, c
&reboot
))
{
case nefarius::util::FunctionCallResult::NotAvailable:
case FunctionCallResult::NotAvailable:
return std::unexpected(Win32Error(ERROR_INVALID_FUNCTION));
case nefarius::util::FunctionCallResult::Failure:
case FunctionCallResult::Failure:
return std::unexpected(Win32Error(GetLastError()));
case nefarius::util::FunctionCallResult::Success:
case FunctionCallResult::Success:
if (rebootRequired)
*rebootRequired = reboot > 0;
return {};
Expand Down Expand Up @@ -416,7 +416,7 @@ std::expected<void, Win32Error> devcon::enable_disable_bth_usb_device(bool state
std::expected<void, Win32Error> devcon::install_driver(const std::wstring& fullInfPath,
bool* rebootRequired)
{
nefarius::util::Newdev newdev;
Newdev newdev;
BOOL reboot;
WCHAR normalisedInfPath[MAX_PATH] = {};

Expand All @@ -435,11 +435,11 @@ std::expected<void, Win32Error> devcon::install_driver(const std::wstring& fullI
&reboot
))
{
case nefarius::util::FunctionCallResult::NotAvailable:
case FunctionCallResult::NotAvailable:
return std::unexpected(Win32Error(ERROR_INVALID_FUNCTION));
case nefarius::util::FunctionCallResult::Failure:
case FunctionCallResult::Failure:
return std::unexpected(Win32Error(GetLastError()));
case nefarius::util::FunctionCallResult::Success:
case FunctionCallResult::Success:
if (rebootRequired)
*rebootRequired = reboot > 0;
return {};
Expand All @@ -450,7 +450,7 @@ std::expected<void, Win32Error> devcon::install_driver(const std::wstring& fullI

std::expected<void, Win32Error> devcon::uninstall_driver(const std::wstring& fullInfPath, bool* rebootRequired)
{
nefarius::util::Newdev newdev;
Newdev newdev;
BOOL reboot;
WCHAR normalisedInfPath[MAX_PATH] = {};

Expand All @@ -469,11 +469,11 @@ std::expected<void, Win32Error> devcon::uninstall_driver(const std::wstring& ful
&reboot
))
{
case nefarius::util::FunctionCallResult::NotAvailable:
case FunctionCallResult::NotAvailable:
return std::unexpected(Win32Error(ERROR_INVALID_FUNCTION));
case nefarius::util::FunctionCallResult::Failure:
case FunctionCallResult::Failure:
return std::unexpected(Win32Error(GetLastError()));
case nefarius::util::FunctionCallResult::Success:
case FunctionCallResult::Success:
if (rebootRequired)
*rebootRequired = reboot > 0;
return {};
Expand All @@ -487,7 +487,7 @@ inline std::expected<void, Win32Error> uninstall_device_and_driver(
{
BOOL drvNeedsReboot = FALSE, devNeedsReboot = FALSE;
DWORD requiredBufferSize = 0;
nefarius::util::Newdev newdev;
Newdev newdev;

if (!newdev.fpDiUninstallDevice || !newdev.fpDiUninstallDriverW)
{
Expand Down Expand Up @@ -808,7 +808,7 @@ std::expected<void, Win32Error> devcon::inf_default_install(
}
}

nefarius::util::Newdev newdev;
Newdev newdev;
BOOL reboot = FALSE;

switch (newdev.CallFunction(
Expand All @@ -819,11 +819,11 @@ std::expected<void, Win32Error> devcon::inf_default_install(
&reboot
))
{
case nefarius::util::FunctionCallResult::NotAvailable:
case FunctionCallResult::NotAvailable:
return std::unexpected(Win32Error(ERROR_INVALID_FUNCTION));
case nefarius::util::FunctionCallResult::Failure:
case FunctionCallResult::Failure:
return std::unexpected(Win32Error());
case nefarius::util::FunctionCallResult::Success:
case FunctionCallResult::Success:
if (rebootRequired)
{
*rebootRequired = reboot > FALSE || g_RestartDialogExCalled;
Expand Down
79 changes: 0 additions & 79 deletions src/LibraryHelper.hpp
View file

This file was deleted.

1 change: 1 addition & 0 deletions src/NefConUtil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@
#include <nefarius/neflib/HDEVINFOHandleGuard.hpp>
#include <nefarius/neflib/HKEYHandleGuard.hpp>
#include <nefarius/neflib/INFHandleGuard.hpp>
#include <nefarius/neflib/LibraryHelper.hpp>
2 changes: 0 additions & 2 deletions src/framework.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@

#include <initguid.h>
#include <winioctl.h>

#include "LibraryHelper.hpp"

0 comments on commit 3fa2395

Please sign in to comment.