December 2019 - Wine-commits

Derek Lesho : winemac: Set the scan code prefix when necessary.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: d5db609c4c9f3439aab22c6bbf207302cc3941fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5db609c4c9f3439aab22c6b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:17 2019 -0600 winemac: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index aed4ff0d6e..bb408cb20c 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1392,6 +1392,11 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) break; } } + + /* set scan code prefix */ + if (wMapType == MAPVK_VK_TO_VSC_EX && + (wCode == VK_RCONTROL || wCode == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */

1 0

Derek Lesho : winex11: Set the scan code prefix when necessary.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: bc02e8551f7fb07c49d5bfd1e3865bca6f157fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc02e8551f7fb07c49d5bfd1… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:16 2019 -0600 winex11: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 131c5f5442..48da12c029 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2107,6 +2107,11 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) break; } } + + /* set scan code prefix */ + if (wMapType == MAPVK_VK_TO_VSC_EX && + (wCode == VK_RCONTROL || wCode == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */

1 0

Derek Lesho : wineandroid: Set the scan code prefix when necessary.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 6da06330876fde9afaf546844518851fc8b67871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da06330876fde9afaf54684… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:18 2019 -0600 wineandroid: Set the scan code prefix when necessary. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 2c37c42e0d..a0f3257f74 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -932,6 +932,11 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) break; } if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; + + /* set scan code prefix */ + if (maptype == MAPVK_VK_TO_VSC_EX && + (code == VK_RCONTROL || code == VK_RMENU)) + ret |= 0xe000; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX:

1 0

Derek Lesho : users/tests: Test scan code prefix for MAPVK_VK_TO_VSC_EX.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 11ef39af39fef20032b08a09380c5a5ce30254e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ef39af39fef20032b08a09… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Nov 12 14:50:19 2019 -0600 users/tests: Test scan code prefix for MAPVK_VK_TO_VSC_EX. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0e7603811..ddaf7541e4 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1873,6 +1873,16 @@ static void test_key_map(void) vkey, numpad_scan); } } + + /* test the scan code prefixes of the right variant of a keys */ + s = MapVirtualKeyExA(VK_RCONTROL, MAPVK_VK_TO_VSC, kl); + ok(s >> 8 == 0x00, "Scan code prefixes should not be returned when not using MAPVK_VK_TO_VSC_EX %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RCONTROL, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0xE0 || broken(s == 0), "Scan code prefix for VK_RCONTROL should be 0xE0 when MAPVK_VK_TO_VSC_EX is set, was %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RMENU, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0xE0 || broken(s == 0), "Scan code prefix for VK_RMENU should be 0xE0 when MAPVK_VK_TO_VSC_EX is set, was %#1x\n", s >> 8); + s = MapVirtualKeyExA(VK_RSHIFT, MAPVK_VK_TO_VSC_EX, kl); + ok(s >> 8 == 0x00 || broken(s == 0), "The scan code shouldn't have a prefix, got %#1x\n", s >> 8); } #define shift 1

1 0

Rémi Bernon : widl: Cast freed pointers to void* to fix discarded-array-qualifiers warning.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 1491453ea9f1610e60b65acca41269d3c4ac7c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1491453ea9f1610e60b65acc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:22 2019 +0100 widl: Cast freed pointers to void* to fix discarded-array-qualifiers warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f37c7b0d67..9b8aa1a322 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4286,7 +4286,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); } } else @@ -4361,7 +4361,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); break; } } @@ -4463,7 +4463,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); indent--; } break;

1 0

Jactry Zeng : sapi: Implement ISpeechVoice stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 474a20a0b0a315594456aba88e60374e481dd6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=474a20a0b0a315594456aba8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:17:51 2019 +0800 sapi: Implement ISpeechVoice stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 3 +- dlls/sapi/tests/tts.c | 71 ++++++++ dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++++++++++ include/sapi.idl | 11 +- 8 files changed, 516 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=474a20a0b0a315594456…

1 0

Zebediah Figura : strmbase: Don't hold the filter lock while calling IPin::NewSegment().
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3b7ce569082e345445d12621ba351bfac8865b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b7ce569082e345445d12621… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 30 19:48:31 2019 -0600 strmbase: Don't hold the filter lock while calling IPin::NewSegment(). It's not safe to hold the filter lock from a streaming thread, and anyway we aren't protecting anything that needs locking. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index d39dbbd3ab..7650232c44 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -495,12 +495,10 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC TRACE("iface %p, start %s, stop %s, rate %.16e.\n", iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - EnterCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnNewSegment) hr = pTransform->pFuncsTable->pfnNewSegment(pTransform, tStart, tStop, dRate); if (SUCCEEDED(hr)) hr = BaseInputPinImpl_NewSegment(iface, tStart, tStop, dRate); - LeaveCriticalSection(&pTransform->filter.csFilter); return hr; }

1 0

Zebediah Figura : strmbase/transform: Hold the streaming lock for the entirety of Receive().
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3a7f54947e77e6a3bed4f74ae61759f731b1451a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7f54947e77e6a3bed4f74a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 30 19:48:32 2019 -0600 strmbase/transform: Hold the streaming lock for the entirety of Receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 4 ---- dlls/quartz/avidec.c | 22 +++++++++------------- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gsttffilter.c | 3 --- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 64e0018980..8eea6ab147 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -66,12 +66,10 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam LONGLONG tStart = -1, tStop = -1, tMed; LONGLONG mtStart = -1, mtStop = -1, mtMed; - EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - LeaveCriticalSection(&This->tf.csReceive); return hr; } @@ -107,7 +105,6 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - LeaveCriticalSection(&This->tf.csReceive); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -224,7 +221,6 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; - LeaveCriticalSection(&This->tf.csReceive); return hr; } diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index cbe109df2b..32969a3473 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -111,12 +111,11 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) LONGLONG tStart, tStop; DWORD flags = 0; - EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - goto error; + return hr; } cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -129,7 +128,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->tf.source, &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - goto error; + return hr; } hr = IMediaSample_SetActualDataLength(pOutSample, 0); @@ -138,13 +137,14 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) hr = IMediaSample_GetPointer(pOutSample, &pbDstStream); if (FAILED(hr)) { ERR("Unable to get pointer to buffer (%x)\n", hr); - goto error; + IMediaSample_Release(pOutSample); + return hr; } cbDstStream = IMediaSample_GetSize(pOutSample); if (cbDstStream < This->pBihOut->biSizeImage) { ERR("Sample size is too small %d < %d\n", cbDstStream, This->pBihOut->biSizeImage); - hr = E_FAIL; - goto error; + IMediaSample_Release(pOutSample); + return E_FAIL; } if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -161,8 +161,8 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { - hr = S_OK; - goto error; + IMediaSample_Release(pOutSample); + return S_OK; } IMediaSample_SetActualDataLength(pOutSample, This->pBihOut->biSizeImage); @@ -187,11 +187,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); -error: - if (pOutSample) - IMediaSample_Release(pOutSample); - - LeaveCriticalSection(&This->tf.csReceive); + IMediaSample_Release(pOutSample); return hr; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7650232c44..9e2582a0db 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -82,12 +82,12 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, return S_FALSE; } - LeaveCriticalSection(&pTransform->csReceive); if (pTransform->pFuncsTable->pfnReceive) hr = pTransform->pFuncsTable->pfnReceive(pTransform, pInSample); else hr = S_FALSE; + LeaveCriticalSection(&pTransform->csReceive); return hr; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index baa4c0c2c5..9ff5f8741d 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -227,7 +227,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM mark_wine_thread(); - EnterCriticalSection(&This->tf.csReceive); IMediaSample_GetPointer(sample, &data); IMediaSample_AddRef(sample); @@ -235,7 +234,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM buf = gst_buffer_new_wrapped_full(0, data, bufsize, 0, bufsize, sample, release_sample_wrapper); if (!buf) { IMediaSample_Release(sample); - LeaveCriticalSection(&This->tf.csReceive); return S_OK; } @@ -259,7 +257,6 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_LIVE); if (IMediaSample_IsSyncPoint(sample) != S_OK) GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT); - LeaveCriticalSection(&This->tf.csReceive); ret = gst_pad_push(This->my_src, buf); if (ret) WARN("Sending returned: %i\n", ret);

1 0

Jactry Zeng : sapi: Implement ISpVoice stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 58b20d1db7888a8039f3b97b5715c26ede4d6387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b20d1db7888a8039f3b97b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:07 2019 +0800 sapi: Implement ISpVoice stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/tts.c | 24 +++- dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58b20d1db7888a8039f3…

1 0

Francois Gouget : testbotwinerunreconfig: Fix formatting of a trace.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: tools Branch: master Commit: 00180486a070bd95e3715db9de974752f2f7cb1b URL: https://source.winehq.org/git/tools.git/?a=commit;h=00180486a070bd95e3715db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 2 13:51:29 2019 +0100 testbotwinerunreconfig: Fix formatting of a trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index df8b7df..5c63913 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -503,7 +503,7 @@ if ($NewStatus eq "completed") my $ErrMessage = $TA->GetLastError(); FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); } - Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + Debug(Elapsed($Start), " Upgraded testagentd to $Version\n"); } }

1 0