January 2016 - Wine-Commits

Austin English : kernel32: Add SetSearchPathMode stub.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

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

Alexandre Julliard : explorer: Support a quoted /desktop option.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

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

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

Jan. 14, 2016

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(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{ 0x8, 0x8}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x10, 0x10}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x8}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_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

Aric Stewart : hidclass.sys: Implement IOCTL_HID_GET_FEATURE.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

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

Austin English : rasapi32: Add RasSetCustomAuthDataA/W stubs.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 61942c8d43492a1cdc26a5a68d3bb27d340280b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61942c8d43492a1cdc26a5a68… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 5 00:56:46 2016 -0600 rasapi32: Add RasSetCustomAuthDataA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 12 ++++++++++++ dlls/rasapi32/rasapi32.spec | 2 ++ include/ras.h | 3 +++ 3 files changed, 17 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 235ab65..15061c5 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -494,6 +494,18 @@ DWORD WINAPI RasRenameEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszOldEntry, LPCWST return 0; } +DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + return 0; +} + +DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) +{ + FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + return 0; +} + DWORD WINAPI RasSetEntryDialParamsA(LPCSTR lpszPhonebook, LPRASDIALPARAMSA lprasdialparams, BOOL fRemovePassword) { diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 08c750e..f2ce65e 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -64,6 +64,8 @@ @ stdcall RasSetAutodialParamW(long ptr long) @ stub RasSetCredentialsA @ stub RasSetCredentialsW +@ stdcall RasSetCustomAuthDataA(str str ptr long) +@ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) diff --git a/include/ras.h b/include/ras.h index f9fad2e..9e5d564 100644 --- a/include/ras.h +++ b/include/ras.h @@ -493,6 +493,9 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR,DWORD,LPRASAUTODIALENTRYW,DWORD,DWOR DWORD WINAPI RasSetAutodialParamA(DWORD,LPVOID,DWORD); DWORD WINAPI RasSetAutodialParamW(DWORD,LPVOID,DWORD); #define RasSetAutodialParam WINELIB_NAME_AW(RasSetAutodialParam) +DWORD WINAPI RasSetCustomAuthDataA(const CHAR *,const CHAR *,BYTE *,DWORD); +DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *,const WCHAR *,BYTE *,DWORD); +#define RasSetCustomAuthData WINELIB_NAME_AW(RasSetCustomAuthData) DWORD WINAPI RasSetEntryDialParamsA(LPCSTR,LPRASDIALPARAMSA,BOOL); DWORD WINAPI RasSetEntryDialParamsW(LPCWSTR,LPRASDIALPARAMSW,BOOL); #define RasSetEntryDialParams WINELIB_NAME_AW(RasSetEntryDialParams)

1 0

Aric Stewart : hidclass.sys: Implement HID_Device_write.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

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

Nikolay Sivov : ole2disp: Implement SafeArrayLock()/SafeArrayUnlock().
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: wine Branch: master Commit: 2ef42bd946caa11c2248afbeb0dfc3e6d05929b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef42bd946caa11c2248afbeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 22:25:56 2016 +0300 ole2disp: Implement SafeArrayLock()/SafeArrayUnlock(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 34 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 20b7b6c..af6f03c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -108,6 +108,40 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayLock [OLE2DISP.21] + */ +HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0xffff) + return E_UNEXPECTED; + + sa->cLocks++; + return S_OK; +} + +/****************************************************************************** + * SafeArrayUnlock [OLE2DISP.22] + */ +HRESULT WINAPI SafeArrayUnlock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0) + return E_UNEXPECTED; + + sa->cLocks--; + return S_OK; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index ca884a0..b0db920 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -18,8 +18,8 @@ 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND -21 stub SAFEARRAYLOCK -22 stub SAFEARRAYUNLOCK +21 pascal SafeArrayLock(ptr) SafeArrayLock16 +22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 stub SAFEARRAYACCESSDATA 24 stub SAFEARRAYUNACCESSDATA 25 stub SAFEARRAYGETELEMENT

1 0

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

Jan. 14, 2016

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(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x60, 0xb0}, "??_8?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x5c, 0xa8}, "??_8?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x5c, 0xa8}, "??_8?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{ 0xc, 0x18}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0x4, 0x8}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_istringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"}, + {{0x54, 0x98}, "??_8?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x4, 0x8}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B@"}, + {{0x50, 0x90}, "??_8?$basic_ostringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B@"}, + {{0x58, 0xa0}, "??_8?$basic_stringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x50, 0x90}, "??_8?$basic_stringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x58, 0xa0}, "??_8?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x50, 0x90}, "??_8?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@7B?$basic_ostream(a)GU?$char_traits(a)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

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

Jan. 14, 2016

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

Austin English : Update 1.8 references to 2.0.
by Alexandre Julliard Jan. 14, 2016

Jan. 14, 2016

Module: bugzilla Branch: master Commit: 306c3846e235273eb013491e63d4a7bdabe2cb5a URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=306c3846e235273eb0134… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 10 23:34:54 2016 -0600 Update 1.8 references to 2.0. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 07b81e2..f710221 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 5d5b1b8..4c2dc95 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,8 +150,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> - These bugs are scheduled to be fixed before Wine 1.8 is released. + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a> + These bugs are scheduled to be fixed before Wine 2.0 is released. </li> <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a>

1 0