bugfix: deviceName garbled in Windows #34 #86

nononoone · 2019-06-21T06:51:55Z

Fix deviceName garbled in Windows

MadLittleMods · 2019-06-22T00:48:22Z

src/detection_win.cpp

+    WideCharToMultiByte(CP_UTF8, 0, &wstr_tmp[0], (int)wstr_tmp.size(), &str_utf8[0], str_size, NULL, NULL);
+
+    return str_utf8;
+}


Did you get this code from somewhere like StackOverflow? Let's link it for reference like the following at the top of this function

// via https://stackoverflow.com/q/25410284/796832

No, i wrote it myself, it easy for me, i wrote is before. sometimes i need change the code page from 'gbk' to 'utf8'.

There is a bit too much magic here for me to be comfortable. Just seems like something could be exploitable here with all of this reference and byte copying stuff.

Would definitely prefer a standard approach to tackle this

Perhaps https://stackoverflow.com/a/3999597/796832

MadLittleMods · 2019-06-22T00:49:39Z

src/detection_win.cpp

@@ -89,6 +89,7 @@ _SetupDiGetDeviceRegistryProperty DllSetupDiGetDeviceRegistryProperty;
 * Local Helper Functions protoypes
 **********************************/
 void UpdateDevice(PDEV_BROADCAST_DEVICEINTERFACE pDevInf, WPARAM wParam, DeviceState_t state);
+std::string Utf8Encode(const std::string &str);


Is std::string still available after #84 is merged?

Also any of the string stuff we are doing below?

No problem, 'std::string' is the c++ standard，mean string with namespace std,
#84 problem is the 'ATL' is not the standard library.

MadLittleMods · 2019-06-22T00:51:12Z

@nononoone Can you give a before after results when you use usbDetect.find?

nononoone · 2019-06-22T07:30:02Z

@nononoone Can you give a before after results when you use usbDetect.find?

before:

G:\Test\node_modules\usb-detection\test>node dev-helper-test.js
startMonitoring
find 14 [ { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB Root Hub',
    manufacturer: '(��׼ USB ��������)',
    serialNumber: '',
    deviceAddress: 12 },
  { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB Root Hub',
    manufacturer: '(��׼ USB ��������)',
    serialNumber: '',
    deviceAddress: 3 },
  { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB ��������(USB 3.0)',
    manufacturer: '(��׼ USB ������)',
    serialNumber: '',
    deviceAddress: 10 },

after:

G:\Working\Test\node_modules\usb-detection\test>node dev-helper-test.js  
startMonitoring
find 14 [ { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB Root Hub',
    manufacturer: '(标准 USB 主控制器)',
    serialNumber: '',
    deviceAddress: 12 },
  { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB Root Hub',
    manufacturer: '(标准 USB 主控制器)',
    serialNumber: '',
    deviceAddress: 3 },
  { locationId: 0,
    vendorId: 0,
    productId: 0,
    deviceName: 'USB 根集线器(USB 3.0)',
    manufacturer: '(标准 USB 集线器)',
    serialNumber: '',
    deviceAddress: 10 },

ilopsource · 2019-07-27T11:07:53Z

V4.3.0 encountered the same bug, I hope to be able to merge this code in the new version，please

MadLittleMods · 2019-10-06T22:29:55Z

src/detection_win.cpp

+    //System default code page to wide character
+    int wstr_size = MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, NULL, 0);
+    std::wstring wstr_tmp(wstr_size, 0);
+    MultiByteToWideChar(CP_ACP, 0, str.c_str(), -1, &wstr_tmp[0], wstr_size);


I see this is pretty similar to https://stackoverflow.com/a/6693107/796832 so seems good enough to me

MadLittleMods · 2019-10-06T22:31:35Z

src/detection_win.cpp

+    //Wide character to Utf8
+    int str_size = WideCharToMultiByte(CP_UTF8, 0, &wstr_tmp[0], (int)wstr_tmp.size(), NULL, 0, NULL, NULL);
+    std::string str_utf8(str_size, 0);
+    WideCharToMultiByte(CP_UTF8, 0, &wstr_tmp[0], (int)wstr_tmp.size(), &str_utf8[0], str_size, NULL, NULL);


This seems pretty similar to WideCharToMultiByte so seems good enough to me

MadLittleMods · 2019-10-06T22:47:25Z

Sorry for the delay @nononoone 🥶

This is now shipped in usb-detection@4.4.0 🎉

Thanks for the fix ❤️

bugfix: deviceName garbled in Windows MadLittleMods#34

ffa68ab

MadLittleMods added the Windows label Jun 22, 2019

MadLittleMods reviewed Jun 22, 2019

View reviewed changes

MadLittleMods assigned nononoone Jun 22, 2019

MadLittleMods reviewed Oct 6, 2019

View reviewed changes

MadLittleMods merged commit 1b78855 into MadLittleMods:master Oct 6, 2019

MadLittleMods added a commit that referenced this pull request Oct 6, 2019

Prepare changelog with #86

73524c9

This was referenced Oct 6, 2019

deviceName garbled in Windows #34

Closed

The same HID device, node-hid and usb-detection get different manufacturer data #89

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: deviceName garbled in Windows #34 #86

bugfix: deviceName garbled in Windows #34 #86

nononoone commented Jun 21, 2019 •

edited by MadLittleMods

Loading

MadLittleMods Jun 22, 2019 •

edited

Loading

nononoone Jun 22, 2019

MadLittleMods Oct 6, 2019

MadLittleMods Oct 6, 2019

MadLittleMods Jun 22, 2019 •

edited

Loading

nononoone Jun 22, 2019

MadLittleMods commented Jun 22, 2019 •

edited

Loading

nononoone commented Jun 22, 2019

ilopsource commented Jul 27, 2019

MadLittleMods Oct 6, 2019

MadLittleMods Oct 6, 2019

MadLittleMods commented Oct 6, 2019

bugfix: deviceName garbled in Windows #34 #86

bugfix: deviceName garbled in Windows #34 #86

Conversation

nononoone commented Jun 21, 2019 • edited by MadLittleMods Loading

MadLittleMods Jun 22, 2019 • edited Loading

Choose a reason for hiding this comment

nononoone Jun 22, 2019

Choose a reason for hiding this comment

MadLittleMods Oct 6, 2019

Choose a reason for hiding this comment

MadLittleMods Oct 6, 2019

Choose a reason for hiding this comment

MadLittleMods Jun 22, 2019 • edited Loading

Choose a reason for hiding this comment

nononoone Jun 22, 2019

Choose a reason for hiding this comment

MadLittleMods commented Jun 22, 2019 • edited Loading

nononoone commented Jun 22, 2019

ilopsource commented Jul 27, 2019

MadLittleMods Oct 6, 2019

Choose a reason for hiding this comment

MadLittleMods Oct 6, 2019

Choose a reason for hiding this comment

MadLittleMods commented Oct 6, 2019

nononoone commented Jun 21, 2019 •

edited by MadLittleMods

Loading

MadLittleMods Jun 22, 2019 •

edited

Loading

MadLittleMods Jun 22, 2019 •

edited

Loading

MadLittleMods commented Jun 22, 2019 •

edited

Loading