May 2022 - Wine-commits - list.winehq.org

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.ConditionForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4e04446c9b8721acb0098ff4a0b303923398ea21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e04446c9b8721acb0098ff4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 12:04:29 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.ConditionForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/condition_effect.c | 272 +++++++++++++++++++++++++++ dlls/windows.gaming.input/force_feedback.c | 18 ++ dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 7 + 7 files changed, 301 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e04446c9b8721acb009…

1 0

Philip Allison : uiautomationcore: Fix header compatibility with C++.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 26637de7cbc770cab20c6e35a828cc9e93fcfc9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26637de7cbc770cab20c6e35… Author: Philip Allison <mangobrain(a)gmail.com> Date: Fri May 13 21:54:23 2022 +0100 uiautomationcore: Fix header compatibility with C++. Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcoreapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..7f60fb45727 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Jactry Zeng : dwmapi: Use RtlGetVersion() for system version detection instead.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 0260f2dc126c305be3cf9d4214c2d73e1ed46ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0260f2dc126c305be3cf9d42… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed May 11 02:44:20 2022 -0500 dwmapi: Use RtlGetVersion() for system version detection instead. >From commit 6719bf2e037b, GetVersionExW() only returns the real emulated system version when supportedOS is specified in the application's manifest file, so let's use RtlGetVersion() instead. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index cec20220ec2..5293a22729b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -21,6 +21,7 @@ #include <stdarg.h> +#include "winternl.h" #define COBJMACROS #include "windef.h" #include "winbase.h" @@ -37,18 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - OSVERSIONINFOW version; + RTL_OSVERSIONINFOEXW version; TRACE("%p\n", enabled); if (!enabled) return E_INVALIDARG; - version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - - if (!GetVersionExW(&version)) - *enabled = FALSE; - else + *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(version); + if (!RtlGetVersion(&version)) *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); return S_OK;

1 0

Jactry Zeng : dwmapi: Partially implement DwmGetCompositionTimingInfo().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 182feddd4b02e83f3c69863bc2e6e63945eb2df1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=182feddd4b02e83f3c69863b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed May 11 02:44:21 2022 -0500 dwmapi: Partially implement DwmGetCompositionTimingInfo(). This makes Tencent START cloud game client happy. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 8 +++++++- dlls/dwmapi/tests/dwmapi.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 5293a22729b..9defcb14373 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -218,9 +218,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) { static int i; + if (!info) + return E_INVALIDARG; + + if (info->cbSize != sizeof(DWM_TIMING_INFO)) + return MILERR_MISMATCHED_SIZE; + if(!i++) FIXME("(%p %p)\n", hwnd, info); - return E_NOTIMPL; + return S_OK; } /********************************************************************** diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 7cb9eb424f1..696aa9c9d86 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -33,7 +33,36 @@ static void test_DwmIsCompositionEnabled(void) ok(enabled == TRUE || enabled == FALSE, "Got unexpected %#x.\n", enabled); } +static void test_DwmGetCompositionTimingInfo(void) +{ + DWM_TIMING_INFO timing_info; + BOOL enabled; + HRESULT hr; + + enabled = FALSE; + hr = DwmIsCompositionEnabled(&enabled); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (!enabled) + { + skip("DWM is disabled.\n"); + return; + } + + hr = DwmGetCompositionTimingInfo(NULL, NULL); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + memset(&timing_info, 0, sizeof(timing_info)); + hr = DwmGetCompositionTimingInfo(NULL, &timing_info); + ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr); + + timing_info.cbSize = sizeof(timing_info); + hr = DwmGetCompositionTimingInfo(NULL, &timing_info); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + START_TEST(dwmapi) { test_DwmIsCompositionEnabled(); + test_DwmGetCompositionTimingInfo(); }

1 0

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: e55515bf5b21580499ee05bee964444be8dc3c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55515bf5b21580499ee05be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:19:01 2022 +0800 win32u: Fix a memory leak. The subkey handle is leaked when deleting a GPU entry succeeded. Also, there is no need to restart the enumeration for the grandparent key hkey. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5fec4ade0f8..dd494188121 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -702,7 +702,6 @@ static void cleanup_devices(void) hkey = reg_open_key( enum_key, pciW, sizeof(pciW) ); -restart: while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key, sizeof(buffer), &size )) { unsigned int j = 0; @@ -735,7 +734,7 @@ restart: NtClose( device_key ); if (!present && reg_delete_tree( subkey, bufferW, lstrlenW( bufferW ) * sizeof(WCHAR) )) - goto restart; + j = 0; } NtClose( subkey );

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if find_entry_from_{luid|index} fails.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 42bf76686633acee8453dbfe65e842e4c6d465ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bf76686633acee8453dbfe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 15:32:04 2022 -0500 nsiproxy.sys: Update interface table only if find_entry_from_{luid|index} fails. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index ba4933ff16b..a3a10148109 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -495,9 +495,11 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, UINT key_size, void pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_luid( (const NET_LUID *)key ); + if (!(entry = find_entry_from_luid( (const NET_LUID *)key ))) + { + update_if_table(); + entry = find_entry_from_luid( (const NET_LUID *)key ); + } if (entry) { ifinfo_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); @@ -557,9 +559,11 @@ static NTSTATUS ifinfo_get_parameter( const void *key, UINT key_size, UINT param pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_luid( (const NET_LUID *)key ); + if (!(entry = find_entry_from_luid( (const NET_LUID *)key ))) + { + update_if_table(); + entry = find_entry_from_luid( (const NET_LUID *)key ); + } if (entry) { switch (param_type) @@ -591,9 +595,11 @@ static NTSTATUS index_luid_get_parameter( const void *key, UINT key_size, UINT p pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - entry = find_entry_from_index( *(UINT *)key ); + if (!(entry = find_entry_from_index( *(UINT *)key ))) + { + update_if_table(); + entry = find_entry_from_index( *(UINT *)key ); + } if (entry) { *(NET_LUID *)data = entry->if_luid;

1 0

Paul Gofman : nsiproxy.sys: Finish search once found in convert_luid_to_unix_name().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8e756fe5acab9e1ddead4e56aa4d09205ca73f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e756fe5acab9e1ddead4e56… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 15:35:12 2022 -0500 nsiproxy.sys: Finish search once found in convert_luid_to_unix_name(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index a3a10148109..929bda9cd90 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -644,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) { *unix_name = entry->if_unix_name; ret = TRUE; - + break; } pthread_mutex_unlock( &if_list_lock );

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1f3c1fdbc7e4c537c2ab41d59bcaa68aa4f93567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3c1fdbc7e4c537c2ab41d5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:24:45 2022 -0500 nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 929bda9cd90..9b09756f35c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -286,17 +286,19 @@ static struct if_entry *add_entry( UINT index, char *name ) return entry; } -static void update_if_table( void ) +static unsigned int update_if_table( void ) { struct if_nameindex *indices = if_nameindex(), *entry; + unsigned int append_count = 0; for (entry = indices; entry->if_index; entry++) { - if (!find_entry_from_index( entry->if_index )) - add_entry( entry->if_index, entry->if_name ); + if (!find_entry_from_index( entry->if_index ) && add_entry( entry->if_index, entry->if_name )) + ++append_count; } if_freenameindex( indices ); + return append_count; } static void if_counted_string_init( IF_COUNTED_STRING *str, const WCHAR *value ) @@ -634,18 +636,24 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) { struct if_entry *entry; BOOL ret = FALSE; + int updated = 0; pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) - if (entry->if_luid.Value == luid->Value) + do + { + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) { - *unix_name = entry->if_unix_name; - ret = TRUE; - break; + if (entry->if_luid.Value == luid->Value) + { + *unix_name = entry->if_unix_name; + ret = TRUE; + goto done; + } } + } while (!updated++ && update_if_table()); + +done: pthread_mutex_unlock( &if_list_lock ); return ret;

1 0

Paul Gofman : nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 50c27f88e369ef72bd05b68c700b6d3c4695f4e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c27f88e369ef72bd05b68c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:29:04 2022 -0500 nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 9b09756f35c..667d399b0cb 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -615,18 +615,24 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) { struct if_entry *entry; BOOL ret = FALSE; + int updated = 0; pthread_mutex_lock( &if_list_lock ); - update_if_table(); - - LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) - if (!strcmp( entry->if_unix_name, unix_name )) + do + { + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) { - *luid = entry->if_luid; - ret = TRUE; - break; + if (!strcmp( entry->if_unix_name, unix_name )) + { + *luid = entry->if_luid; + ret = TRUE; + goto done; + } } + } while (!updated++ && update_if_table()); + +done: pthread_mutex_unlock( &if_list_lock ); return ret;

1 0

Paul Gofman : nsi: Allocate a small buffer at once in NsiAllocateAndGetTable().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 7ef04f4118c1d221c1f8d8d87d833246534ebe47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef04f4118c1d221c1f8d8d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 16 16:53:03 2022 -0500 nsi: Allocate a small buffer at once in NsiAllocateAndGetTable(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index efb10c0f615..345dce6dfe6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -39,7 +39,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) { - DWORD err, num = 0; + DWORD err, num = 64; void *data[4] = { NULL }; DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size }; int i, attempt; @@ -49,9 +49,6 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR for (attempt = 0; attempt < 5; attempt++) { - err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); - if (err) return err; - for (i = 0; i < ARRAY_SIZE(data); i++) { if (sizes[i]) @@ -68,9 +65,11 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, data[0], sizes[0], data[1], sizes[1], data[2], sizes[2], data[3], sizes[3], &num ); if (err != ERROR_MORE_DATA) break; - + TRACE( "Short buffer, attempt %d.\n", attempt ); NsiFreeTable( data[0], data[1], data[2], data[3] ); memset( data, 0, sizeof(data) ); + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); + if (err) return err; } if (!err)

1 0