- Wine-Devel - list.winehq.org

[PATCH vkd3d] vkd3d: Do not append a newline to messages passed to d3d12_device_mark_as_removed().
by Zebediah Figura Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f9ae3d44..bbb832ec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5865,7 +5865,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm if (cmd_list->is_recording) { d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL, - "Command list %p is in recording state.\n", command_lists[i]); + "Command list %p is in recording state.", command_lists[i]); vkd3d_free(buffers); return; } -- 2.32.0

2 1

[PATCH vkd3d v3 1/5] vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op().
by Zebediah Figura Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e4070572..9f50d2fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op]; -- 2.32.0

5 16

[PATCH] advapi32/tests: RegSetValueExA() should succeed when given a NULL data pointer.
by Francois Gouget Aug. 16, 2021

Aug. 16, 2021

This used to fail on Windows 95 but we don't want to allow such behavior anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 85be22bd74e..5fac9aa429f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -491,9 +491,9 @@ static void test_enum_value(void) else ok( !res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_EXPAND_SZ, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); /* test reading the value and data without setting them */ val_count = 20; -- 2.20.1

1 0

[PATCH 2/2] user32: If STM_SETIMAGE failed to assign the image don't repaint the control.
by Dmitry Timoshkov Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/static.c | 3 ++- dlls/user32/tests/static.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 72e49e15e8f..8e0aa176dd2 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -514,7 +514,8 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); break; } - STATIC_TryPaintFcn( hwnd, full_style ); + if (lResult) + STATIC_TryPaintFcn( hwnd, full_style ); break; case STM_SETICON: diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0c453d08a67..657e521d035 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -189,6 +189,22 @@ static void test_set_image(void) DeleteObject(image); } +static void test_set_image_on_text_control(void) +{ + HWND hwnd = build_static(SS_LEFT); + HICON image, old_image; + + image = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)image); + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + DestroyIcon(image); + DestroyWindow(hwnd); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -222,6 +238,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_set_image_on_text_control(); DestroyWindow(hMainWnd); } -- 2.31.1

2 2

[PATCH 10/10] gdi32: Use NtGdiGetAndSetDCDword for SetTextColor.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

2 1

[PATCH 09/10] gdi32: Use NtGdiGetAndSetDCDword for SetBkColor.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

2 1

[PATCH 08/10] gdi32: Use NtGdiDoPalette for GetDIBColorTable and SetDIBColorTable.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 10 ++-------- dlls/gdi32/ntgdi_private.h | 4 ++++ dlls/gdi32/objects.c | 16 ++++++++++++++++ dlls/gdi32/palette.c | 4 ++++ 4 files changed, 26 insertions(+), 8 deletions(-)

2 1

[PATCH 07/10] gdi32: Use NtGdiDoPalette for GetSystemPaletteEntries.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 44 ++++++++++++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 44 ++++---------------------------------- dlls/gdi32/tests/palette.c | 2 ++ 3 files changed, 50 insertions(+), 40 deletions(-)

2 1

[PATCH 06/10] gdi32: Use NtGdiDoPalette for AnimatePalette.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/palette.c | 22 +++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-)

2 1

[PATCH 05/10] gdi32: Use NtGdiDoPalette for SetPaletteEntries.
by Jacek Caban Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 9 +++++++++ dlls/gdi32/palette.c | 18 ++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-)

2 1