October 2021 - Wine-Commits

Ivo Ivanov : dinput: Ignore input caps from the PID usage page.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: eb223bf58da4fd1b5b6c9e4db391453b2b77972b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb223bf58da4fd1b5b6c9e4d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Oct 14 09:39:53 2021 +0200 dinput: Ignore input caps from the PID usage page. Prevents PID usage page input reports from being parsed and listed in the device objects, increasing the total number of buttons or axes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 16 ++++- dlls/dinput8/tests/hid.c | 171 ++++++++++++++++++++++++++------------------- 2 files changed, 115 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb223bf58da4fd1b5b6c…

1 0

Alexandre Julliard : include: Always add defines for the Interlocked* functions.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 19d5734e20d383c16dc0d616ebb8568f0a37fc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d5734e20d383c16dc0d616… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 14 12:16:09 2021 +0200 include: Always add defines for the Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 73 ++++++++++++++------------------------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 58f1267773d..ef731e29c52 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6308,6 +6308,19 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) /* Interlocked functions */ +#define InterlockedAnd _InterlockedAnd +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedDecrement16 _InterlockedDecrement16 +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangePointer _InterlockedExchangePointer +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedIncrement16 _InterlockedIncrement16 +#define InterlockedOr _InterlockedOr + #ifdef _MSC_VER #pragma intrinsic(_InterlockedAnd) @@ -6332,66 +6345,13 @@ long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); -static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) -{ - return _InterlockedAnd( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) -{ - return _InterlockedIncrement16( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) -{ - return _InterlockedDecrement16( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) -{ - return _InterlockedOr( (long volatile *)dest, val ); -} - #ifndef __i386__ #pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchangePointer) -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); +void *_InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *_InterlockedExchangePointer(void *volatile*,void*); #else @@ -6531,6 +6491,9 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ #ifdef _WIN64 + +#define InterlockedCompareExchange128 _InterlockedCompareExchange128 + #if defined(_MSC_VER) && !defined(__clang__) #pragma intrinsic(_InterlockedCompareExchange128)

1 0

Rémi Bernon : hidparse.sys: Ignore unknown item types, rather than failing.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 6d307e2a647e71c21106feb0d62e371b3e55ab38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d307e2a647e71c21106feb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:00:25 2021 +0200 hidparse.sys: Ignore unknown item types, rather than failing. Some DS4 controllers have a trailing NUL byte when accessed over bluetooth. This causes parse_descriptor to return an error where we can instead ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 18ee23974f0..d455049d9b1 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -628,7 +628,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng default: FIXME( "item type %x not implemented!\n", *ptr ); - goto done; + break; } #undef SHORT_ITEM }

1 0

Nikolay Sivov : d3d10/effect: Get rid of linear search for property information.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 1bc3ca71d6108cc7af2bfbb2a23c43298ac57b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc3ca71d6108cc7af2bfbb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:36 2021 +0300 d3d10/effect: Get rid of linear search for property information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd5f6517c54..71ad3f64a05 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -176,7 +176,7 @@ struct d3d10_effect_state_property_info LONG index_offset; }; -static const struct d3d10_effect_state_property_info property_info[] = +static const struct d3d10_effect_state_property_info property_infos[] = { {0x00, "Pass.RasterizerState", D3D10_SVT_RASTERIZER, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, rasterizer) }, {0x01, "Pass.DepthStencilState", D3D10_SVT_DEPTHSTENCIL, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, depth_stencil) }, @@ -1540,19 +1540,6 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ return S_OK; } -static const struct d3d10_effect_state_property_info *get_property_info(UINT id) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(property_info); ++i) - { - if (property_info[i].id == id) - return &property_info[i]; - } - - return NULL; -} - static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER_VARIABLE_TYPE id) { unsigned int i; @@ -1764,14 +1751,14 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size read_dword(ptr, &operation); read_dword(ptr, &value_offset); - if (!(property_info = get_property_info(id))) + if (id >= ARRAY_SIZE(property_infos)) { - FIXME("Failed to find property info for property %#x.\n", id); + FIXME("Unknown property id %#x.\n", id); return E_FAIL; } + property_info = &property_infos[id]; - TRACE("Property %s[%#x] = value list @ offset %#x.\n", - property_info->name, idx, value_offset); + TRACE("Property %s[%#x] = value list @ offset %#x.\n", property_info->name, idx, value_offset); if (property_info->container_type != container_type) {

1 0

Hans Leidekker : wbemprox: Add __DERIVATION to the list of system properties.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 8b6565a61fe66ccd1472a4c78b3daf0e1897fba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6565a61fe66ccd1472a4c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:45 2021 +0200 wbemprox: Add __DERIVATION to the list of system properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 28028474d59..63007565766 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1395,7 +1395,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0;

1 0

Hans Leidekker : wbemprox: Return an empty array for __DERIVATION.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 2243229043b9af45376e27df55a3fa279590a9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2243229043b9af45376e27df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:44 2021 +0200 wbemprox: Return an empty array for __DERIVATION. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 77ed27e105d..28028474d59 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1006,6 +1006,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 69bb8e7977e..5ca61cff825 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1642,6 +1642,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING );

1 0

Eric Pouech : dbghelp: Use proper macros for VARIANT.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 58d5b3c880ce9d3f0d5f9d193dba250014676144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d5b3c880ce9d3f0d5f9d19… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:20 2021 +0200 dbghelp: Use proper macros for VARIANT. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 32 ++++++++++++++--------------- dlls/dbghelp/msc.c | 57 +++++++++++++++++++++++++-------------------------- dlls/dbghelp/symbol.c | 18 ++++++++-------- dlls/dbghelp/type.c | 8 ++++---- 4 files changed, 57 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d5b3c880ce9d3f0d5f…

1 0

Jacek Caban : win32u: Move NtUserGetObjectInformation implementation from user32.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: b55abd072e3cc8c8e1627c00b18a0893bafeb9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b55abd072e3cc8c8e1627c00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:55:30 2021 +0200 win32u: Move NtUserGetObjectInformation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 95 +----------------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/user.c | 11 ++++++ include/ntuser.h | 2 + 8 files changed, 113 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b55abd072e3cc8c8e162…

1 0

Eric Pouech : winedump: Fix incorrect alignment.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: bad368750e5881683574250df3ad7db75b0607ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad368750e5881683574250d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:08 2021 +0200 winedump: Fix incorrect alignment. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2c3d406347e..b7b7eb435ff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1161,7 +1161,7 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) codeview_dump_one_type(curr_type, type); curr_type++; - ptr += (type->generic.len + 2 + 3) & ~3; + ptr += type->generic.len + 2; } return TRUE;

1 0

Eric Pouech : winedump: Dump MSC's S_UNAMESPACE entries.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 768bb93fd78fc4cafd01443989e5cec75a9adaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=768bb93fd78fc4cafd014439… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:14 2021 +0200 winedump: Dump MSC's S_UNAMESPACE entries. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 15 +++++++++++++++ tools/winedump/msc.c | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c9ab4abb166..1ede937abc4 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1958,6 +1958,20 @@ union codeview_symbol unsigned short varflags; char name[1]; } file_static_v3; + + struct + { + unsigned short int len; + unsigned short int id; + struct p_string pname; + } unamespace_v2; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned char name[1]; + } unamespace_v3; }; enum BinaryAnnotationOpcode @@ -2031,6 +2045,7 @@ enum BinaryAnnotationOpcode #define S_GTHREAD32_ST 0x100f #define S_FRAMEPROC 0x1012 #define S_COMPILE2_ST 0x1013 +#define S_UNAMESPACE_ST 0x1029 #define S_OBJNAME 0x1101 #define S_THUNK32 0x1102 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index b7b7eb435ff..12d1a9e62ab 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1839,6 +1839,14 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) get_varflags(sym->file_static_v3.varflags)); break; + case S_UNAMESPACE_ST: + printf("UNameSpace V2 '%s'\n", p_string(&sym->unamespace_v2.pname)); + break; + + case S_UNAMESPACE: + printf("UNameSpace V3 '%s'\n", sym->unamespace_v3.name); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0