October 2021 - Wine-Commits

Eric Pouech : mscoree/tests: Remove unused parameter in sprintf.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 7b5e8ef1d84a3f1c78a1dc467a671d5b8785116f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5e8ef1d84a3f1c78a1dc46… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:15:24 2021 +0200 mscoree/tests: Remove unused parameter in sprintf. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 6c0d081cbd3..f6dc93c1070 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -166,7 +166,7 @@ static void run_registry_test(run_type run) if (run == run_type_exe_directory) result_expected = S_OK; else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test)); ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); if (ret == ERROR_ACCESS_DENIED && !IsUserAnAdmin()) {

1 0

Eric Pouech : dbghelp: Report a couple more VARIANT types in symbol info for constants.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: eded75f8d25dbf011ecbf5bcbae0352e2ca654b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eded75f8d25dbf011ecbf5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:26 2021 +0200 dbghelp: Report a couple more VARIANT types in symbol info for constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0b71584e6e0..3fb6ba360fd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -750,13 +750,16 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Flags |= SYMFLAG_LOCAL; switch (V_VT(&data->u.value)) { - case VT_I4: sym_info->Value = (ULONG)V_I4(&data->u.value); break; - case VT_I2: sym_info->Value = (ULONG)(LONG_PTR)V_I2(&data->u.value); break; - case VT_I1: sym_info->Value = (ULONG)(LONG_PTR)V_I1(&data->u.value); break; - case VT_UI4: sym_info->Value = (ULONG)V_UI4(&data->u.value); break; - case VT_UI2: sym_info->Value = (ULONG)V_UI2(&data->u.value); break; - case VT_UI1: sym_info->Value = (ULONG)V_UI1(&data->u.value); break; - case VT_BYREF: sym_info->Value = (ULONG64)(DWORD_PTR)V_BYREF(&data->u.value); break; + case VT_I8: sym_info->Value = (LONG64)V_I8(&data->u.value); break; + case VT_I4: sym_info->Value = (LONG64)V_I4(&data->u.value); break; + case VT_I2: sym_info->Value = (LONG64)V_I2(&data->u.value); break; + case VT_I1: sym_info->Value = (LONG64)V_I1(&data->u.value); break; + case VT_UINT:sym_info->Value = V_UINT(&data->u.value); break; + case VT_UI8: sym_info->Value = V_UI8(&data->u.value); break; + case VT_UI4: sym_info->Value = V_UI4(&data->u.value); break; + case VT_UI2: sym_info->Value = V_UI2(&data->u.value); break; + case VT_UI1: sym_info->Value = V_UI1(&data->u.value); break; + case VT_BYREF: sym_info->Value = (DWORD_PTR)V_BYREF(&data->u.value); break; case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", V_VT(&data->u.value));

1 0

Nikolay Sivov : d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 99376ade2a89a0c9a41687bb53da29a748fe5bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=99376ade2a89a0c9a41687bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:34 2021 +0300 d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper. 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 | 142 +++++++++++++++++++++++++++++++++++----- dlls/d3d10/tests/effect.c | 161 ++++++++++++++++++++++++++++++---------------- 2 files changed, 233 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99376ade2a89a0c9a416…

1 0

Eduard Permyakov : wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 8257d1efdc6a00bceb994c1a58b0ffd02e2fdf3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8257d1efdc6a00bceb994c1a… Author: Eduard Permyakov <epermyakov(a)codeweavers.com> Date: Wed Oct 13 11:00:03 2021 +0300 wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 442a9015951..d76602f4930 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -286,7 +286,9 @@ static const struct column col_physicalmemory[] = }; static const struct column col_pnpentity[] = { - { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, }; static const struct column col_printer[] = { @@ -701,6 +703,8 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *device_id; + const WCHAR *manufacturer; + const WCHAR *name; }; struct record_printer { @@ -3063,6 +3067,8 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * ARRAY_SIZE(device_id), NULL )) { rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine PnP Device"; table->num_rows++; if (!match_row( table, table->num_rows - 1, cond, &status ))

1 0

Alexandre Julliard : include: Add prototypes for the byteswap functions.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 84bfdccf6d4f4e6d9538ec4123c65244937714e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bfdccf6d4f4e6d9538ec41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 13:19:43 2021 +0200 include: Add prototypes for the byteswap functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 2 +- include/msvcrt/stdlib.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index bee269ed5f8..17b83069f94 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -490,7 +490,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) /********************************************************************* * _byteswap_ulong (MSVCR80.@) */ -ULONG CDECL _byteswap_ulong(ULONG l) +__msvcrt_ulong CDECL _byteswap_ulong(__msvcrt_ulong l) { return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 287e4030669..7a2a774dfb5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -153,6 +153,9 @@ _ACRTIMP __int64 __cdecl _atoi64(const char*); _ACRTIMP long double __cdecl _atold(const char*); _ACRTIMP int __cdecl _atoldbl(_LDOUBLE*,char*); _ACRTIMP void __cdecl _beep(unsigned int,unsigned int); +_ACRTIMP unsigned short __cdecl _byteswap_ushort(unsigned short); +_ACRTIMP __msvcrt_ulong __cdecl _byteswap_ulong(__msvcrt_ulong); +_ACRTIMP unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64); _ACRTIMP char* __cdecl _ecvt(double,int,int*,int*); _ACRTIMP char* __cdecl _fcvt(double,int,int*,int*); _ACRTIMP char* __cdecl _fullpath(char*,const char*,size_t);

1 0

Rémi Bernon : dinput: Correctly parse instance numbers for joystick semantics.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 1d4fdb5aca786222f2c4200716af2f82452ab93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d4fdb5aca786222f2c42007… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:20 2021 +0200 dinput: Correctly parse instance numbers for joystick semantics. This should fix the last BuildActionMap / EnumDevicesBySemantics test failures when a joystick is plugged in. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8f57d32dee2..e2d2e551d02 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -651,21 +651,20 @@ static int id_to_offset(const DataFormat *df, int id) static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) { DWORD type = (0x0000ff00 & dwSemantic) >> 8; - DWORD offset = 0x000000ff & dwSemantic; - DWORD obj_instance = 0; + BOOL byofs = (dwSemantic & 0x80000000) != 0; + DWORD value = (dwSemantic & 0x000000ff); BOOL found = FALSE; + DWORD instance; int i; - for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) + for (i = 0; i < This->data_format.wine_df->dwNumObjs && !found; i++) { LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - if (odf->dwOfs == offset) - { - obj_instance = DIDFT_GETINSTANCE(odf->dwType); - found = TRUE; - break; - } + if (byofs && value != odf->dwOfs) continue; + if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; + instance = DIDFT_GETINSTANCE(odf->dwType); + found = TRUE; } if (!found) return 0; @@ -673,7 +672,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) if (type & DIDFT_AXIS) type = DIDFT_RELAXIS; if (type & DIDFT_BUTTON) type = DIDFT_PSHBUTTON; - return type | (0x0000ff00 & (obj_instance << 8)); + return type | (0x0000ff00 & (instance << 8)); } /*

1 0

Rémi Bernon : dinput: Wait for the internal thread to complete unacquiring.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 947e6ee5b43cda0f8b610567886286a26caf375c URL: https://source.winehq.org/git/wine.git/?a=commit;h=947e6ee5b43cda0f8b610567… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:19 2021 +0200 dinput: Wait for the internal thread to complete unacquiring. Otherwise we may close HID read event before it has finished removing it from the wait handles, causing MsgWaitForMultipleObjectsEx to return an error and terminate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 13 ++++--------- dlls/dinput8/tests/hid.c | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 46c18ed55dd..985dae1ab36 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1381,8 +1381,7 @@ static DWORD WINAPI hook_thread_proc(void *param) mouse_hook = NULL; } - if (finished_event) - SetEvent(finished_event); + SetEvent(finished_event); } } @@ -1504,17 +1503,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage ); } - if (acquired) - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); - if (acquired) - { - WaitForSingleObject(hook_change_finished_event, INFINITE); - CloseHandle(hook_change_finished_event); - } + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cf50dd32fb9..87a2a9a7a3c 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4758,9 +4758,6 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); @@ -7227,9 +7224,6 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref );

1 0

Rémi Bernon : dinput: Factor all (Un)Acquire implementations together.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 77f5edda30d9e9b1e9abbc251eab72a37fd061f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f5edda30d9e9b1e9abbc25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 13 09:21:17 2021 +0200 dinput: Factor all (Un)Acquire implementations together. And introduce new internal acquire / unacquire callbacks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 65 +++++++++++++++++-------------- dlls/dinput/device_private.h | 17 +++++--- dlls/dinput/dinput_main.c | 4 +- dlls/dinput/joystick_hid.c | 93 +++++++++++++++----------------------------- dlls/dinput/keyboard.c | 34 +++++++++------- dlls/dinput/mouse.c | 30 +++++++------- 6 files changed, 114 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f5edda30d9e9b1e9ab…

1 0

Alexandre Julliard : include: Import specstrings.h and related headers from Mingw.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: d4259ac8e9326a8173d6f83f0d525c97b90a1da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4259ac8e9326a8173d6f83f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 11:57:38 2021 +0200 include: Import specstrings.h and related headers from Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/unix_lib.c | 2 + include/Makefile.in | 3 + include/concurrencysal.h | 48 +++++++ include/driverspecs.h | 55 ++++++++ include/msvcrt/corecrt.h | 2 + include/ntdef.h | 1 + include/rpcdce.h | 2 + include/specstrings.h | 340 +++++++++++++++++++++++++++++++++++++++++++++++ include/winerror.h | 2 + include/winnt.h | 1 + 10 files changed, 456 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4259ac8e9326a8173d6…

1 0

Alexandre Julliard : include: Use compatible header guard in basetsd.h.
by Alexandre Julliard Oct. 13, 2021

Oct. 13, 2021

Module: wine Branch: master Commit: 6b416a771d7c0c4c59c0e4980707dd18fe5955aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b416a771d7c0c4c59c0e498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 13 13:10:00 2021 +0200 include: Use compatible header guard in basetsd.h. libjpeg depends on this. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 761af4d5214..a4774a2fea5 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_BASETSD_H -#define __WINE_BASETSD_H +#ifndef _BASETSD_H_ +#define _BASETSD_H_ #ifdef __cplusplus extern "C" { @@ -303,4 +303,4 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* !defined(__WINE_BASETSD_H) */ +#endif /* !defined(_BASETSD_H_) */

1 0