July 2023 - Wine-commits - list.winehq.org

Mohamad Al-Jaf : windows.devices.bluetooth: Add IBluetoothAdapterStatics stub interface.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 5e942086dca8bb10da209ee968fe1dc8f6f2e4d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e942086dca8bb10da209ee968fe1d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 23 03:25:55 2023 -0400 windows.devices.bluetooth: Add IBluetoothAdapterStatics stub interface. --- dlls/windows.devices.bluetooth/bluetoothadapter.c | 44 +++++++++++++++++++++++ dlls/windows.devices.bluetooth/main.c | 2 +- dlls/windows.devices.bluetooth/private.h | 40 +++++++++++++++++++++ dlls/windows.devices.bluetooth/tests/bluetooth.c | 6 ++++ 4 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.bluetooth/bluetoothadapter.c b/dlls/windows.devices.bluetooth/bluetoothadapter.c index a165031293a..367cd464e42 100644 --- a/dlls/windows.devices.bluetooth/bluetoothadapter.c +++ b/dlls/windows.devices.bluetooth/bluetoothadapter.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); struct bluetoothadapter { IActivationFactory IActivationFactory_iface; + IBluetoothAdapterStatics IBluetoothAdapterStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IBluetoothAdapterStatics )) + { + *out = &impl->IBluetoothAdapterStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,45 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( bluetoothadapter_statics, IBluetoothAdapterStatics, struct bluetoothadapter, IActivationFactory_iface ) + +static HRESULT WINAPI bluetoothadapter_statics_GetDeviceSelector( IBluetoothAdapterStatics *iface, HSTRING *result ) +{ + FIXME( "iface %p, result %p stub!\n", iface, result ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_statics_FromIdAsync( IBluetoothAdapterStatics *iface, HSTRING id, IAsyncOperation_BluetoothAdapter **operation ) +{ + FIXME( "iface %p, id %s, operation %p stub!\n", iface, debugstr_hstring(id), operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI bluetoothadapter_statics_GetDefaultAsync( IBluetoothAdapterStatics *iface, IAsyncOperation_BluetoothAdapter **operation ) +{ + FIXME( "iface %p, operation %p stub!\n", iface, operation ); + return E_NOTIMPL; +} + +static const struct IBluetoothAdapterStaticsVtbl bluetoothadapter_statics_vtbl = +{ + bluetoothadapter_statics_QueryInterface, + bluetoothadapter_statics_AddRef, + bluetoothadapter_statics_Release, + /* IInspectable methods */ + bluetoothadapter_statics_GetIids, + bluetoothadapter_statics_GetRuntimeClassName, + bluetoothadapter_statics_GetTrustLevel, + /* IBluetoothAdapterStatics methods */ + bluetoothadapter_statics_GetDeviceSelector, + bluetoothadapter_statics_FromIdAsync, + bluetoothadapter_statics_GetDefaultAsync, +}; + static struct bluetoothadapter bluetoothadapter_statics = { {&factory_vtbl}, + {&bluetoothadapter_statics_vtbl}, 1, }; diff --git a/dlls/windows.devices.bluetooth/main.c b/dlls/windows.devices.bluetooth/main.c index 532c9eeee0b..810b00d90fd 100644 --- a/dlls/windows.devices.bluetooth/main.c +++ b/dlls/windows.devices.bluetooth/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bluetooth); -static const char *debugstr_hstring( HSTRING hstr ) +const char *debugstr_hstring( HSTRING hstr ) { const WCHAR *str; UINT32 len; diff --git a/dlls/windows.devices.bluetooth/private.h b/dlls/windows.devices.bluetooth/private.h index d06bd6139e9..8840321443e 100644 --- a/dlls/windows.devices.bluetooth/private.h +++ b/dlls/windows.devices.bluetooth/private.h @@ -35,6 +35,46 @@ #define WIDL_using_Windows_Devices_Bluetooth #include "windows.devices.bluetooth.h" +extern const char *debugstr_hstring( HSTRING hstr ); + extern IActivationFactory *bluetoothadapter_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.devices.bluetooth/tests/bluetooth.c b/dlls/windows.devices.bluetooth/tests/bluetooth.c index bb212ca6ac9..bf9e94dfb69 100644 --- a/dlls/windows.devices.bluetooth/tests/bluetooth.c +++ b/dlls/windows.devices.bluetooth/tests/bluetooth.c @@ -49,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_BluetoothAdapterStatics(void) { static const WCHAR *bluetoothadapter_statics_name = L"Windows.Devices.Bluetooth.BluetoothAdapter"; + IBluetoothAdapterStatics *bluetoothadapter_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -70,6 +71,11 @@ static void test_BluetoothAdapterStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IBluetoothAdapterStatics, (void **)&bluetoothadapter_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IBluetoothAdapterStatics_Release( bluetoothadapter_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Alexandre Julliard : shlwapi: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 09c7cc1e365090474dea676c0b77a83f0568ef6b URL: https://gitlab.winehq.org/wine/wine/-/commit/09c7cc1e365090474dea676c0b77a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:59:36 2023 +0200 shlwapi: Use nameless unions/structs. --- dlls/shlwapi/istream.c | 2 -- dlls/shlwapi/stopwatch.c | 2 -- dlls/shlwapi/string.c | 46 ++++++++++++++++++++++------------------------ 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 37fa4c6ddcc..b0087209e75 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index 68ffab944ea..8a5d07b14e4 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -27,8 +27,6 @@ #include <string.h> #include <stdlib.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 2c894198239..b8bf0bb227c 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <string.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #define NO_SHLWAPI_REG @@ -220,16 +218,16 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U switch (src->uType) { case STRRET_WSTR: - WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, dest, len, NULL, NULL); - CoTaskMemFree(src->u.pOleStr); + WideCharToMultiByte(CP_ACP, 0, src->pOleStr, -1, dest, len, NULL, NULL); + CoTaskMemFree(src->pOleStr); break; case STRRET_CSTR: - lstrcpynA(dest, src->u.cStr, len); + lstrcpynA(dest, src->cStr, len); break; case STRRET_OFFSET: - lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); + lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->uOffset, len); break; default: @@ -263,12 +261,12 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, switch (src->uType) { case STRRET_WSTR: { size_t dst_len; - if (!src->u.pOleStr) + if (!src->pOleStr) return E_FAIL; - dst_len = lstrlenW(src->u.pOleStr); - memcpy(dest, src->u.pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); + dst_len = lstrlenW(src->pOleStr); + memcpy(dest, src->pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); dest[min(dst_len, len-1)] = 0; - CoTaskMemFree(src->u.pOleStr); + CoTaskMemFree(src->pOleStr); if (len <= dst_len) { dest[0] = 0; @@ -278,14 +276,14 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, } case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) + if (!MultiByteToWideChar( CP_ACP, 0, src->cStr, -1, dest, len )) dest[len-1] = 0; break; case STRRET_OFFSET: if (pidl) { - if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, + if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->uOffset, -1, dest, len )) dest[len-1] = 0; } @@ -320,16 +318,16 @@ HRESULT WINAPI StrRetToStrA(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPSTR *pp switch (lpStrRet->uType) { case STRRET_WSTR: - hRet = _SHStrDupAW(lpStrRet->u.pOleStr, ppszName); - CoTaskMemFree(lpStrRet->u.pOleStr); + hRet = _SHStrDupAW(lpStrRet->pOleStr, ppszName); + CoTaskMemFree(lpStrRet->pOleStr); break; case STRRET_CSTR: - hRet = _SHStrDupAA(lpStrRet->u.cStr, ppszName); + hRet = _SHStrDupAA(lpStrRet->cStr, ppszName); break; case STRRET_OFFSET: - hRet = _SHStrDupAA(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, ppszName); + hRet = _SHStrDupAA(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, ppszName); break; default: @@ -351,16 +349,16 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p switch (lpStrRet->uType) { case STRRET_WSTR: - hRet = SHStrDupW(lpStrRet->u.pOleStr, ppszName); - CoTaskMemFree(lpStrRet->u.pOleStr); + hRet = SHStrDupW(lpStrRet->pOleStr, ppszName); + CoTaskMemFree(lpStrRet->pOleStr); break; case STRRET_CSTR: - hRet = SHStrDupA(lpStrRet->u.cStr, ppszName); + hRet = SHStrDupA(lpStrRet->cStr, ppszName); break; case STRRET_OFFSET: - hRet = SHStrDupA(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, ppszName); + hRet = SHStrDupA(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, ppszName); break; default: @@ -414,18 +412,18 @@ HRESULT WINAPI StrRetToBSTR(STRRET *lpStrRet, LPCITEMIDLIST pidl, BSTR* pBstrOut switch (lpStrRet->uType) { case STRRET_WSTR: - *pBstrOut = SysAllocString(lpStrRet->u.pOleStr); + *pBstrOut = SysAllocString(lpStrRet->pOleStr); if (*pBstrOut) hRet = S_OK; - CoTaskMemFree(lpStrRet->u.pOleStr); + CoTaskMemFree(lpStrRet->pOleStr); break; case STRRET_CSTR: - hRet = _SHStrDupAToBSTR(lpStrRet->u.cStr, pBstrOut); + hRet = _SHStrDupAToBSTR(lpStrRet->cStr, pBstrOut); break; case STRRET_OFFSET: - hRet = _SHStrDupAToBSTR(((LPCSTR)&pidl->mkid) + lpStrRet->u.uOffset, pBstrOut); + hRet = _SHStrDupAToBSTR(((LPCSTR)&pidl->mkid) + lpStrRet->uOffset, pBstrOut); break; default:

1 0

Alexandre Julliard : uiautomationcore: Fix some long/LONG mismatches.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 641623ffe802577de720ab9d109fdc0ca3e0acbf URL: https://gitlab.winehq.org/wine/wine/-/commit/641623ffe802577de720ab9d109fdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:25:33 2023 +0200 uiautomationcore: Fix some long/LONG mismatches. --- dlls/uiautomationcore/tests/uiautomation.c | 2 +- dlls/uiautomationcore/uia_client.c | 2 +- dlls/uiautomationcore/uia_event.c | 6 +++--- dlls/uiautomationcore/uia_private.h | 2 +- dlls/uiautomationcore/uia_provider.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 4845fe7ab33..242f800d5db 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -29,7 +29,7 @@ #include "wine/test.h" -static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, long, DWORD, IRawElementProviderSimple **); +static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, LONG, DWORD, IRawElementProviderSimple **); static HRESULT (WINAPI *pUiaDisconnectProvider)(IRawElementProviderSimple *); #define DEFINE_EXPECT(func) \ diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 5fe3078bec1..8dac22db066 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -539,7 +539,7 @@ static HRESULT WINAPI uia_node_get_hwnd(IWineUiaNode *iface, ULONG *out_hwnd) return S_OK; } -static HRESULT WINAPI uia_node_attach_event(IWineUiaNode *iface, long proc_id, long event_cookie, +static HRESULT WINAPI uia_node_attach_event(IWineUiaNode *iface, LONG proc_id, LONG event_cookie, IWineUiaEvent **ret_event) { struct uia_node *node = impl_from_IWineUiaNode(iface); diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index be3e422c313..563c16066db 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -562,7 +562,7 @@ static ULONG WINAPI uia_event_Release(IWineUiaEvent *iface) return ref; } -static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_added, long adviser_start_idx) +static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_added, LONG adviser_start_idx) { struct uia_event *event = impl_from_IWineUiaEvent(iface); HRESULT hr; @@ -607,7 +607,7 @@ static HRESULT WINAPI uia_event_advise_events(IWineUiaEvent *iface, BOOL advise_ return S_OK; } -static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID *event_guid, long scope, +static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID *event_guid, LONG scope, VARIANT runtime_id, IWineUiaEvent *event_iface) { struct uia_event *event = impl_from_IWineUiaEvent(iface); @@ -1042,7 +1042,7 @@ HRESULT uia_event_add_serverside_event_adviser(IWineUiaEvent *serverside_event, return hr; } -static HRESULT uia_event_advise(struct uia_event *event, BOOL advise_added, long start_idx) +static HRESULT uia_event_advise(struct uia_event *event, BOOL advise_added, LONG start_idx) { IWineUiaEvent *event_iface; HRESULT hr; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 727c0be6894..807ca134521 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -220,7 +220,7 @@ HRESULT create_base_hwnd_provider(HWND hwnd, IRawElementProviderSimple **elprov) void uia_stop_provider_thread(void) DECLSPEC_HIDDEN; void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN; LRESULT uia_lresult_from_node(HUIANODE huianode) DECLSPEC_HIDDEN; -HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL known_root_acc, +HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc, IRawElementProviderSimple **elprov) DECLSPEC_HIDDEN; /* uia_utils.c */ diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index faa7e2cb7fa..38ddcd8678f 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1133,7 +1133,7 @@ static const ILegacyIAccessibleProviderVtbl msaa_acc_provider_vtbl = { msaa_acc_provider_get_DefaultAction, }; -HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL known_root_acc, +HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc, IRawElementProviderSimple **elprov) { struct msaa_provider *msaa_prov = heap_alloc_zero(sizeof(*msaa_prov)); @@ -1172,7 +1172,7 @@ HRESULT create_msaa_provider(IAccessible *acc, long child_id, HWND hwnd, BOOL kn /*********************************************************************** * UiaProviderFromIAccessible (uiautomationcore.@) */ -HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, +HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags, IRawElementProviderSimple **elprov) { IServiceProvider *serv_prov; diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 9d131abc6cc..0c2ad7b742d 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -537,7 +537,7 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov); -HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, IRawElementProviderSimple **elprov); +HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags, IRawElementProviderSimple **elprov); HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIANT *out_val); HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE *huianode); BOOL WINAPI UiaNodeRelease(HUIANODE huianode);

1 0

Alexandre Julliard : oleaut32: Get rid of the DECIMAL access macros.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 36963b6d27abcf74b58bcf11953ebdf2b7e9767c URL: https://gitlab.winehq.org/wine/wine/-/commit/36963b6d27abcf74b58bcf11953ebd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:42:53 2023 +0200 oleaut32: Get rid of the DECIMAL access macros. --- dlls/oleaut32/variant.c | 83 +++++++------ dlls/oleaut32/variant.h | 20 ---- dlls/oleaut32/vartype.c | 303 +++++++++++++++++++++++------------------------- 3 files changed, 188 insertions(+), 218 deletions(-)

1 0

Alexandre Julliard : oleaut32: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 374d74e8432b8b56257ac2079cd943f2c4c77ea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/374d74e8432b8b56257ac2079cd943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:47:11 2023 +0200 oleaut32: Use nameless unions/structs. --- dlls/oleaut32/olefont.c | 31 +++--- dlls/oleaut32/olepicture.c | 74 +++++++------ dlls/oleaut32/olepropframe.c | 14 ++- dlls/oleaut32/recinfo.c | 6 +- dlls/oleaut32/typelib.c | 244 +++++++++++++++++++++---------------------- dlls/oleaut32/usrmarshal.c | 24 ++--- 6 files changed, 189 insertions(+), 204 deletions(-)

1 0

Alexandre Julliard : oleaut32/tests: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 34ab144f04e782fe101e3395453bdb9a08708852 URL: https://gitlab.winehq.org/wine/wine/-/commit/34ab144f04e782fe101e3395453bdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:48:21 2023 +0200 oleaut32/tests: Use nameless unions/structs. --- dlls/oleaut32/tests/olefont.c | 26 +-- dlls/oleaut32/tests/olepicture.c | 103 +++++---- dlls/oleaut32/tests/typelib.c | 451 +++++++++++++++++++-------------------- dlls/oleaut32/tests/vartest.c | 95 +++++---- dlls/oleaut32/tests/vartype.c | 74 +++---- 5 files changed, 373 insertions(+), 376 deletions(-)

1 0

Alexandre Julliard : ole32: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 61a06d4bcd1ab1dae2241894a54e54946b0c8682 URL: https://gitlab.winehq.org/wine/wine/-/commit/61a06d4bcd1ab1dae2241894a54e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:49:26 2023 +0200 ole32: Use nameless unions/structs. --- dlls/ole32/antimoniker.c | 2 - dlls/ole32/clipboard.c | 58 ++++++++++----------- dlls/ole32/compobj.c | 2 - dlls/ole32/datacache.c | 103 ++++++++++++++++++------------------- dlls/ole32/filelockbytes.c | 27 +++++----- dlls/ole32/filemoniker.c | 2 - dlls/ole32/itemmoniker.c | 2 - dlls/ole32/memlockbytes.c | 37 ++++++-------- dlls/ole32/ole2.c | 40 +++++++-------- dlls/ole32/oleobj.c | 4 +- dlls/ole32/pointermoniker.c | 2 - dlls/ole32/stg_prop.c | 36 ++++++------- dlls/ole32/stg_stream.c | 18 +++---- dlls/ole32/storage32.c | 122 ++++++++++++++++++++++---------------------- dlls/ole32/usrmarshal.c | 108 +++++++++++++++++++-------------------- 15 files changed, 265 insertions(+), 298 deletions(-)

1 0

Alexandre Julliard : ole32/tests: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 7c1d8b29e56f77b2740ec0d3c4464091c8389298 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c1d8b29e56f77b2740ec0d3c44640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:49:50 2023 +0200 ole32/tests: Use nameless unions/structs. --- dlls/ole32/tests/clipboard.c | 37 ++++++------ dlls/ole32/tests/marshal.c | 4 +- dlls/ole32/tests/ole2.c | 80 +++++++++++++------------- dlls/ole32/tests/propvariant.c | 90 +++++++++++++++--------------- dlls/ole32/tests/stg_prop.c | 124 ++++++++++++++++++++--------------------- dlls/ole32/tests/storage32.c | 59 ++++++++++---------- dlls/ole32/tests/usrmarshal.c | 34 +++++------ 7 files changed, 212 insertions(+), 216 deletions(-)

1 0

Alexandre Julliard : shell32: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 5cb72744039587ebed721b49d7bb3ade14aa0bd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cb72744039587ebed721b49d7bb3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:59:05 2023 +0200 shell32: Use nameless unions/structs. --- dlls/shell32/brsfolder.c | 4 +--- dlls/shell32/cpanelfolder.c | 10 ++++------ dlls/shell32/dataobject.c | 12 +++++------- dlls/shell32/ebrowser.c | 8 +++----- dlls/shell32/pidl.c | 8 +++----- dlls/shell32/recyclebin.c | 5 ++--- dlls/shell32/shellitem.c | 20 +++++++++----------- dlls/shell32/shelllink.c | 8 +++----- dlls/shell32/shellole.c | 8 +++----- dlls/shell32/shellstring.c | 18 ++++++++---------- dlls/shell32/shfldr_desktop.c | 12 +++++------- dlls/shell32/shfldr_fs.c | 22 ++++++++++------------ dlls/shell32/shfldr_mycomp.c | 20 +++++++++----------- dlls/shell32/shlfolder.c | 18 ++++++++---------- dlls/shell32/shlview.c | 7 +++---- dlls/shell32/shlview_cmenu.c | 24 +++++++++++------------- dlls/shell32/systray.c | 8 +++----- 17 files changed, 90 insertions(+), 122 deletions(-)

1 0

Alexandre Julliard : shell32/tests: Use nameless unions/structs.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: dd1625476f11327df6891463501d12900ddbfb32 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd1625476f11327df6891463501d12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 4 12:59:23 2023 +0200 shell32/tests: Use nameless unions/structs. --- dlls/shell32/tests/shelldispatch.c | 3 --- dlls/shell32/tests/shellole.c | 3 +-- dlls/shell32/tests/shfldr_special.c | 9 +++------ dlls/shell32/tests/shlexec.c | 6 +++--- dlls/shell32/tests/shlfolder.c | 10 +++++----- dlls/shell32/tests/string.c | 8 ++++---- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 67659f72345..7dfbd476372 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -19,9 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "shldisp.h" #include "shlobj.h" #include "shlwapi.h" diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 4864d35ea9a..5efdb035859 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -18,7 +18,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION #include <stdio.h> #include <wine/test.h> @@ -117,7 +116,7 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG ok(rgpropvar != NULL, "rgpropvar = NULL\n"); ok(rgpspec[0].ulKind == PRSPEC_PROPID, "rgpspec[0].ulKind = %ld\n", rgpspec[0].ulKind); - ok(rgpspec[0].u.propid == PID_CODEPAGE, "rgpspec[0].propid = %ld\n", rgpspec[0].u.propid); + ok(rgpspec[0].propid == PID_CODEPAGE, "rgpspec[0].propid = %ld\n", rgpspec[0].propid); rgpropvar[0].vt = VT_I2; rgpropvar[0].iVal = 1234; diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 22749c231f3..61b6a9309bc 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -23,9 +23,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "shellapi.h" @@ -233,10 +230,10 @@ if (0) hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08lx\n", hr); - details.str.u.pOleStr = NULL; + details.str.pOleStr = NULL; hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); ok(hr == S_OK || broken(hr == E_NOTIMPL) /* W2K */, "got 0x%08lx\n", hr); - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + if (SHELL_OsIsUnicode()) SHFree(details.str.pOleStr); /* test every column if method is implemented */ if (hr == S_OK) @@ -252,7 +249,7 @@ if (0) ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); /* can't be on w9x at this point, IShellFolder2 unsupported there, check present for running Wine with w9x setup */ - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + if (SHELL_OsIsUnicode()) SHFree(details.str.pOleStr); hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); ok(hr == S_OK, "got 0x%08lx\n", hr); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b84a96a2434..90e96b91586 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -611,7 +611,7 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sei.lpClass=class; sei.hkeyClass=NULL; sei.dwHotKey=0; - U(sei).hIcon=NULL; + sei.hIcon=NULL; sei.hProcess=(HANDLE)0xdeadbeef; /* Out */ DeleteFileA(child_file); @@ -2400,7 +2400,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) /* Search for the correct imported module by walking the import descriptors */ import_descriptor = (PIMAGE_IMPORT_DESCRIPTOR)(base + import_directory_rva); - while (U(*import_descriptor).OriginalFirstThunk != 0) + while (import_descriptor->OriginalFirstThunk != 0) { char *import_module_name; @@ -2415,7 +2415,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) * arrays. We need the import name table to find the imported * routine and the import address table to patch the address, so * walk them side by side */ - int_entry = (PIMAGE_THUNK_DATA)(base + U(*import_descriptor).OriginalFirstThunk); + int_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->OriginalFirstThunk); iat_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->FirstThunk); while (int_entry->u1.Ordinal != 0) { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index be22e577c8b..29785793355 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4709,16 +4709,16 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) ok_(__FILE__,l)(filename.uType == STRRET_WSTR || filename.uType == STRRET_CSTR, "Got unexpected string type: %d\n", filename.uType); if(filename.uType == STRRET_WSTR){ - ok_(__FILE__,l)(lstrcmpW(path, U(filename).pOleStr) == 0, + ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); - SHFree(U(filename).pOleStr); + wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + SHFree(filename.pOleStr); } else if(filename.uType == STRRET_CSTR) { - WCHAR *strW = make_wstr(U(filename).cStr); + WCHAR *strW = make_wstr(filename.cStr); ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), U(filename).cStr); + wine_dbgstr_w(path), filename.cStr); free(strW); } diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index d1d621d9577..d40f6c7fc4f 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -58,21 +58,21 @@ static void test_StrRetToStringNW(void) trace("StrRetToStringNAW is Unicode\n"); strret.uType = STRRET_WSTR; - U(strret).pOleStr = CoDupStrW("Test"); + strret.pOleStr = CoDupStrW("Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_WSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_CSTR; - lstrcpyA(U(strret).cStr, "Test"); + lstrcpyA(strret.cStr, "Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_CSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_OFFSET; - U(strret).uOffset = 1; + strret.uOffset = 1; strcpy((char*)&iidl, " Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, iidl); @@ -84,7 +84,7 @@ if (0) { /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; - U(strret).pOleStr = CoDupStrW("Test"); + strret.pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, ARRAY_SIZE(buff), &strret, NULL); trace("NULL dest: ret=%d\n", ret); }

1 0