February 2020 - Wine-devel - list.winehq.org

[PATCH] shlwapi/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 06 Feb '20

06 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 135d82ead1..f1527eb6b8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -95,13 +95,6 @@ static const CHAR ie_international[] = { static const CHAR acceptlanguage[] = { 'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0}; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - typedef struct { int id; const void *args[5]; @@ -2740,11 +2733,11 @@ static void test_SHGetIniString(void) ret = pSHGetIniStringW(TestAppW, AKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + ok(!lstrcmpW(out, L"asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); out[0] = 1; ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, ARRAY_SIZE(out), pathW); -- 2.24.1

1 0

[PATCH] oleaut32/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 06 Feb '20

06 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1bd40ac6bc..127af46ba1 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -661,19 +661,13 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT VariantClear( &result ); } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_bstr_var(a,b) _test_bstr_var(__LINE__,a,b) -static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) +static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) { ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "unexpected vt=%d\n", V_VT(v)); if(V_VT(v) == VT_BSTR) - ok(!strcmp_wa(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), str); + ok(!lstrcmpW(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), + wine_dbgstr_w(str)); } static void test_VariantInit(void) @@ -6136,7 +6130,7 @@ static void test_VarCat(void) hres = pVarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); - ok(!strcmp_wa(V_BSTR(&result), "1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); + ok(!lstrcmpW(V_BSTR(&result), L"1234"), "got %s\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6179,20 +6173,20 @@ static void test_VarCat(void) ok(hres == S_OK, "VarCat failed: %08x\n", hres); VariantClear(&right); - cmp = strcmp_wa(V_BSTR(&result), "True"); + cmp = lstrcmpW(V_BSTR(&result), L"True"); VariantClear(&result); if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - test_bstr_var(&result, "TrueTrue"); + test_bstr_var(&result, L"TrueTrue"); VariantClear(&result); V_BOOL(&right) = VARIANT_FALSE; hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - test_bstr_var(&result, "TrueFalse"); + test_bstr_var(&result, L"TrueFalse"); VariantClear(&result); }else { skip("Got %s as True, assuming non-English locale\n", wine_dbgstr_w(V_BSTR(&result))); -- 2.24.1

1 0

[PATCH] propsys/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 06 Feb '20

06 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/tests/propsys.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 191a154744..d2218c7f42 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -57,13 +57,6 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static void test_PSStringFromPropertyKey(void) { static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X', @@ -475,10 +468,10 @@ static void test_InitPropVariantFromGUIDAsString(void) const struct { REFGUID guid; - const char *str; + const WCHAR *str; } testcases[] = { - {&IID_NULL, "{00000000-0000-0000-0000-000000000000}" }, - {&dummy_guid, "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, + {&IID_NULL, L"{00000000-0000-0000-0000-000000000000}" }, + {&dummy_guid, L"{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, }; hres = InitPropVariantFromGUIDAsString(NULL, &propvar); @@ -498,7 +491,7 @@ static void test_InitPropVariantFromGUIDAsString(void) hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt); - ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", + ok(!lstrcmpW(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", i, wine_dbgstr_w(propvar.u.pwszVal)); CoTaskMemFree(propvar.u.pwszVal); @@ -508,7 +501,7 @@ static void test_InitPropVariantFromGUIDAsString(void) ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var)); ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n", SysStringLen(V_BSTR(&var))); - ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", + ok(!lstrcmpW(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", i, wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } @@ -1439,7 +1432,7 @@ static void test_PropVariantToString(void) U(propvar).lVal = 22; hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); - todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + todo_wine ok(!lstrcmpW(bufferW, L"22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); memset(bufferW, 0, sizeof(bufferW)); PropVariantClear(&propvar); -- 2.24.1

1 0

[PATCH 3/5] propsys: Allow only ASCII digits in PSPropertyKeyFromString.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/propsys/propsys_main.c | 2 +- dlls/propsys/tests/propsys.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

2 1

[PATCH 1/5] atl: Allow only ASCII digit for registrar binary values.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atl/registrar.c | 17 +++++++++++------ dlls/atl/tests/registrar.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-)

2 1

[PATCH] comctl32/tests: Add some tests for Static/SS_BITMAP control.
by Dmitry Timoshkov 06 Feb '20

06 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/bmp1x1_32bpp.bmp | Bin 0 -> 58 bytes dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 3 + dlls/comctl32/tests/static.c | 92 +++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 dlls/comctl32/tests/bmp1x1_32bpp.bmp diff --git a/dlls/comctl32/tests/bmp1x1_32bpp.bmp b/dlls/comctl32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3b565be8c2b1ca5b8d121df4e3b6f57822b72600 GIT binary patch literal 58 hcmZ?rwPJt(Ga#h_#EfvP0Aw*Ruz*QaLQu)r1pq_i0r>y` literal 0 HcmV?d00001 diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 53522c0a09..c4692654ae 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -23,6 +23,7 @@ #define IDB_BITMAP_128x15 10 #define IDB_BITMAP_80x15 11 +#define IDB_BITMAP_1x1_32BPP 12 #define IDS_TBADD1 16 #define IDS_TBADD2 17 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 6eb4fe8a0a..df22053d4c 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -101,6 +101,9 @@ IDB_BITMAP_128x15 BITMAP bmp128x15.bmp /* @makedep: bmp80x15.bmp */ IDB_BITMAP_80x15 BITMAP bmp80x15.bmp +/* @makedep: bmp1x1_32bpp.bmp */ +IDB_BITMAP_1x1_32BPP BITMAP bmp1x1_32bpp.bmp + IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index a65e352728..0e44c4ed7a 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -24,6 +24,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "commctrl.h" +#include "resources.h" #include "wine/test.h" @@ -133,6 +134,96 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_image(HBITMAP image, BOOL is_dib, BOOL is_premult) +{ + BITMAP bm; + HDC hdc; + BITMAPINFO info; + BYTE bits[4]; + + GetObjectW(image, sizeof(bm), &bm); + ok(bm.bmWidth == 1, "got %d\n", bm.bmWidth); + ok(bm.bmHeight == 1, "got %d\n", bm.bmHeight); + ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); + if (is_dib) + { +todo_wine + ok(bm.bmBits != NULL, "bmBits is NULL\n"); +if (bm.bmBits) +{ + memcpy(bits, bm.bmBits, 4); + if (is_premult) + ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + } + else + ok(bm.bmBits == NULL, "bmBits is not NULL\n"); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + + hdc = CreateCompatibleDC(0); + GetDIBits(hdc, image, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS); + DeleteDC(hdc); + + if (is_premult) +todo_wine + ok(bits[0] == 0x05 && bits[1] == 0x09 && bits[2] == 0x0e && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); + else + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + +static void test_set_image(void) +{ + HWND hwnd = create_static(SS_BITMAP); + HBITMAP bmp1, bmp2, image; + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDB_BITMAP_1x1_32BPP), IMAGE_BITMAP, 0, 0, 0); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image, FALSE, FALSE); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 == NULL, "got not NULL\n"); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp1 == NULL, "got not NULL\n"); + + bmp1 = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp1 != NULL, "got NULL\n"); +todo_wine + ok(bmp1 != image, "bmp == image\n"); + test_image(bmp1, TRUE, TRUE); + + bmp2 = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp2 != NULL, "got NULL\n"); +todo_wine + ok(bmp2 != image, "bmp == image\n"); + ok(bmp1 == bmp2, "bmp1 != bmp2\n"); + test_image(bmp2, TRUE, TRUE); + + DestroyWindow(hwnd); + + test_image(bmp2, TRUE, TRUE); + + DeleteObject(image); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -171,6 +262,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_set_image(); DestroyWindow(hMainWnd); -- 2.20.1

2 1

[PATCH] wined3d: Don't print a FIXME when casting int to uint.
by Zebediah Figura 06 Feb '20

06 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 25e97723255..f30be4855b4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3127,7 +3127,8 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) { - if (dst_data_type == src_data_type) + if (dst_data_type == src_data_type + || (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_UINT)) { string_buffer_sprintf(dst_param, "%s", src_param); return; -- 2.25.0

2 2

[PATCH] testbot/doc: The procmail dependency is optional.
by Francois Gouget 06 Feb '20

06 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7ac155d09f..bd4f39bbe9 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,11 +4,12 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Sendmail and Procmail +- Sendmail - Bytes::Random::Secure (libbytes-random-secure-perl) - DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) +- Optional: Procmail (to process mailing list patches) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) - Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl) -- 2.20.1

1 0

[PATCH] testbot/UpdateTaskLogs: Fix error handling for the task.log and testbot.log renames.
by Francois Gouget 06 Feb '20

06 Feb '20

The code checks that the target filename does not exist (so rename() does not clobber it), so it's very unlikely that the error is that the destination already exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index d89ccfc4ad..f259302a20 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -351,12 +351,17 @@ sub ProcessTaskLogs($$$) "old_log.err" => "old_testbot.log"); while (my ($OldName, $NewName) = each %LogMap) { - if (-f "$TaskDir/$OldName" and !-f "$TaskDir/$NewName" and - !rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + next if (!-f "$TaskDir/$OldName"); + if (-f "$TaskDir/$NewName") { Error TaskKeyStr($Task) .": Could not rename $OldName because $NewName already exists\n"; $Rc = 1; } + elsif (!rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + { + Error TaskKeyStr($Task) .": Could not rename $OldName to $NewName: $!\n"; + $Rc = 1; + } } # testbot.log is the only log which we expect to be empty. -- 2.20.1

1 0

[PATCH] testbot/UpdateTaskLogs: Fix deletion of the new per-task reference reports.
by Francois Gouget 06 Feb '20

06 Feb '20

$ReportNames had the wrong scope, causing it to be undefined when the time came to delete the per-task reference reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4fe6ff3c42..d89ccfc4ad 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -321,7 +321,7 @@ sub ProcessTaskLogs($$$) { # Upgrade the naming scheme of the task's old reference reports, # delete those that are not meant to exist. - my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + (my $ErrMessage, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); if ($ErrMessage) { Error "$ErrMessage\n"; -- 2.20.1

1 0