August 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Close any open registry keys before starting the key deletion process.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 60e771e686a9424efaf0bdfa90d4fb8d7255da04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e771e686a9424efaf0bdfa9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:36:49 2017 +0000 regedit: Close any open registry keys before starting the key deletion process. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 58ca5ac..162d088 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -708,6 +708,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; + close_key(parser); + if (*p == 'H' || *p == 'h') delete_registry_key(p); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9b2f1fb..5e895ab 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3016,7 +3016,7 @@ static void test_key_creation_and_deletion(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" "\"Wine1a\"=dword:12345678\n\n"); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine1a"); + verify_reg_nonexist(hkey, "Wine1a"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" @@ -3166,7 +3166,7 @@ static void test_key_creation_and_deletion_unicode(void) "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" "\"Wine1a\"=dword:12345678\n\n"); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine1a"); + verify_reg_nonexist(hkey, "Wine1a"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"

1 0

Hugh McMaster : reg/tests: Add some mixed key creation and deletion tests.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: b7c838bf98ce8e6b313ff4d2a11fbed8832b09a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c838bf98ce8e6b313ff4d2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:36:58 2017 +0000 reg/tests: Add some mixed key creation and deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f6a7ce1..8a9d12a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1734,6 +1734,28 @@ static void test_import(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + /* Test value deletion. We start by creating some registry values. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3190,6 +3212,28 @@ static void test_unicode_import(void) verify_key_nonexist(hkey, "Subkey3a"); verify_key_nonexist(hkey, "Subkey3b"); + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + /* Test value deletion. We start by creating some registry values. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg: Close any open registry keys before starting the key deletion process.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 82fc4c8c62b2e72e749a709352048de48dd274e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fc4c8c62b2e72e749a70935… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 25 05:37:06 2017 +0000 reg: Close any open registry keys before starting the key deletion process. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 2 ++ programs/reg/tests/reg.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index b9900b3..a39e1db 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -600,6 +600,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; + close_key(parser); + if (*p == 'H' || *p == 'h') { HKEY root; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8a9d12a..a373805 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1746,7 +1746,7 @@ static void test_import(void) "\"Wine46a\"=dword:12345678\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46a"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" @@ -3224,7 +3224,7 @@ static void test_unicode_import(void) "\"Wine46a\"=dword:12345678\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key_nonexist(hkey, "Subkey4a"); - todo_wine verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"

1 0

Alexandre Julliard : winex11: If importing an X11 clipboard format fails, try other candidate formats for the target.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 401ccc73e204522278d1d0426af008a1b89c8bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401ccc73e204522278d1d0426… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:08:13 2017 +0200 winex11: If importing an X11 clipboard format fails, try other candidate formats for the target. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8e6e05b..c55a266 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1087,8 +1087,9 @@ static HANDLE render_format( UINT id ) for (i = 0; i < nb_current_x11_formats; i++) { if (current_x11_formats[i]->id != id) continue; - handle = import_selection( display, import_window, current_selection, current_x11_formats[i] ); - if (handle) SetClipboardData( id, handle ); + if (!(handle = import_selection( display, import_window, + current_selection, current_x11_formats[i] ))) continue; + SetClipboardData( id, handle ); break; } return handle;

1 0

Alexandre Julliard : gdi32/tests: Add a test case for DIB color painting.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 103f2646d56e9d7e3e94bb3b24c1bc9e622e609c URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f2646d56e9d7e3e94bb3b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:23:19 2017 +0200 gdi32/tests: Add a test case for DIB color painting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4e5b4d0..23d376d 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "8eb1f99d21a84153e88e7958707049d517ab7641", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", + "fd5b4569f2a1e42b2804c5baf93d95c9963cf608", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", "d08f2c4e2b30131450328ed6be0efb9966a890de", "e462052a03dbe4ec3814db7700e166d00d4d686f", @@ -201,6 +202,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "8eb1f99d21a84153e88e7958707049d517ab7641", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", + "fd5b4569f2a1e42b2804c5baf93d95c9963cf608", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", "d08f2c4e2b30131450328ed6be0efb9966a890de", "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", @@ -272,6 +274,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "c272d1e0342e6089a0182dc42b37e47889116a9b", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", + "9098b3ef02debe1924ad5a1bc4d24ade9d91ae7f", "849d4abf4b690128a5f70e9b8ac78f20c437de06", "88a51deb333457af423e1a1a4e3dd4ef8ca4e8c5", "87f57a31253a38dbf3dc3070473328fa04b68a48", @@ -343,6 +346,7 @@ static const char *sha1_graphics_r10g10b10[] = "7735098af7535d8c57266190a13f92d8869e8529", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", + "5d0e4959415b18f0c5589e03d03605e553309138", "4782df8e24127e66a434b4e839adebf2dbb223fb", "c31bed2e92265aab0b690fb5092e2f6e533a0554", "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", @@ -414,6 +418,7 @@ static const char *sha1_graphics_r6g6b6[] = "4b41865829b50b2e29beda51b055bd1f908a649c", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", + "65b7b585ffa3bfaa9ce1561a343e450b6ba409db", "2b3e87e0b705b03c7c08f403409ab82cce095ba1", "3ded1c18712c1d102e327d0699be43675f881e89", "aecb242c31f31a90f071b6455ea7d808d4ea22e3", @@ -485,6 +490,7 @@ static const char *sha1_graphics_24[] = "bf55d4bdb26ae0f358bd67ef01932563519aab98", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", + "5ef5da5582a1a57272efaa98b109c0eb20f8ea03", "099c688a920f606655b485e8f0a433dc811bc976", "8a6c0e9f060653365ae76294e1ec53741c89c27d", "354b92008a8409c62d0fa1dff1532c5943aa37a2", @@ -555,6 +561,7 @@ static const char *sha1_graphics_r5g5b5[] = "ace2c60bd76b11a002bee852686e8783f102eba1", "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", + "60357eaacc998d34891ce084904fd27d1fcde958", "904f1d82159bcf5485f323bd12b859dc5e83f8eb", "bf63c5db6b057e67a4444c1a0b3a6e5b99a45363", "295ec16530126046790fb734e99f86f5b3b74ed8", @@ -625,6 +632,7 @@ static const char *sha1_graphics_r4g4b4[] = "a80f3df0aea1e1b30d9833039157bca658218f48", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", + "facf052602b422d2cbe29f9ab3bb8e2f599f57f3", "f373a5f37b82e7523c64c08eb509b6191e49b173", "a966cb01ea9b1d962094717e483092d3baab6626", "7587a9c87cab1eca827807f351bb67ca184d1ac5", @@ -695,6 +703,7 @@ static const char *sha1_graphics_8_color[] = "65b2c868790806be7ab4aaa6114d445c42a31f98", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", + "d215ad3e5efef008ebe672dcc66478d06935e5cb", "52e7c2f8b01592898c13f1e7633881e350244209", "4907fd0fdbf375a2dcca573208a49efa2e15c9d6", "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", @@ -766,6 +775,7 @@ static const char *sha1_graphics_8_grayscale[] = "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", "5eb00252664ec39e61359adb1dade4906a87a248", + "7ae54b25bbead496af7886dadd8530be5f53e85c", "ee7b9b292ea9fb559ef5ebf6a2a5586d38c7f854", "5b4a11854e508a579b1cda121841442367716930", "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", @@ -836,6 +846,7 @@ static const char *sha1_graphics_8[] = "95060f3dc9e6d01ada42f09a871b69f0699cb77c", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", + "b7ffe12eec77bde401bbe17df0de5ea7f37e3323", "0025a440866a404523a8a20e79a8891e45a2ff56", "7833e6cb62b4e4459d3e7ceba2cc6eb18c4b5d59", "bd28d77cd85b20a2384d6b25082cfd884bba683e", @@ -906,6 +917,7 @@ static const char *sha1_graphics_4[] = "09438163dcbede3890a0e6d8e614c97a06759380", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", + "aa3b12616cfce8ddd8aa71e390c0be5013f870f3", "ccf8d11b1e81895e9781f17c227c821228d8714b", "33a86f99eb8472088a1d63a1c63539bd5cea1c7f", "28a6b9f7927e99e53cf46f0333d29168cb10e920", @@ -976,6 +988,7 @@ static const char *sha1_graphics_4_grayscale[] = "f8d2f196ba8a16f54acb934e61a759ab7d3f2f05", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", + "020b00eab7dcf12ea1a58441d44b85ebc9c026e8", "06a6a224be0f5cdc51ac4704f9f57fc1f3813d6f", "d5335e66fdbd61a350f010986fa9b47655f1517f", "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", @@ -1048,6 +1061,7 @@ static const char *sha1_graphics_1[] = "58273e1fbf961ff2c772d57160d60170e258d3fe", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", + "ca711c69165e1fa5be72993b9a7870ef6d485249", "44a28536466dc895feb824b23dfd4a47c6948af8", "6bea3a3b5bde2e8038bfee86bb332205167571f4", "781d8c5cbc28591fd48fce06f984c502fdc6b363", @@ -1118,6 +1132,7 @@ static const RECT graphics_bounds[] = { 0, 0, 16, 16 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, + { 0, 0, 512, 512 }, { 0, 10, 511, 306 }, { 0, 0, 512, 336 }, { 1, 1, 300, 512 }, @@ -2412,6 +2427,19 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) compare_hash_broken_todo(hdc, bmi, bits, "stretchdibits", dib_is_8bpp_gray ? 1 : 0, dib_is_8bpp_gray ); /* Solid colors */ + + for (i = 0; i < 16; i++) + { + for (j = 0; j < 16; j++) + { + solid_patblt( hdc, 16 * j, 16 * i, 16, 16, RGB( i*16+j, i*16+j, i*16+j )); + solid_patblt( hdc, 16 * j, 256 + 16 * i, 16, 16, RGB( 3*(i*16+j), i*16+j, i*16+j )); + solid_patblt( hdc, 256 + 16 * j, 16 * i, 16, 16, RGB( i*16+j, 3*(i*16+j), i*16+j )); + solid_patblt( hdc, 256 + 16 * j, 256 + 16 * i, 16, 16, RGB( i*16+j, i*16+j, 3*(i*16+j) )); + } + } + compare_hash(hdc, bmi, bits, "color fills"); + for (i = 0; i < 256; i++) { solid_patblt( hdc, i * 2, 10, 1, 1, DIBINDEX(i) );

1 0

Alexandre Julliard : gdi32: Always dither brush when painting to a 1-bpp device.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 80ae5c968e78f80f96c6542934ac86d772270633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ae5c968e78f80f96c654293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 08:29:14 2017 +0200 gdi32: Always dither brush when painting to a 1-bpp device. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/tests/dib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 8e55d1a..a36e03f 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1933,7 +1933,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * BITMAPINFO *info = (BITMAPINFO *)buffer; RGBQUAD color_table[2]; dib_info pattern; - BOOL dither = (brush->dib.bit_count == 1); + BOOL dither = (brush->dib.bit_count == 1) || (pdev->dib.bit_count == 1); if (brush->pattern.info->bmiHeader.biClrUsed && brush->pattern.usage == DIB_PAL_COLORS) { diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 23d376d..4017845 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1753,7 +1753,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) y += 25; } } - compare_hash_broken_todo(hdc, bmi, bits, "top-down 8888 dib brush patblt", 0, dib_is_1bpp); + compare_hash(hdc, bmi, bits, "top-down 8888 dib brush patblt"); SelectObject(hdc, orig_brush); DeleteObject(dib_brush);

1 0

Alexandre Julliard : gdi32/tests: Run DIB tests also against a monochrome DDB.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 593def1756a07a9588aa9cd1273e56d9e9c1006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=593def1756a07a9588aa9cd12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 25 12:46:48 2017 +0200 gdi32/tests: Run DIB tests also against a monochrome DDB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 384 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 306 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=593def1756a07a9588aa9…

1 0

Alistair Leslie-Hughes : ntdll: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: cb13ee3bf1f90195bf1e5050d54d28fcebb2e61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb13ee3bf1f90195bf1e5050d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 25 08:24:48 2017 +0000 ntdll: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tape.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 09803d4..9050584 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -405,9 +405,9 @@ static NTSTATUS TAPE_SetPosition( int fd, const TAPE_SET_POSITION *data ) #ifdef HAVE_SYS_MTIO_H struct mtop cmd; - TRACE( "fd: %d method: 0x%08x partition: 0x%08x offset: 0x%x%08x immediate: 0x%02x\n", - fd, data->Method, data->Partition, (DWORD)(data->Offset.QuadPart >> 32), - (DWORD)data->Offset.QuadPart, data->Immediate ); + TRACE( "fd: %d method: 0x%08x partition: 0x%08x offset: 0x%s immediate: 0x%02x\n", + fd, data->Method, data->Partition, wine_dbgstr_longlong(data->Offset.QuadPart), + data->Immediate ); if (sizeof(cmd.mt_count) < sizeof(data->Offset.QuadPart) && (int)data->Offset.QuadPart != data->Offset.QuadPart)

1 0

Alistair Leslie-Hughes : wininet: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: wine Branch: master Commit: 43deec95f6b2bb05b3156c570473429ddfdfb7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43deec95f6b2bb05b3156c570… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 25 08:24:39 2017 +0000 wininet: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7db5eab..c7b5f9e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3420,8 +3420,8 @@ HANDLE WINAPI FindFirstUrlCacheEntryExA( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3439,8 +3439,8 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3716,8 +3716,8 @@ INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD dwFlags, LPVOID lpReserved) */ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(0x%08x%08x, 0x%08x, %p) stub\n", - (ULONG)(GroupId >> 32), (ULONG)GroupId, dwFlags, lpReserved); + FIXME("(0x%s, 0x%08x, %p) stub\n", + wine_dbgstr_longlong(GroupId), dwFlags, lpReserved); return FALSE; } @@ -3739,8 +3739,8 @@ BOOL WINAPI SetUrlCacheEntryGroupA(LPCSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_a(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_a(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3754,8 +3754,8 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_w(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_w(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3785,8 +3785,8 @@ BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3795,8 +3795,8 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3804,16 +3804,16 @@ BOOL WINAPI GetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttr BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } BOOL WINAPI SetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; }

1 0

Rosanne DiMesio : Add hardware section to test report form
by Jeremy Newman 25 Aug '17

25 Aug '17

Module: appdb Branch: master Commit: 6aef8feeebe9d2e2d7f2e2d0cb865cd3dc9bbc35 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6aef8feeebe9d2e2d7f2e2d0… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 23 13:46:37 2017 -0500 Add hardware section to test report form Fixes bug 16031. Currently only adds fields for the GPU and driver, but more fields could be added to track other hardware. Also changes the Installs? and Runs? dropdown lists to bootstrap form-inline to match the other dropdown lists. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 77 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index cd76375..49cfa69 100644 --- a/include/testData.php +++ b/include/testData.php @@ -24,6 +24,8 @@ class testData{ var $sComments; var $sSubmitTime; var $iSubmitterId; + var $sGpuMfr; + var $sGraphicsDriver; private $sState; // constructor, fetches the data. @@ -63,6 +65,8 @@ class testData{ $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; $this->sState = $oRow->state; + $this->sGpuMfr = $oRow->gpuMfr; + $this->sGraphicsDriver = $oRow->graphicsDriver; } } @@ -80,10 +84,11 @@ class testData{ "testedRelease, staging, installs, runs,". "usedWorkaround, workarounds,". "testedRating, comments,". - "submitTime, submitterId, state)". + "submitTime, submitterId, state,". + "gpuMfr, graphicsDriver)". "VALUES('?', '?', '?', '?', '?', '?', '?',". "'?', '?', '?', '?', '?',". - "'?', '?', '?', '?', '?')", + "'?', '?', '?', '?', '?', '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, @@ -100,7 +105,9 @@ class testData{ $this->sComments, "NOW()", $_SESSION['current']->iUserId, - $this->sState); + $this->sState, + $this->sGpuMfr, + $this->sGraphicsDriver); if($hResult) { @@ -247,7 +254,9 @@ class testData{ workarounds = '?', testedRating = '?', comments = '?', - state = '?' + state = '?', + gpuMfr = '?', + graphicsDriver = '?' WHERE testingId = '?'", $this->iVersionId, $this->shWhatWorks, @@ -264,6 +273,8 @@ class testData{ $this->sTestedRating, $this->sComments, $this->sState, + $this->sGpuMfr, + $this->sGraphicsDriver, $this->iTestingId)) { if($bUpdateRatingInfo && $this->sState == 'accepted') @@ -572,6 +583,7 @@ class testData{ "<p><b>What does not</b></p>\n<p>{$this->shWhatDoesnt}</p>\n". "<p><b>Workarounds</b></p>\n<p>{$this->shWorkarounds}</p>\n". "<p><b>What was not tested</b></p>\n<p>{$this->shWhatNotTested}</p>\n". + "<p><b>Hardware tested</b></p>\n<p><i>Graphics: </i></ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul></p>". "<p><b>Additional Comments</b></p>\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; } @@ -898,6 +910,16 @@ class testData{ echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; echo $this->sComments.'</textarea></td></tr>',"\n"; + /* Graphics hardware/driver + this section could be expanded to include info on other hardware (e.g., CPU, audio) */ + echo '<tr><td><b>Hardware</b></td>',"\n"; + echo '<td>'; + echo 'Graphics: '; + echo testData::make_gpuMfr_list("sGpuMfr", $this->sGpuMfr); + // echo '<br>'; + echo testData::make_graphicsDriver_list('sGraphicsDriver', $this->sGraphicsDriver); + echo '</td></tr>'; + // Distribution $oDistribution = new distribution($this->iDistributionId); $sDistributionHelp = ""; @@ -971,6 +993,12 @@ class testData{ if (empty($aValues['sTestedRelease'])) $errors .= "<li>Please enter the version of Wine that you tested with.</li>\n"; + + if (empty($aValues['sGpuMfr'])) + $errors .= "<li>Please select your GPU manufacturer from the list. If you don't know, select Unknown.</li>\n"; + + if (empty($aValues['sGraphicsDriver'])) + $errors .= "<li>Please indicate whether your graphics driver is open source or proprietary. If you don't know, select unknown.</li>\n"; // Ask for confirmation if changing the tested Wine versions, becase we want users // to submit new reports instead of updating existing ones when testing new Wines @@ -1073,11 +1101,13 @@ class testData{ $this->sUsedWorkaround = $aValues['sUsedWorkaround']; $this->sTestedRating = $aValues['sTestedRating']; $this->sComments = $aValues['sComments']; + $this->sGpuMfr = $aValues['sGpuMfr']; + $this->sGraphicsDriver = $aValues['sGraphicsDriver']; } function make_Installs_list($sVarname, $sSelectedValue) { - echo "<select name='$sVarname'>\n"; + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose ...</option>\n"; $aRating = array('Yes', 'No', 'No, but has workaround', 'N/A'); $iMax = count($aRating); @@ -1094,7 +1124,7 @@ class testData{ function make_Runs_list($sVarname, $sSelectedValue) { - echo "<select name='$sVarname'>\n"; + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose ...</option>\n"; $aRating = array("Yes", "No", "Not installable"); $iMax = count($aRating); @@ -1108,6 +1138,41 @@ class testData{ } echo "</select>\n"; } + + function make_gpuMfr_list($sVarname, $sSelectedValue) + { + echo "<select name='$sVarname'class='form-control form-control-inline'>\n"; + echo "<option value=\"\">GPU manufacturer?</option>\n"; + $aGpuMfr = array('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown'); + $iMax = count($aGpuMfr); + + for($i=0; $i < $iMax; $i++) + { + if($aGpuMfr[$i] == $sSelectedValue) + echo "<option value='".$aGpuMfr[$i]."' selected>".$aGpuMfr[$i]."\n"; + else + echo "<option value='".$aGpuMfr[$i]."'>".$aGpuMfr[$i]."\n"; + } + echo "</select>\n"; + } + + function make_graphicsDriver_list($sVarname, $sSelectedValue) + + { + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; + echo "<option value=\"\">Open source or proprietary driver?</option>\n"; + $aGraphicsDriver = array('open source', 'proprietary', 'unknown'); + $iMax = count($aGraphicsDriver); + + for($i=0; $i < $iMax; $i++) + { + if($aGraphicsDriver[$i] == $sSelectedValue) + echo "<option value='".$aGraphicsDriver[$i]."' selected>".$aGraphicsDriver[$i]."\n"; + else + echo "<option value='".$aGraphicsDriver[$i]."'>".$aGraphicsDriver[$i]."\n"; + } + echo "</select>\n"; + } public static function getTestResultsForUser($iUserId, $iVersionId) {

1 0