wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Austin English : kernel32: Add SetSearchPathMode stub.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 6b36d7cfef603ee11c8ce609cd39ac3ae6f9b21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b36d7cfef603ee11c8ce609c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 7 22:02:37 2016 -0600 kernel32: Add SetSearchPathMode stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/path.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 68325ba..9fecbd7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1429,7 +1429,7 @@ # @ stub SetProcessUserModeExceptionPolicy @ stdcall SetProcessWorkingSetSize(long long long) # @ stub SetProcessWorkingSetSizeEx -# @ stub SetSearchPathMode +@ stdcall SetSearchPathMode(long) @ stdcall SetStdHandle(long long) # @ stub SetStdHandleEx @ stdcall SetSystemFileCacheSize(long long long) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b12c71e..b3fccb2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2088,3 +2088,10 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn return TRUE; } + +BOOL WINAPI SetSearchPathMode(DWORD flags) +{ + FIXME("(%x): stub\n", flags); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +}

1 0

Andrew Eikum : winegstreamer: Always run gstreamer callbacks on a Wine thread.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 56b6523842f8fd9125f6d3c1651d836163dfef00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b6523842f8fd9125f6d3c16… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:35:04 2016 -0600 winegstreamer: Always run gstreamer callbacks on a Wine thread. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 +- dlls/winegstreamer/glibthread.c | 390 --------------------------------------- dlls/winegstreamer/gst_cbs.c | 325 ++++++++++++++++++++++++++++++++ dlls/winegstreamer/gst_cbs.h | 204 ++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 8 +- dlls/winegstreamer/gstdemux.c | 264 +++++++++++++++++++++++--- dlls/winegstreamer/gsttffilter.c | 45 +++-- dlls/winegstreamer/main.c | 3 +- 8 files changed, 806 insertions(+), 435 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56b6523842f8fd9125f6d…

1 0

Aric Stewart : hidclass.sys: Implement IOCTL_HID_SET_FEATURE.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: d24239efdf6287bc8b058a0b1dcbfc06d0d59833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24239efdf6287bc8b058a0b1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 11 09:18:44 2016 -0600 hidclass.sys: Implement IOCTL_HID_SET_FEATURE. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 7c2904a..41b5405 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -464,6 +464,33 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) return rc; } +static NTSTATUS HID_set_feature(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + HID_XFER_PACKET packet; + NTSTATUS rc; + + irp->IoStatus.Information = 0; + + TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.InputBufferLength, irp->AssociatedIrp.SystemBuffer); + packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; + packet.reportId = ((char*)irp->AssociatedIrp.SystemBuffer)[0]; + packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; + TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); + + rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, NULL, 0, &packet, sizeof(packet)); + + irp->IoStatus.u.Status = rc; + if (irp->IoStatus.u.Status == STATUS_SUCCESS) + irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.InputBufferLength; + else + irp->IoStatus.Information = 0; + + TRACE_(hid_report)("Result 0x%x set %li bytes\n", rc, irp->IoStatus.Information); + + return rc; +} + NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS rc = STATUS_SUCCESS; @@ -582,6 +609,9 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_GET_FEATURE: rc = HID_get_feature(device, irp); break; + case IOCTL_HID_SET_FEATURE: + rc = HID_set_feature(device, irp); + break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Aric Stewart : hidclass.sys: Implement IOCTL_HID_GET_FEATURE.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 5a06668488b8ef8d99853d76ae01d1486d4d2492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a06668488b8ef8d99853d76a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 11 09:18:38 2016 -0600 hidclass.sys: Implement IOCTL_HID_GET_FEATURE. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 09e3c0c..7c2904a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -430,6 +430,40 @@ static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT return STATUS_SUCCESS; } +static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + HID_XFER_PACKET *packet; + DWORD len; + NTSTATUS rc = STATUS_SUCCESS; + WCHAR *out_buffer; + + irp->IoStatus.Information = 0; + + out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + + len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; + packet = HeapAlloc(GetProcessHeap(), 0, len); + packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); + packet->reportId = out_buffer[0]; + + TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); + + rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, len); + + irp->IoStatus.u.Status = rc; + if (irp->IoStatus.u.Status == STATUS_SUCCESS) + irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + else + irp->IoStatus.Information = 0; + + TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); + + return rc; +} + NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS rc = STATUS_SUCCESS; @@ -545,6 +579,9 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) } break; } + case IOCTL_HID_GET_FEATURE: + rc = HID_get_feature(device, irp); + break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0

Aric Stewart : hidclass.sys: Implement HID_Device_write.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: ba84b6472e5e86d5afb9118a763b986d31ce9c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba84b6472e5e86d5afb9118a7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 11 08:40:07 2016 -0600 hidclass.sys: Implement HID_Device_write. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 53ec569..09e3c0c 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -607,16 +607,29 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + HID_XFER_PACKET packet; + NTSTATUS rc; irp->IoStatus.Information = 0; - TRACE("Buffer length %i\n", irpsp->Parameters.Write.Length); + TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.Write.Length, irp->AssociatedIrp.SystemBuffer); + packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; + packet.reportId = ((char*)irp->AssociatedIrp.SystemBuffer)[0]; + packet.reportBufferLen = irpsp->Parameters.Write.Length; + TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - FIXME("device %p\n", device); + rc = call_minidriver(IOCTL_HID_WRITE_REPORT, device, NULL, 0, &packet, sizeof(packet)); + + irp->IoStatus.u.Status = rc; + if (irp->IoStatus.u.Status == STATUS_SUCCESS) + irp->IoStatus.Information = irpsp->Parameters.Write.Length; + else + irp->IoStatus.Information = 0; + + TRACE_(hid_report)("Result 0x%x wrote %li bytes\n", rc, irp->IoStatus.Information); - irp->IoStatus.u.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); - return STATUS_SUCCESS; + return rc; } NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp)

1 0

Bernhard Übelacker : msvcp60/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 46b913df52e0c0e2f4d81db6d0d5d73f2ae0ac9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b913df52e0c0e2f4d81db6d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:55:16 2016 +0100 msvcp60/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index cf0fa19..f121604 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1636,6 +1636,53 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x60, 0xb0}, "??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x60, 0xb0}, "??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x5c, 0xa8}, "??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{0x50, 0x90}, "??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{0x50, 0x90}, "??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x00, 0x00}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(ios) { @@ -1653,5 +1700,7 @@ START_TEST(ios) test_istream_getline(); test_ostream_print_ushort(); + test_vbtable_size_exports(); + FreeLibrary(msvcp); }

1 0

Bernhard Übelacker : msvcp90/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: c612ef43661cb50fa958cc67f79ead519f145bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c612ef43661cb50fa958cc67f… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:56 2016 +0100 msvcp90/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/misc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d4e1f5a..34d6090 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -991,6 +991,65 @@ static void test_complex(void) ok(almost_eq(c2.imag, 0.00035447), "c2.imag = %g\n", c2.imag); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x5c, 0xa8}, "??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_fstream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_fstream@_WU?$char_traits@_W@std@@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@"}, + {{0x4c, 0x88}, "??_8?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x54, 0x98}, "??_8?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x4c, 0x88}, "??_8?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(misc) { if(!init()) @@ -1008,6 +1067,7 @@ START_TEST(misc) test_allocator_char(); test_Ctraits_math_functions(); test_complex(); + test_vbtable_size_exports(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Bernhard Übelacker : msvcp100/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 243b234149c0ddb5db60dbf1d56279b708e68807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243b234149c0ddb5db60dbf1d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:29 2016 +0100 msvcp100/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 7775888..4740951 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -195,6 +195,41 @@ static void test__Container_base12(void) ok(p2.head == (void*)0xdeadbeef, "p2.head = %p, expected 0xdeadbeef\n", p2.head); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x18, 0x18}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(misc) { if(!init()) @@ -202,5 +237,7 @@ START_TEST(misc) test__Container_base12(); + test_vbtable_size_exports(); + FreeLibrary(msvcp); }

1 0

Bernhard Übelacker : msvcp110/tests: Test virtual base table size exports.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: adfe3f1deed2a1186e65ec3723b16ac0e8663447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfe3f1deed2a1186e65ec372… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Jan 13 22:54:11 2016 +0100 msvcp110/tests: Test virtual base table size exports. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index f688c8d..58db584 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -155,9 +155,45 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x20, 0x20}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_istream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream@_WU?$char_traits@_W@std@@@std@@7B?$basic_ostream@_WU?$char_traits@_W@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream@_WU?$char_traits@_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(msvcp110) { if(!init()) return; test_tr2_sys__Last_write_time(); + test_vbtable_size_exports(); FreeLibrary(msvcp); }

1 0

Alexandre Julliard : explorer: Support a quoted /desktop option.
by Alexandre Julliard 14 Jan '16

14 Jan '16

Module: wine Branch: master Commit: 91a394a616e5d44db5100d24768ed037a6ae93be URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a394a616e5d44db5100d247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 19:41:49 2016 +0900 explorer: Support a quoted /desktop option. Workaround for Worms Armageddon which uses an invalid but previously supported syntax. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c178017..8bfb826 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -682,6 +682,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_root[] = {'/','r','o','o','t',','}; static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; + static const WCHAR arg_desktop_quotes[] = {'"','/','d','e','s','k','t','o','p'}; LPWSTR p = commandline; @@ -716,6 +717,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += sizeof(arg_desktop)/sizeof(WCHAR); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } + /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ + else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + { + p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ + } else { /* left over command line is generally the path to be opened */

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016