November 2018 - Wine-Commits

Piotr Caban : msvcp90: Add time_get<char>::do_get_date implementation.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 74d0c97383139b13c732f1d95ae559bb0aeb2733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d0c97383139b13c732f1d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:30 2018 +0100 msvcp90: Add time_get<char>::do_get_date implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 173 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 143 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 83fa3de..a5bcae2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10060,36 +10060,6 @@ istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char * return NULL; } -/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ -/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_do_get_date, 36) /* virtual */ -#if _MSVCP_VER <= 100 -#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 12, istreambuf_iterator_char*, \ - (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ - (this, ret, s, e, base, err, t)) -#else -#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 20, istreambuf_iterator_char*, \ - (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ - (this, ret, s, e, base, err, t)) -#endif -istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t) -{ - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; -} - -/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ -/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_get_date, 36) -istreambuf_iterator_char* __thiscall time_get_char_get_date(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t) -{ - return call_time_get_char_do_get_date(this, ret, s, e, base, err, t); -} - static int find_longest_match(istreambuf_iterator_char *iter, const char *str) { int i, len = 0, last_match = -1, match = -1; @@ -10310,6 +10280,149 @@ istreambuf_iterator_char* __thiscall time_get_char_get_year(const time_get_char return call_time_get_char_do_get_year(this, ret, s, e, base, err, t); } +static void skip_date_delim(ctype_char *ctype, istreambuf_iterator_char *iter) +{ + istreambuf_iterator_char_val(iter); + while(iter->strbuf && ctype_char_is_ch(ctype, _SPACE, iter->val)) + istreambuf_iterator_char_inc(iter); + + if(iter->strbuf && (iter->val == '/' || iter->val == ':')) + istreambuf_iterator_char_inc(iter); + + while(iter->strbuf && ctype_char_is_ch(ctype, _SPACE, iter->val)) + istreambuf_iterator_char_inc(iter); +} + +/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ +/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_do_get_date, 36) /* virtual */ +#if _MSVCP_VER <= 100 +#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 12, istreambuf_iterator_char*, \ + (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ + (this, ret, s, e, base, err, t)) +#else +#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 20, istreambuf_iterator_char*, \ + (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ + (this, ret, s, e, base, err, t)) +#endif +istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t) +{ + ctype_char *ctype; + dateorder order; + + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + ctype = ctype_char_use_facet(IOS_LOCALE(base)); + + order = time_get_char_date_order(this); + if(order == DATEORDER_no_order) + order = DATEORDER_mdy; + + switch(order) { + case DATEORDER_dmy: + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(s.strbuf && ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + time_get_char_get_year(this, &s, s, e, base, err, t); + break; + case DATEORDER_mdy: + istreambuf_iterator_char_val(&s); + if(s.strbuf && ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + time_get_char_get_year(this, &s, s, e, base, err, t); + break; + case DATEORDER_ymd: + time_get_char_get_year(this, &s, s, e, base, err, t); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + break; + case DATEORDER_ydm: + time_get_char_get_year(this, &s, s, e, base, err, t); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + break; + default: + ERR("incorrect order value: %d\n", order); + break; + } + + if(!s.strbuf) + *err |= IOSTATE_eofbit; + *ret = s; + return ret; +} + +/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ +/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_get_date, 36) +istreambuf_iterator_char* __thiscall time_get_char_get_date(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t) +{ + return call_time_get_char_do_get_date(this, ret, s, e, base, err, t); +} + /* ??_7_Locimp(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale__Locimp_vtable;

1 0

Aric Stewart : ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 73e448820bfc6c310e1314c706ea3a53a20f459e URL: https://source.winehq.org/git/wine.git/?a=commit;h=73e448820bfc6c310e1314c7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 09:47:41 2018 -0600 ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 110 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 96 insertions(+), 14 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a60f9ac..3b42e29 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -102,6 +102,16 @@ struct wine_driver SERVICE_STATUS_HANDLE service_handle; }; +struct device_interface +{ + struct wine_rb_entry entry; + + UNICODE_STRING symbolic_link; + DEVICE_OBJECT *device; + GUID interface_class; + BOOL enabled; +}; + static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) @@ -114,6 +124,16 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; +static int interface_rb_compare( const void *key, const struct wine_rb_entry *entry) +{ + const struct device_interface *iface = WINE_RB_ENTRY_VALUE( entry, const struct device_interface, entry ); + const UNICODE_STRING *k = key; + + return RtlCompareUnicodeString( k, &iface->symbolic_link, FALSE ); +} + +static struct wine_rb_tree device_interfaces = { interface_rb_compare }; + static CRITICAL_SECTION drivers_cs; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1321,6 +1341,30 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) return status; } +static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *symlink_name ) +{ + UNICODE_STRING device_nameU; + WCHAR *device_name; + ULONG len = 0; + NTSTATUS ret; + + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, 0, NULL, &len ); + if (ret != STATUS_BUFFER_TOO_SMALL) + return ret; + + device_name = heap_alloc( len ); + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, len, device_name, &len ); + if (ret) + { + heap_free( device_name ); + return ret; + } + + RtlInitUnicodeString( &device_nameU, device_name ); + ret = IoCreateSymbolicLink( symlink_name, &device_nameU ); + heap_free( device_name ); + return ret; +} /*********************************************************************** * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) @@ -1339,16 +1383,31 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; + struct device_interface *iface; HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; + struct wine_rb_entry *entry; WCHAR *path, *refstr, *p; UNICODE_STRING string; + DWORD data = enable; NTSTATUS ret; - size_t len; GUID class; + ULONG len; TRACE("(%s, %d)\n", debugstr_us(name), enable); + entry = wine_rb_get( &device_interfaces, name ); + if (!entry) + return STATUS_OBJECT_NAME_NOT_FOUND; + + iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); + + if (!enable && !iface->enabled) + return STATUS_OBJECT_NAME_NOT_FOUND; + + if (enable && iface->enabled) + return STATUS_OBJECT_NAME_EXISTS; + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) @@ -1374,22 +1433,37 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable attr.ObjectName = &string; RtlInitUnicodeString( &string, path ); ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); - if (!ret) + heap_free(path); + if (ret) + return ret; + + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + NtClose( iface_key ); + if (ret) + return ret; + + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + if (ret) { - attr.RootDirectory = iface_key; - RtlInitUnicodeString( &string, controlW ); - ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); - if (!ret) - { - DWORD data = enable; - RtlInitUnicodeString( &string, linkedW ); - ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); - NtClose( control_key ); - } - NtClose( iface_key ); + NtClose( control_key ); + return ret; } - heap_free( path ); + if (enable) + ret = create_device_symlink( iface->device, name ); + else + ret = IoDeleteSymbolicLink( name ); + if (ret) + { + NtDeleteValueKey( control_key, &string ); + NtClose( control_key ); + return ret; + } + + iface->enabled = enable; len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]); @@ -1696,6 +1770,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; DWORD required; BOOL rc; + struct device_interface *iface; TRACE( "(%p, %s, %s, %p)\n", device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link ); @@ -1766,9 +1841,16 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla data->DevicePath[1] = '?'; TRACE( "Device path %s\n",debugstr_w(data->DevicePath) ); + iface = heap_alloc_zero( sizeof(struct device_interface) ); + iface->device = device; + iface->interface_class = *class_guid; + RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); if (symbolic_link) RtlCreateUnicodeString( symbolic_link, data->DevicePath); + if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) + ERR( "failed to insert interface %s into tree\n", debugstr_us(&iface->symbolic_link) ); + HeapFree( GetProcessHeap(), 0, data ); return status;

1 0

Piotr Caban : msvcp100: Add time_get<char>do_get implementation.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 2dfbfbd4cf968bb16c6e1c1c44b911d55b75e6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dfbfbd4cf968bb16c6e1c1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:40 2018 +0100 msvcp100: Add time_get<char>do_get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp110/msvcp110.spec | 6 +- dlls/msvcp120/msvcp120.spec | 6 +- dlls/msvcp120_app/msvcp120_app.spec | 6 +- dlls/msvcp140/msvcp140.spec | 6 +- dlls/msvcp90/locale.c | 238 ++++++++++++++++++++++++++++++------ 6 files changed, 217 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dfbfbd4cf968bb16c6e…

1 0

Jacek Caban : schannel.h: Add TLS 1.3 defines.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 40c847d8074770681d1c6434fdaf7c015bca99f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c847d8074770681d1c6434… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 19:13:06 2018 +0100 schannel.h: Add TLS 1.3 defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 1 + include/schannel.h | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2bd0e01..ebdfcb6 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -202,6 +202,7 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); + X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); #undef X if(protocols.grbitProtocol) diff --git a/include/schannel.h b/include/schannel.h index 2e1a9f6..6dac2e9 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -107,6 +107,8 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_ALL 0xffffffff #define SP_PROT_UNI_CLIENT 0x80000000 #define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_TLS1_3_SERVER 0x00001000 +#define SP_PROT_TLS1_3_CLIENT 0x00002000 #define SP_PROT_TLS1_2_CLIENT 0x00000800 #define SP_PROT_TLS1_2_SERVER 0x00000400 #define SP_PROT_TLS1_1_CLIENT 0x00000200 @@ -124,6 +126,7 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_NONE 0x00000000 #define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) #define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) #define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) #define SP_PROT_TLS1_0 (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER) @@ -136,10 +139,20 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_SSL3TLS1_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_SERVER) #define SP_PROT_SSL3TLS1_X_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_X_CLIENT) #define SP_PROT_SSL3TLS1_X_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_X_SERVER) -#define SP_PROT_TLS1_X_CLIENT (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) -#define SP_PROT_TLS1_X_SERVER (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) -#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) -#define SP_PROT_TLS1_1PLUS_SERVER (SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_X_CLIENT ( SP_PROT_TLS1_0_CLIENT \ + | SP_PROT_TLS1_1_CLIENT \ + | SP_PROT_TLS1_2_CLIENT \ + | SP_PROT_TLS1_3_CLIENT ) +#define SP_PROT_TLS1_X_SERVER ( SP_PROT_TLS1_0_SERVER \ + | SP_PROT_TLS1_1_SERVER \ + | SP_PROT_TLS1_2_SERVER \ + | SP_PROT_TLS1_3_SERVER ) +#define SP_PROT_TLS1_1PLUS_CLIENT ( SP_PROT_TLS1_1_CLIENT \ + | SP_PROT_TLS1_2_CLIENT \ + | SP_PROT_TLS1_3_CLIENT) +#define SP_PROT_TLS1_1PLUS_SERVER ( SP_PROT_TLS1_1_SERVER \ + | SP_PROT_TLS1_2_SERVER \ + | SP_PROT_TLS1_3_SERVER ) #define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) #define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \

1 0

Michael Stefaniuc : iphlpapi: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 488432317206bc816432af0dd740e18979e37e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488432317206bc816432af0d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 20 20:47:20 2018 +0100 iphlpapi: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 84d28ee..c36f42a 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2787,8 +2787,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE break; } HeapFree( GetProcessHeap(), 0, map ); - if (addr_scopes) - HeapFree( GetProcessHeap(), 0, addr_scopes ); + HeapFree( GetProcessHeap(), 0, addr_scopes ); fclose( fp ); } else ret = ERROR_NOT_SUPPORTED;

1 0

Michael Stefaniuc : msxml3/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: c743b72d250b3ad273d4885e5ff8e5181e7c793c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c743b72d250b3ad273d4885e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:13 2018 +0100 msxml3/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index dc8ab7d..53eefcb 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -206,7 +206,7 @@ static void test_Load(void) BSTR source; lstrcpyW(buf, res); - GetModuleFileNameW(NULL, buf+lstrlenW(buf), (sizeof(buf)-sizeof(res))/sizeof(WCHAR)); + GetModuleFileNameW(NULL, buf+lstrlenW(buf), ARRAY_SIZE(buf)-ARRAY_SIZE(res)); lstrcatW(buf, xmlview_xmlW); if(!pCreateURLMoniker) {

1 0

Brendan McGrath : winebus.sys: Use JoystickNumButtons for button_count.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 9736a36fe60f611558774fcb4bbef32e2706f4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9736a36fe60f611558774fcb… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Tue Nov 20 11:17:10 2018 +1100 winebus.sys: Use JoystickNumButtons for button_count. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e..4f0f685 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -857,7 +857,7 @@ static void try_add_device(SDL_JoystickID index) id, vid, pid, version, debugstr_w(serial)); axis_count = pSDL_JoystickNumAxes(joystick); - button_count = pSDL_JoystickNumAxes(joystick); + button_count = pSDL_JoystickNumButtons(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); }

1 0

Aric Stewart : hidclass.sys: Move IoSetDeviceInterfaceState to PNP_RemoveDevice.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 72298934933d222d08b50abe2046c61266b433f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72298934933d222d08b50abe… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 13 20:48:18 2018 -0600 hidclass.sys: Move IoSetDeviceInterfaceState to PNP_RemoveDevice. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 11 ----------- dlls/hidclass.sys/pnp.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a841575..547c355 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -130,23 +130,12 @@ error: void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { - NTSTATUS status; BASE_DEVICE_EXTENSION *ext; LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; - if (ext->link_name.Buffer) - { - TRACE("Delete link %s\n", debugstr_w(ext->link_name.Buffer)); - - IoSetDeviceInterfaceState(&ext->link_name, FALSE); - status = IoDeleteSymbolicLink(&ext->link_name); - if (status != STATUS_SUCCESS) - ERR("Delete Symbolic Link failed (%x)\n",status); - } - if (ext->thread) { SetEvent(ext->halt_event); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 47bd443..08aae15 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -212,9 +212,17 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) { + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; hid_device *hiddev; NTSTATUS rc = STATUS_NOT_SUPPORTED; + rc = IoSetDeviceInterfaceState(&ext->link_name, FALSE); + if (rc) + { + FIXME("failed to disable interface %x\n", rc); + return rc; + } + if (irp) rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(&minidriver->minidriver, device);

1 0

Piotr Caban : msvcp100: Add time_get<char>::get_fmt implementation.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: ba7cf8cf8fdbb279f2849f109fbe97f57ec2cc61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7cf8cf8fdbb279f2849f10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:46 2018 +0100 msvcp100: Add time_get<char>::get_fmt implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 58 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 64f7de2..7755ddf 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10019,16 +10019,6 @@ dateorder __thiscall time_get_char_date_order(const time_get_char *this) return call_time_get_char_do_date_order(this); } -/* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@PEBD4(a)Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_get_fmt, 44) -istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t, const char *fmtstart, const char *fmtend) -{ - FIXME("(%p %p %p %p %p %p %p) stub\n", this, ret, base, err, t, fmtstart, fmtend); - return NULL; -} - static int find_longest_match(istreambuf_iterator_char *iter, const char *str) { int i, len = 0, last_match = -1, match = -1; @@ -10590,6 +10580,54 @@ istreambuf_iterator_char* __thiscall time_get_char_get(const time_get_char *this return call_time_get_char_do_get(this, ret, s, e, base, err, t, fmt, mod); } +/* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@PEBD4(a)Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_get_fmt, 44) +istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t, const char *fmtstart, const char *fmtend) +{ + ctype_char *ctype; + + TRACE("(%p %p %p %p %p %s)\n", this, ret, base, err, t, wine_dbgstr_an(fmtstart, fmtend-fmtstart)); + + ctype = ctype_char_use_facet(IOS_LOCALE(base)); + istreambuf_iterator_char_val(&s); + + while(fmtstart < fmtend) { + if(ctype_char_is_ch(ctype, _SPACE, *fmtstart)) { + skip_ws(ctype, &s); + fmtstart++; + continue; + } + + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + + if(*fmtstart != '%' || fmtstart+1 >= fmtend || fmtstart[1] == '%') { + if(s.val != *fmtstart) + *err |= IOSTATE_failbit; + else + istreambuf_iterator_char_inc(&s); + if(*fmtstart == '%') + fmtstart++; + } else { + fmtstart++; + time_get_char_get(this, &s, s, e, base, err, t, *fmtstart, 0); + } + + if(*err & IOSTATE_failbit) + break; + fmtstart++; + } + + if(!s.strbuf) + *err |= IOSTATE_eofbit; + *ret = s; + return ret; +} + /* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@PBD4(a)Z */ /* ??_7_Locimp(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale__Locimp_vtable;

1 0

Serge Gautherie : winmm: Add a WARNing when winejoystick.drv is missing.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 175a2a027637719d1f3c644d97b6df4aacabb296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=175a2a027637719d1f3c644d… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Nov 16 00:52:52 2018 +0100 winmm: Add a WARNing when winejoystick.drv is missing. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5a12b36..92a7ce9 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -79,6 +79,8 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) if (!JOY_Sticks[dwJoyID].hDriver) { + WARN("OpenDriverA(\"winejoystick.drv\") failed\n"); + /* The default driver is missing, don't attempt to load it again */ winejoystick_missing = TRUE; }

1 0