Use string equality wrappers

This commit is contained in:
Tau 2019-05-13 16:49:18 -04:00
parent a96e625a36
commit 07237730cd
7 changed files with 18 additions and 10 deletions

View File

@ -16,6 +16,7 @@
#include "util/crc.h" #include "util/crc.h"
#include "util/dprintf.h" #include "util/dprintf.h"
#include "util/setupapi.h" #include "util/setupapi.h"
#include "util/str.h"
#pragma pack(push, 1) #pragma pack(push, 1)
@ -105,7 +106,7 @@ static HRESULT ds_handle_irp(struct irp *irp)
static HRESULT ds_handle_open(struct irp *irp) static HRESULT ds_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"$ds") != 0) { if (!wstr_eq(irp->open_filename, L"$ds")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -18,6 +18,7 @@
#include "util/dprintf.h" #include "util/dprintf.h"
#include "util/setupapi.h" #include "util/setupapi.h"
#include "util/str.h"
static HRESULT eeprom_handle_irp(struct irp *irp); static HRESULT eeprom_handle_irp(struct irp *irp);
static HRESULT eeprom_handle_open(struct irp *irp); static HRESULT eeprom_handle_open(struct irp *irp);
@ -81,7 +82,7 @@ static HRESULT eeprom_handle_irp(struct irp *irp)
static HRESULT eeprom_handle_open(struct irp *irp) static HRESULT eeprom_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"$eeprom") != 0) { if (!wstr_eq(irp->open_filename, L"$eeprom") != 0) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -10,6 +10,7 @@
#include "util/dprintf.h" #include "util/dprintf.h"
#include "util/setupapi.h" #include "util/setupapi.h"
#include "util/str.h"
enum { enum {
GPIO_IOCTL_SET_LEDS = 0x8000A004, GPIO_IOCTL_SET_LEDS = 0x8000A004,
@ -120,7 +121,7 @@ static HRESULT gpio_handle_irp(struct irp *irp)
static HRESULT gpio_handle_open(struct irp *irp) static HRESULT gpio_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"$gpio") != 0) { if (!wstr_eq(irp->open_filename, L"$gpio")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -18,6 +18,7 @@
#include "util/dprintf.h" #include "util/dprintf.h"
#include "util/dump.h" #include "util/dump.h"
#include "util/setupapi.h" #include "util/setupapi.h"
#include "util/str.h"
enum { enum {
JVS_IOCTL_HELLO = 0x80006004, JVS_IOCTL_HELLO = 0x80006004,
@ -86,7 +87,7 @@ static HRESULT jvs_handle_irp(struct irp *irp)
static HRESULT jvs_handle_open(struct irp *irp) static HRESULT jvs_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"$jvs") != 0) { if (!wstr_eq(irp->open_filename, L"$jvs")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -17,6 +17,7 @@
#include "util/dprintf.h" #include "util/dprintf.h"
#include "util/setupapi.h" #include "util/setupapi.h"
#include "util/str.h"
static HRESULT sram_handle_irp(struct irp *irp); static HRESULT sram_handle_irp(struct irp *irp);
static HRESULT sram_handle_open(struct irp *irp); static HRESULT sram_handle_open(struct irp *irp);
@ -76,7 +77,7 @@ static HRESULT sram_handle_irp(struct irp *irp)
static HRESULT sram_handle_open(struct irp *irp) static HRESULT sram_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"$sram") != 0) { if (!wstr_eq(irp->open_filename, L"$sram")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -9,6 +9,8 @@
#include "platform/hwmon.h" #include "platform/hwmon.h"
#include "util/str.h"
enum { enum {
HWMON_IOCTL_READ_CPU_TEMP = 0x80006000, HWMON_IOCTL_READ_CPU_TEMP = 0x80006000,
}; };
@ -46,7 +48,7 @@ static HRESULT hwmon_handle_irp(struct irp *irp)
static HRESULT hwmon_handle_open(struct irp *irp) static HRESULT hwmon_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"\\\\.\\sghwmonitor") != 0) { if (!wstr_ieq(irp->open_filename, L"\\\\.\\sghwmonitor")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }

View File

@ -2,13 +2,14 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "util/dprintf.h"
#include "util/dump.h"
#include "hook/iohook.h" #include "hook/iohook.h"
#include "platform/nusec.h" #include "platform/nusec.h"
#include "util/dprintf.h"
#include "util/dump.h"
#include "util/str.h"
enum { enum {
NUSEC_IOCTL_PING = 0x22A114, NUSEC_IOCTL_PING = 0x22A114,
NUSEC_IOCTL_ERASE_TRACE_LOG = 0x22E188, NUSEC_IOCTL_ERASE_TRACE_LOG = 0x22E188,
@ -87,7 +88,7 @@ static HRESULT nusec_handle_irp(struct irp *irp)
static HRESULT nusec_handle_open(struct irp *irp) static HRESULT nusec_handle_open(struct irp *irp)
{ {
if (wcscmp(irp->open_filename, L"\\??\\FddDriver") != 0) { if (!wstr_ieq(irp->open_filename, L"\\??\\FddDriver")) {
return iohook_invoke_next(irp); return iohook_invoke_next(irp);
} }