January 2023 - Wine-commits

Hans Leidekker : ntdll/tests: Fix some Wow64 test failures on Windows 11.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: bf48ebf2a4777f9f4fbcb00db4de91dff74f89a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf48ebf2a4777f9f4fbcb00db4de91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 18 11:21:42 2023 +0100 ntdll/tests: Fix some Wow64 test failures on Windows 11. --- dlls/ntdll/tests/wow64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index b0f5dda5804..b8f28f6215c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -662,7 +662,8 @@ static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args ) return func( func64, nb_args, args ); } -static ULONG64 main_module, ntdll_module, wow64_module, wow64cpu_module, wow64win_module; +static ULONG64 main_module, ntdll_module, wow64_module, wow64base_module, wow64con_module, + wow64cpu_module, wow64win_module; static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) { @@ -776,6 +777,8 @@ static void check_module( ULONG64 base, const WCHAR *name ) #define CHECK_MODULE(mod) if (!wcsicmp( name, L"" #mod ".dll" )) { mod ## _module = base; return; } CHECK_MODULE(ntdll); CHECK_MODULE(wow64); + CHECK_MODULE(wow64base); + CHECK_MODULE(wow64con); CHECK_MODULE(wow64cpu); CHECK_MODULE(wow64win); #undef CHECK_MODULE

1 0

Paul Gofman : msauddecmft: Add stub dll.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: a0456fb31a90c7f5bd23eab4b733bb000cc797ee URL: https://gitlab.winehq.org/wine/wine/-/commit/a0456fb31a90c7f5bd23eab4b733bb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Dec 30 21:19:12 2022 -0600 msauddecmft: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/msauddecmft/Makefile.in | 1 + dlls/msauddecmft/msauddecmft.spec | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/configure b/configure index eb8512993f1..4168d4ec03f 100755 --- a/configure +++ b/configure @@ -1210,6 +1210,7 @@ enable_msacm32 enable_msado15 enable_msadp32_acm enable_msasn1 +enable_msauddecmft enable_mscat32 enable_mscms enable_mscoree @@ -21358,6 +21359,7 @@ wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 wine_fn_config_makefile dlls/msasn1/tests enable_tests +wine_fn_config_makefile dlls/msauddecmft enable_msauddecmft wine_fn_config_makefile dlls/mscat32 enable_mscat32 wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests diff --git a/configure.ac b/configure.ac index 39ad3c89cc6..14a41c84739 100644 --- a/configure.ac +++ b/configure.ac @@ -2732,6 +2732,7 @@ WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) WINE_CONFIG_MAKEFILE(dlls/msasn1/tests) +WINE_CONFIG_MAKEFILE(dlls/msauddecmft) WINE_CONFIG_MAKEFILE(dlls/mscat32) WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) diff --git a/dlls/msauddecmft/Makefile.in b/dlls/msauddecmft/Makefile.in new file mode 100644 index 00000000000..abce4d1cfe4 --- /dev/null +++ b/dlls/msauddecmft/Makefile.in @@ -0,0 +1 @@ +MODULE = msauddecmft.dll diff --git a/dlls/msauddecmft/msauddecmft.spec b/dlls/msauddecmft/msauddecmft.spec new file mode 100644 index 00000000000..a9b7505d360 --- /dev/null +++ b/dlls/msauddecmft/msauddecmft.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Alistair Leslie-Hughes : include: Add D3DKMT_ENUMADAPTERS2 structure.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 84d38ef306bfe39bf4e353b65831bbaee489c04e URL: https://gitlab.winehq.org/wine/wine/-/commit/84d38ef306bfe39bf4e353b65831bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 12:10:22 2023 +1100 include: Add D3DKMT_ENUMADAPTERS2 structure. --- include/ddk/d3dkmthk.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index b65fcb8c9c6..69239a45fd9 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -667,6 +667,20 @@ typedef struct _D3DKMT_ESCAPE D3DKMT_HANDLE hContext; } D3DKMT_ESCAPE; +typedef struct _D3DKMT_ADAPTERINFO +{ + D3DKMT_HANDLE hAdapter; + LUID AdapterLuid; + ULONG NumOfSources; + BOOL bPrecisePresentRegionsPreferred; +} D3DKMT_ADAPTERINFO; + +typedef struct _D3DKMT_ENUMADAPTERS2 +{ + ULONG NumAdapters; + D3DKMT_ADAPTERINFO *pAdapters; +} D3DKMT_ENUMADAPTERS2; + #ifdef __cplusplus extern "C" {

1 0

Mohamad Al-Jaf : include: Add windows.system.profile.systemmanufacturers.idl file.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: e8ebab396dafafb92177023eaef69847c5bbce87 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ebab396dafafb92177023eaef698… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Nov 18 02:15:39 2022 -0500 include: Add windows.system.profile.systemmanufacturers.idl file. --- include/Makefile.in | 1 + .../windows.system.profile.systemmanufacturers.idl | 60 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 40d9bf44fdd..9b5f2a5ae02 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -819,6 +819,7 @@ SOURCES = \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ + windows.system.profile.systemmanufacturers.idl \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.idl \ diff --git a/include/windows.system.profile.systemmanufacturers.idl b/include/windows.system.profile.systemmanufacturers.idl new file mode 100644 index 00000000000..644a664020b --- /dev/null +++ b/include/windows.system.profile.systemmanufacturers.idl @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.System.Profile.SystemManufacturers +{ + apicontract SystemManufacturersContract; + interface ISmbiosInformationStatics; + runtimeclass SmbiosInformation; + + [ + contractversion(3.0) + ] + apicontract SystemManufacturersContract + { + } + + [ + contract(Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0), + exclusiveto(Windows.System.Profile.SystemManufacturers.SmbiosInformation), + uuid(080cca7c-637c-48c4-b728-f9273812db8e) + ] + interface ISmbiosInformationStatics : IInspectable + { + [propget] HRESULT SerialNumber([out, retval] HSTRING *value); + } + + [ + contract(Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.Profile.SystemManufacturers.ISmbiosInformationStatics, Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0) + ] + runtimeclass SmbiosInformation + { + } +}

1 0

Mohamad Al-Jaf : windows.system.profile.systemmanufacturers: Add stub DLL.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: db684bff7fc9b918fe80d8b2c68ab41ae78a094d URL: https://gitlab.winehq.org/wine/wine/-/commit/db684bff7fc9b918fe80d8b2c68ab4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 19 20:42:14 2022 -0500 windows.system.profile.systemmanufacturers: Add stub DLL. --- configure | 3 + configure.ac | 2 + .../Makefile.in | 8 ++ .../classes.idl | 23 ++++ .../main.c | 148 +++++++++++++++++++++ .../private.h | 31 +++++ .../tests/Makefile.in | 5 + .../tests/smbios.c | 83 ++++++++++++ ...windows.system.profile.systemmanufacturers.spec | 3 + 9 files changed, 306 insertions(+)

1 0

Mohamad Al-Jaf : windows.system.profile.systemmanufacturers: Stub ISmbiosInformationStatics interface.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 34ff248bf2d471b0f2cf10f246f1037edaebf3b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/34ff248bf2d471b0f2cf10f246f103… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 28 03:15:39 2022 -0500 windows.system.profile.systemmanufacturers: Stub ISmbiosInformationStatics interface. --- .../main.c | 30 +++++++++++++++++ .../private.h | 38 ++++++++++++++++++++++ .../tests/smbios.c | 7 ++++ 3 files changed, 75 insertions(+) diff --git a/dlls/windows.system.profile.systemmanufacturers/main.c b/dlls/windows.system.profile.systemmanufacturers/main.c index 3f5e937392e..35b4529ad7a 100644 --- a/dlls/windows.system.profile.systemmanufacturers/main.c +++ b/dlls/windows.system.profile.systemmanufacturers/main.c @@ -36,6 +36,7 @@ static const char *debugstr_hstring( HSTRING hstr ) struct smbios_statics { IActivationFactory IActivationFactory_iface; + ISmbiosInformationStatics ISmbiosInformationStatics_iface; LONG ref; }; @@ -60,6 +61,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ISmbiosInformationStatics )) + { + *out = &impl->ISmbiosInformationStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -118,9 +126,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( statics, ISmbiosInformationStatics, struct smbios_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics_get_SerialNumber( ISmbiosInformationStatics *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct ISmbiosInformationStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* ISmbiosInformationStatics methods */ + statics_get_SerialNumber, +}; + static struct smbios_statics smbios_statics = { {&factory_vtbl}, + {&statics_vtbl}, 1, }; diff --git a/dlls/windows.system.profile.systemmanufacturers/private.h b/dlls/windows.system.profile.systemmanufacturers/private.h index e3672c3aec5..42c19710dcb 100644 --- a/dlls/windows.system.profile.systemmanufacturers/private.h +++ b/dlls/windows.system.profile.systemmanufacturers/private.h @@ -29,3 +29,41 @@ #define WIDL_using_Windows_System_Profile_SystemManufacturers #include "windows.system.profile.systemmanufacturers.h" + +#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 ) diff --git a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c index fa3308f21ab..e23a4d9adb7 100644 --- a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c +++ b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c @@ -45,6 +45,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_Smbios_Statics(void) { static const WCHAR *smbios_statics_name = L"Windows.System.Profile.SystemManufacturers.SmbiosInformation"; + ISmbiosInformationStatics *smbios_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -66,6 +67,12 @@ static void test_Smbios_Statics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_ISmbiosInformationStatics, (void **)&smbios_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = ISmbiosInformationStatics_Release( smbios_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : windows.system.profile.systemmanufacturers/tests: Add ISmbiosInformationStatics_get_SerialNumber tests.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: d58a24d9c393907dd0fa34da7d9d1a6ad7b0197e URL: https://gitlab.winehq.org/wine/wine/-/commit/d58a24d9c393907dd0fa34da7d9d1a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 28 23:20:30 2022 -0500 windows.system.profile.systemmanufacturers/tests: Add ISmbiosInformationStatics_get_SerialNumber tests. --- .../tests/smbios.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c index e23a4d9adb7..49e90216c42 100644 --- a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c +++ b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c @@ -47,8 +47,10 @@ static void test_Smbios_Statics(void) static const WCHAR *smbios_statics_name = L"Windows.System.Profile.SystemManufacturers.SmbiosInformation"; ISmbiosInformationStatics *smbios_statics; IActivationFactory *factory; - HSTRING str; + HSTRING str, serial; + const WCHAR *buf; HRESULT hr; + UINT32 len; LONG ref; hr = WindowsCreateString( smbios_statics_name, wcslen( smbios_statics_name ), &str ); @@ -70,6 +72,18 @@ static void test_Smbios_Statics(void) hr = IActivationFactory_QueryInterface( factory, &IID_ISmbiosInformationStatics, (void **)&smbios_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (0) /* Win8 Crash */ + { + hr = ISmbiosInformationStatics_get_SerialNumber( smbios_statics, &serial ); + todo_wine ok( hr == S_OK || broken(hr == E_UNEXPECTED), "got hr %#lx.\n", hr ); + if (hr == S_OK) + { + buf = WindowsGetStringRawBuffer( serial, &len ); + todo_wine ok( buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len ); + WindowsDeleteString( serial ); + } + } + ref = ISmbiosInformationStatics_Release( smbios_statics ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : windows.system.profile.systemmanufacturers: Implement ISmbiosInformationStatics_get_SerialNumber.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: e1169dfabe356e0f22ba7c21fd7ca03f25dae742 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1169dfabe356e0f22ba7c21fd7ca0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 28 23:22:34 2022 -0500 windows.system.profile.systemmanufacturers: Implement ISmbiosInformationStatics_get_SerialNumber. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53747 --- .../Makefile.in | 2 +- .../main.c | 62 +++++++++++++++++++++- .../private.h | 2 + .../tests/smbios.c | 4 +- 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/windows.system.profile.systemmanufacturers/Makefile.in b/dlls/windows.system.profile.systemmanufacturers/Makefile.in index a2d6076740f..9d07caa287c 100644 --- a/dlls/windows.system.profile.systemmanufacturers/Makefile.in +++ b/dlls/windows.system.profile.systemmanufacturers/Makefile.in @@ -1,5 +1,5 @@ MODULE = windows.system.profile.systemmanufacturers.dll -IMPORTS = combase +IMPORTS = combase oleaut32 C_SRCS = \ main.c diff --git a/dlls/windows.system.profile.systemmanufacturers/main.c b/dlls/windows.system.profile.systemmanufacturers/main.c index 35b4529ad7a..d2feb32054e 100644 --- a/dlls/windows.system.profile.systemmanufacturers/main.c +++ b/dlls/windows.system.profile.systemmanufacturers/main.c @@ -128,10 +128,68 @@ static const struct IActivationFactoryVtbl factory_vtbl = DEFINE_IINSPECTABLE( statics, ISmbiosInformationStatics, struct smbios_statics, IActivationFactory_iface ) +static HRESULT get_bios_serialnumber( BSTR *value ) +{ + const WCHAR *class = L"Win32_BIOS"; + IEnumWbemClassObject *wbem_enum; + IWbemClassObject *wbem_class; + IWbemServices *wbem_service; + IWbemLocator *wbem_locator; + VARIANT serial; + ULONG count; + HRESULT hr; + BSTR bstr; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void**)&wbem_locator ); + if (FAILED(hr)) return hr; + + bstr = SysAllocString( L"ROOT\\CIMV2" ); + if (!bstr) + { + IWbemLocator_Release( wbem_locator ); + return E_OUTOFMEMORY; + } + hr = IWbemLocator_ConnectServer( wbem_locator, bstr, NULL, NULL, NULL, 0, NULL, NULL, &wbem_service ); + IWbemLocator_Release( wbem_locator ); + SysFreeString( bstr ); + if (FAILED(hr)) return hr; + + bstr = SysAllocString( class ); + if (!bstr) + { + IWbemServices_Release( wbem_service ); + return E_OUTOFMEMORY; + } + hr = IWbemServices_CreateInstanceEnum( wbem_service, bstr, WBEM_FLAG_SYSTEM_ONLY, NULL, &wbem_enum ); + IWbemServices_Release( wbem_service ); + SysFreeString( bstr ); + if (FAILED(hr)) return hr; + + hr = IEnumWbemClassObject_Next( wbem_enum, 1000, 1, &wbem_class, &count ); + IEnumWbemClassObject_Release( wbem_enum ); + if (FAILED(hr)) return hr; + + hr = IWbemClassObject_Get( wbem_class, L"SerialNumber", 0, &serial, NULL, NULL ); + IWbemClassObject_Release( wbem_class ); + if (FAILED(hr)) return hr; + + *value = V_BSTR( &serial ); + VariantClear( &serial ); + return hr; +} + static HRESULT WINAPI statics_get_SerialNumber( ISmbiosInformationStatics *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + BSTR serial; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED( hr = get_bios_serialnumber( &serial ) )) return hr; + if (FAILED( hr = WindowsCreateString( serial, wcslen(serial), value ) )) return hr; + + TRACE( "Returning serial number: %s.\n", debugstr_w( serial ) ); + return hr; } static const struct ISmbiosInformationStaticsVtbl statics_vtbl = diff --git a/dlls/windows.system.profile.systemmanufacturers/private.h b/dlls/windows.system.profile.systemmanufacturers/private.h index 42c19710dcb..374a2829130 100644 --- a/dlls/windows.system.profile.systemmanufacturers/private.h +++ b/dlls/windows.system.profile.systemmanufacturers/private.h @@ -30,6 +30,8 @@ #define WIDL_using_Windows_System_Profile_SystemManufacturers #include "windows.system.profile.systemmanufacturers.h" +#include "wbemcli.h" + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c index 49e90216c42..8d02b2c423a 100644 --- a/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c +++ b/dlls/windows.system.profile.systemmanufacturers/tests/smbios.c @@ -75,11 +75,11 @@ static void test_Smbios_Statics(void) if (0) /* Win8 Crash */ { hr = ISmbiosInformationStatics_get_SerialNumber( smbios_statics, &serial ); - todo_wine ok( hr == S_OK || broken(hr == E_UNEXPECTED), "got hr %#lx.\n", hr ); + ok( hr == S_OK || broken(hr == E_UNEXPECTED), "got hr %#lx.\n", hr ); if (hr == S_OK) { buf = WindowsGetStringRawBuffer( serial, &len ); - todo_wine ok( buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len ); + ok( buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len ); WindowsDeleteString( serial ); } }

1 0

Rémi Bernon : dinput: Update the input thread device list when notified only.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 6122dddf4ffe006127f69052414a5068a8c08aec URL: https://gitlab.winehq.org/wine/wine/-/commit/6122dddf4ffe006127f69052414a50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 12:23:53 2023 +0100 dinput: Update the input thread device list when notified only. --- dlls/dinput/dinput_main.c | 64 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 48aa53c63cb..c9bbb34e554 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -52,6 +52,8 @@ struct input_thread_state { UINT events_count; UINT devices_count; + HHOOK mouse_ll_hook; + HHOOK keyboard_ll_hook; struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; HANDLE events[INPUT_THREAD_MAX_DEVICES]; }; @@ -167,7 +169,7 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); } -static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) +static LRESULT CALLBACK input_thread_ll_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { struct dinput_device *impl; int skip = 0; @@ -243,8 +245,8 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static void input_thread_update_device_list( struct input_thread_state *state ) { + UINT count = 0, keyboard_count, mouse_count; struct dinput_device *device; - UINT count = 0; EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) @@ -256,14 +258,32 @@ static void input_thread_update_device_list( struct input_thread_state *state ) } state->events_count = count; state->devices_count = count; + + keyboard_count = list_count( &acquired_keyboard_list ); + mouse_count = list_count( &acquired_mouse_list ); LeaveCriticalSection( &dinput_hook_crit ); + + if (keyboard_count && !state->keyboard_ll_hook) + state->keyboard_ll_hook = SetWindowsHookExW( WH_KEYBOARD_LL, input_thread_ll_hook_proc, DINPUT_instance, 0 ); + else if (!keyboard_count && state->keyboard_ll_hook) + { + UnhookWindowsHookEx( state->keyboard_ll_hook ); + state->keyboard_ll_hook = NULL; + } + + if (mouse_count && !state->mouse_ll_hook) + state->mouse_ll_hook = SetWindowsHookExW( WH_MOUSE_LL, input_thread_ll_hook_proc, DINPUT_instance, 0 ); + else if (!mouse_count && state->mouse_ll_hook) + { + UnhookWindowsHookEx( state->mouse_ll_hook ); + state->mouse_ll_hook = NULL; + } } static DWORD WINAPI dinput_thread_proc( void *params ) { HANDLE finished_event, start_event = params; struct input_thread_state state = {0}; - static HHOOK kbd_hook, mouse_hook; struct dinput_device *device; DWORD ret; MSG msg; @@ -276,8 +296,6 @@ static DWORD WINAPI dinput_thread_proc( void *params ) while ((ret = MsgWaitForMultipleObjectsEx( state.events_count, state.events, INFINITE, QS_ALLINPUT, 0 )) <= state.events_count) { - UINT kbd_cnt = 0, mice_cnt = 0; - if (ret < state.events_count) { if ((device = state.devices[ret]) && FAILED( device->vtbl->read( &device->IDirectInputDevice8W_iface ) )) @@ -286,6 +304,11 @@ static DWORD WINAPI dinput_thread_proc( void *params ) dinput_device_internal_unacquire( &device->IDirectInputDevice8W_iface ); LeaveCriticalSection( &dinput_hook_crit ); device->status = STATUS_UNPLUGGED; + + state.events[ret] = state.events[--state.events_count]; + state.devices[ret] = state.devices[state.events_count]; + state.devices[state.events_count] = state.devices[--state.devices_count]; + dinput_device_internal_release( device ); } } @@ -304,38 +327,17 @@ static DWORD WINAPI dinput_thread_proc( void *params ) if (!msg.wParam) { - if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); - if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); - kbd_hook = mouse_hook = NULL; + if (state.keyboard_ll_hook) UnhookWindowsHookEx( state.keyboard_ll_hook ); + if (state.mouse_ll_hook) UnhookWindowsHookEx( state.mouse_ll_hook ); + state.keyboard_ll_hook = state.mouse_ll_hook = NULL; goto done; } - EnterCriticalSection( &dinput_hook_crit ); - kbd_cnt = list_count( &acquired_keyboard_list ); - mice_cnt = list_count( &acquired_mouse_list ); - LeaveCriticalSection( &dinput_hook_crit ); - - if (kbd_cnt && !kbd_hook) - kbd_hook = SetWindowsHookExW( WH_KEYBOARD_LL, LL_hook_proc, DINPUT_instance, 0 ); - else if (!kbd_cnt && kbd_hook) - { - UnhookWindowsHookEx( kbd_hook ); - kbd_hook = NULL; - } - - if (mice_cnt && !mouse_hook) - mouse_hook = SetWindowsHookExW( WH_MOUSE_LL, LL_hook_proc, DINPUT_instance, 0 ); - else if (!mice_cnt && mouse_hook) - { - UnhookWindowsHookEx( mouse_hook ); - mouse_hook = NULL; - } + while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); + input_thread_update_device_list( &state ); SetEvent(finished_event); } - - while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); - input_thread_update_device_list( &state ); } if (ret != state.events_count) ERR("Unexpected termination, ret %#lx\n", ret);

1 0

Rémi Bernon : dinput: Update the device status while holding its CS.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 721437b43618db9ba9e0d4384014e0bbc7895a15 URL: https://gitlab.winehq.org/wine/wine/-/commit/721437b43618db9ba9e0d4384014e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 12:26:51 2023 +0100 dinput: Update the device status while holding its CS. --- dlls/dinput/dinput_main.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c9bbb34e554..2b7528a20ea 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -107,7 +107,7 @@ void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) LeaveCriticalSection( &dinput_hook_crit ); } -static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) +static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD status ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -117,7 +117,7 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) if (impl->status == STATUS_ACQUIRED) { impl->vtbl->unacquire( iface ); - impl->status = STATUS_UNACQUIRED; + impl->status = status; list_remove( &impl->entry ); } LeaveCriticalSection( &impl->crit ); @@ -211,7 +211,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam if (msg->hwnd == impl->win && msg->hwnd != foreground) { TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry ) @@ -219,7 +219,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam if (msg->hwnd == impl->win && msg->hwnd != foreground) { TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry ) @@ -227,7 +227,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam if (msg->hwnd == impl->win && msg->hwnd != foreground) { TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry ) @@ -235,7 +235,7 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam if (msg->hwnd == impl->win && msg->hwnd != foreground) { TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } } LeaveCriticalSection( &dinput_hook_crit ); @@ -301,9 +301,8 @@ static DWORD WINAPI dinput_thread_proc( void *params ) if ((device = state.devices[ret]) && FAILED( device->vtbl->read( &device->IDirectInputDevice8W_iface ) )) { EnterCriticalSection( &dinput_hook_crit ); - dinput_device_internal_unacquire( &device->IDirectInputDevice8W_iface ); + dinput_device_internal_unacquire( &device->IDirectInputDevice8W_iface, STATUS_UNPLUGGED ); LeaveCriticalSection( &dinput_hook_crit ); - device->status = STATUS_UNPLUGGED; state.events[ret] = state.events[--state.events_count]; state.devices[ret] = state.devices[state.events_count];

1 0