From 6647d36f8524cb89604d25712b7c7bc35e368a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 9 Oct 2024 21:46:49 +0800 Subject: [PATCH] Mouse / Keyboard (macOS): don't detect vendor name --- src/detection/keyboard/keyboard_apple.c | 14 +------------- src/detection/mouse/mouse_apple.c | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/detection/keyboard/keyboard_apple.c b/src/detection/keyboard/keyboard_apple.c index f0d4def0c..46278c5aa 100644 --- a/src/detection/keyboard/keyboard_apple.c +++ b/src/detection/keyboard/keyboard_apple.c @@ -11,20 +11,8 @@ static void enumSet(IOHIDDeviceRef value, FFlist* results) ffStrbufInit(&device->serial); ffStrbufInit(&device->name); - CFStringRef manufacturer = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDManufacturerKey)); - ffCfStrGetString(manufacturer, &device->name); - CFStringRef product = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDProductKey)); - if (device->name.length) - { - ffCfStrGetString(product, &device->serial); - ffStrbufAppendC(&device->name, ' '); - ffStrbufAppend(&device->name, &device->serial); - } - else - { - ffCfStrGetString(product, &device->name); - } + ffCfStrGetString(product, &device->name); CFStringRef serialNumber = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDSerialNumberKey)); ffCfStrGetString(serialNumber, &device->serial); diff --git a/src/detection/mouse/mouse_apple.c b/src/detection/mouse/mouse_apple.c index 511b0ff56..feadff649 100644 --- a/src/detection/mouse/mouse_apple.c +++ b/src/detection/mouse/mouse_apple.c @@ -11,20 +11,8 @@ static void enumSet(IOHIDDeviceRef value, FFlist* results) ffStrbufInit(&device->serial); ffStrbufInit(&device->name); - CFStringRef manufacturer = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDManufacturerKey)); - ffCfStrGetString(manufacturer, &device->name); - CFStringRef product = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDProductKey)); - if (device->name.length) - { - ffCfStrGetString(product, &device->serial); - ffStrbufAppendC(&device->name, ' '); - ffStrbufAppend(&device->name, &device->serial); - } - else - { - ffCfStrGetString(product, &device->name); - } + ffCfStrGetString(product, &device->name); CFStringRef serialNumber = IOHIDDeviceGetProperty(value, CFSTR(kIOHIDSerialNumberKey)); ffCfStrGetString(serialNumber, &device->serial);