February 2020 - Wine-Commits

Zhiyi Zhang : d3d9/tests: Add multiple adapters tests.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 63d98c7552efcec31f7a9b1d806451e174b68b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d98c7552efcec31f7a9b1d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:01 2020 +0330 d3d9/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 03ebe242e9..156cb188f0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13405,6 +13405,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D9 *d3d; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D9_Release(d3d); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13532,6 +13574,7 @@ START_TEST(device) test_multiply_transform(); test_vertex_buffer_read_write(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: c436080e8e9cc8d44822d7d687b2d552816a3ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c436080e8e9cc8d44822d7d6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 7 14:35:19 2020 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 58 ++++++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index ed89ee2509..ac15875867 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3703,17 +3703,15 @@ msgstr "Odotettiin merkkiä '@'" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript -käännösvirhe" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript -suoritusvirhe" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Tuntematon virhe" +msgstr "Tuntematon ajonaikainen virhe" #: jscript.rc:54 msgid "Number expected" @@ -3761,7 +3759,7 @@ msgstr "Syntaksivirhe säännöllisessä lausekkeessa" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Poikkeusta ei otettu kiinni" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -8310,79 +8308,59 @@ msgstr "Tarjoaja" #: version.rc:45 msgid "Select the data you want to connect to:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Valitse tietolähde, johon haluat yhdistää:" #: version.rc:52 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Yhteydet" +msgstr "Yhteys" #: version.rc:55 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Määritä seuraavat, jotta voit yhdistää ODBC-tietolähteeseen:" #: version.rc:56 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Määritä tietolähde:" #: version.rc:57 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Anna nimesi" +msgstr "Käytä tietolähteen &nimeä" #: version.rc:60 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Nollattuja yhteyksiä" +msgstr "Syötä yhteysasetukset &merkkijonona" #: version.rc:61 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Yhteydet" +msgstr "Yhteys&asetukset:" #: version.rc:63 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Lisää..." +msgstr "&Luo..." #: version.rc:64 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Syötä palvelimen kirjautumistiedot" #: version.rc:65 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Käyttäjänimi:" +msgstr "&Tunnus:" #: version.rc:69 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tyhjä sivu" +msgstr "&Ei salasanaa" #: version.rc:70 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Väärä salasana.\n" +msgstr "Sa&lli salasanan tallennus" #: version.rc:71 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Syötä ensiksi käytettävä &katalogi:" #: version.rc:73 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Nollattuja yhteyksiä" +msgstr "Testaa y&hteyttä" #: version.rc:36 msgid "Data Link Properties"

1 0

Nikolay Sivov : shell32/tests: Fix some compiler warnings on sprintf() buffer sizes.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 5d6f0de3ea47c511e3a43a7aa489466e88509f2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6f0de3ea47c511e3a43a7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 19:33:07 2020 +0300 shell32/tests: Fix some compiler warnings on sprintf() buffer sizes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c9606c6f10..e724448c7a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1782,7 +1782,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static const char wine[] = "wine"; static const char winetemp[] = "wine\\temp"; static char appdata[MAX_PATH]; - static char testpath[MAX_PATH]; + static char testpath[2 * MAX_PATH]; static char toolongpath[MAX_PATH+1]; if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))

1 0

Jacek Caban : winhttp: Fix digit character check in parse_port.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: be403aac2150faa7e971edee1e7bb5bbcc7e9e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be403aac2150faa7e971edee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:07:07 2020 +0100 winhttp: Fix digit character check in parse_port. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index ba9ed4366a..3e248bca9f 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -158,7 +158,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) { const WCHAR *p = str; DWORD port = 0; - while (len && iswdigit( *p )) + while (len && '0' <= *p && *p <= '9') { if ((port = port * 10 + *p - '0') > 65535) return ERROR_WINHTTP_INVALID_URL; p++; len--;

1 0

Jacek Caban : webservices: Fix digit character checks.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 29848ee3fda5dc7b24c7072365bfdd860835f3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29848ee3fda5dc7b24c70723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:07:03 2020 +0100 webservices: Fix digit character checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/url.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 8bd3d82660..6f2ce9d6c9 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -87,11 +87,13 @@ static inline int url_decode_byte( char c1, char c2 ) if (c1 >= '0' && c1 <= '9') ret = (c1 - '0') * 16; else if (c1 >= 'a' && c1 <= 'f') ret = (c1 - 'a' + 10) * 16; - else ret = (c1 - 'A' + 10) * 16; + else if (c1 >= 'A' && c1 <= 'F') ret = (c1 - 'A' + 10) * 16; + else return -1; if (c2 >= '0' && c2 <= '9') ret += c2 - '0'; else if (c2 >= 'a' && c2 <= 'f') ret += c2 - 'a' + 10; - else ret += c2 - 'A' + 10; + else if (c2 >= 'A' && c2 <= 'F') ret += c2 - 'A' + 10; + else return -1; return ret; } @@ -102,15 +104,16 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) BOOL decode = FALSE, convert = FALSE; ULONG i, len_utf8, len_left; unsigned char *utf8, *r; + int b; *ret_len = len; for (i = 0; i < len; i++, p++) { if ((len - i) < 3) break; - if (p[0] == '%' && iswxdigit( p[1] ) && iswxdigit( p[2] )) + if (p[0] == '%' && (b = url_decode_byte( p[1], p[2] )) != -1) { decode = TRUE; - if (url_decode_byte( p[1], p[2] ) > 159) + if (b > 159) { convert = TRUE; break; @@ -125,9 +128,9 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) p = str; while (len) { - if (len >= 3 && p[0] == '%' && iswxdigit( p[1] ) && iswxdigit( p[2] )) + if (len >= 3 && p[0] == '%' && (b = url_decode_byte( p[1], p[2] )) != -1) { - *q++ = url_decode_byte( p[1], p[2] ); + *q++ = b; p += 3; len -= 3; } @@ -144,9 +147,9 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) len_left = len_utf8; while (len_left) { - if (len_left >= 3 && r[0] == '%' && isxdigit( r[1] ) && isxdigit( r[2] )) + if (len_left >= 3 && r[0] == '%' && (b = url_decode_byte( r[1], r[2] )) != -1) { - r[0] = url_decode_byte( r[1], r[2] ); + r[0] = b; len_left -= 3; memmove( r + 1, r + 3, len_left ); len_utf8 -= 2; @@ -214,7 +217,7 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS if (len && *q == ':') { p = ++q; len--; - while (len && iswdigit( *q )) + while (len && '0' <= *q && *q <= '9') { if ((port = port * 10 + *q - '0') > 65535) goto done; q++; len--; @@ -481,7 +484,7 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S { q = url->portAsString.chars; len = url->portAsString.length; - while (len && iswdigit( *q )) + while (len && '0' <= *q && *q <= '9') { if ((port = port * 10 + *q - '0') > 65535) {

1 0

Nikolay Sivov : shell32/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 5b7dc90efb1aba519b9d3cc2d279580059931958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7dc90efb1aba519b9d3cc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 7 19:33:06 2020 +0300 shell32/tests: Get rid of strcmp_wa(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 14d243a03b..c9606c6f10 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -83,13 +83,6 @@ static WCHAR *make_wstr(const char *str) return ret; } -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 init_function_pointers(void) { HMODULE hmod; @@ -4503,10 +4496,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); SHFree(U(filename).pOleStr); - }else if(filename.uType == STRRET_CSTR){ - ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0, - "didn't get expected path (%s), instead: %s\n", + } + else if(filename.uType == STRRET_CSTR) + { + WCHAR *strW = make_wstr(U(filename).cStr); + ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), U(filename).cStr); + heap_free(strW); } IShellFolder_Release(parent);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetFVF().
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 95d74311e8cb4c02028ca0d735a8727a1ef0ceb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95d74311e8cb4c02028ca0d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:28 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetFVF(). 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/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c59d83b11a..2d5bc77ed7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3440,8 +3440,6 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) } wined3d_stateblock_set_vertex_declaration(device->update_state, decl); - if (!device->recording) - wined3d_device_set_vertex_declaration(device->wined3d_device, decl); device->has_vertex_declaration = TRUE; wined3d_mutex_unlock();

1 0

Dmitry Timoshkov : user32/tests: Add some tests for Static/SS_BITMAP control.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: f5906a5cfb22db07a22e6ac7b4a1afcd907c0af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5906a5cfb22db07a22e6ac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 17:31:09 2020 +0800 user32/tests: Add some tests for Static/SS_BITMAP control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/bmp1x1_32bpp.bmp | Bin 0 -> 58 bytes dlls/user32/tests/resource.rc | 3 ++ dlls/user32/tests/static.c | 60 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/dlls/user32/tests/bmp1x1_32bpp.bmp b/dlls/user32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000..3b565be8c2 Binary files /dev/null and b/dlls/user32/tests/bmp1x1_32bpp.bmp differ diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 4301af6d68..89aaf5a61c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -249,6 +249,9 @@ FONT 8, "MS Shell Dlg" /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp +/* @makedep: bmp1x1_32bpp.bmp */ +101 BITMAP bmp1x1_32bpp.bmp + 1 MENU { POPUP "&File" diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 8776c3a9e0..0c453d08a6 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -130,6 +130,65 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_image(HBITMAP image) +{ + 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); + 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); + + 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 = build_static(SS_BITMAP); + HBITMAP bmp, image; + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(101), IMAGE_BITMAP, 0, 0, 0); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp == NULL, "got not NULL\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + test_image(image); + + DestroyWindow(hwnd); + DeleteObject(image); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -162,6 +221,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_set_image(); DestroyWindow(hMainWnd); }

1 0

Dmitry Timoshkov : comctl32/tests: Add some tests for Static/SS_BITMAP control.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: f909d18baf1d97831c55a1d47610427ac2084ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f909d18baf1d97831c55a1d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 17:31:16 2020 +0800 comctl32/tests: Add some tests for Static/SS_BITMAP control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(+) diff --git a/dlls/comctl32/tests/bmp1x1_32bpp.bmp b/dlls/comctl32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000..3b565be8c2 Binary files /dev/null and b/dlls/comctl32/tests/bmp1x1_32bpp.bmp differ 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);

1 0

Jacek Caban : wbemprox: Fix checking for digit characters.
by Alexandre Julliard Feb. 7, 2020

Feb. 7, 2020

Module: wine Branch: master Commit: 5a44fc7b8156e4cfaa4ad66f2b67ee3443395888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a44fc7b8156e4cfaa4ad66f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:06:58 2020 +0100 wbemprox: Fix checking for digit characters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 6 +++--- dlls/wbemprox/wbemprox_private.h | 5 +++++ dlls/wbemprox/wql.y | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1f8afb46fe..c680ae23c3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1694,17 +1694,17 @@ static WCHAR *convert_bios_date( const WCHAR *str ) while (len && iswspace( p[len - 1] )) { len--; } q = p; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p != 2 || !len || *q != '/') return NULL; month = (p[0] - '0') * 10 + p[1] - '0'; p = ++q; len--; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p != 2 || !len || *q != '/') return NULL; day = (p[0] - '0') * 10 + p[1] - '0'; p = ++q; len--; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p == 4) year = (p[0] - '0') * 1000 + (p[1] - '0') * 100 + (p[2] - '0') * 10 + p[3] - '0'; else if (q - p == 2) year = 1900 + (p[0] - '0') * 10 + p[1] - '0'; else return NULL; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9096b392e3..57ac793a4e 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -272,6 +272,11 @@ static inline WCHAR *heap_strdupAW( const char *src ) return dst; } +static inline BOOL is_digit(WCHAR c) +{ + return '0' <= c && c <= '9'; +} + static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 0fae44da2e..f5b249aaba 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -785,7 +785,7 @@ static int get_token( const WCHAR *s, int *token ) *token = TK_STRING; return i; case '.': - if (!iswdigit( s[1] )) + if (!is_digit( s[1] )) { *token = TK_DOT; return 1; @@ -794,7 +794,7 @@ static int get_token( const WCHAR *s, int *token ) case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *token = TK_INTEGER; - for (i = 1; iswdigit( s[i] ); i++) {} + for (i = 1; is_digit( s[i] ); i++) {} return i; default: if (!id_char[*s]) break;

1 0