August 2021 - Wine-devel - list.winehq.org

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

16 Aug '21

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 16 Aug '21

16 Aug '21

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 16 Aug '21

16 Aug '21

2 1

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

16 Aug '21

2 1

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

16 Aug '21

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 16 Aug '21

16 Aug '21

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 16 Aug '21

16 Aug '21

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 16 Aug '21

16 Aug '21

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

[PATCH 04/10] gdi32: Use NtGdiDoPalette for GetPaletteEntries.
by Jacek Caban 16 Aug '21

16 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 4 ++-- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/palette.c | 35 +++++++++++++++++++---------------- include/ntgdi.h | 10 ++++++++++ 7 files changed, 45 insertions(+), 22 deletions(-)

2 1

[PATCH 03/10] gdi32: Use ntgdi names for palette functions.
by Jacek Caban 16 Aug '21

16 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 4 +-- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi32.spec | 16 +++++------ dlls/gdi32/palette.c | 58 +++++++++++++--------------------------- include/ntgdi.h | 6 +++++ 5 files changed, 35 insertions(+), 51 deletions(-)

2 1