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

Sven Baars : d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 07cb8ef5d02ba280c317b3ebb78ab9e7f28bd97f URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cb8ef5d02ba280c317b3eb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat May 7 13:17:48 2022 +0200 d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51827 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_34/tests/Makefile.in | 2 +- dlls/d3dx10_35/tests/Makefile.in | 2 +- dlls/d3dx10_36/tests/Makefile.in | 2 +- dlls/d3dx10_37/tests/Makefile.in | 2 +- dlls/d3dx10_38/tests/Makefile.in | 2 +- dlls/d3dx10_39/tests/Makefile.in | 2 +- dlls/d3dx10_40/tests/Makefile.in | 2 +- dlls/d3dx10_41/tests/Makefile.in | 2 +- dlls/d3dx10_42/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 8 ++++++-- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx10_34/tests/Makefile.in b/dlls/d3dx10_34/tests/Makefile.in index 77795f87885..b3cb20f944e 100644 --- a/dlls/d3dx10_34/tests/Makefile.in +++ b/dlls/d3dx10_34/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=34 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_34.dll IMPORTS = d3dx10_34 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_35/tests/Makefile.in b/dlls/d3dx10_35/tests/Makefile.in index 95777543e56..5d15ac0f99a 100644 --- a/dlls/d3dx10_35/tests/Makefile.in +++ b/dlls/d3dx10_35/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=35 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_35.dll IMPORTS = d3dx10_35 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_36/tests/Makefile.in b/dlls/d3dx10_36/tests/Makefile.in index d2cd9c02350..a9503459208 100644 --- a/dlls/d3dx10_36/tests/Makefile.in +++ b/dlls/d3dx10_36/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=36 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_36.dll IMPORTS = d3dx10_36 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_37/tests/Makefile.in b/dlls/d3dx10_37/tests/Makefile.in index 505f85d0c4b..e5707117a73 100644 --- a/dlls/d3dx10_37/tests/Makefile.in +++ b/dlls/d3dx10_37/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=37 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_37.dll IMPORTS = d3dx10_37 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_38/tests/Makefile.in b/dlls/d3dx10_38/tests/Makefile.in index b5da90a2f97..c1507422b4d 100644 --- a/dlls/d3dx10_38/tests/Makefile.in +++ b/dlls/d3dx10_38/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=38 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_38.dll IMPORTS = d3dx10_38 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_39/tests/Makefile.in b/dlls/d3dx10_39/tests/Makefile.in index 63190f1e090..fadaf089165 100644 --- a/dlls/d3dx10_39/tests/Makefile.in +++ b/dlls/d3dx10_39/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=39 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_39.dll IMPORTS = d3dx10_39 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_40/tests/Makefile.in b/dlls/d3dx10_40/tests/Makefile.in index 669ef97d4f7..f5ffaf385a8 100644 --- a/dlls/d3dx10_40/tests/Makefile.in +++ b/dlls/d3dx10_40/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=40 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_40.dll IMPORTS = d3dx10_40 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_41/tests/Makefile.in b/dlls/d3dx10_41/tests/Makefile.in index 85204bc4f2a..afff1c75705 100644 --- a/dlls/d3dx10_41/tests/Makefile.in +++ b/dlls/d3dx10_41/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=41 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_41.dll IMPORTS = d3dx10_41 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in index 8936c5859e7..f996b86b0e6 100644 --- a/dlls/d3dx10_42/tests/Makefile.in +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=42 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_42.dll IMPORTS = d3dx10_42 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_43/tests/Makefile.in b/dlls/d3dx10_43/tests/Makefile.in index 5cef10c80ff..95078d0e12b 100644 --- a/dlls/d3dx10_43/tests/Makefile.in +++ b/dlls/d3dx10_43/tests/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES +EXTRADEFS = -DD3DX10_SDK_VERSION=43 -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_43.dll IMPORTS = d3dx10 ole32 gdi32 diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 9b7a4d7cc9b..4a734fe0149 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2466,11 +2466,15 @@ static void test_font(void) hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test glyphs that are not rendered */ - hr = ID3DX10Font_PreloadGlyphs(font, 0, 5); +#if D3DX10_SDK_VERSION > 34 + /* Test multiple textures. + * Native d3dx10_34.dll shows signs of memory corruption in this call. */ + hr = ID3DX10Font_PreloadGlyphs(font, 0, 1000); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +#endif + /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) { srv = (void *)0xdeadbeef;

1 0

Rémi Bernon : ntdll: Update block unused_bytes in shrink_used_block.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 0c856978f1d418d39d3c90173437aca1af021f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c856978f1d418d39d3c9017… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 23:57:48 2022 +0200 ntdll: Update block unused_bytes in shrink_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f0f8704029c..44c9ad53196 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -808,17 +808,19 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) } -static void shrink_used_block( SUBHEAP *subheap, struct block *block, SIZE_T data_size ) +static void shrink_used_block( SUBHEAP *subheap, struct block *block, SIZE_T data_size, SIZE_T size ) { SIZE_T old_data_size = block_get_size( block ) - sizeof(*block); if (old_data_size >= data_size + HEAP_MIN_SHRINK_SIZE) { block->size = data_size | block_get_flags( block ); + block->unused_bytes = data_size - size; HEAP_CreateFreeBlock( subheap, next_block( subheap, block ), old_data_size - data_size ); } else { struct block *next; + block->unused_bytes = old_data_size - size; if ((next = next_block( subheap, block ))) next->size &= ~ARENA_FLAG_PREV_FREE; } } @@ -1579,8 +1581,7 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Shrink the block */ - shrink_used_block( subheap, pInUse, rounded_size ); - pInUse->unused_bytes = (pInUse->size & ARENA_SIZE_MASK) - size; + shrink_used_block( subheap, pInUse, rounded_size, size ); notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); initialize_block( pInUse + 1, size, pInUse->unused_bytes, flags ); @@ -1687,7 +1688,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size pArena->size += block_get_size( next ); if (!HEAP_Commit( subheap, pArena, rounded_size )) return STATUS_NO_MEMORY; notify_realloc( pArena + 1, oldActualSize, size ); - shrink_used_block( subheap, pArena, rounded_size ); + shrink_used_block( subheap, pArena, rounded_size, size ); } else { @@ -1703,11 +1704,9 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size else { notify_realloc( pArena + 1, oldActualSize, size ); - shrink_used_block( subheap, pArena, rounded_size ); + shrink_used_block( subheap, pArena, rounded_size, size ); } - pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size; - /* Clear the extra bytes if needed */ if (size > oldActualSize)

1 0

Rémi Bernon : ntdll: Cleanup HEAP_ShrinkBlock and rename it to shrink_used_block.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 481ecc2d72496e1273b2060ab30d53d20d350740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=481ecc2d72496e1273b2060a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 18 09:44:35 2022 +0200 ntdll: Cleanup HEAP_ShrinkBlock and rename it to shrink_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3a1a4268683..f0f8704029c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -808,26 +808,18 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) } -/*********************************************************************** - * HEAP_ShrinkBlock - * - * Shrink an in-use block. - */ -static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) +static void shrink_used_block( SUBHEAP *subheap, struct block *block, SIZE_T data_size ) { - SIZE_T old_data_size = pArena->size & ARENA_SIZE_MASK; - if (old_data_size >= size + HEAP_MIN_SHRINK_SIZE) + SIZE_T old_data_size = block_get_size( block ) - sizeof(*block); + if (old_data_size >= data_size + HEAP_MIN_SHRINK_SIZE) { - /* assign size plus previous arena flags */ - pArena->size = size | (pArena->size & ~ARENA_SIZE_MASK); - HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, old_data_size - size ); + block->size = data_size | block_get_flags( block ); + HEAP_CreateFreeBlock( subheap, next_block( subheap, block ), old_data_size - data_size ); } else { - /* Turn off PREV_FREE flag in next block */ - char *pNext = (char *)(pArena + 1) + old_data_size; - if (pNext < (char *)subheap->base + subheap->size) - *(DWORD *)pNext &= ~ARENA_FLAG_PREV_FREE; + struct block *next; + if ((next = next_block( subheap, block ))) next->size &= ~ARENA_FLAG_PREV_FREE; } } @@ -1118,7 +1110,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, * last free arena in ! * So just one heap struct, one first free arena which will eventually * get used, and a second free arena that might get assigned all remaining - * free space in HEAP_ShrinkBlock() */ + * free space in shrink_used_block() */ total_size = size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); if (total_size < size) return NULL; /* overflow */ @@ -1587,7 +1579,7 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Shrink the block */ - HEAP_ShrinkBlock( subheap, pInUse, rounded_size ); + shrink_used_block( subheap, pInUse, rounded_size ); pInUse->unused_bytes = (pInUse->size & ARENA_SIZE_MASK) - size; notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); @@ -1695,7 +1687,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size pArena->size += block_get_size( next ); if (!HEAP_Commit( subheap, pArena, rounded_size )) return STATUS_NO_MEMORY; notify_realloc( pArena + 1, oldActualSize, size ); - HEAP_ShrinkBlock( subheap, pArena, rounded_size ); + shrink_used_block( subheap, pArena, rounded_size ); } else { @@ -1711,7 +1703,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size else { notify_realloc( pArena + 1, oldActualSize, size ); - HEAP_ShrinkBlock( subheap, pArena, rounded_size ); + shrink_used_block( subheap, pArena, rounded_size ); } pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;

1 0

Rémi Bernon : windows.gaming.input: Implement IConstantForceEffect_SetParameters(WithEnvelope).
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: aba20b0624aa1092035894848381288401a3143a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba20b0624aa109203589484… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 15:59:04 2022 +0200 windows.gaming.input: Implement IConstantForceEffect_SetParameters(WithEnvelope). 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 | 6 +-- dlls/windows.gaming.input/constant_effect.c | 45 ++++++++++++++++++--- dlls/windows.gaming.input/force_feedback.c | 62 +++++++++++++++++++++++++++++ dlls/windows.gaming.input/provider.idl | 29 ++++++++++++++ 4 files changed, 132 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aba20b0624aa10920358…

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackEffect_(get|put)_Gain.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: bc6df7ca5707d8509efb8fae1629300b7f50bf17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6df7ca5707d8509efb8fae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 15:58:05 2022 +0200 windows.gaming.input: Implement IForceFeedbackEffect_(get|put)_Gain. 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 | 8 +------- dlls/windows.gaming.input/force_feedback.c | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index da01ce63a96..7755cca1927 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5572,7 +5572,7 @@ static void test_windows_gaming_input(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x5a,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -6061,12 +6061,9 @@ static void test_windows_gaming_input(void) gain = 12345.6; hr = IForceFeedbackEffect_get_Gain( effect, &gain ); - todo_wine ok( hr == S_OK, "get_Gain returned %#lx\n", hr ); - todo_wine ok( gain == 1.0, "got gain %f\n", gain ); hr = IForceFeedbackEffect_put_Gain( effect, 0.5 ); - todo_wine ok( hr == S_FALSE, "put_Gain returned %#lx\n", hr ); state = 0xdeadbeef; hr = IForceFeedbackEffect_get_State( effect, &state ); @@ -6317,12 +6314,9 @@ static void test_windows_gaming_input(void) gain = 12345.6; hr = IForceFeedbackEffect_get_Gain( effect, &gain ); - todo_wine ok( hr == S_OK, "get_Gain returned %#lx\n", hr ); - todo_wine ok( gain == 1.0, "get_MasterGain returned %f\n", gain ); hr = IForceFeedbackEffect_put_Gain( effect, 0.5 ); - todo_wine ok( hr == S_FALSE, "put_Gain returned %#lx\n", hr ); state = 0xdeadbeef; hr = IForceFeedbackEffect_get_State( effect, &state ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 9f24fa8a748..667174829f5 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -19,6 +19,8 @@ #include "private.h" +#include "math.h" + #include "ddk/hidsdi.h" #include "dinput.h" #include "hidusage.h" @@ -117,14 +119,31 @@ DEFINE_IINSPECTABLE_OUTER( effect, IForceFeedbackEffect, struct effect, IInspect static HRESULT WINAPI effect_get_Gain( IForceFeedbackEffect *iface, DOUBLE *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( iface ); + + TRACE( "iface %p, value %p.\n", iface, value ); + + EnterCriticalSection( &impl->cs ); + *value = impl->params.dwGain / 10000.; + LeaveCriticalSection( &impl->cs ); + + return S_OK; } static HRESULT WINAPI effect_put_Gain( IForceFeedbackEffect *iface, DOUBLE value ) { - FIXME( "iface %p, value %f stub!\n", iface, value ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( iface ); + HRESULT hr; + + TRACE( "iface %p, value %f.\n", iface, value ); + + EnterCriticalSection( &impl->cs ); + impl->params.dwGain = round( value * 10000 ); + if (!impl->effect) hr = S_FALSE; + else hr = IDirectInputEffect_SetParameters( impl->effect, &impl->params, DIEP_GAIN ); + LeaveCriticalSection( &impl->cs ); + + return hr; } static HRESULT WINAPI effect_get_State( IForceFeedbackEffect *iface, ForceFeedbackEffectState *value )

1 0

Rémi Bernon : windows.gaming.input: Always assume at least two force feedback axes.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: c578aa7cd3f671a39024c45c432cd57508c11974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c578aa7cd3f671a39024c45c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 15:56:25 2022 +0200 windows.gaming.input: Always assume at least two force feedback axes. 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 | 8 ++++---- dlls/windows.gaming.input/force_feedback.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 9cf636880c0..da01ce63a96 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5482,7 +5482,7 @@ static void test_windows_gaming_input(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x02,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x02,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -5523,7 +5523,7 @@ static void test_windows_gaming_input(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x03,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x03,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -5572,7 +5572,7 @@ static void test_windows_gaming_input(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -5621,7 +5621,7 @@ static void test_windows_gaming_input(void) .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x05,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x05,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index f3b5f16f8c0..9f24fa8a748 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -232,7 +232,7 @@ HRESULT force_feedback_effect_create( enum WineForceFeedbackEffectType type, IIn impl->params.dwTriggerButton = -1; impl->params.dwGain = 10000; impl->params.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; - impl->params.cAxes = 0; + impl->params.cAxes = 2; impl->axes[0] = DIJOFS_X; impl->axes[1] = DIJOFS_Y; impl->axes[2] = DIJOFS_Z;

1 0

Brendan Shanks : crypt32/tests: Fix mismatched deallocation function.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 65954db2be6495356b56d504b1fadacf3fe9c740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65954db2be6495356b56d504… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 29 09:04:41 2022 -0700 crypt32/tests: Fix mismatched deallocation function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9dabe58efba..b65ffde3a84 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2603,7 +2603,7 @@ static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) rsaPubKeys[i].modulus, rsaPubKeys[i].decodedModulusLen), "Unexpected modulus\n"); LocalFree(buf); - LocalFree(leModulus); + HeapFree(GetProcessHeap(), 0, leModulus); } } }

1 0

Brendan Shanks : include: Add __WINE_MALLOC attribute and use it for allocation functions.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: fd1b9afc1d4ce4f0401b15aa2a498e33ea74cc1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd1b9afc1d4ce4f0401b15aa… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 28 10:16:06 2022 -0700 include: Add __WINE_MALLOC attribute and use it for allocation functions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 12 ++++++------ include/objbase.h | 2 +- include/oleauto.h | 6 +++--- include/rpcndr.h | 8 ++++---- include/winbase.h | 6 +++--- include/wincrypt.h | 2 +- include/wine/heap.h | 6 +++--- include/winnt.h | 6 ++++++ include/winternl.h | 2 +- 9 files changed, 28 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1b9afc1d4ce4f0401b…

1 0

Rémi Bernon : windows.gaming.input: Implement IConditionForceEffect_SetParameters.
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 37abfa73f264217cf3499fc04ca0f58d10a9746e URL: https://source.winehq.org/git/wine.git/?a=commit;h=37abfa73f264217cf3499fc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 16:03:31 2022 +0200 windows.gaming.input: Implement IConditionForceEffect_SetParameters. 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 | 11 ----------- dlls/windows.gaming.input/condition_effect.c | 20 ++++++++++++++++++-- dlls/windows.gaming.input/force_feedback.c | 13 ++++++++++++- dlls/windows.gaming.input/provider.idl | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 6903e490193..05b0ad9c427 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5514,23 +5514,13 @@ static void test_windows_gaming_input(void) .report_id = 4, .report_len = 12, .report_buf = {4,0x01,0x00,0x70,0x17,0x7b,0x02,0xe9,0x04,0x4c,0x66,0x7f}, - .todo = TRUE, }, /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x03,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, - .wine_only = TRUE, - .todo = TRUE, - }, { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x03,0x08,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x00,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_create_constant[] = @@ -6216,7 +6206,6 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Kind returned %#lx\n", hr ); ok( condition_kind == ConditionForceEffectKind_Spring, "got kind %u\n", condition_kind ); hr = IConditionForceEffect_SetParameters( condition_effect, direction, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6 ); - todo_wine ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); IConditionForceEffect_Release( condition_effect ); diff --git a/dlls/windows.gaming.input/condition_effect.c b/dlls/windows.gaming.input/condition_effect.c index dccc50bb48f..c3a5a1fcd8b 100644 --- a/dlls/windows.gaming.input/condition_effect.c +++ b/dlls/windows.gaming.input/condition_effect.c @@ -110,10 +110,26 @@ static HRESULT WINAPI effect_get_Kind( IConditionForceEffect *iface, ConditionFo static HRESULT WINAPI effect_SetParameters( IConditionForceEffect *iface, Vector3 direction, FLOAT positive_coeff, FLOAT negative_coeff, FLOAT max_positive_magnitude, FLOAT max_negative_magnitude, FLOAT deadzone, FLOAT bias ) { - FIXME( "iface %p, direction %s, positive_coeff %f, negative_coeff %f, max_positive_magnitude %f, max_negative_magnitude %f, deadzone %f, bias %f stub!\n", + struct condition_effect *impl = impl_from_IConditionForceEffect( iface ); + WineForceFeedbackEffectParameters params = + { + .condition = + { + .type = WineForceFeedbackEffectType_Condition + impl->kind, + .direction = direction, + .positive_coeff = positive_coeff, + .negative_coeff = negative_coeff, + .max_positive_magnitude = max_positive_magnitude, + .max_negative_magnitude = max_negative_magnitude, + .deadzone = deadzone, + .bias = bias, + }, + }; + + TRACE( "iface %p, direction %s, positive_coeff %f, negative_coeff %f, max_positive_magnitude %f, max_negative_magnitude %f, deadzone %f, bias %f.\n", iface, debugstr_vector3( &direction ), positive_coeff, negative_coeff, max_positive_magnitude, max_negative_magnitude, deadzone, bias ); - return E_NOTIMPL; + return IWineForceFeedbackEffectImpl_put_Parameters( impl->IWineForceFeedbackEffectImpl_inner, params, NULL ); } static const struct IConditionForceEffectVtbl effect_vtbl = diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 3e6b49ee1aa..dd10f86bd3e 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -162,7 +162,18 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * case WineForceFeedbackEffectType_Condition_Damper: case WineForceFeedbackEffectType_Condition_Inertia: case WineForceFeedbackEffectType_Condition_Friction: - FIXME("stub!\n"); + impl->repeat_count = 1; + impl->condition.lPositiveCoefficient = round( atan( params.condition.positive_coeff ) / M_PI_2 * 10000 ); + impl->condition.lNegativeCoefficient = round( atan( params.condition.negative_coeff ) / M_PI_2 * 10000 ); + impl->condition.dwPositiveSaturation = round( params.condition.max_positive_magnitude * 10000 ); + impl->condition.dwNegativeSaturation = round( params.condition.max_negative_magnitude * 10000 ); + impl->condition.lDeadBand = round( params.condition.deadzone * 10000 ); + impl->condition.lOffset = round( params.condition.bias * 10000 ); + impl->params.dwDuration = -1; + impl->params.dwStartDelay = 0; + impl->directions[0] = round( params.condition.direction.X * 10000 ); + impl->directions[1] = round( params.condition.direction.Y * 10000 ); + impl->directions[2] = round( params.condition.direction.Z * 10000 ); break; } diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 4aacc43d80e..e7b6e96b8aa 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -37,6 +37,7 @@ namespace Windows.Gaming.Input.Custom { typedef enum WineForceFeedbackEffectType WineForceFeedbackEffectType; typedef struct WineGameControllerState WineGameControllerState; typedef struct WineGameControllerVibration WineGameControllerVibration; + typedef struct WineConditionEffectParameters WineConditionEffectParameters; typedef struct WineConstantEffectParameters WineConstantEffectParameters; typedef struct WineRampEffectParameters WineRampEffectParameters; typedef struct WinePeriodicEffectParameters WinePeriodicEffectParameters; @@ -92,6 +93,18 @@ namespace Windows.Gaming.Input.Custom { UINT16 right; }; + struct WineConditionEffectParameters + { + WineForceFeedbackEffectType type; + Windows.Foundation.Numerics.Vector3 direction; + FLOAT positive_coeff; + FLOAT negative_coeff; + FLOAT max_positive_magnitude; + FLOAT max_negative_magnitude; + FLOAT deadzone; + FLOAT bias; + }; + struct WineConstantEffectParameters { WineForceFeedbackEffectType type; @@ -137,6 +150,7 @@ namespace Windows.Gaming.Input.Custom { union WineForceFeedbackEffectParameters { WineForceFeedbackEffectType type; + WineConditionEffectParameters condition; WineConstantEffectParameters constant; WineRampEffectParameters ramp; WinePeriodicEffectParameters periodic;

1 0

Rémi Bernon : windows.gaming.input: Implement IPeriodicForceEffect_SetParameters(WithEnvelope).
by Alexandre Julliard May 18, 2022

May 18, 2022

Module: wine Branch: master Commit: 84fe8c224618e3b6f2509048eb908081f2d77dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84fe8c224618e3b6f2509048… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 16:02:07 2022 +0200 windows.gaming.input: Implement IPeriodicForceEffect_SetParameters(WithEnvelope). 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 | 8 +---- dlls/windows.gaming.input/force_feedback.c | 11 +++++- dlls/windows.gaming.input/periodic_effect.c | 52 ++++++++++++++++++++++++++--- dlls/windows.gaming.input/provider.idl | 15 +++++++++ 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index acd12f22401..6903e490193 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5467,7 +5467,6 @@ static void test_windows_gaming_input(void) .report_id = 7, .report_len = 10, .report_buf = {7,0x01,0xa0,0x0f,0xd0,0x07,0x70,0xff,0x0a,0x00}, - .todo = TRUE, }, /* set envelope */ { @@ -5475,14 +5474,13 @@ static void test_windows_gaming_input(void) .report_id = 8, .report_len = 8, .report_buf = {8,0x01,0x4c,0x7f,0x28,0x00,0x50,0x00}, - .todo = TRUE, }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, - .report_buf = {3,0x01,0x02,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x00,0x00,0x00}, + .report_buf = {3,0x01,0x02,0x08,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0xce,0x00,0x00,0x00}, .wine_only = TRUE, .todo = TRUE, }, @@ -6047,11 +6045,9 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Kind returned %#lx\n", hr ); ok( periodic_kind == PeriodicForceEffectKind_SawtoothWaveUp, "got kind %u\n", periodic_kind ); hr = IPeriodicForceEffect_SetParameters( periodic_effect, direction, 1.0, 0.1, 0.0, duration ); - todo_wine ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); hr = IPeriodicForceEffect_SetParametersWithEnvelope( periodic_effect, direction, 100.0, 0.1, 0.2, 0.3, 0.4, 0.5, delay, attack_duration, duration, release_duration, 1 ); - todo_wine ok( hr == S_OK, "SetParametersWithEnvelope returned %#lx\n", hr ); IPeriodicForceEffect_Release( periodic_effect ); @@ -6120,11 +6116,9 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Kind returned %#lx\n", hr ); ok( periodic_kind == PeriodicForceEffectKind_SineWave, "got kind %u\n", periodic_kind ); hr = IPeriodicForceEffect_SetParameters( periodic_effect, direction, 1.0, 0.1, 0.0, duration ); - todo_wine ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); hr = IPeriodicForceEffect_SetParametersWithEnvelope( periodic_effect, direction, 100.0, 0.1, 0.2, 0.3, 0.4, 0.5, delay, duration, duration, duration, 1 ); - todo_wine ok( hr == S_OK, "SetParametersWithEnvelope returned %#lx\n", hr ); IPeriodicForceEffect_Release( periodic_effect ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 2ed272916c9..3e6b49ee1aa 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -146,7 +146,16 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * case WineForceFeedbackEffectType_Periodic_SquareWave: case WineForceFeedbackEffectType_Periodic_SawtoothWaveDown: case WineForceFeedbackEffectType_Periodic_SawtoothWaveUp: - FIXME("stub!\n"); + impl->repeat_count = params.periodic.repeat_count; + impl->periodic.dwMagnitude = round( params.periodic.gain * 10000 ); + impl->periodic.dwPeriod = 1000000 / params.periodic.frequency; + impl->periodic.dwPhase = round( params.periodic.phase * 36000 ); + impl->periodic.lOffset = round( params.periodic.bias * 10000 ); + impl->params.dwDuration = params.periodic.duration.Duration / 10; + impl->params.dwStartDelay = params.periodic.start_delay.Duration / 10; + impl->directions[0] = round( -params.periodic.direction.X * 10000 ); + impl->directions[1] = round( -params.periodic.direction.Y * 10000 ); + impl->directions[2] = round( -params.periodic.direction.Z * 10000 ); break; case WineForceFeedbackEffectType_Condition_Spring: diff --git a/dlls/windows.gaming.input/periodic_effect.c b/dlls/windows.gaming.input/periodic_effect.c index 81ca60f28ef..8633a8fb9b9 100644 --- a/dlls/windows.gaming.input/periodic_effect.c +++ b/dlls/windows.gaming.input/periodic_effect.c @@ -110,9 +110,26 @@ static HRESULT WINAPI effect_get_Kind( IPeriodicForceEffect *iface, PeriodicForc static HRESULT WINAPI effect_SetParameters( IPeriodicForceEffect *iface, Vector3 direction, FLOAT frequency, FLOAT phase, FLOAT bias, TimeSpan duration ) { - FIXME( "iface %p, direction %s, frequency %f, phase %f, bias %f, duration %I64u stub!\n", iface, + struct periodic_effect *impl = impl_from_IPeriodicForceEffect( iface ); + WineForceFeedbackEffectParameters params = + { + .periodic = + { + .type = WineForceFeedbackEffectType_Periodic_SquareWave + impl->kind, + .direction = direction, + .frequency = frequency, + .phase = phase, + .bias = bias, + .duration = duration, + .repeat_count = 1, + .gain = 1., + }, + }; + + TRACE( "iface %p, direction %s, frequency %f, phase %f, bias %f, duration %I64u.\n", iface, debugstr_vector3( &direction ), frequency, phase, bias, duration.Duration ); - return E_NOTIMPL; + + return IWineForceFeedbackEffectImpl_put_Parameters( impl->IWineForceFeedbackEffectImpl_inner, params, NULL ); } static HRESULT WINAPI effect_SetParametersWithEnvelope( IPeriodicForceEffect *iface, Vector3 direction, FLOAT frequency, FLOAT phase, FLOAT bias, @@ -120,11 +137,36 @@ static HRESULT WINAPI effect_SetParametersWithEnvelope( IPeriodicForceEffect *if TimeSpan attack_duration, TimeSpan sustain_duration, TimeSpan release_duration, UINT32 repeat_count ) { - FIXME( "iface %p, direction %s, frequency %f, phase %f, bias %f, attack_gain %f, sustain_gain %f, release_gain %f, start_delay %I64u, " - "attack_duration %I64u, sustain_duration %I64u, release_duration %I64u, repeat_count %u stub!\n", iface, debugstr_vector3( &direction ), + struct periodic_effect *impl = impl_from_IPeriodicForceEffect( iface ); + WineForceFeedbackEffectParameters params = + { + .periodic = + { + .type = WineForceFeedbackEffectType_Periodic_SquareWave + impl->kind, + .direction = direction, + .frequency = frequency, + .phase = phase, + .bias = bias, + .duration = {attack_duration.Duration + sustain_duration.Duration + release_duration.Duration}, + .start_delay = start_delay, + .repeat_count = repeat_count, + .gain = sustain_gain, + }, + }; + WineForceFeedbackEffectEnvelope envelope = + { + .attack_gain = attack_gain, + .release_gain = release_gain, + .attack_duration = attack_duration, + .release_duration = release_duration, + }; + + TRACE( "iface %p, direction %s, frequency %f, phase %f, bias %f, attack_gain %f, sustain_gain %f, release_gain %f, start_delay %I64u, " + "attack_duration %I64u, sustain_duration %I64u, release_duration %I64u, repeat_count %u.\n", iface, debugstr_vector3( &direction ), frequency, phase, bias, attack_gain, sustain_gain, release_gain, start_delay.Duration, attack_duration.Duration, sustain_duration.Duration, release_duration.Duration, repeat_count ); - return E_NOTIMPL; + + return IWineForceFeedbackEffectImpl_put_Parameters( impl->IWineForceFeedbackEffectImpl_inner, params, &envelope ); } static const struct IPeriodicForceEffectVtbl effect_vtbl = diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 3baac4fe77d..4aacc43d80e 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -39,6 +39,7 @@ namespace Windows.Gaming.Input.Custom { typedef struct WineGameControllerVibration WineGameControllerVibration; typedef struct WineConstantEffectParameters WineConstantEffectParameters; typedef struct WineRampEffectParameters WineRampEffectParameters; + typedef struct WinePeriodicEffectParameters WinePeriodicEffectParameters; typedef struct WineForceFeedbackEffectEnvelope WineForceFeedbackEffectEnvelope; typedef union WineForceFeedbackEffectParameters WineForceFeedbackEffectParameters; interface IWineGameControllerProvider; @@ -112,6 +113,19 @@ namespace Windows.Gaming.Input.Custom { FLOAT gain; }; + struct WinePeriodicEffectParameters + { + WineForceFeedbackEffectType type; + Windows.Foundation.Numerics.Vector3 direction; + Windows.Foundation.TimeSpan duration; + Windows.Foundation.TimeSpan start_delay; + UINT32 repeat_count; + FLOAT frequency; + FLOAT phase; + FLOAT bias; + FLOAT gain; + }; + struct WineForceFeedbackEffectEnvelope { FLOAT attack_gain; @@ -125,6 +139,7 @@ namespace Windows.Gaming.Input.Custom { WineForceFeedbackEffectType type; WineConstantEffectParameters constant; WineRampEffectParameters ramp; + WinePeriodicEffectParameters periodic; }; [

1 0