October 2016 - Wine-commits

Aric Stewart : winebus.sys: Watch for hid raw device addition and removal.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: c29c3d1fadaf1d3646eb5c330b3b7188a5bbe36e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29c3d1fadaf1d3646eb5c330… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 3 13:27:36 2016 +0200 winebus.sys: Watch for hid raw device addition and removal. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1f6df6f..dae165d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -26,6 +26,12 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_POLL_H +# include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif @@ -129,6 +135,11 @@ static void try_add_device(struct udev_device *dev) HeapFree(GetProcessHeap(), 0, serial); } +static void try_remove_device(struct udev_device *dev) +{ + /* FIXME */ +} + static void build_initial_deviceset(void) { struct udev_enumerate *enumerate; @@ -164,13 +175,82 @@ static void build_initial_deviceset(void) udev_enumerate_unref(enumerate); } +static struct udev_monitor *create_monitor(struct pollfd *pfd) +{ + struct udev_monitor *monitor; + + monitor = udev_monitor_new_from_netlink(udev_context, "udev"); + if (!monitor) + { + WARN("Unable to get udev monitor object\n"); + return NULL; + } + + if (udev_monitor_filter_add_match_subsystem_devtype(monitor, "hidraw", NULL) < 0) + WARN("Failed to add subsystem 'hidraw' to monitor\n"); + + if (udev_monitor_enable_receiving(monitor) < 0) + goto error; + + if ((pfd->fd = udev_monitor_get_fd(monitor)) >= 0) + { + pfd->events = POLLIN; + return monitor; + } + +error: + WARN("Failed to start monitoring\n"); + udev_monitor_unref(monitor); + return NULL; +} + +static void process_monitor_event(struct udev_monitor *monitor) +{ + struct udev_device *dev; + const char *action; + + dev = udev_monitor_receive_device(monitor); + if (!dev) + { + FIXME("Failed to get device that has changed\n"); + return; + } + + action = udev_device_get_action(dev); + TRACE("Received action %s for udev device %s\n", debugstr_a(action), + debugstr_a(udev_device_get_devnode(dev))); + + if (!action) + WARN("No action received\n"); + else if (strcmp(action, "add") == 0) + try_add_device(dev); + else if (strcmp(action, "remove") == 0) + try_remove_device(dev); + else + WARN("Unhandled action %s\n", debugstr_a(action)); + + udev_device_unref(dev); +} + static DWORD CALLBACK deviceloop_thread(void *args) { + struct udev_monitor *monitor; HANDLE init_done = args; + struct pollfd pfd; + monitor = create_monitor(&pfd); build_initial_deviceset(); SetEvent(init_done); + while (monitor) + { + if (poll(&pfd, 1, -1) <= 0) continue; + process_monitor_event(monitor); + } + + TRACE("Monitor thread exiting\n"); + if (monitor) + udev_monitor_unref(monitor); return 0; }

1 0

Aric Stewart : winebus.sys: Add implementation for device removal.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 9f8758b19dea4f8ad9230d5bcac73519365cb190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8758b19dea4f8ad9230d5bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 3 13:29:49 2016 +0200 winebus.sys: Add implementation for device removal. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 16 ++++++++-- dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++++++--- dlls/winebus.sys/main.c | 74 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 111 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index dcb50f2..099558b 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -19,8 +19,18 @@ /* Busses */ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; +/* Native device function table */ +typedef struct +{ + int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); +} platform_vtbl; + +void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; + /* HID Plug and Play Bus */ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, - WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, WORD vid, WORD pid, + DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, + const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; +void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dae165d..93e56f3 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -61,6 +61,16 @@ static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; #include "initguid.h" DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); +struct platform_private +{ + struct udev_device *udev_device; +}; + +static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) +{ + return (struct platform_private *)get_platform_private(device); +} + static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); @@ -88,6 +98,18 @@ static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) return dst; } +static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) +{ + struct udev_device *dev1 = impl_from_DEVICE_OBJECT(device)->udev_device; + struct udev_device *dev2 = platform_dev; + return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); +} + +static const platform_vtbl hidraw_vtbl = +{ + compare_platform_device, +}; + static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; @@ -123,12 +145,15 @@ static void try_add_device(struct udev_device *dev) subsystem = udev_device_get_subsystem(dev); if (strcmp(subsystem, "hidraw") == 0) { - device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, - version, 0, serial, FALSE, &GUID_DEVCLASS_HIDRAW); + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, FALSE, + &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); } if (device) - udev_device_ref(dev); + { + impl_from_DEVICE_OBJECT(device)->udev_device = udev_device_ref(dev); + IoInvalidateDeviceRelations(device, BusRelations); + } else WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); @@ -137,7 +162,12 @@ static void try_add_device(struct udev_device *dev) static void try_remove_device(struct udev_device *dev) { - /* FIXME */ + DEVICE_OBJECT *device = bus_find_hid_device(&hidraw_vtbl, dev); + if (!device) return; + + dev = impl_from_DEVICE_OBJECT(device)->udev_device; + bus_remove_hid_device(device); + udev_device_unref(dev); } static void build_initial_deviceset(void) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 1364eab..09a59d6 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -47,13 +47,16 @@ struct pnp_device struct device_extension { - void *native; /* Must be the first member of the structure */ + struct pnp_device *pnp_device; WORD vid, pid; DWORD uid, version, index; BOOL is_gamepad; WCHAR *serial; const WCHAR *busid; /* Expected to be a static constant */ + + const platform_vtbl *vtbl; + BYTE platform_private[1]; }; static CRITICAL_SECTION device_list_cs; @@ -80,6 +83,12 @@ static inline WCHAR *strdupW(const WCHAR *src) return dst; } +void *get_platform_private(DEVICE_OBJECT *device) +{ + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + return ext->platform_private; +} + static DWORD get_vidpid_index(WORD vid, WORD pid) { struct pnp_device *ptr; @@ -157,9 +166,9 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } -DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, - WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class) +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, WORD vid, WORD pid, + DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, + const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; struct device_extension *ext; @@ -169,16 +178,18 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, WCHAR dev_name[256]; HDEVINFO devinfo; NTSTATUS status; + DWORD length; - TRACE("(%p, %s, %p, %04x, %04x, %u, %u, %s, %u, %s)\n", driver, debugstr_w(busidW), native, - vid, pid, version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class)); + TRACE("(%p, %s, %04x, %04x, %u, %u, %s, %u, %s, %p, %u)\n", driver, debugstr_w(busidW), vid, pid, + version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class), vtbl, platform_data_size); if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) return NULL; - sprintfW(dev_name, device_name_fmtW, busidW, native); + sprintfW(dev_name, device_name_fmtW, busidW, pnp_dev); RtlInitUnicodeString(&nameW, dev_name); - status = IoCreateDevice(driver, sizeof(*ext), &nameW, 0, 0, FALSE, &device); + length = FIELD_OFFSET(struct device_extension, platform_private[platform_data_size]); + status = IoCreateDevice(driver, length, &nameW, 0, 0, FALSE, &device); if (status) { FIXME("failed to create device error %x\n", status); @@ -190,7 +201,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, /* fill out device_extension struct */ ext = (struct device_extension *)device->DeviceExtension; - ext->native = native; + ext->pnp_device = pnp_dev; ext->vid = vid; ext->pid = pid; ext->uid = uid; @@ -199,6 +210,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, ext->is_gamepad = is_gamepad; ext->serial = strdupW(serialW); ext->busid = busidW; + ext->vtbl = vtbl; /* add to list of pnp devices */ pnp_dev->device = device; @@ -226,10 +238,52 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, else ERR("failed to get ClassDevs: %x\n", GetLastError()); - IoInvalidateDeviceRelations(device, BusRelations); return device; } +DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) +{ + struct pnp_device *dev; + DEVICE_OBJECT *ret = NULL; + + TRACE("(%p, %p)\n", vtbl, platform_dev); + + EnterCriticalSection(&device_list_cs); + LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) + { + struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; + if (ext->vtbl != vtbl) continue; + if (ext->vtbl->compare_platform_device(dev->device, platform_dev) == 0) + { + ret = dev->device; + break; + } + } + LeaveCriticalSection(&device_list_cs); + + TRACE("returning %p\n", ret); + return ret; +} + +void bus_remove_hid_device(DEVICE_OBJECT *device) +{ + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + struct pnp_device *pnp_device = ext->pnp_device; + + TRACE("(%p)\n", device); + + EnterCriticalSection(&device_list_cs); + list_remove(&pnp_device->entry); + LeaveCriticalSection(&device_list_cs); + + IoInvalidateDeviceRelations(device, RemovalRelations); + HeapFree(GetProcessHeap(), 0, ext->serial); + IoDeleteDevice(device); + + /* pnp_device must be released after the device is gone */ + HeapFree(GetProcessHeap(), 0, pnp_device); +} + static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status;

1 0

Sebastian Lackner : kernel32/tests: Add a testcase for CreateFileA with an invalid path.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 82856af5fafa3cdcf6410be24d77382964e5dc0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82856af5fafa3cdcf6410be24… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 3 13:49:31 2016 +0200 kernel32/tests: Add a testcase for CreateFileA with an invalid path. Spotted by Christoph von Wittich. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5327865..f039cf9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1206,20 +1206,22 @@ static void test_CreateFileA(void) char directory[] = "removeme"; static const char nt_drive[] = "\\\\?\\A:"; DWORD i, ret, len; - struct test_list p[] = { - {"", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ - {"", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ - {"a", ERROR_FILE_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ - {"a\\", ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ - {"removeme", ERROR_ACCESS_DENIED, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ - {"removeme\\", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ - {"c:", ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ - {"c:", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ - {"c:\\", ERROR_PATH_NOT_FOUND, ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ - {"c:\\", ERROR_SUCCESS, ERROR_ACCESS_DENIED, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ - {"\\\\?\\c:", ERROR_SUCCESS, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ - {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ - {NULL, 0, -1, 0, FALSE} + static const struct test_list p[] = + { + {"", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ + {"", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ + {"a", ERROR_FILE_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ + {"a\\", ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ + {"removeme", ERROR_ACCESS_DENIED, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ + {"removeme\\", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ + {"c:", ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ + {"c:", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ + {"c:\\", ERROR_PATH_NOT_FOUND, ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ + {"c:\\", ERROR_SUCCESS, ERROR_ACCESS_DENIED, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ + {"c:c:\\windows", ERROR_INVALID_NAME, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* invalid path */ + {"\\\\?\\c:", ERROR_SUCCESS, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ + {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ + {NULL, 0, -1, 0, FALSE} }; BY_HANDLE_FILE_INFORMATION Finfo; WCHAR curdir[MAX_PATH];

1 0

Alexandre Julliard : Wine release 1.9.20
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: website Branch: master Commit: 1c8806b92973a1a9810e5f814bce43e60fb3c744 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c8806b92973a1a9810e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:34:54 2016 +0200 Wine release 1.9.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016100101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016100101.xml b/news/en/2016100101.xml new file mode 100644 index 0000000..58cd9b5 --- /dev/null +++ b/news/en/2016100101.xml @@ -0,0 +1,15 @@ +<news> +<date>October 1, 2016</date> +<title>Wine 1.9.20 Released</title> +<body> + The Wine development release 1.9.20 is now available. + <a href="{$root}/announce/1.9.20">What's new</a> in this release: +<ul> + <li>Reimplementation of the clipboard API.</li> + <li>Message handling in WebServices.</li> + <li>Many more API Set libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.9.20.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: 8a92dd9a5720c4b6b334e4f13629c0b0f5a72e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a92dd9a5720c4b6b334e4f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 480 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 252 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a92dd9a5720c4b6b334e…

1 0

Tag wine-1.9.20 : Alexandre Julliard : Release 1.9.20
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: refs/tags/wine-1.9.20 Tag: 43e53e9057964b4e4c886ed042007f7b9d7bb928 URL: http://source.winehq.org/git/wine.git/?a=tag;h=43e53e9057964b4e4c886ed04200… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 1 17:29:06 2016 +0200 Release 1.9.20

1 0

Piotr Caban : msvcp120: Don't add basic_ios:: _Add_vtordisp virtual functions.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: b5933916286899a20d8f6744b03a206dc0bfea2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5933916286899a20d8f6744b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 30 09:14:14 2016 +0200 msvcp120: Don't add basic_ios::_Add_vtordisp virtual functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ddd9580..f673bc1 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -759,21 +759,21 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ios_base_vector_dtor)); __ASM_VTABLE(basic_ios_char, VTABLE_ADD_FUNC(basic_ios_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ios_wchar, VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ios_short, VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif @@ -957,189 +957,189 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); __ASM_VTABLE(basic_ostream_char, VTABLE_ADD_FUNC(basic_ostream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostream_wchar, VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostream_short, VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_char, VTABLE_ADD_FUNC(basic_istream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_wchar, VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istream_short, VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_char, VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_wchar, VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_iostream_short, VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_char, VTABLE_ADD_FUNC(basic_ofstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_wchar, VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ofstream_short, VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_char, VTABLE_ADD_FUNC(basic_ifstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_wchar, VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ifstream_short, VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_char, VTABLE_ADD_FUNC(basic_fstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_wchar, VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_fstream_short, VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_char, VTABLE_ADD_FUNC(basic_ostringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_wchar, VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_ostringstream_short, VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_char, VTABLE_ADD_FUNC(basic_istringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_wchar, VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_istringstream_short, VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_char, VTABLE_ADD_FUNC(basic_stringstream_char_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_wchar, VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(basic_stringstream_short, VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif @@ -1163,14 +1163,14 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); __ASM_VTABLE(ostrstream, VTABLE_ADD_FUNC(ostrstream_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor) -#if _MSVCP_VER >= 110 +#if _MSVCP_VER == 110 VTABLE_ADD_FUNC(basic_ios__Add_vtordisp1) VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif

1 0

Sebastian Lackner : server: Handle error when memdup fails in synthesize_formats.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: b6b54fa14abe58d35e7d68afe2b8af5319c8983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b54fa14abe58d35e7d68afe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 30 03:41:38 2016 +0200 server: Handle error when memdup fails in synthesize_formats. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/clipboard.c b/server/clipboard.c index d8b5f96..89ce835 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -206,7 +206,7 @@ static int synthesize_formats( struct clipboard *clipboard ) (HAS_FORMAT( map, CF_TEXT ) || HAS_FORMAT( map, CF_OEMTEXT ) || HAS_FORMAT( map, CF_UNICODETEXT ))) { void *data = memdup( &clipboard->lcid, sizeof(clipboard->lcid) ); - if ((format = add_format( clipboard, CF_LOCALE ))) + if (data && (format = add_format( clipboard, CF_LOCALE ))) { format->seqno = clipboard->seqno++; format->data = data;

1 0

Sebastian Lackner : user32: Also release GMEM_FIXED data in free_cached_data.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: df3c2a4a41f969869e0d8617d44cc8be4b9ad0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3c2a4a41f969869e0d8617d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 1 14:55:05 2016 +0200 user32: Also release GMEM_FIXED data in free_cached_data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 6 +----- dlls/user32/tests/clipboard.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0d48984..d33459c 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -326,11 +326,7 @@ static void free_cached_data( struct cached_format *cache ) GlobalFree( cache->handle ); break; default: - if ((ptr = GlobalLock( cache->handle )) && ptr != cache->handle) - { - GlobalUnlock( cache->handle ); - GlobalFree( cache->handle ); - } + GlobalFree( cache->handle ); break; } list_remove( &cache->entry ); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 832eca6..69bdba8 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1590,9 +1590,7 @@ static BOOL is_fixed( HANDLE handle ) static BOOL is_freed( HANDLE handle ) { - void *ptr = GlobalLock( handle ); - if (ptr) GlobalUnlock( handle ); - return !ptr; + return !GlobalSize( handle ); } static UINT format_id; @@ -1602,7 +1600,8 @@ static const LOGPALETTE logpalette = { 0x300, 1, {{ 0x12, 0x34, 0x56, 0x78 }}}; static void test_handles( HWND hwnd ) { - HGLOBAL h, htext, htext2, htext3, htext4, htext5, hfixed, hmoveable, empty_fixed, empty_moveable; + HGLOBAL h, htext, htext2, htext3, htext4, htext5; + HGLOBAL hfixed, hfixed2, hmoveable, empty_fixed, empty_moveable; void *ptr; UINT format_id2 = RegisterClipboardFormatA( "another format" ); BOOL r; @@ -1622,6 +1621,7 @@ static void test_handles( HWND hwnd ) palette = CreatePalette( &logpalette ); hfixed = GlobalAlloc( GMEM_FIXED, 17 ); + hfixed2 = GlobalAlloc( GMEM_FIXED, 17 ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); ok( GlobalSize( hfixed ) == 17, "wrong size %lu\n", GlobalSize( hfixed )); @@ -1682,8 +1682,8 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( format_id2, empty_fixed ); ok( h == empty_fixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); - h = SetClipboardData( 0xdeadbeef, hfixed ); - ok( h == hfixed, "got %p\n", h ); + h = SetClipboardData( 0xdeadbeef, hfixed2 ); + ok( h == hfixed2, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = SetClipboardData( 0xdeadbabe, hmoveable ); ok( h == hmoveable, "got %p\n", h ); @@ -1719,7 +1719,7 @@ static void test_handles( HWND hwnd ) ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( 0xdeadbeef ); - ok( data == hfixed, "wrong data %p\n", data ); + ok( data == hfixed2, "wrong data %p\n", data ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( 0xdeadbabe ); @@ -1734,6 +1734,11 @@ static void test_handles( HWND hwnd ) ok( is_moveable( h ), "expected moveable mem %p\n", h ); ok( is_freed( htext5 ), "expected freed mem %p\n", htext5 ); + h = SetClipboardData( 0xdeadbeef, hfixed ); + ok( h == hfixed, "got %p\n", h ); + ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); + r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Detlef Riekenberg : ntdll/tests: Use case insensitive compare for filenames.
by Alexandre Julliard 01 Oct '16

01 Oct '16

Module: wine Branch: master Commit: 1ebbfb1a1d54c4573d79367261030d259e2925cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebbfb1a1d54c4573d7936726… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 29 23:07:47 2016 +0200 ntdll/tests: Use case insensitive compare for filenames. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 649b6b4..586b2c9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1571,7 +1571,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -1741,7 +1741,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2147,7 +2147,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - todo_wine ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2203,7 +2203,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2373,7 +2373,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); @@ -2776,7 +2776,7 @@ static void test_file_link_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - ok( !lstrcmpW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, oldpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(oldpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni );

1 0