wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Nikolay Sivov : comctl32/tests: Add Static control tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: c170a483232f8ecf89e0d12408bd7a70730fdf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c170a483232f8ecf89e0d1240… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:21 2017 +0300 comctl32/tests: Add Static control tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/static.c | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index ad298f8..36d77f0 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ progress.c \ propsheet.c \ rebar.c \ + static.c \ status.c \ subclass.c \ syslink.c \ diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c new file mode 100644 index 0000000..890fcf5 --- /dev/null +++ b/dlls/comctl32/tests/static.c @@ -0,0 +1,177 @@ +/* Unit test suite for static controls. + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#include "v6util.h" + +#define TODO_COUNT 1 + +#define CTRL_ID 1995 + +static HWND hMainWnd; +static int g_nReceivedColorStatic; + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + +static HWND create_static(DWORD style) +{ + return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wparam; + HRGN hrgn = CreateRectRgn(0, 0, 1, 1); + ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); + DeleteObject(hrgn); + g_nReceivedColorStatic++; + return (LRESULT) GetStockObject(BLACK_BRUSH); + } + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_updates(int style, int flags) +{ + HWND hStatic = create_static(style); + RECT r1 = {20, 20, 30, 30}; + int exp; + + flush_events(); + g_nReceivedColorStatic = 0; + /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ + InvalidateRect(hMainWnd, NULL, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hMainWnd, &r1, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hStatic, &r1, FALSE); + UpdateWindow(hStatic); + InvalidateRect(hStatic, NULL, FALSE); + UpdateWindow(hStatic); + + if ((style & SS_TYPEMASK) == SS_BITMAP) + { + HDC hdc = GetDC(hStatic); + COLORREF colour = GetPixel(hdc, 10, 10); + todo_wine + ok(colour == 0, "Unexpected pixel color.\n"); + ReleaseDC(hStatic, hdc); + } + + if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) + exp = 4; + else + exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + + if (flags & TODO_COUNT) + todo_wine + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) + ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); + else + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + DestroyWindow(hStatic); +} + +static void test_set_text(void) +{ + HWND hStatic = create_static(SS_SIMPLE); + char buffA[10]; + + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); + + SetWindowTextA(hStatic, NULL); + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(buffA[0] == 0, "got wrong text %s\n", buffA); + + DestroyWindow(hStatic); +} + +START_TEST(static) +{ + static const char classname[] = "testclass"; + WNDCLASSEXA wndclass; + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = classname; + wndclass.lpszMenuName = NULL; + RegisterClassExA(&wndclass); + + hMainWnd = CreateWindowA(classname, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + + test_updates(0, 0); + test_updates(SS_SIMPLE, 0); + test_updates(SS_ICON, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); + test_updates(SS_BLACKRECT, TODO_COUNT); + test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, TODO_COUNT); + test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_set_text(); + + DestroyWindow(hMainWnd); + + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Nikolay Sivov : comctl32/tests: Add ComboBox tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0b907389cf6e22c7708b69ebe2a44804f88a61e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b907389cf6e22c7708b69ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:20 2017 +0300 comctl32/tests: Add ComboBox tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 639 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 614 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b907389cf6e22c7708b6…

1 0

Nikolay Sivov : comctl32/tests: Rename test file.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: d6c6790cb1157d5f4114df706fa37fb854c0f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c6790cb1157d5f4114df706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:19 2017 +0300 comctl32/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{comboex.c => combo.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 5faf1f8..ad298f8 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ button.c \ - comboex.c \ + combo.c \ datetime.c \ dpa.c \ header.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/combo.c similarity index 99% rename from dlls/comctl32/tests/comboex.c rename to dlls/comctl32/tests/combo.c index fede917..4504ce9 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/combo.c @@ -594,7 +594,7 @@ static void test_get_set_item(void) DestroyWindow(hComboEx); } -START_TEST(comboex) +START_TEST(combo) { if (!init()) return;

1 0

Nikolay Sivov : user32/tests: Release window DCs consistently.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0a953f117a068080f69acd7c60a72f852377d7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a953f117a068080f69acd7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:48:08 2017 +0300 user32/tests: Release window DCs consistently. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 ++ dlls/user32/tests/static.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- dlls/user32/tests/win.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 61b32e0..211376b 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1070,6 +1070,8 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + + ReleaseDC(NULL, hdc); } static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 929b50d..8776c3a 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -99,6 +99,7 @@ static void test_updates(int style, int flags) HDC hdc = GetDC( hStatic); COLORREF colour = GetPixel( hdc, 10, 10); ok ( colour != 0, "pixel should NOT be painted black!\n"); + ReleaseDC(hStatic, hdc); } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fa473c1..5dd8e58 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2918,7 +2918,8 @@ static void test_GetSystemMetrics( void) trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } - ReleaseDC( 0, hdc); + + DeleteDC(hdc); } static void test_EnumDisplaySettings(void) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e72cbc..db27b6b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5242,6 +5242,7 @@ static void test_scrolldc( HWND parent) if (winetest_debug > 0) dump_region(hrgn); /* clean up */ + ReleaseDC(hwnd1, hdc); DeleteObject(hrgn); DeleteObject(exprgn); DeleteObject(tmprgn);

1 0

Alex Henrie : include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 224d284f99416ef5b56cd36284d289447a7f5edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=224d284f99416ef5b56cd3628… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 13 23:23:28 2017 -0700 include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 5bc4d1c..8e3f481 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -61,10 +61,12 @@ extern "C" { * use GetExceptionInformation() and GetExceptionCode() to retrieve the * exception info. * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. + * Warning: Inside a __TRY or __EXCEPT block, 'break' or 'continue' statements + * break out of the current block, but avoid using them because they + * won't work when compiling with native exceptions. You cannot use + * 'return', 'goto', or 'longjmp' to leave a __TRY block either, as + * this will surely crash. You can use 'return', 'goto', or 'longjmp' + * to leave an __EXCEPT block though. * * -- AJ */

1 0

Henri Verbeet : include: Remove some superfluous semicolons.
by Alexandre Julliard 14 Dec '17

14 Dec '17

1 0

Józef Kucia : libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot().
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 7ee3a02f9230b52c54df4bf55418901589072b86 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=7ee3a02f9230b52c54df4bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:59 2017 +0100 libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0684cd3..e749873 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3806,7 +3806,7 @@ static void vkd3d_dxbc_compiler_emit_dot(struct vkd3d_dxbc_compiler *compiler, write_mask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1; assert(instruction->src_count == ARRAY_SIZE(src_ids)); - for (i = 0; i < instruction->src_count; ++i) + for (i = 0; i < ARRAY_SIZE(src_ids); ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], write_mask); type_id = vkd3d_spirv_get_type_id(builder,

1 0

Józef Kucia : tests: Explicitly detect if tests are run under Wine.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: a285b4c842aeb7b2b666e3c763083ef105c4b786 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=a285b4c842aeb7b2b666e3c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:58 2017 +0100 tests: Explicitly detect if tests are run under Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index f4a1627..888436a 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -237,6 +237,12 @@ static char *vkd3d_test_strdupWtoA(WCHAR *str) return out; } +static bool running_under_wine(void) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + return module && GetProcAddress(module, "wine_server_call"); +} + int wmain(int argc, WCHAR **wargv) { char **argv; @@ -251,7 +257,7 @@ int wmain(int argc, WCHAR **wargv) } assert(i == argc); - vkd3d_test_platform = "windows"; + vkd3d_test_platform = running_under_wine() ? "wine" : "windows"; ret = main(argc, argv);

1 0

Józef Kucia : tests: Detect test platform dynamically.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 3956eaf6d00b4a3caeac1f98bc7b667363f7e5a7 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=3956eaf6d00b4a3caeac1f98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:57 2017 +0100 tests: Detect test platform dynamically. In order to run cross-compiled tests under Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 56 +++++++++++++++++++++++++++++++++----------- tests/d3d12.c | 11 +++++---- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index c66b227..f4a1627 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -30,6 +30,7 @@ static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; +static const char *vkd3d_test_platform = "other"; #define START_TEST(name) \ static const char *vkd3d_test_name = #name; \ @@ -53,13 +54,8 @@ static const char *vkd3d_test_name; unsigned int vkd3d_line = line; \ VKD3D_TEST_TODO -#ifdef _WIN32 -# define VKD3D_TEST_TODO(args...) \ - vkd3d_test_ok(vkd3d_line, args); } while (0) -#else # define VKD3D_TEST_TODO(args...) \ vkd3d_test_todo(vkd3d_line, args); } while (0) -#endif /* _WIN32 */ #define skip_(line) \ do { \ @@ -88,8 +84,14 @@ static struct unsigned int debug_level; } vkd3d_test_state; -static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED -vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) +static bool +vkd3d_test_platform_is_windows(void) +{ + return !strcmp(vkd3d_test_platform, "windows"); +} + +static void +vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { if (result) { @@ -99,33 +101,44 @@ vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) } else { - va_list args; - va_start(args, fmt); printf("%s:%d: Test failed: ", vkd3d_test_name, line); vprintf(fmt, args); - va_end(args); InterlockedIncrement(&vkd3d_test_state.failure_count); } } static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED +vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_test_check_ok(line, result, fmt, args); + va_end(args); +} + +static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED vkd3d_test_todo(unsigned int line, bool result, const char *fmt, ...) { va_list args; - if (result) + va_start(args, fmt); + if (vkd3d_test_platform_is_windows()) + { + vkd3d_test_check_ok(line, result, fmt, args); + } + else if (result) { printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); } else { printf("%s:%d: Todo: ", vkd3d_test_name, line); + vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); } - - va_start(args, fmt); - vprintf(fmt, args); va_end(args); } @@ -177,10 +190,20 @@ vkd3d_test_debug(const char *fmt, ...) int main(int argc, char **argv) { const char *debug_level = getenv("VKD3D_TEST_DEBUG"); + char *test_platform = getenv("VKD3D_TEST_PLATFORM"); memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); vkd3d_test_state.debug_level = !debug_level ? 0 : atoi(debug_level); + if (test_platform) + { + test_platform = strdup(test_platform); + vkd3d_test_platform = test_platform; + } + + if (vkd3d_test_state.debug_level > 1) + printf("Test platform: '%s'.\n", vkd3d_test_platform); + vkd3d_test_main(argc, argv); printf("%s: %lu tests executed (%lu failures, %lu skipped, %lu todo).\n", @@ -193,6 +216,9 @@ int main(int argc, char **argv) (unsigned long)vkd3d_test_state.skip_count, (unsigned long)vkd3d_test_state.todo_count); + if (test_platform) + free(test_platform); + return vkd3d_test_state.failure_count || vkd3d_test_state.todo_success_count; } @@ -225,6 +251,8 @@ int wmain(int argc, WCHAR **wargv) } assert(i == argc); + vkd3d_test_platform = "windows"; + ret = main(argc, argv); for (i = 0; i < argc; ++i) diff --git a/tests/d3d12.c b/tests/d3d12.c index caf94d2..1d8e625 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5193,11 +5193,12 @@ static void test_bundle_state_inheritance(void) unsigned int x, y; HRESULT hr; -#ifndef _WIN32 - /* Avoid 2048 test todos. */ - skip("Bundles are not implemented yet.\n"); - return; -#endif + if (!vkd3d_test_platform_is_windows()) + { + /* Avoid 2048 test todos. */ + skip("Bundles are not implemented yet.\n"); + return; + } if (use_warp_device) {

1 0

Józef Kucia : libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 006f36c2ac79e12235c422d8bc22d3511cbb210d URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=006f36c2ac79e12235c422d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:56 2017 +0100 libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc07d96..0684cd3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2078,6 +2078,13 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float(struct vkd3d_dxbc_compile return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_FLOAT, 1, (uint32_t *)&value); } +static uint32_t vkd3d_dxbc_compiler_get_constant_uint_vector(struct vkd3d_dxbc_compiler *compiler, + uint32_t value, unsigned int component_count) +{ + const uint32_t values[] = {value, value, value, value}; + return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, values); +} + static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_compiler *compiler, float value, unsigned int component_count) { @@ -2624,7 +2631,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - static const uint32_t zero[VKD3D_VEC4_SIZE]; uint32_t type_id; SpvOp op; @@ -2633,20 +2639,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_BOOL, component_count); op = condition & VKD3D_SHADER_CONDITIONAL_OP_Z ? SpvOpIEqual : SpvOpINotEqual; return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, type_id, val_id, - vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, zero)); + vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count)); } static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler *compiler, unsigned int component_count, uint32_t val_id) { - static const uint32_t d3d_true[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - static const uint32_t d3d_false[] = {0, 0, 0, 0}; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, true_id, false_id; - true_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_true); - false_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_false); + true_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0xffffffff, component_count); + false_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, component_count); return vkd3d_spirv_build_op_select(builder, type_id, val_id, true_id, false_id); } @@ -3885,9 +3888,7 @@ static void vkd3d_dxbc_compiler_emit_imad(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - static const uint32_t ffffffff[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - - uint32_t type_id, val_id, src0_id, src1_id, condition_id, ffffffff_id; + uint32_t type_id, val_id, src0_id, src1_id, condition_id, uint_max_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -3904,12 +3905,12 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); val_id = vkd3d_spirv_build_op_udiv(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[0], val_id); } @@ -3927,13 +3928,13 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); } val_id = vkd3d_spirv_build_op_umod(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[1], val_id); }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017