February 2023 - Wine-Commits

Mohamad Al-Jaf : include: Add BluetoothRegisterForAuthenticationEx prototype.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 5d2051eb64109a7e309c00021178850903aa82df URL: https://gitlab.winehq.org/wine/wine/-/commit/5d2051eb64109a7e309c0002117885… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 25 23:41:50 2022 -0500 include: Add BluetoothRegisterForAuthenticationEx prototype. --- include/bluetoothapis.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/bluetoothapis.h b/include/bluetoothapis.h index fd90b731bf9..1942513fab3 100644 --- a/include/bluetoothapis.h +++ b/include/bluetoothapis.h @@ -110,6 +110,49 @@ typedef struct _BLUETOOTH_SELECT_DEVICE_PARAMS { typedef BOOL (WINAPI *PFN_AUTHENTICATION_CALLBACK)(void *, PBLUETOOTH_DEVICE_INFO); +#define BLUETOOTH_DEVICE_INFO BLUETOOTH_DEVICE_INFO_STRUCT + +typedef BLUETOOTH_DEVICE_INFO *PBLUETOOTH_DEVICE_INFO; + +typedef enum _BLUETOOTH_AUTHENTICATION_METHOD { + BLUETOOTH_AUTHENTICATION_METHOD_LEGACY = 0x1, + BLUETOOTH_AUTHENTICATION_METHOD_OOB, + BLUETOOTH_AUTHENTICATION_METHOD_NUMERIC_COMPARISON, + BLUETOOTH_AUTHENTICATION_METHOD_PASSKEY_NOTIFICATION, + BLUETOOTH_AUTHENTICATION_METHOD_PASSKEY, +} BLUETOOTH_AUTHENTICATION_METHOD, *PBLUETOOTH_AUTHENTICATION_METHOD; + +typedef enum _BLUETOOTH_IO_CAPABILITY { + BLUETOOTH_IO_CAPABILITY_DISPLAYONLY = 0x00, + BLUETOOTH_IO_CAPABILITY_DISPLAYYESNO = 0x01, + BLUETOOTH_IO_CAPABILITY_KEYBOARDONLY = 0x02, + BLUETOOTH_IO_CAPABILITY_NOINPUTNOOUTPUT = 0x03, + BLUETOOTH_IO_CAPABILITY_UNDEFINED = 0xff, +} BLUETOOTH_IO_CAPABILITY; + +typedef enum _BLUETOOTH_AUTHENTICATION_REQUIREMENTS{ + BLUETOOTH_MITM_ProtectionNotRequired = 0, + BLUETOOTH_MITM_ProtectionRequired = 0x1, + BLUETOOTH_MITM_ProtectionNotRequiredBonding = 0x2, + BLUETOOTH_MITM_ProtectionRequiredBonding = 0x3, + BLUETOOTH_MITM_ProtectionNotRequiredGeneralBonding = 0x4, + BLUETOOTH_MITM_ProtectionRequiredGeneralBonding = 0x5, + BLUETOOTH_MITM_ProtectionNotDefined = 0xff, +} BLUETOOTH_AUTHENTICATION_REQUIREMENTS; + +typedef struct _BLUETOOTH_AUTHENTICATION_CALLBACK_PARAMS { + BLUETOOTH_DEVICE_INFO deviceInfo; + BLUETOOTH_AUTHENTICATION_METHOD authenticationMethod; + BLUETOOTH_IO_CAPABILITY ioCapability; + BLUETOOTH_AUTHENTICATION_REQUIREMENTS authenticationRequirements; + union{ + ULONG Numeric_Value; + ULONG Passkey; + }; +} BLUETOOTH_AUTHENTICATION_CALLBACK_PARAMS, *PBLUETOOTH_AUTHENTICATION_CALLBACK_PARAMS; + +typedef BOOL (CALLBACK *PFN_AUTHENTICATION_CALLBACK_EX)(void *, BLUETOOTH_AUTHENTICATION_CALLBACK_PARAMS *); + typedef struct _SDP_ELEMENT_DATA { SDP_TYPE type; SDP_SPECIFICTYPE specificType; @@ -183,6 +226,7 @@ DWORD WINAPI BluetoothGetRadioInfo(HANDLE, PBLUETOOTH_RADIO_INFO); BOOL WINAPI BluetoothIsConnectable(HANDLE); BOOL WINAPI BluetoothIsDiscoverable(HANDLE); DWORD WINAPI BluetoothRegisterForAuthentication(BLUETOOTH_DEVICE_INFO *, HBLUETOOTH_AUTHENTICATION_REGISTRATION *, PFN_AUTHENTICATION_CALLBACK, void *); +DWORD WINAPI BluetoothRegisterForAuthenticationEx(const BLUETOOTH_DEVICE_INFO *, HBLUETOOTH_AUTHENTICATION_REGISTRATION *, PFN_AUTHENTICATION_CALLBACK_EX, void *); DWORD WINAPI BluetoothRemoveDevice(BLUETOOTH_ADDRESS *); #define BluetoothEnumAttributes BluetoothSdpEnumAttributes BOOL WINAPI BluetoothSdpEnumAttributes(BYTE *, ULONG, PFN_BLUETOOTH_ENUM_ATTRIBUTES_CALLBACK, void *);

1 0

Alistair Leslie-Hughes : msado15: Support "Optimize" in Properties get_Item.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: e5b1ddeab3a9dd49319c9353962cfa08788c4535 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5b1ddeab3a9dd49319c9353962cfa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 18 22:11:08 2023 +1100 msado15: Support "Optimize" in Properties get_Item. The Optimize property tells msado15 to create index maps for lookups in Recordset Find. Just store the value for now until Find is implemented. --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 188 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 189 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index edbbaeb9e6e..187c3cf7518 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -147,6 +147,7 @@ static REFIID tid_ids[] = { &IID_Field, &IID_Fields, &IID_Properties, + &IID_Property, &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 71344934b95..f7062c94b27 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -33,6 +33,7 @@ typedef enum tid_t { Field_tid, Fields_tid, Properties_tid, + Property_tid, Recordset_tid, Stream_tid, LAST_tid diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b8c4487d4c9..c9309336cb6 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -74,6 +74,9 @@ struct field LONG attrs; LONG index; struct recordset *recordset; + + /* Field Properties */ + VARIANT optimize; }; static inline struct field *impl_from_Field( Field *iface ) @@ -567,10 +570,193 @@ static HRESULT WINAPI field_props_Refresh(Properties *iface) return E_NOTIMPL; } + +struct field_property +{ + Property Property_iface; + LONG refs; + VARIANT *value; +}; + +static inline struct field_property *impl_from_Property( Property *iface ) +{ + return CONTAINING_RECORD( iface, struct field_property, Property_iface ); +} + +static ULONG WINAPI field_property_AddRef(Property *iface) +{ + struct field_property *property = impl_from_Property( iface ); + LONG refs = InterlockedIncrement( &property->refs ); + TRACE( "%p new refcount %ld\n", property, refs ); + return refs; +} + +static ULONG WINAPI field_property_Release(Property *iface) +{ + struct field_property *property = impl_from_Property( iface ); + LONG refs = InterlockedDecrement( &property->refs ); + TRACE( "%p new refcount %ld\n", property, refs ); + if (!refs) + { + free( property ); + } + return refs; +} + +static HRESULT WINAPI field_property_QueryInterface(Property *iface, REFIID riid, void **obj) +{ + struct field_property *property = impl_from_Property( iface ); + TRACE( "%p, %s, %p\n", property, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_Property ) + || IsEqualGUID( riid, &IID_IDispatch ) + || IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + field_property_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI field_property_GetTypeInfoCount(Property *iface, UINT *count) +{ + struct field_property *property = impl_from_Property( iface ); + TRACE( "%p, %p\n", property, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI field_property_GetTypeInfo(Property *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + struct field_property *property = impl_from_Property( iface ); + TRACE( "%p, %u, %lu, %p\n", property, index, lcid, info ); + return get_typeinfo(Property_tid, info); +} + +static HRESULT WINAPI field_property_GetIDsOfNames(Property *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + struct field_property *property = impl_from_Property( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %lu, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Property_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_property_Invoke(Property *iface, DISPID member, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err) +{ + struct field_property *property = impl_from_Property( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + + hr = get_typeinfo(Property_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &property->Property_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_property_get_Value(Property *iface, VARIANT *val) +{ + struct field_property *property = impl_from_Property( iface ); + TRACE("%p, %p\n", property, val); + VariantCopy(val, property->value); + return S_OK; +} + +static HRESULT WINAPI field_property_put_Value(Property *iface, VARIANT val) +{ + struct field_property *property = impl_from_Property( iface ); + TRACE("%p, %s\n", property, debugstr_variant(&val)); + VariantCopy(property->value, &val); + return S_OK; +} + +static HRESULT WINAPI field_property_get_Name(Property *iface, BSTR *str) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_property_get_Type(Property *iface, DataTypeEnum *type) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_property_get_Attributes(Property *iface, LONG *attributes) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_property_put_Attributes(Property *iface, LONG attributes) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static struct PropertyVtbl field_property_vtbl = +{ + field_property_QueryInterface, + field_property_AddRef, + field_property_Release, + field_property_GetTypeInfoCount, + field_property_GetTypeInfo, + field_property_GetIDsOfNames, + field_property_Invoke, + field_property_get_Value, + field_property_put_Value, + field_property_get_Name, + field_property_get_Type, + field_property_get_Attributes, + field_property_put_Attributes +}; + static HRESULT WINAPI field_props_get_Item(Properties *iface, VARIANT index, Property **object) { struct field *field = impl_from_Properties( iface ); - FIXME( "%p, %s, %p\n", field, debugstr_variant(&index), object); + struct field_property *prop; + + TRACE( "%p, %s, %p\n", field, debugstr_variant(&index), object); + + if (V_VT(&index) == VT_BSTR) + { + if(!wcscmp(L"Optimize", V_BSTR(&index))) + { + prop = malloc (sizeof(struct field_property)); + prop->Property_iface.lpVtbl = &field_property_vtbl; + prop->value = &field->optimize; + + *object = &prop->Property_iface; + return S_OK; + } + } + + FIXME("Unsupported property %s\n", debugstr_variant(&index)); + return MAKE_ADO_HRESULT(adErrItemNotFound); }

1 0

Mohamad Al-Jaf : bthprops.cpl: Move implementations to bluetoothapis and import them.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: a700b6208961351b37d26280cb5f731fab2e45e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a700b6208961351b37d26280cb5f73… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Feb 18 18:23:34 2023 -0500 bthprops.cpl: Move implementations to bluetoothapis and import them. --- dlls/bluetoothapis/Makefile.in | 4 ++++ dlls/bluetoothapis/bluetoothapis.spec | 14 +++++++------- dlls/{bthprops.cpl => bluetoothapis}/main.c | 4 ++-- dlls/bthprops.cpl/Makefile.in | 6 ++---- dlls/bthprops.cpl/bthprops.cpl.spec | 14 +++++++------- dlls/irprops.cpl/Makefile.in | 3 ++- dlls/irprops.cpl/irprops.cpl.spec | 14 +++++++------- 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index 51b2871d81d..50799b90435 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,3 +1,7 @@ MODULE = bluetoothapis.dll +IMPORTLIB = bluetoothapis EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec index 39354b8c9a8..421934f6a71 100644 --- a/dlls/bluetoothapis/bluetoothapis.spec +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -7,28 +7,28 @@ @ stub BluetoothEnumerateLocalServices @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stub BluetoothFindFirstRadio +@ stdcall BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stub BluetoothFindRadioClose +@ stdcall BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGATTAbortReliableWrite @ stub BluetoothGATTBeginReliableWrite @@ -45,7 +45,7 @@ @ stub BluetoothGATTUnregisterEvent @ stub BluetoothGetDeviceInfo @ stub BluetoothGetLocalServiceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothGetServicePnpInstance @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable diff --git a/dlls/bthprops.cpl/main.c b/dlls/bluetoothapis/main.c similarity index 97% rename from dlls/bthprops.cpl/main.c rename to dlls/bluetoothapis/main.c index 2dcb18458b7..49a731b8522 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bluetoothapis/main.c @@ -1,5 +1,5 @@ /* - * Bluetooth properties control panel + * Bluetooth APIs * * Copyright 2016 Austin English * @@ -27,7 +27,7 @@ #include "bthsdpdef.h" #include "bluetoothapis.h" -WINE_DEFAULT_DEBUG_CHANNEL(bthpropscpl); +WINE_DEFAULT_DEBUG_CHANNEL(bluetoothapis); /********************************************************************* * BluetoothFindFirstDevice diff --git a/dlls/bthprops.cpl/Makefile.in b/dlls/bthprops.cpl/Makefile.in index 41dc9dfdb98..e1a3936fde9 100644 --- a/dlls/bthprops.cpl/Makefile.in +++ b/dlls/bthprops.cpl/Makefile.in @@ -1,4 +1,2 @@ -MODULE = bthprops.cpl - -C_SRCS = \ - main.c +MODULE = bthprops.cpl +IMPORTS = bluetoothapis diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 30b5bfa0040..ac9c2994337 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -11,31 +11,31 @@ @ stub BluetoothEnumerateInstalledServicesEx @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stdcall BluetoothFindDeviceClose(ptr) +@ stdcall -import BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stdcall BluetoothFindFirstDevice(ptr ptr) +@ stdcall -import BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stdcall BluetoothFindFirstRadio(ptr ptr) +@ stdcall -import BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stdcall BluetoothFindNextDevice(ptr ptr) +@ stdcall -import BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stdcall BluetoothFindNextRadio(ptr ptr) +@ stdcall -import BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stdcall BluetoothFindRadioClose(ptr) +@ stdcall -import BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stdcall BluetoothGetRadioInfo(ptr ptr) +@ stdcall -import BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable diff --git a/dlls/irprops.cpl/Makefile.in b/dlls/irprops.cpl/Makefile.in index 7270ca32b83..89f72d17b0c 100644 --- a/dlls/irprops.cpl/Makefile.in +++ b/dlls/irprops.cpl/Makefile.in @@ -1 +1,2 @@ -MODULE = irprops.cpl +MODULE = irprops.cpl +IMPORTS = bluetoothapis diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index 252410f589f..8ca19fc9631 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -8,30 +8,30 @@ @ stub BluetoothEnumerateInstalledServices @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stdcall BluetoothFindDeviceClose(ptr) bthprops.cpl.BluetoothFindDeviceClose +@ stdcall -import BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stdcall BluetoothFindFirstDevice(ptr ptr) bthprops.cpl.BluetoothFindFirstDevice +@ stdcall -import BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry -@ stdcall BluetoothFindFirstRadio(ptr ptr) bthprops.cpl.BluetoothFindFirstRadio +@ stdcall -import BluetoothFindFirstRadio(ptr ptr) @ stub BluetoothFindFirstService @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stdcall BluetoothFindNextDevice(ptr ptr) bthprops.cpl.BluetoothFindNextDevice +@ stdcall -import BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stdcall BluetoothFindNextRadio(ptr ptr) bthprops.cpl.BluetoothFindNextRadio +@ stdcall -import BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose @ stub BluetoothFindProtocolEntryClose -@ stdcall BluetoothFindRadioClose(ptr) bthprops.cpl.BluetoothFindRadioClose +@ stdcall -import BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stdcall BluetoothGetRadioInfo(ptr ptr) bthprops.cpl.BluetoothGetRadioInfo +@ stdcall -import BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothMapClassOfDeviceToImageIndex

1 0

Mohamad Al-Jaf : bluetoothapis: Add BluetoothRegisterForAuthenticationEx stub.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: f74c0f4c787e677dfacf77b0cab9f02f293492b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74c0f4c787e677dfacf77b0cab9f0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Feb 18 18:24:09 2023 -0500 bluetoothapis: Add BluetoothRegisterForAuthenticationEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54112 --- dlls/bluetoothapis/bluetoothapis.spec | 2 +- dlls/bluetoothapis/main.c | 10 ++++++++++ dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec index 421934f6a71..f6fc3142d76 100644 --- a/dlls/bluetoothapis/bluetoothapis.spec +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -51,7 +51,7 @@ @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable @ stub BluetoothRegisterForAuthentication -@ stub BluetoothRegisterForAuthenticationEx +@ stdcall BluetoothRegisterForAuthenticationEx(ptr ptr ptr ptr) @ stub BluetoothRemoveDevice @ stub BluetoothSdpEnumAttributes @ stub BluetoothSdpGetAttributeValue diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c index 49a731b8522..f16357559e4 100644 --- a/dlls/bluetoothapis/main.c +++ b/dlls/bluetoothapis/main.c @@ -99,3 +99,13 @@ BOOL WINAPI BluetoothFindNextDevice(HBLUETOOTH_DEVICE_FIND find, BLUETOOTH_DEVIC SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothRegisterForAuthenticationEx + */ +DWORD WINAPI BluetoothRegisterForAuthenticationEx(const BLUETOOTH_DEVICE_INFO *info, HBLUETOOTH_AUTHENTICATION_REGISTRATION *out, + PFN_AUTHENTICATION_CALLBACK_EX callback, void *param) +{ + FIXME("(%p, %p, %p, %p): stub!\n", info, out, callback, param); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index ac9c2994337..3a5d9ef622c 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -42,7 +42,7 @@ @ stub BluetoothMapClassOfDeviceToImageIndex @ stub BluetoothMapClassOfDeviceToString @ stub BluetoothRegisterForAuthentication -@ stub BluetoothRegisterForAuthenticationEx +@ stdcall -import BluetoothRegisterForAuthenticationEx(ptr ptr ptr ptr) @ stub BluetoothRemoveDevice @ stub BluetoothSdpEnumAttributes @ stub BluetoothSdpGetAttributeValue

1 0

David Gow : dxgi: Don't warn on DXGI_ALPHA_MODE_UNSPECIFIED with wined3d.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: fe9a1403fa796389ce75b7dec266c9541355fa85 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe9a1403fa796389ce75b7dec266c9… Author: David Gow <david(a)ingeniumdigital.com> Date: Mon Feb 20 15:21:35 2023 +0800 dxgi: Don't warn on DXGI_ALPHA_MODE_UNSPECIFIED with wined3d. --- dlls/dxgi/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index e99951e0a04..08e3a0d39db 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -572,7 +572,7 @@ HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_ if (dxgi_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", dxgi_desc->Scaling); - if (dxgi_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + if (dxgi_desc->AlphaMode != DXGI_ALPHA_MODE_UNSPECIFIED && dxgi_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", dxgi_desc->AlphaMode); if (dxgi_fullscreen_desc && dxgi_fullscreen_desc->ScanlineOrdering) FIXME("Unhandled scanline ordering %#x.\n", dxgi_fullscreen_desc->ScanlineOrdering);

1 0

Paul Gofman : server: Retry socket connection on ECONNABORTED error.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 4e6a5d62ad2bbccafa751812ca31eb9ffa25727e URL: https://gitlab.winehq.org/wine/wine/-/commit/4e6a5d62ad2bbccafa751812ca31eb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 15 16:29:32 2023 -0600 server: Retry socket connection on ECONNABORTED error. --- dlls/ws2_32/tests/afd.c | 8 +------- dlls/ws2_32/tests/sock.c | 41 ++++++++++++++++++++++++++--------------- server/sock.c | 11 +++++++++++ 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 3215ddaef62..b07fb40fe3f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -569,13 +569,7 @@ static void test_poll(void) ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - if (WSAGetLastError() == WSAECONNABORTED) - { - ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - ok(ret == -1, "got %d\n", ret); - ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); /* A subsequent poll call returns no events, or times out. However, this * can't be reliably tested, as e.g. Linux will fail the connection diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 58dcf9e7f4e..17298ca4136 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4352,13 +4352,7 @@ static void test_select(void) ret = connect(fdWrite, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - if (WSAGetLastError() == WSAECONNABORTED) - { - ret = connect(fdWrite, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); - ok(ret == -1, "got %d\n", ret); - ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); len = sizeof(id); id = 0xdeadbeef; @@ -4380,13 +4374,7 @@ static void test_select(void) ok(!ret, "got error %u\n", WSAGetLastError()); ret = connect(fdWrite, (const struct sockaddr *)&address, sizeof(address)); ok(ret == -1, "got %d\n", ret); - todo_wine ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - if (WSAGetLastError() == WSAECONNABORTED) - { - ret = connect(fdWrite, (const struct sockaddr *)&address, sizeof(address)); - ok(ret == -1, "got %d\n", ret); - ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); @@ -8320,7 +8308,6 @@ static void test_connect(void) closesocket(connector); closesocket(acceptor); - closesocket(listener); tcp_socketpair(&connector, &acceptor); @@ -8380,6 +8367,30 @@ static void test_connect(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); + + /* Test connect after previous connect attempt failure. */ + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + conaddress.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + conaddress.sin_port = htons(255); + iret = connect(connector, (struct sockaddr *)&conaddress, sizeof(conaddress)); + ok(iret == -1, "connection succeeded.\n"); + + ok(WSAGetLastError() == WSAECONNREFUSED, "got error %u\n", WSAGetLastError()); + set_blocking( connector, FALSE ); + iret = getsockname(listener, (struct sockaddr*)&address, &addrlen); + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret == -1 && WSAGetLastError() == WSAEWOULDBLOCK, "unexpected iret %d, error %d.\n", + iret, WSAGetLastError()); + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket error %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + closesocket(listener); } static void test_AcceptEx(void) diff --git a/server/sock.c b/server/sock.c index a64cb22404e..610e0a94cc0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2602,6 +2602,17 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) unix_addr.in.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); ret = connect( unix_fd, &unix_addr.addr, unix_len ); + if (ret < 0 && errno == ECONNABORTED) + { + /* On Linux with nonblocking socket if the previous connect() failed for any reason (including + * timeout), next connect will fail. If the error code was queried by getsockopt( SO_ERROR ) + * the error code returned now is ECONNABORTED (otherwise that is the actual connect() failure + * error code). If we got here after previous connect attempt on the socket that means + * we already queried SO_ERROR in sock_error(), so retrying on ECONNABORTED only is + * sufficient. */ + ret = connect( unix_fd, &unix_addr.addr, unix_len ); + } + if (ret < 0 && errno != EINPROGRESS) { set_error( sock_get_ntstatus( errno ) );

1 0

Alexandre Julliard : ntdll: Return the correct IOSB information when creating a named pipe.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 1b9db994178fe964f826ca2a28ed7c9b53c6f0f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b9db994178fe964f826ca2a28ed7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 11:16:04 2023 +0100 ntdll: Return the correct IOSB information when creating a named pipe. --- dlls/ntdll/tests/om.c | 4 ---- dlls/ntdll/unix/file.c | 6 +++++- include/wine/server_protocol.h | 4 ++-- server/named_pipe.c | 1 + server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2b2805d0b00..3f42b7d045d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -379,7 +379,6 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); pNtClose( h ); @@ -389,7 +388,6 @@ static void test_name_collisions(void) FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); memset( &iosb, 0xcc, sizeof(iosb) ); @@ -398,7 +396,6 @@ static void test_name_collisions(void) FILE_OPEN, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); @@ -408,7 +405,6 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); - todo_wine ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ba4730eced4..4daf1a5335c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4144,7 +4144,11 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR req->insize = inbound_quota; req->timeout = timeout->QuadPart; wine_server_add_data( req, objattr, len ); - if (!(status = wine_server_call( req ))) *handle = wine_server_ptr_handle( reply->handle ); + if (!(status = wine_server_call( req ))) + { + *handle = wine_server_ptr_handle( reply->handle ); + io->Information = reply->created ? FILE_CREATED : FILE_OPENED; + } } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e2bc1a71940..c5e0182f42a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3086,7 +3086,7 @@ struct create_named_pipe_reply { struct reply_header __header; obj_handle_t handle; - char __pad_12[4]; + int created; }; @@ -6356,7 +6356,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 759 +#define SERVER_PROTOCOL_VERSION 760 /* ### protocol_version end ### */ diff --git a/server/named_pipe.c b/server/named_pipe.c index bf3b1b1bd35..9a10c2bf041 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1437,6 +1437,7 @@ DECL_HANDLER(create_named_pipe) GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + reply->created = 1; } else { diff --git a/server/protocol.def b/server/protocol.def index 2445288bbcc..69888fa643e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2279,6 +2279,7 @@ enum message_type VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the pipe */ + int created; @END /* flags in create_named_pipe and get_named_pipe_info */ diff --git a/server/request.h b/server/request.h index fe8e9c2f258..10b877b1deb 100644 --- a/server/request.h +++ b/server/request.h @@ -1459,6 +1459,7 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 48 ); C_ASSERT( sizeof(struct create_named_pipe_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, handle) == 8 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, created) == 12 ); C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, flags) == 16 ); diff --git a/server/trace.c b/server/trace.c index f114039b97b..b63bc386ee8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2873,6 +2873,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", created=%d", req->created ); } static void dump_set_named_pipe_info_request( const struct set_named_pipe_info_request *req )

1 0

Alexandre Julliard : kernelbase: Set ERROR_ALREADY_EXISTS for existing pipe in CreateNamedPipeW().
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: 89bb2622d2b8ca7f58267f2958084a82a0cb68c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/89bb2622d2b8ca7f58267f2958084a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 11:18:13 2023 +0100 kernelbase: Set ERROR_ALREADY_EXISTS for existing pipe in CreateNamedPipeW(). Reported by Dávid Török. --- dlls/kernelbase/sync.c | 2 +- dlls/ntdll/tests/om.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index a5cda6bb49e..eabde0530d9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1305,12 +1305,12 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateNamedPipeW( LPCWSTR name, DWORD open_mode, if (instances >= PIPE_UNLIMITED_INSTANCES) instances = ~0U; time.QuadPart = (ULONGLONG)timeout * -10000; - SetLastError( 0 ); status = NtCreateNamedPipeFile( &handle, access, &attr, &iosb, sharing, FILE_OPEN_IF, options, pipe_type, read_mode, non_block, instances, in_buff, out_buff, &time ); RtlFreeUnicodeString( &nt_name ); if (!set_ntstatus( status )) return INVALID_HANDLE_VALUE; + SetLastError( iosb.Information == FILE_CREATED ? ERROR_SUCCESS : ERROR_ALREADY_EXISTS ); return handle; } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3f42b7d045d..fb6deb19fa9 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -411,7 +411,6 @@ static void test_name_collisions(void) h1 = CreateNamedPipeA( "\\\\.\\pipe\\named_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, 10, 256, 256, 1000, NULL ); winerr = GetLastError(); - todo_wine ok(h1 != 0 && winerr == ERROR_ALREADY_EXISTS, "CreateNamedPipeA got ret=%p (%ld)\n", h1, winerr); pNtClose(h1); pNtClose(h);

1 0

Alexandre Julliard : ntdll: Pass the NtCreateNamedPipeFile disposition to the server.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: wine Branch: master Commit: d74b084e45ba6bf025f6638624c917ae081030f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d74b084e45ba6bf025f6638624c917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 10:32:52 2023 +0100 ntdll: Pass the NtCreateNamedPipeFile disposition to the server. --- dlls/kernelbase/sync.c | 4 +-- dlls/ntdll/tests/om.c | 61 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/tests/pipe.c | 6 ++--- dlls/ntdll/unix/file.c | 1 + include/wine/server_protocol.h | 4 +-- server/named_pipe.c | 19 ++++++++++--- server/protocol.def | 1 + server/request.h | 7 ++--- server/trace.c | 1 + 9 files changed, 89 insertions(+), 15 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support lit() intrinsic.
by Alexandre Julliard Feb. 21, 2023

Feb. 21, 2023

Module: vkd3d Branch: master Commit: d86db8bcbe5d0e2593d39864c7e5215bd643008f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d86db8bcbe5d0e2593d39864c7e52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 18:02:31 2023 +0100 vkd3d-shader/hlsl: Support lit() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 119 +++++++++++++++++++++++++++++++++++---- libs/vkd3d-shader/hlsl_codegen.c | 8 +-- tests/lit.shader_test | 62 ++++++++++++++++++++ 5 files changed, 176 insertions(+), 16 deletions(-)

1 0