January 2021 - Wine-commits

Piotr Caban : msvcr100: Use LC_TIME code page when converting strftime data.
by Alexandre Julliard 04 Jan '21

04 Jan '21

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 04 Jan '21

04 Jan '21

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 04 Jan '21

04 Jan '21

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

André Hentschel : dxgi/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: c6491bca46c59fa453b86a647eafb56466962ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6491bca46c59fa453b86a64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 15:53:39 2020 +0100 dxgi/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/dxgi/tests/dxgi.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3c3a57806a4..53d768d1a36 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5475,8 +5475,8 @@ static void test_multi_adapter(void) /* Should have the same monitor rectangle. */ monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, + ret = GetMonitorInfoA(monitor, &monitor_info); + ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, output_index, GetLastError()); ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), "Adapter %u output %u: Got unexpected output rect %s, expected %s.\n", @@ -6572,6 +6572,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) IDXGIOutput *output; ULONG refcount; HRESULT hr; + BOOL ret; get_factory(device, is_d3d12, &factory); @@ -6622,11 +6623,12 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) "Adapter %u output %u: Failed to find a different mode than %ux%u.\n", adapter_idx, output_idx, width, height); - ok(ClipCursor(NULL), "Adapter %u output %u: ClipCursor failed, error %#x.\n", + ret = ClipCursor(NULL); + ok(ret, "Adapter %u output %u: ClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6647,8 +6649,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6671,8 +6673,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6691,8 +6693,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,

1 0

Zebediah Figura : wined3d: Use debug_d3dusage() for both usage and usage query flags.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 9cbe2735586965c2bf08e4a11e9c2e32daccfe48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbe2735586965c2bf08e4a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 25 10:41:19 2020 -0600 wined3d: Use debug_d3dusage() for both usage and usage query flags. Avoid spurious FIXME messages in wined3d_check_device_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/utils.c | 29 ++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d35108710c2..2764b113065 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,10 +1692,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, DWORD format_flags = 0; DWORD allowed_usage; - TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, %s, " + TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, " "bind_flags %s, resource_type %s, check_format %s.\n", wined3d, adapter, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dusage(usage), debug_d3dusagequery(usage), wined3d_debug_bind_flags(bind_flags), + debug_d3dusage(usage), wined3d_debug_bind_flags(bind_flags), debug_d3dresourcetype(resource_type), debug_d3dformat(check_format_id)); adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 88175d4bf26..4ec6e4db42d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4710,6 +4710,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGE_TO_STR if (usage) FIXME("Unrecognized usage flag(s) %#x.\n", usage); @@ -4717,27 +4725,6 @@ const char *debug_d3dusage(DWORD usage) return wine_dbg_sprintf("%s", buffer.str); } -const char *debug_d3dusagequery(DWORD usage) -{ - struct debug_buffer buffer; - - init_debug_buffer(&buffer, "0"); -#define WINED3DUSAGEQUERY_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); -#undef WINED3DUSAGEQUERY_TO_STR - if (usage) - FIXME("Unrecognized usage query flag(s) %#x.\n", usage); - - return wine_dbg_sprintf("%s", buffer.str); -} - const char *debug_d3ddeclmethod(enum wined3d_decl_method method) { switch (method) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0749f95f998..bd848f61e32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5273,7 +5273,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; -const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; const char *debug_d3dinput_classification(enum wined3d_input_classification classification) DECLSPEC_HIDDEN;

1 0

Kevin Puetz : include: Check whether the ms_abi attribute is supported on aarch64.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 849e521dbaf04ffc55b4df17d56b6e09dfa23252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849e521dbaf04ffc55b4df17… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Jan 4 11:19:39 2021 -0600 include: Check whether the ms_abi attribute is supported on aarch64. Updated to maintain sync with dac1e16dd4edc8404c59dc63ae708cd8bb50a38a. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- include/wine/test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index e064aaefb8e..2255f62e502 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -157,7 +157,7 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __wine_dbg_cdecl __cdecl # define __wine_dbg_va_list __builtin_ms_va_list # define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg) diff --git a/include/wine/test.h b/include/wine/test.h index 38c8922458e..787fea0ba24 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -78,7 +78,7 @@ extern void winetest_wait_child_process( HANDLE process ); #define START_TEST(name) void func_##name(void) #endif -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else

1 0

Jacek Caban : conhost: Fix wrapping search in edit_line_find_in_history.
by Alexandre Julliard 04 Jan '21

04 Jan '21

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

Jacek Caban : jscript/tests: Silence noisy debug trace.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 221fdb09b4c20da45e9834aa0cae27dcc75ea27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=221fdb09b4c20da45e9834aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 21:35:33 2021 +0100 jscript/tests: Silence noisy debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9c9d3fa56f9..da0ad1e1ebc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2521,7 +2521,6 @@ function testException(func, id) { } catch(e) { ret = e.name; num = e.number; - trace(e.message); } ok(ret === ex.type, "Exception test, ret = " + ret + ", expected " + ex.type +". Executed function: " + func.toString());

1 0

Zebediah Figura : vkd3d-shader: Handle preprocessor parsing errors.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: vkd3d Branch: master Commit: 5304cabf462ec0454fa75d225473fd6f511661e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5304cabf462ec0454fa75d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 15 17:13:20 2020 -0600 vkd3d-shader: Handle preprocessor parsing errors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.h | 4 ++++ libs/vkd3d-shader/preproc.l | 38 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 17 +++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index cbd9322..bd9dfdd 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -27,7 +27,11 @@ struct preproc_ctx { void *scanner; + struct vkd3d_shader_message_context *message_context; struct vkd3d_string_buffer buffer; + struct vkd3d_shader_location location; + + bool error; }; #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4d809b8..b406af0 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -27,6 +27,10 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static void update_location(struct preproc_ctx *ctx); + +#define YY_USER_ACTION update_location(yyget_extra(yyscanner)); + %} %option 8bit @@ -88,6 +92,27 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% +static void update_location(struct preproc_ctx *ctx) +{ + unsigned int i, leng = yyget_leng(ctx->scanner); + const char *text = yyget_text(ctx->scanner); + + /* We want to do this here, rather than before calling yylex(), because + * some tokens are skipped by the lexer. */ + + *yyget_lloc(ctx->scanner) = ctx->location; + + for (i = 0; i < leng; ++i) + { + ++ctx->location.column; + if (text[i] == '\n') + { + ctx->location.column = 1; + ++ctx->location.line; + } + } +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -101,7 +126,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) return 0; text = yyget_text(scanner); - TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->line, debugstr_a(text)); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -115,6 +140,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + ctx.message_context = message_context; + ctx.location.source_name = compile_info->source_name; + ctx.location.line = 1; + ctx.location.column = 1; yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); @@ -124,6 +153,13 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.error) + { + WARN("Failed to preprocess.\n"); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) { vkd3d_string_buffer_cleanup(&ctx.buffer); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 92448f2..16b84ea 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -24,6 +24,8 @@ #include "vkd3d_shader_private.h" #include "preproc.h" +#define PREPROC_YYLTYPE struct vkd3d_shader_location + } %code provides @@ -36,9 +38,22 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, %code { +#define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) + +static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(ctx->message_context, loc, error, format, args); + va_end(args); + ctx->error = true; +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { - FIXME("Error reporting is not implemented.\n"); + preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e974b92..882a806 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, + + VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Zebediah Figura : vkd3d-shader: Implement basic support for #if and #endif.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: vkd3d Branch: master Commit: 86cb863bc2de7f9c61c05bae6681d39907ffc9fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=86cb863bc2de7f9c61c05ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 21 14:37:06 2020 -0600 vkd3d-shader: Implement basic support for #if and #endif. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_memory.h | 11 ++++ libs/vkd3d-shader/preproc.h | 17 +++++ libs/vkd3d-shader/preproc.l | 106 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/preproc.y | 102 ++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 24 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ tests/hlsl_d3d12.c | 2 +- 7 files changed, 258 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=86cb863bc2de7f9c61c…

1 0