January 2021 - Wine-Commits

Julian Rüger : readme: Update German translation.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: wine Branch: master Commit: c0ca6913ca9a7063deadd53fc4954da860880897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ca6913ca9a7063deadd53f… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 5 16:36:45 2021 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index fbf63eca22e..b30575a356d 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -44,7 +44,7 @@ folgenden Betriebssysteme: FreeBSD 8.0 oder neuer Solaris x86 9 oder neuer NetBSD-current - Mac OS X 10.5 oder neuer + Mac OS X 10.8 oder neuer Da Wine Thread-Unterstützung auf Kernelebene benötigt, werden nur die oben aufgeführten Betriebssysteme unterstützt. @@ -67,9 +67,10 @@ NetBSD-Info: SYSVMSG in Ihrem Kernel aktiviert haben. Mac OS X Info: - Sie benötigen mindestens Xcode 2.4 um richtig unter x86 kompilieren zu - können. Der Mac-Treiber benötigt mindestens OS X 10.6, unter 10.5 wird - dieser nicht mit kompiliert. + Sie benötigen Xcode/Xcode-Kommandozeilentools oder Apple cctools. Die + Mindestanforderungen um Wine zu kompilieren sind clang 3.8 mit dem + MacOSX10.10.sdk und mingw-w64 v8. Das MacOSX10.14.sdk oder neuer kann + nur wine64 erzeugen. Unterstützte Dateisysteme: Wine sollte auf den meisten Dateisystemen laufen. Kompatibilitätsprobleme

1 0

Anton Baskanov : winegstreamer: Split audio data to fit in the sample buffer.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: wine Branch: master Commit: 2752029e920608d416aa22a9c602211527eec951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2752029e920608d416aa22a9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:49 2020 +0700 winegstreamer: Split audio data to fit in the sample buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50355 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 80 +++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ab4ea9c0d6..1e91c9f8e7e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -793,12 +793,13 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } -static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info) +static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, + GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { HRESULT hr; BYTE *ptr = NULL; - hr = IMediaSample_SetActualDataLength(sample, info->size); + hr = IMediaSample_SetActualDataLength(sample, size); if(FAILED(hr)){ WARN("SetActualDataLength failed: %08x\n", hr); return hr; @@ -806,18 +807,27 @@ static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, Gs IMediaSample_GetPointer(sample, &ptr); - memcpy(ptr, info->data, info->size); + memcpy(ptr, &info->data[offset], size); if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); + REFERENCE_TIME rtStart; + GstClockTime ptsStart = buf->pts; + if (offset > 0) + ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); + rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); if (rtStart >= 0) rtStart /= 100; if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME tStart = buf->pts / 100; - REFERENCE_TIME tStop = (buf->pts + buf->duration) / 100; REFERENCE_TIME rtStop; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts + buf->duration); + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + GstClockTime ptsStop = buf->pts + buf->duration; + if (offset + size < info->size) + ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); + tStart = ptsStart / 100; + tStop = ptsStop / 100; + rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); if (rtStop >= 0) rtStop /= 100; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); @@ -832,7 +842,7 @@ static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, Gs IMediaSample_SetMediaTime(sample, NULL, NULL); } - IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); + IMediaSample_SetDiscontinuity(sample, !offset && GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); @@ -850,7 +860,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu { struct gstdemux_source *pin = gst_pad_get_element_private(pad); struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); - HRESULT hr; + HRESULT hr = S_OK; IMediaSample *sample; GstMapInfo info; @@ -861,24 +871,58 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + gst_buffer_map(buf, &info, GST_MAP_READ); - if (FAILED(hr)) + if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) + && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) + || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; + gsize offset = 0; + while (offset < info.size) + { + gsize advance; + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + break; + } + + advance = min(IMediaSample_GetSize(sample), info.size - offset); + + hr = send_sample(pin, sample, buf, &info, offset, advance, format->nAvgBytesPerSec); + + IMediaSample_Release(sample); + + if (FAILED(hr)) + break; + + offset += advance; + } } else { - gst_buffer_map(buf, &info, GST_MAP_READ); - - hr = send_sample(pin, sample, buf, &info); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - gst_buffer_unmap(buf, &info); + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + } + else + { + hr = send_sample(pin, sample, buf, &info, 0, info.size, 0); - IMediaSample_Release(sample); + IMediaSample_Release(sample); + } } + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); if (hr == VFW_E_NOT_CONNECTED)

1 0

Anton Baskanov : winegstreamer: Move sample sending to a helper function.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: wine Branch: master Commit: 291d5a9c10948f4372553a322bcf932e9501af99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=291d5a9c10948f4372553a32… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:48 2020 +0700 winegstreamer: Move sample sending to a helper function. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 76 +++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 805a7b8c089..3ab4ea9c0d6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -793,51 +793,20 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } -static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) +static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info) { - struct gstdemux_source *pin = gst_pad_get_element_private(pad); - struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); HRESULT hr; BYTE *ptr = NULL; - IMediaSample *sample; - GstMapInfo info; - - TRACE("%p %p\n", pad, buf); - - if (This->initial) { - gst_buffer_unref(buf); - return GST_FLOW_OK; - } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (hr == VFW_E_NOT_CONNECTED) { - gst_buffer_unref(buf); - return GST_FLOW_NOT_LINKED; - } - - if (FAILED(hr)) { - gst_buffer_unref(buf); - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); - return GST_FLOW_FLUSHING; - } - - gst_buffer_map(buf, &info, GST_MAP_READ); - - hr = IMediaSample_SetActualDataLength(sample, info.size); + hr = IMediaSample_SetActualDataLength(sample, info->size); if(FAILED(hr)){ - IMediaSample_Release(sample); - gst_buffer_unmap(buf, &info); - gst_buffer_unref(buf); WARN("SetActualDataLength failed: %08x\n", hr); - return GST_FLOW_FLUSHING; + return hr; } IMediaSample_GetPointer(sample, &ptr); - memcpy(ptr, info.data, info.size); - - gst_buffer_unmap(buf, &info); + memcpy(ptr, info->data, info->size); if (GST_BUFFER_PTS_IS_VALID(buf)) { REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); @@ -874,8 +843,43 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu TRACE("sending sample returned: %08x\n", hr); + return hr; +} + +static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) +{ + struct gstdemux_source *pin = gst_pad_get_element_private(pad); + struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); + HRESULT hr; + IMediaSample *sample; + GstMapInfo info; + + TRACE("%p %p\n", pad, buf); + + if (This->initial) { + gst_buffer_unref(buf); + return GST_FLOW_OK; + } + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + } + else + { + gst_buffer_map(buf, &info, GST_MAP_READ); + + hr = send_sample(pin, sample, buf, &info); + + gst_buffer_unmap(buf, &info); + + IMediaSample_Release(sample); + } + gst_buffer_unref(buf); - IMediaSample_Release(sample); if (hr == VFW_E_NOT_CONNECTED) return GST_FLOW_NOT_LINKED;

1 0

Francois Gouget : testbot: Update the $MaxVMErrors description.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: tools Branch: master Commit: 30dee3956f0397eb428708d7bf6beb6d8cb05346 URL: https://source.winehq.org/git/tools.git/?a=commit;h=30dee3956f0397eb428708d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 5 11:29:53 2021 +0100 testbot: Update the $MaxVMErrors description. We no longer put the VM in maintenance mode because that means only the administrator can put it back online. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index ea08aa0..ca3e983 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -102,7 +102,8 @@ $SleepAfterRevert = 0; # for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; -# After three consecutive failures to revert a VM, put it in maintenance mode. +# Notify the administrator that a VM probably needs manual fixing after +# $MaxVMErrors consecutive revert errors. $MaxVMErrors = 3; # How many times to run a test that fails before giving up.

1 0

Francois Gouget : transl: Fix the spelling of a comment.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: tools Branch: master Commit: 1ded4f6ec67a9879e20b34eb87eac6cd443f9a97 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ded4f6ec67a9879e20b34e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 5 11:28:58 2021 +0100 transl: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/lib_res.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transl/lib_res.php b/transl/lib_res.php index fe64354..52889fc 100644 --- a/transl/lib_res.php +++ b/transl/lib_res.php @@ -70,7 +70,7 @@ function get_stringorid_asascii($data, &$pos) return $ret; } -/* same as get_stringorid, but uses 0xff00 as the marker of an oridinal */ +/* same as get_stringorid, but uses 0xff00 as the marker of an ordinal */ function get_stringorid($data, &$pos, $magic = 0xffff) { $len = strlen($data);

1 0

Francois Gouget : winetest: Fix the spelling of a comment.
by Alexandre Julliard Jan. 5, 2021

Jan. 5, 2021

Module: tools Branch: master Commit: 2267d2dfc52f25c7b108f05783f9370063f35209 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2267d2dfc52f25c7b108f05… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 5 11:28:36 2021 +0100 winetest: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/winehq_snapshot/index_files/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/tests/winehq_snapshot/index_files/utils.js b/winetest/tests/winehq_snapshot/index_files/utils.js index 1d20f17..6cc4237 100644 --- a/winetest/tests/winehq_snapshot/index_files/utils.js +++ b/winetest/tests/winehq_snapshot/index_files/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ /*

1 0

Piotr Caban : msvcr100: Use LC_TIME code page when converting strftime data.
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

Module: wine Branch: master Commit: 560ac90ba059f663f5d9221c619355051d20678f URL: https://source.winehq.org/git/wine.git/?a=commit;h=560ac90ba059f663f5d9221c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 4 13:51:22 2021 +0100 msvcr100: Use LC_TIME code page when converting strftime data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50151 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 24 +++++++++++++++++++----- dlls/ucrtbase/tests/misc.c | 9 +++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 60b8c8575d3..327d8e086e0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <locale.h> #include <stdlib.h> #include <time.h> #include <sys/timeb.h> @@ -1437,6 +1438,7 @@ static size_t strftime_helper(char *str, size_t max, const char *format, #else wchar_t *s, *fmt; size_t len; + int cp; TRACE("(%p %Iu %s %p %p %p)\n", str, max, format, mstm, time_data, loc); @@ -1445,15 +1447,27 @@ static size_t strftime_helper(char *str, size_t max, const char *format, *str = 0; if (!MSVCRT_CHECK_PMT(format != NULL)) return 0; - len = _mbstowcs_l( NULL, format, 0, loc ) + 1; - if (!len || !(fmt = malloc( len*sizeof(wchar_t) ))) return 0; - _mbstowcs_l(fmt, format, len, loc); + cp = (loc ? loc->locinfo : get_locinfo())->lc_id[LC_TIME].wCodePage; + + len = MultiByteToWideChar( cp, 0, format, -1, NULL, 0 ); + if (!len) + { + *_errno() = EILSEQ; + return 0; + } + fmt = malloc( len*sizeof(wchar_t) ); + if (!fmt) return 0; + MultiByteToWideChar( cp, 0, format, -1, fmt, len ); if ((s = malloc( max*sizeof(wchar_t) ))) { len = strftime_impl( s, max, fmt, mstm, time_data, loc ); if (len) - len = _wcstombs_l( str, s, max, loc ); + { + len = WideCharToMultiByte( cp, 0, s, -1, str, max, NULL, NULL ); + if (len) len--; + else *_errno() = EILSEQ; + } free( s ); } else len = 0; @@ -1478,7 +1492,7 @@ size_t CDECL _strftime_l( char *str, size_t max, const char *format, * _Strftime (MSVCRT.@) */ size_t CDECL _Strftime(char *str, size_t max, const char *format, - const struct tm *mstm, __lc_time_data *time_data) + const struct tm *mstm, void *time_data) { return strftime_helper(str, max, format, mstm, time_data, NULL); } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f15585369cb..5fcec2e2bb5 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1112,6 +1112,15 @@ static void test_strftime(void) ok(ret == 8, "ret = %d\n", ret); ok(!strcmp(buf, "00:00:00"), "buf = \"%s\", expected \"%s\"\n", buf, "00:00:00"); setlocale(LC_ALL, "C"); + + if(!setlocale(LC_TIME, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + ret = strftime(buf, sizeof(buf), "%a", &epoch); + ok(ret == 2 || broken(ret == 1), "ret = %d\n", ret); + ok(!strcmp(buf, "\x96\xd8"), "buf = %s, expected \"\\x96\\xd8\"\n", wine_dbgstr_an(buf, 2)); + setlocale(LC_ALL, "C"); } static LONG* get_failures_counter(HANDLE *map)

1 0

André Hentschel : ddraw/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

Module: wine Branch: master Commit: 36ece53533c44e159dc1c67512e50b1f6f18748f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ece53533c44e159dc1c675… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 15:53:36 2020 +0100 ddraw/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 4 files changed, 76 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36ece53533c44e159dc1…

1 0

André Hentschel : d3d8/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

Module: wine Branch: master Commit: 30e5f0c46d8d501567372da194c02aba7c66515d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e5f0c46d8d501567372da1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 15:53:38 2020 +0100 d3d8/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 45cf0f20eda..ffd940067e8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10465,8 +10465,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -10597,6 +10597,7 @@ static void test_cursor_clipping(void) IDirect3D8 *d3d; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -10625,10 +10626,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height); - ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10643,7 +10646,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10651,7 +10655,8 @@ static void test_cursor_clipping(void) IDirect3DDevice8_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));

1 0

Jacek Caban : conhost: Fix wrapping search in edit_line_find_in_history.
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

Module: wine Branch: master Commit: 105db4c5381c1ab6e5a2542b6aa7d7a2f1bdaf81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=105db4c5381c1ab6e5a2542b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 21:13:50 2021 +0100 conhost: Fix wrapping search in edit_line_find_in_history. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3e41577a44b..0ac1c5f507b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -691,6 +691,7 @@ static void edit_line_find_in_history( struct console *console ) unsigned int len, oldoffset; WCHAR *line; + if (!console->history_index) return; if (ctx->history_index && ctx->history_index == console->history_index) { start_pos--; @@ -699,28 +700,28 @@ static void edit_line_find_in_history( struct console *console ) do { - line = edit_line_history(console, ctx->history_index); - - if (ctx->history_index) ctx->history_index--; - else ctx->history_index = console->history_index; - - len = lstrlenW(line) + 1; - if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) - { - /* need to clean also the screen if new string is shorter than old one */ - edit_line_delete(console, 0, ctx->len); - - if (edit_line_grow(console, len)) - { - oldoffset = ctx->cursor; - ctx->cursor = 0; - edit_line_insert( console, line, len - 1 ); - ctx->cursor = oldoffset; - free(line); - return; - } - } - free(line); + line = edit_line_history(console, ctx->history_index); + + if (ctx->history_index) ctx->history_index--; + else ctx->history_index = console->history_index - 1; + + len = lstrlenW(line) + 1; + if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) + { + /* need to clean also the screen if new string is shorter than old one */ + edit_line_delete(console, 0, ctx->len); + + if (edit_line_grow(console, len)) + { + oldoffset = ctx->cursor; + ctx->cursor = 0; + edit_line_insert( console, line, len - 1 ); + ctx->cursor = oldoffset; + free(line); + return; + } + } + free(line); } while (ctx->history_index != start_pos); }

1 0