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

Andrey Gusev : include: Add more D3D12_ROOT_SIGNATURE_FLAGS enums.
by Alexandre Julliard 12 May '22

12 May '22

Module: vkd3d Branch: master Commit: a9dc39dd92bbcac6d774c3cfcd3bcd6dbd73dc89 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a9dc39dd92bbcac6d774c3c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 10 12:28:04 2022 +0300 include: Add more D3D12_ROOT_SIGNATURE_FLAGS enums. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2d0800b9..5190b9d7 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -916,6 +916,11 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10, D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, + D3D12_ROOT_SIGNATURE_FLAG_LOCAL_ROOT_SIGNATURE = 0x80, + D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS = 0x100, + D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS = 0x200, + D3D12_ROOT_SIGNATURE_FLAG_CBV_SRV_UAV_HEAP_DIRECTLY_INDEXED = 0x400, + D3D12_ROOT_SIGNATURE_FLAG_SAMPLER_HEAP_DIRECTLY_INDEXED = 0x800, } D3D12_ROOT_SIGNATURE_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);")

1 0

Matteo Bruni : vkd3d-shader/hlsl: Handle over/underflow when parsing integer literals.
by Alexandre Julliard 12 May '22

12 May '22

Module: vkd3d Branch: master Commit: 228f7ab5cd2371bd202b4d06f40fc47c48f4e0e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=228f7ab5cd2371bd202b4d0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 11 16:39:08 2022 +0200 vkd3d-shader/hlsl: Handle over/underflow when parsing integer literals. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.l | 6 +++--- libs/vkd3d-shader/preproc.y | 34 +------------------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 32 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 267c8c30..ff7b712f 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -197,15 +197,15 @@ row_major {return KW_ROW_MAJOR; } return C_FLOAT; } 0x[0-9a-fA-F]+ { - sscanf(yytext, "0x%x", &yylval->intval); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } 0[0-7]+ { - sscanf(yytext, "0%o", &yylval->intval); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } [0-9]+ { - yylval->intval = (atoi(yytext)); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 3f02ac03..009c35ff 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -165,38 +165,6 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) return true; } -static int char_to_int(char c) -{ - if ('0' <= c && c <= '9') - return c - '0'; - if ('A' <= c && c <= 'F') - return c - 'A' + 10; - if ('a' <= c && c <= 'f') - return c - 'a' + 10; - return -1; -} - -static uint32_t preproc_parse_integer(const char *s) -{ - uint32_t base = 10, ret = 0; - int digit; - - if (*s == '0') - { - base = 8; - ++s; - if (*s == 'x' || *s == 'X') - { - base = 16; - ++s; - } - } - - while ((digit = char_to_int(*s++)) >= 0) - ret = ret * base + (uint32_t)digit; - return ret; -} - static int default_open_include(const char *filename, bool local, const char *parent_data, void *context, struct vkd3d_shader_code *out) { @@ -691,7 +659,7 @@ directive primary_expr : T_INTEGER { - $$ = preproc_parse_integer($1); + $$ = vkd3d_parse_integer($1); vkd3d_free($1); } | T_IDENTIFIER diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 62baf17f..6fd32435 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -24,6 +24,38 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); +static inline int char_to_int(char c) +{ + if ('0' <= c && c <= '9') + return c - '0'; + if ('A' <= c && c <= 'F') + return c - 'A' + 10; + if ('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +uint32_t vkd3d_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (*s == '0') + { + base = 8; + ++s; + if (*s == 'x' || *s == 'X') + { + base = 16; + ++s; + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} + void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { buffer->buffer_size = 16; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 29e178cc..8bde5523 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1035,6 +1035,8 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer) return buffer->size; } +uint32_t vkd3d_parse_integer(const char *s); + struct vkd3d_shader_message_context { enum vkd3d_shader_log_level log_level;

1 0

Rémi Bernon : windows.gaming.input: AddRef on the returned async handler in get_Completed.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: d7701deddc00dbe37b6891105d01588533eba991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7701deddc00dbe37b689110… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 19:32:14 2022 +0200 windows.gaming.input: AddRef on the returned async handler in get_Completed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 1426b3d8481..dfcb4144e74 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -146,7 +146,8 @@ static HRESULT WINAPI async_impl_get_Completed( IWineAsyncInfoImpl *iface, IWine EnterCriticalSection( &impl->cs ); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; - *handler = (impl->handler != HANDLER_NOT_SET) ? impl->handler : NULL; + if (impl->handler == NULL || impl->handler == HANDLER_NOT_SET) *handler = NULL; + else IWineAsyncOperationCompletedHandler_AddRef( (*handler = impl->handler) ); LeaveCriticalSection( &impl->cs ); return hr;

1 0

Rémi Bernon : windows.gaming.input: Reset spare CS pointer before deleting it.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: c3c11d08037dac90f5fac4151884f0f08211d1e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c11d08037dac90f5fac415… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 13:05:36 2022 +0200 windows.gaming.input: Reset spare CS pointer before deleting it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index dfcb4144e74..fc593bc6121 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -98,6 +98,7 @@ static ULONG WINAPI async_impl_Release( IWineAsyncInfoImpl *iface ) IAsyncInfo_Close( &impl->IAsyncInfo_iface ); if (impl->param) IUnknown_Release( impl->param ); if (impl->invoker) IUnknown_Release( impl->invoker ); + impl->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &impl->cs ); free( impl ); }

1 0

Rémi Bernon : windows.gaming.input: Use case insensitive compare when looking for devices.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 5912d0fa00cf55f0f7977dc12839492b5f6389bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5912d0fa00cf55f0f7977dc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 10:49:18 2022 +0200 windows.gaming.input: Use case insensitive compare when looking for devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/provider.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c index 70900000eef..1f3f4e047f5 100644 --- a/dlls/windows.gaming.input/provider.c +++ b/dlls/windows.gaming.input/provider.c @@ -572,7 +572,7 @@ void provider_create( const WCHAR *device_path ) EnterCriticalSection( &provider_cs ); LIST_FOR_EACH_ENTRY( entry, &provider_list, struct provider, entry ) - if ((found = !wcscmp( entry->device_path, device_path ))) break; + if ((found = !wcsicmp( entry->device_path, device_path ))) break; if (!found) list_add_tail( &provider_list, &impl->entry ); LeaveCriticalSection( &provider_cs ); @@ -592,11 +592,12 @@ void provider_remove( const WCHAR *device_path ) EnterCriticalSection( &provider_cs ); LIST_FOR_EACH_ENTRY( entry, &provider_list, struct provider, entry ) - if ((found = !wcscmp( entry->device_path, device_path ))) break; + if ((found = !wcsicmp( entry->device_path, device_path ))) break; if (found) list_remove( &entry->entry ); LeaveCriticalSection( &provider_cs ); - if (found) + if (!found) WARN( "provider not found for device %s\n", debugstr_w( device_path ) ); + else { provider = &entry->IGameControllerProvider_iface; manager_on_provider_removed( provider );

1 0

Rémi Bernon : windows.gaming.input: Register Windows.Gaming.Input.ForceFeedback classes.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 922cf81c91c4b37f9197e62476badf680d47e1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=922cf81c91c4b37f9197e624… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 20 19:06:58 2022 +0200 windows.gaming.input: Register Windows.Gaming.Input.ForceFeedback classes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/classes.idl | 3 ++- include/windows.gaming.input.forcefeedback.idl | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/classes.idl b/dlls/windows.gaming.input/classes.idl index ca3bd5d8dd7..2adf43cdbb0 100644 --- a/dlls/windows.gaming.input/classes.idl +++ b/dlls/windows.gaming.input/classes.idl @@ -29,11 +29,12 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; +import "windows.foundation.numerics.idl"; import "windows.devices.haptics.idl"; -import "windows.gaming.input.forcefeedback.idl"; import "windows.system.idl"; import "windows.devices.power.idl"; #define DO_NO_IMPORTS +#include "windows.gaming.input.forcefeedback.idl" #include "windows.gaming.input.idl" #include "windows.gaming.input.custom.idl" diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 290d1f62971..82fb083b34b 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -20,12 +20,14 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; import "windows.foundation.numerics.idl"; +#endif namespace Windows.Gaming.Input.ForceFeedback { typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes;

1 0

Rémi Bernon : windows.gaming.input: Implement stub ConstantForceEffect runtimeclass factory.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: b1306875ffb32422d8e3decd81142b2c142a8c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1306875ffb32422d8e3decd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 12:15:58 2022 +0200 windows.gaming.input: Implement stub ConstantForceEffect runtimeclass factory. 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/constant_effect.c | 117 ++++++++++++++++++++++++++++ dlls/windows.gaming.input/main.c | 3 + dlls/windows.gaming.input/private.h | 1 + 5 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 976b1b93863..a1e41dedf44 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5620,15 +5620,14 @@ static void test_windows_gaming_input(void) hr = pWindowsCreateString( constant_effect_class_name, wcslen( constant_effect_class_name ), &str ); ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); hr = pRoGetActivationFactory( str, &IID_IActivationFactory, (void **)&activation_factory ); - todo_wine ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); pWindowsDeleteString( str ); - if (hr != S_OK) goto skip_tests; hr = IActivationFactory_ActivateInstance( activation_factory, &tmp_inspectable ); todo_wine ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); IActivationFactory_Release( activation_factory ); + if (hr != S_OK) goto skip_tests; hr = IInspectable_QueryInterface( tmp_inspectable, &IID_IForceFeedbackEffect, (void **)&effect ); todo_wine diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 463f6b97f74..8f3af4fec62 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = combase uuid user32 dinput8 setupapi hid C_SRCS = \ async.c \ + constant_effect.c \ controller.c \ event_handlers.c \ force_feedback.c \ diff --git a/dlls/windows.gaming.input/constant_effect.c b/dlls/windows.gaming.input/constant_effect.c new file mode 100644 index 00000000000..a27258dd9bf --- /dev/null +++ b/dlls/windows.gaming.input/constant_effect.c @@ -0,0 +1,117 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 + */ + +#include "private.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +struct constant_factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct constant_factory *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct constant_factory, IActivationFactory_iface ); +} + +static HRESULT WINAPI activation_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct constant_factory *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI activation_AddRef( IActivationFactory *iface ) +{ + struct constant_factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI activation_Release( IActivationFactory *iface ) +{ + struct constant_factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI activation_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI activation_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI activation_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI activation_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_vtbl = +{ + activation_QueryInterface, + activation_AddRef, + activation_Release, + /* IInspectable methods */ + activation_GetIids, + activation_GetRuntimeClassName, + activation_GetTrustLevel, + /* IActivationFactory methods */ + activation_ActivateInstance, +}; + +static struct constant_factory constant_statics = +{ + {&activation_vtbl}, + 1, +}; + +IInspectable *constant_effect_factory = (IInspectable *)&constant_statics.IActivationFactory_iface; diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 21808d9c2ad..aeb870b039b 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -185,6 +185,9 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_ForceFeedback_ConstantForceEffect )) + IInspectable_QueryInterface( constant_effect_factory, &IID_IActivationFactory, (void **)factory ); + if (*factory) return S_OK; return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 68f6bdcf5b6..2e97f182e78 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -45,6 +45,7 @@ extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; extern ICustomGameControllerFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; +extern IInspectable *constant_effect_factory; struct vector_iids {

1 0

Eric Pouech : winepulse.drv: Use correct integral type.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: c3440679533522b5ec0bcd7a907c7659708ebbc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3440679533522b5ec0bcd7a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed May 4 10:22:33 2022 +0200 winepulse.drv: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/pulse.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 18009435f1f..e97a04d6a8d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -250,7 +250,7 @@ typedef struct tagLANGANDCODEPAGE WORD wCodePage; } LANGANDCODEPAGE; -static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, DWORD *len) +static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) { WCHAR pn[37]; swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f685e2047e7..6309a27f42b 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -87,7 +87,7 @@ typedef struct _PhysDevice { enum phys_device_bus_type bus_type; USHORT vendor_id, product_id; EndpointFormFactor form; - DWORD channel_mask; + UINT channel_mask; UINT index; char pulse_name[0]; } PhysDevice; @@ -252,7 +252,7 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) struct get_endpoint_ids_params *params = args; struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; struct endpoint *endpoint = params->endpoints; - DWORD len, name_len, needed; + size_t len, name_len, needed; unsigned int offset; PhysDevice *dev; @@ -393,10 +393,10 @@ fail: return E_FAIL; } -static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) +static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) { int i; - DWORD mask = 0; + UINT mask = 0; for (i = 0; i < map->channels; ++i) { switch (map->map[i]) { @@ -452,9 +452,9 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - DWORD channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *name) { - DWORD len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name), name_len = strlen(name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); WCHAR *wname; @@ -485,7 +485,7 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { struct list *speaker; - DWORD channel_mask; + UINT channel_mask; if (!i || !i->name || !i->name[0]) return; @@ -516,7 +516,7 @@ static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eo * would report for a given channel layout. */ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIBLE *fmt) { - DWORD pa_mask = pulse_channel_map_to_channel_mask(pa_map); + UINT pa_mask = pulse_channel_map_to_channel_mask(pa_map); TRACE("got mask for PA: 0x%x\n", pa_mask); @@ -772,7 +772,7 @@ fail: return STATUS_SUCCESS; } -static DWORD get_channel_mask(unsigned int channels) +static UINT get_channel_mask(unsigned int channels) { switch(channels) { case 0: @@ -845,8 +845,8 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV break; case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE*)fmt; - DWORD mask = wfe->dwChannelMask; - DWORD i = 0, j; + UINT mask = wfe->dwChannelMask; + unsigned i = 0, j; if (fmt->cbSize != (sizeof(*wfe) - sizeof(*fmt)) && fmt->cbSize != sizeof(*wfe)) break; if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) &&

1 0

Eric Pouech : winepulse.drv: Enable compilation with long types.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 59419244a84a6d1b3e1ff49d90fd83a1a50ccdd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59419244a84a6d1b3e1ff49d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed May 4 10:22:39 2022 +0200 winepulse.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 1 - dlls/winepulse.drv/mmdevdrv.c | 40 ++++++++++++++++++++-------------------- dlls/winepulse.drv/pulse.c | 6 +++--- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index d4b40e66644..39ed860676e 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winepulse.drv UNIXLIB = winepulse.so IMPORTS = dxguid uuid winmm user32 advapi32 ole32 version diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e97a04d6a8d..3cbbc1d8115 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -403,7 +403,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, NULL, &dev_key, NULL); if (status != ERROR_SUCCESS) { - ERR("Failed to open registry key for device %s: %u\n", pulse_name, status); + ERR("Failed to open registry key for device %s: %lu\n", pulse_name, status); CoCreateGuid(guid); return; } @@ -413,7 +413,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name CoCreateGuid(guid); status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); if (status != ERROR_SUCCESS) - ERR("Failed to store device GUID for %s to registry: %u\n", pulse_name, status); + ERR("Failed to store device GUID for %s to registry: %lu\n", pulse_name, status); } RegCloseKey(dev_key); } @@ -452,7 +452,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); if (status != ERROR_SUCCESS) { - ERR("Failed to open devices registry key: %u\n", status); + ERR("Failed to open devices registry key: %lu\n", status); drv_key = NULL; } @@ -658,7 +658,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) ACImpl *This = impl_from_IAudioClient3(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -667,7 +667,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ACImpl *This = impl_from_IAudioClient3(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) { if (This->pulse_stream) { pulse_release_stream(This->pulse_stream, This->timer); @@ -703,15 +703,15 @@ static void dump_fmt(const WAVEFORMATEX *fmt) TRACE(")\n"); TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); + TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); + TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); TRACE("cbSize: %u\n", fmt->cbSize); if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); + TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); TRACE("Samples: %04x\n", fmtex->Samples.wReserved); TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); } @@ -829,7 +829,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, char *name; HRESULT hr; - TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, + TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); if (!fmt) @@ -851,7 +851,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { - FIXME("Unknown flags: %08x\n", flags); + FIXME("Unknown flags: %08lx\n", flags); return E_INVALIDARG; } @@ -1128,7 +1128,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, if (hr == S_OK && exclusive) return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; - TRACE("returning: %08x %p\n", hr, out ? *out : NULL); + TRACE("returning: %08lx %p\n", hr, out ? *out : NULL); return hr; } @@ -1377,7 +1377,7 @@ static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *ifa { ACImpl *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(0x%x, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); + FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); return E_NOTIMPL; } @@ -1471,7 +1471,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( ACImpl *This = impl_from_IAudioRenderClient(iface); struct release_render_buffer_params params; - TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); + TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); if (!This->pulse_stream) return AUDCLNT_E_NOT_INITIALIZED; @@ -1963,7 +1963,7 @@ static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -1972,7 +1972,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) { if (This->client) { This->client->session_wrapper = NULL; @@ -2216,7 +2216,7 @@ static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -2225,7 +2225,7 @@ static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -2240,7 +2240,7 @@ static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( AudioSessionWrapper *wrapper; HRESULT hr; - TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), + TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid), flags, out); hr = get_audio_session(session_guid, This->device, 0, &session); @@ -2267,7 +2267,7 @@ static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( AudioSessionWrapper *wrapper; HRESULT hr; - TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), + TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid), flags, out); hr = get_audio_session(session_guid, This->device, 0, &session); @@ -2648,7 +2648,7 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI char pulse_name[MAX_PULSE_NAME_LEN]; DWORD size; - TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + TRACE("%s, (%s,%lu), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); if (!get_pulse_name_by_guid(guid, pulse_name, &params.flow)) return E_FAIL; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 6309a27f42b..1254509f3ce 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -896,7 +896,7 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV if (i < fmt->nChannels || (mask & SPEAKER_RESERVED)) { stream->map.channels = 0; - ERR("Invalid channel mask: %i/%i and %x(%x)\n", i, fmt->nChannels, mask, wfe->dwChannelMask); + ERR("Invalid channel mask: %i/%i and %x(%x)\n", i, fmt->nChannels, mask, (unsigned)wfe->dwChannelMask); break; } break; @@ -1018,7 +1018,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->vol[i] = 1.f; hr = pulse_spec_from_waveformat(stream, params->fmt); - TRACE("Obtaining format returns %08x\n", hr); + TRACE("Obtaining format returns %08x\n", (unsigned)hr); if (FAILED(hr)) goto exit; @@ -1984,7 +1984,7 @@ static NTSTATUS pulse_get_latency(void *args) lat = attr->fragsize / pa_frame_size(&stream->ss); *params->latency = (lat * 10000000) / stream->ss.rate + pulse_def_period[0]; pulse_unlock(); - TRACE("Latency: %u ms\n", (DWORD)(*params->latency / 10000)); + TRACE("Latency: %u ms\n", (unsigned)(*params->latency / 10000)); params->result = S_OK; return STATUS_SUCCESS; }

1 0

Martin Storsjö : ntdll: Fix a typo in a log message for arm unwind data.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: cad3668929c7ba775bdc8785cb231b96b42c6388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad3668929c7ba775bdc8785… Author: Martin Storsjö <martin(a)martin.st> Date: Mon May 9 23:34:18 2022 +0300 ntdll: Fix a typo in a log message for arm unwind data. The function length is expressed in units of 2 bytes. This was handled correctly in code (where it was multiplied by 2), but was incorrect in the log message. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 12ffbb3663a..b8e5e790965 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -972,7 +972,7 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION *f end = (BYTE *)data + codes * 4; TRACE( "function %lx-%lx: len=%#x ver=%u X=%u E=%u F=%u epilogs=%u codes=%u\n", - base + func->BeginAddress, base + func->BeginAddress + info->function_length * 4, + base + func->BeginAddress, base + func->BeginAddress + info->function_length * 2, info->function_length, info->version, info->x, info->e, info->f, epilogs, codes * 4 ); /* check for prolog */

1 0