ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebus.sys: Add a strdupAtoW implementation. 

Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-10-14 08:54:33 +02:00 committed by Alexandre Julliard
parent 4382f9235b
commit 66d70e38f5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/winebus.sys/bus_udev.c
View File

@ -78,6 +78,17 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de
return (struct platform_private *)get_platform_private(device); return (struct platform_private *)get_platform_private(device);
} }
static inline WCHAR *strdupAtoW(const char *src)
{
WCHAR *dst;
DWORD len;
if (!src) return NULL;
len = MultiByteToWideChar(CP_UNIXCP, 0, src, -1, NULL, 0);
if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
MultiByteToWideChar(CP_UNIXCP, 0, src, -1, dst, len);
return dst;
}
static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base)
{ {
const char *attr = udev_device_get_sysattr_value(dev, sysattr); const char *attr = udev_device_get_sysattr_value(dev, sysattr);
@ -92,17 +103,12 @@ static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int
static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr)
{ {
const char *attr = udev_device_get_sysattr_value(dev, sysattr); const char *attr = udev_device_get_sysattr_value(dev, sysattr);
WCHAR *dst;
DWORD len;
if (!attr) if (!attr)
{ {
WARN("Could not get %s from device\n", sysattr); WARN("Could not get %s from device\n", sysattr);
return NULL; return NULL;
} }
len = MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, NULL, 0); return strdupAtoW(attr);
if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
MultiByteToWideChar(CP_UNIXCP, 0, attr, -1, dst, len);
return dst;
} }
static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev)