July 2021 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 7f819ea4e955848c8945c2d3ecaeeed54c611f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f819ea4e955848c8945c2d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:37:51 2021 +0200 gdi32: Use handle layout compatible with GdiSharedHandleTable to store handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 110 ++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f819ea4e955848c8945…

1 0

Zebediah Figura : server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 089b2528c2c933e3c9b45a5f559fa4b5f830872a URL: https://source.winehq.org/git/wine.git/?a=commit;h=089b2528c2c933e3c9b45a5f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:09 2021 -0500 server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key. This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index f36760e6cc1..b7971770728 100644 --- a/server/registry.c +++ b/server/registry.c @@ -413,6 +413,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL;

1 0

Huw Davies : nsi: Implement NsiGetParameterEx().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 794ecdc52406d3b39fa8ac60115ce7460e681639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794ecdc52406d3b39fa8ac60… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:07 2021 +0100 nsi: Implement NsiGetParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d94222aecfc..08aec49257a 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table { struct nsi_get_parameter_ex params; - FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); params.unknown[0] = 0; @@ -277,5 +277,32 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE device = get_nsi_device(); + struct nsiproxy_get_parameter *in; + ULONG in_size = FIELD_OFFSET( struct nsiproxy_get_parameter, key[params->key_size] ), received; + DWORD err = ERROR_SUCCESS; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + in = heap_alloc( in_size ); + if (!in) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + in->module = *params->module; + in->first_arg = params->first_arg; + in->table = params->table; + in->key_size = params->key_size; + in->param_type = params->param_type; + in->data_offset = params->data_offset; + memcpy( in->key, params->key, params->key_size ); + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) + err = GetLastError(); + +err: + heap_free( in ); + CloseHandle( device ); + return err; }

1 0

Huw Davies : nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_PARAMETER.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 8f7f4f13279d26badf326f4667404074a962378d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f7f4f13279d26badf326f46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:06 2021 +0100 nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_PARAMETER. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 18 ++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 3 +++ include/wine/nsi.h | 13 +++++++++++++ 4 files changed, 71 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 88c65ff4602..aa1d7a08bf7 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -123,6 +123,39 @@ static void nsiproxy_get_all_parameters( IRP *irp ) irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } +static void nsiproxy_get_parameter( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_get_parameter_ex get_param; + + if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || + in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + get_param.unknown[0] = 0; + get_param.unknown[1] = 0; + get_param.first_arg = in->first_arg; + get_param.unknown2 = 0; + get_param.module = &in->module; + get_param.table = in->table; + get_param.key = in->key; + get_param.key_size = in->key_size; + get_param.param_type = in->param_type; + get_param.data = out; + get_param.data_size = out_len; + get_param.data_offset = in->data_offset; + + irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -142,6 +175,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) nsiproxy_get_all_parameters( irp ); break; + case IOCTL_NSIPROXY_WINE_GET_PARAMETER: + nsiproxy_get_parameter( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 2bd8f32fdd7..e4286b5fc93 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -99,3 +99,21 @@ NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) return entry->get_all_parameters( params->key, params->key_size, rw, params->rw_size, dyn, params->dynamic_size, stat, params->static_size ); } + +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) +{ + const struct module_table *entry = get_module_table( params->module, params->table ); + + if (!entry || !entry->get_parameter) + { + WARN( "table not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if (params->param_type > 2) return STATUS_INVALID_PARAMETER; + if (params->key_size != entry->sizes[0]) return STATUS_INVALID_PARAMETER; + if (params->data_offset + params->data_size > entry->sizes[params->param_type + 1]) + return STATUS_INVALID_PARAMETER; + return entry->get_parameter( params->key, params->key_size, params->param_type, + params->data, params->data_size, params->data_offset ); +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 37cbbd118c0..0cd2a79d59f 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -20,6 +20,7 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; struct module_table { @@ -31,6 +32,8 @@ struct module_table NTSTATUS (*get_all_parameters)( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); + NTSTATUS (*get_parameter)( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ); }; struct module diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 82183d78190..3327b1f7403 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -126,6 +127,18 @@ struct nsiproxy_get_all_parameters BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_GET_PARAMETER */ +struct nsiproxy_get_parameter +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD table; + DWORD key_size; + DWORD param_type; + DWORD data_offset; + BYTE key[1]; /* key_size */ +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0

1 0

Jacek Caban : gdi32: Move more fields from gdi_handle_entry to gdi_obj_header.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: d02eb26413381dbde6d12db50a4cdf80a4fe8a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02eb26413381dbde6d12db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:36:30 2021 +0200 gdi32: Move more fields from gdi_handle_entry to gdi_obj_header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 10 ++++++++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++--------------------------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9ad99db394b..8a753c0820f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,9 +57,19 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; +struct hdc_list +{ + HDC hdc; + struct hdc_list *next; +}; + struct gdi_obj_header { const struct gdi_obj_funcs *funcs; /* type-specific functions */ + struct hdc_list *hdcs; /* list of HDCs interested in this object */ + WORD selcount; /* number of times the object is selected in a DC */ + WORD system : 1; /* system object flag */ + WORD deleted : 1; /* whether DeleteObject has been called on this object */ }; typedef struct tagDC diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cfad39a6923..3e6b268ad72 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -39,21 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 -struct hdc_list -{ - HDC hdc; - struct hdc_list *next; -}; - struct gdi_handle_entry { void *obj; /* pointer to the object-specific data */ - struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD generation; /* generation count for reusing handle values */ WORD type; /* object type (one of the OBJ_* constants) */ - WORD selcount; /* number of times the object is selected in a DC */ - WORD system : 1; /* system object flag */ - WORD deleted : 1; /* whether DeleteObject has been called on this object */ }; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; @@ -436,7 +426,7 @@ void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) entry->system = !!set; + if ((entry = handle_entry( handle ))) entry_obj( entry )->system = !!set; LeaveCriticalSection( &gdi_section ); } @@ -492,7 +482,7 @@ UINT GDI_get_ref_count( HGDIOBJ handle ) UINT ret = 0; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) ret = entry->selcount; + if ((entry = handle_entry( handle ))) ret = entry_obj( entry )->selcount; LeaveCriticalSection( &gdi_section ); return ret; } @@ -508,7 +498,7 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) entry->selcount++; + if ((entry = handle_entry( handle ))) entry_obj( entry )->selcount++; else handle = 0; LeaveCriticalSection( &gdi_section ); return handle; @@ -527,11 +517,11 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) EnterCriticalSection( &gdi_section ); if ((entry = handle_entry( handle ))) { - assert( entry->selcount ); - if (!--entry->selcount && entry->deleted) + assert( entry_obj( entry )->selcount ); + if (!--entry_obj( entry )->selcount && entry_obj( entry )->deleted) { /* handle delayed DeleteObject*/ - entry->deleted = 0; + entry_obj( entry )->deleted = 0; LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); @@ -725,7 +715,7 @@ static void dump_gdi_objects( void ) else TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), - entry->selcount, entry->deleted ); + entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -757,12 +747,12 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gd return 0; } obj->funcs = funcs; + obj->hdcs = NULL; + obj->selcount = 0; + obj->system = 0; + obj->deleted = 0; entry->obj = obj; - entry->hdcs = NULL; entry->type = type; - entry->selcount = 0; - entry->system = 0; - entry->deleted = 0; if (++entry->generation == 0xffff) entry->generation = 1; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -900,6 +890,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; const struct gdi_obj_funcs *funcs = NULL; + struct gdi_obj_header *header; EnterCriticalSection( &gdi_section ); if (!(entry = handle_entry( obj ))) @@ -908,7 +899,8 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return FALSE; } - if (entry->system) + header = entry_obj( entry ); + if (header->system) { TRACE("Preserving system object %p\n", obj); LeaveCriticalSection( &gdi_section ); @@ -917,15 +909,15 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) obj = entry_to_handle( entry ); /* make it a full handle */ - hdcs_head = entry->hdcs; - entry->hdcs = NULL; + hdcs_head = header->hdcs; + header->hdcs = NULL; - if (entry->selcount) + if (header->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); - entry->deleted = 1; /* mark for delete */ + TRACE("delayed for %p because object in use, count %u\n", obj, header->selcount ); + header->deleted = 1; /* mark for delete */ } - else funcs = entry_obj( entry )->funcs; + else funcs = header->funcs; LeaveCriticalSection( &gdi_section ); @@ -964,17 +956,18 @@ void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->system) + if ((entry = handle_entry( obj )) && !entry_obj( entry )->system) { - for (phdc = entry->hdcs; phdc; phdc = phdc->next) + struct gdi_obj_header *header = entry_obj( entry ); + for (phdc = header->hdcs; phdc; phdc = phdc->next) if (phdc->hdc == hdc) break; if (!phdc) { phdc = HeapAlloc(GetProcessHeap(), 0, sizeof(*phdc)); phdc->hdc = hdc; - phdc->next = entry->hdcs; - entry->hdcs = phdc; + phdc->next = header->hdcs; + header->hdcs = phdc; } } LeaveCriticalSection( &gdi_section ); @@ -992,9 +985,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->system) + if ((entry = handle_entry( obj )) && !entry_obj( entry )->system) { - for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) + for (pphdc = &entry_obj( entry )->hdcs; *pphdc; pphdc = &(*pphdc)->next) if ((*pphdc)->hdc == hdc) { struct hdc_list *phdc = *pphdc;

1 0

Alex Henrie : tbs: Add Tbsi_Context_Create stub.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: dbabe2fa496fb5ba43a32636658106945ecc1d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbabe2fa496fb5ba43a32636… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:48 2021 -0600 tbs: Add Tbsi_Context_Create stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51335 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tbs/Makefile.in | 3 +++ dlls/tbs/tbs.c | 31 +++++++++++++++++++++++++++++++ dlls/tbs/tbs.spec | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/Makefile.in b/dlls/tbs/Makefile.in index 8f23c81e4f9..454d66bc6f4 100644 --- a/dlls/tbs/Makefile.in +++ b/dlls/tbs/Makefile.in @@ -1,3 +1,6 @@ MODULE = tbs.dll EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + tbs.c diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c new file mode 100644 index 00000000000..452a3890e68 --- /dev/null +++ b/dlls/tbs/tbs.c @@ -0,0 +1,31 @@ +/* + * Trusted Platform Module Base Services + * + * Copyright 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "tbs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tbs); + +TBS_RESULT WINAPI Tbsi_Context_Create(const TBS_CONTEXT_PARAMS *params, TBS_HCONTEXT *out) +{ + FIXME("(%p, %p) stub\n", params, out); + return TBS_E_TPM_NOT_FOUND; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 3fa5c04f863..151ea1c6478 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -3,7 +3,7 @@ @ stub GetDeviceID @ stub GetDeviceIDString @ stub GetDeviceIDWithTimeout -@ stub Tbsi_Context_Create +@ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key @ stub Tbsi_FilterLog @ stub Tbsi_GetDeviceInfo

1 0

Zebediah Figura : ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: b58ca92fa53088a87c4c33a1e31c0d4ec1a43a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58ca92fa53088a87c4c33a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:35 2021 -0500 ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ce71e25d63d..9f32e7eaf96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2259,27 +2259,22 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_TYPE: { - int sock_type; + WSAPROTOCOL_INFOW info; + int size; + if (!optlen || *optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - sock_type = _get_fd_type(fd); - if (sock_type == -1) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - (*(int *)optval) = convert_socktype_u2w(sock_type); + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; - release_sock_fd( s, fd ); - return ret; + *(int *)optval = info.iSocketType; + return 0; } + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT);

1 0

Zebediah Figura : ws2_32: Use ws_protocol_info() in getsockopt(SO_LINGER).
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 1ccab719ee6e87b7399876d4d5b30eb889c49e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccab719ee6e87b7399876d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:36 2021 -0500 ws2_32: Use ws_protocol_info() in getsockopt(SO_LINGER). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9f32e7eaf96..84f7f06036f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,14 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static int _get_fd_type(int fd) -{ - int sock_type = -1; - socklen_t optlen = sizeof(sock_type); - getsockopt(fd, SOL_SOCKET, SO_TYPE, (char*) &sock_type, &optlen); - return sock_type; -} - static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) { int fd, optname; @@ -2176,22 +2168,24 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { + WSAPROTOCOL_INFOW info; + int size; + /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (_get_fd_type(fd) == SOCK_DGRAM) + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; + + if (info.iSocketType == SOCK_DGRAM) { - release_sock_fd( s, fd ); SetLastError( WSAENOPROTOOPT ); return -1; } - release_sock_fd( s, fd ); return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen ); }

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_ADD_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 96766e67943d55983f655d1bf9ab36a38e2edb8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=96766e67943d55983f655d1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 20:24:39 2021 -0500 ws2_32: Move the setsockopt(IP_ADD_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 38cb80997ff..f65feef763f 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1675,6 +1675,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 650885a101e..87966545bb8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3624,6 +3624,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_MEMBERSHIP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP, optval, optlen ); + case WS_IP_ADD_SOURCE_MEMBERSHIP: case WS_IP_DROP_SOURCE_MEMBERSHIP: case WS_IP_BLOCK_SOURCE: @@ -3640,7 +3643,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL case WS_IP_HDRINCL: diff --git a/include/wine/afd.h b/include/wine/afd.h index 44a8b1a5ff9..c672168bc6a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -179,6 +179,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP CTL_CODE(FILE_DEVICE_NETWORK, 239, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Alex Henrie : include: Add tbs.h.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 295c657de7f4c03a5b699bad0e26dd3a834094cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=295c657de7f4c03a5b699bad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 29 20:33:46 2021 -0600 include: Add tbs.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/tbs.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index e6477d13cef..d5e4679c5db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -686,6 +686,7 @@ SOURCES = \ t2embapi.h \ tapi.h \ taskschd.idl \ + tbs.h \ tchar.h \ tcpestats.h \ tcpmib.h \ diff --git a/include/tbs.h b/include/tbs.h new file mode 100644 index 00000000000..749624c2aee --- /dev/null +++ b/include/tbs.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _TBS_H_ +#define _TBS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef UINT32 TBS_RESULT; + +typedef struct tdTBS_CONTEXT_PARAMS +{ + UINT32 version; +} TBS_CONTEXT_PARAMS, *PTBS_CONTEXT_PARAMS; + +typedef void *TBS_HCONTEXT, **PTBS_HCONTEXT; + +#ifdef __cplusplus +} +#endif + +#endif

1 0