December 2016 - Wine-Commits

Andrey Gusev : change variable
by Jeremy Newman Dec. 30, 2016

Dec. 30, 2016

Module: appdb Branch: master Commit: b00e068c949030a14a3e827632a59ff160ef2dd4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b00e068c949030a14a3e8276… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 28 19:02:44 2016 +0200 change variable Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/bugs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bugs.php b/include/bugs.php index 7427a31..f8c3f41 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -749,7 +749,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) echo "<td>".$oBuglink->sShort_desc."</td>\n"; echo "<td class=\"text-center\">".$oBuglink->sBug_status."</td>","\n"; echo "<td class=\"text-center\">".$oBuglink->sResolution."</td>","\n"; - echo "<td class=\"text-center\"><a href=\"viewbugs.php?bug_id={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; + echo "<td class=\"text-center\"><a href=\"viewbugs.php?iBugId={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; if($bCanEdit == true) {

1 0

Bruno Jesus : Update the Portuguese version of Downloads page
by Jeremy Newman Dec. 30, 2016

Dec. 30, 2016

Module: website Branch: master Commit: 97de8f8511fe9b15304679bf79839ef1a815e0ee URL: http://source.winehq.org/git/website.git/?a=commit;h=97de8f8511fe9b15304679… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 29 02:15:39 2016 -0200 Update the Portuguese version of Downloads page Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/pt/download.template | 306 +++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=97de8f8511fe9b1530…

1 0

Piotr Caban : msvcp110: Add _Facet_base_vtable export.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: d8c5ef33090fb0ebac62a4fe9e8622a98a50dc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c5ef33090fb0ebac62a4fe9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 27 14:23:49 2016 +0100 msvcp110: Add _Facet_base_vtable export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/locale.c | 8 +++++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e890257..b09a1d4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 33812b9..863ead9 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 265d2be..438cddb 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ msvcp120.??_7_Facet_base(a)std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ msvcp120.??_7_Locimp(a)locale@std@@6B@ @ extern ??_7_Pad(a)std@@6B@ msvcp120.??_7_Pad(a)std@@6B@ @ extern ??_7codecvt_base(a)std@@6B@ msvcp120.??_7codecvt_base(a)std@@6B@ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 36e2cad..fb3d709 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -954,7 +954,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -# extern ??_7_Facet_base(a)std@@6B@ +@ extern ??_7_Facet_base(a)std@@6B@ MSVCP__Facet_base_vtable @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @ extern ??_7ctype_base(a)std@@6B@ MSVCP_ctype_base_vtable diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index fe5bd33..d2fce47 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,7 +11224,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif - +DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@") @@ -11262,6 +11262,11 @@ DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_fac #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(_Facet_base, + VTABLE_ADD_FUNC(locale_facet_vector_dtor) + VTABLE_ADD_FUNC(locale_facet__Incref) + VTABLE_ADD_FUNC(locale_facet__Incref) + ); __ASM_VTABLE(locale_facet, VTABLE_ADD_FUNC(locale_facet_vector_dtor) #if _MSVCP_VER >= 110 @@ -11608,6 +11613,7 @@ void __asm_dummy_vtables(void) { void init_locale(void *base) { #ifdef __x86_64__ + init__Facet_base_rtti(base); init_locale_facet_rtti(base); init_locale__Locimp_rtti(base); init_collate_char_rtti(base);

1 0

Piotr Caban : msvcrt: Pass correct buffer size to snwprintf in DoMessageBoxW helper.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: 7ba79ca9d2e67e92fc39f46a606583bfb7c99798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba79ca9d2e67e92fc39f46a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 27 14:09:36 2016 +0100 msvcrt: Pass correct buffer size to snwprintf in DoMessageBoxW helper. Spotted by Nikolay. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 318bafb..9fd373e 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -121,7 +121,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess MSVCRT_wchar_t text[2048]; INT ret; - MSVCRT__snwprintf(text,sizeof(text),message_format, lead, MSVCRT__wpgmptr, message); + MSVCRT__snwprintf(text, sizeof(text)/sizeof(text[0]), message_format, + lead, MSVCRT__wpgmptr, message); msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow();

1 0

Alexandre Julliard : gdi32: Support PALETTEINDEX colors for 1-bpp DIB blits.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: c0b30432ea76334811e43ccef14a7190fbce4a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b30432ea76334811e43ccef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 16:08:44 2016 +0100 gdi32: Support PALETTEINDEX colors for 1-bpp DIB blits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 43 ++++++++++++++++++++++++++++--------------- dlls/gdi32/tests/dib.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 3a8f0f4..8c2e815 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -221,25 +221,38 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits return blend_bitmapinfo( src_info, src_bits->ptr, src, dst_info, dst_bits->ptr, dst, blend ); } -/* helper to retrieve either both colors or only the background color for monochrome blits */ -void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) +static RGBQUAD get_dc_rgb_color( DC *dc, COLORREF color ) { - RGBQUAD *colors = info->bmiColors; - COLORREF color = dc->backgroundColor; - - colors[count - 1].rgbRed = GetRValue( color ); - colors[count - 1].rgbGreen = GetGValue( color ); - colors[count - 1].rgbBlue = GetBValue( color ); - colors[count - 1].rgbReserved = 0; + RGBQUAD ret = { 0, 0, 0, 0 }; - if (count > 1) + if (color & (1 << 24)) /* PALETTEINDEX */ { - color = dc->textColor; - colors[0].rgbRed = GetRValue( color ); - colors[0].rgbGreen = GetGValue( color ); - colors[0].rgbBlue = GetBValue( color ); - colors[0].rgbReserved = 0; + PALETTEENTRY pal; + + if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal )) + GetPaletteEntries( dc->hPalette, 0, 1, &pal ); + ret.rgbRed = pal.peRed; + ret.rgbGreen = pal.peGreen; + ret.rgbBlue = pal.peBlue; + return ret; } + if (color >> 16 == 0x10ff) /* DIBINDEX */ + { + /* FIXME: need to propagate the index into the conversion functions */ + WARN( "monochrome blit uses DIBINDEX %x\n", color ); + return ret; + } + ret.rgbRed = GetRValue( color ); + ret.rgbGreen = GetGValue( color ); + ret.rgbBlue = GetBValue( color ); + return ret; +} + +/* helper to retrieve either both colors or only the background color for monochrome blits */ +void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) +{ + info->bmiColors[count - 1] = get_dc_rgb_color( dc, dc->backgroundColor ); + if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, dc->textColor ); info->bmiHeader.biClrUsed = count; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 9db74fe..bf3e77c 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "aaf62842bb98d8a2945c4f643baf50afaeea9307", "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", + "00b4e9b243a36a7210a48bcb7c2d410d9cd8c8c7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", @@ -203,6 +204,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "aaf62842bb98d8a2945c4f643baf50afaeea9307", "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", + "00b4e9b243a36a7210a48bcb7c2d410d9cd8c8c7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "a37810f46dee8741fe5adbb3f1f2e87012ffc929", @@ -276,6 +278,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "118bf4c5bddc206ba737f7aa8b239940cd1aadc2", "eac5d164b83edf2cf85bac242686f9f617ec1fa4", "86c84cc8306975edecc6d4a89a8aff29f59b55a7", + "698d6393e97539806351368f95be478c6fbc62b0", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", "849d4abf4b690128a5f70e9b8ac78f20c437de06", @@ -349,6 +352,7 @@ static const char *sha1_graphics_r10g10b10[] = "43d67bc61ef54014b022891e5c024fc24b1fe797", "5a713a91fd471fd331bd13b0868c994aa2ffe2b2", "fc0c32afb719295f28bcfef22803bef94f798e20", + "bb2a421bab95f9b5420704ef44c0f3214a0b5a11", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", "4782df8e24127e66a434b4e839adebf2dbb223fb", @@ -422,6 +426,7 @@ static const char *sha1_graphics_r6g6b6[] = "cd01f2c0a63b2229d4467d2f874d58edca32b3d4", "8ad5cd520cd628b76d2e5a3f318ae1bbb6b4c994", "49341c297a887186bd47d7465d827ab3147f05e3", + "514c07281ef6702c35e68b230e897303a8cdec81", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", "2b3e87e0b705b03c7c08f403409ab82cce095ba1", @@ -495,6 +500,7 @@ static const char *sha1_graphics_24[] = "1015e0217ea13eaa62c7666b8b81aafd75f8f610", "5578c80048520732557abf3a3a3fa22c85015d7d", "b25ba91487ec945410deb2b51bc1156890c032a8", + "4c8c936372755f95051f1159b7ff65a484e1a555", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", "099c688a920f606655b485e8f0a433dc811bc976", @@ -572,6 +578,7 @@ static const char *sha1_graphics_r5g5b5[] = "a7506e2c001d271593297c9eda9b984d4d894774", "8f447a3820c83662086dfa836da2205b0130fd5f", "3772003c7fb420003512d0c437b3659d96d89ce4", + "2ebf37d81da3f11434652d06bf65d55e96b090aa", "dab47c9dc149e570045d699598b14a613bf319b3", "2daca4d26a086ed34894693be0b0374402232809", "904f1d82159bcf5485f323bd12b859dc5e83f8eb", @@ -644,6 +651,7 @@ static const char *sha1_graphics_r4g4b4[] = "9af4907a8144458a73dbb7471784f8c3d9aeffcf", "104e85bad287a62dfe25f0e78280179f18bac765", "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", + "fde993dfce1551ef220f5a07ce4acd66e8524ac5", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", "f373a5f37b82e7523c64c08eb509b6191e49b173", @@ -722,6 +730,7 @@ static const char *sha1_graphics_8_color[] = "f3dc739da41fb299637c8660e8c46917ddcf87a8", "abd2fff80f74b311072ecdb91ce9ceba268fa6e9", "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", + "8269b32b4a34440f1fa37927308debc7eb85f3fa", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", "52e7c2f8b01592898c13f1e7633881e350244209", @@ -804,6 +813,7 @@ static const char *sha1_graphics_8_grayscale[] = "a1a941fa270cda48c648553ed4b427e16e96f8e0", "115c90df05b1ff754dbdfe2a712ef126034d952d", "fb63bbb2f944fb63ed2d7399f07b168740c1034b", + "ae45f0d463ff916f3cb630103969fd49e8d09ef4", "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", "5eb00252664ec39e61359adb1dade4906a87a248", @@ -881,6 +891,7 @@ static const char *sha1_graphics_8[] = "7d1bfff706b0713e53209407889f83a0da26a81d", "5a1d8f9ea978b820edbc5c9e1c6f1cac022620ad", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", + "c404446958788fac00ee1eff571d682bc21dd7ac", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", "0025a440866a404523a8a20e79a8891e45a2ff56", @@ -953,6 +964,7 @@ static const char *sha1_graphics_4[] = "46760975993f9881b7bbe94123173e6a683d3f25", "c644f460937107214a88d5eb9e846d27abd8c874", "df5feb905a31c288008cf5e82d73ac818a160d82", + "4f9658dde0432a711a4d783c1b5aa3365fb7d54b", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", "ccf8d11b1e81895e9781f17c227c821228d8714b", @@ -1025,6 +1037,7 @@ static const char *sha1_graphics_4_grayscale[] = "5eeb56afea8040a8fb18c11f29931b836474126d", "30c256a783c4874261667bb31307eb282ab9470e", "f8681c09f1abfc38d31e47622cb8798cd896a00e", + "0ba7e5d68419702605739acb52fcc01c96cb63d4", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", "06a6a224be0f5cdc51ac4704f9f57fc1f3813d6f", @@ -1115,6 +1128,7 @@ static const char *sha1_graphics_1[] = "a2a928de9007d765da496abec8c21b23601f8c45", "41a417c1f25f2619301afa44bfcde85198985792", "23366004515f3bc46796ea505d748f8d0f97fbe1", + "ba682eb15c0ddffb942e6086e0ccad2353ed7241", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", "44a28536466dc895feb824b23dfd4a47c6948af8", @@ -1189,6 +1203,7 @@ static const RECT graphics_bounds[] = { 100, 100, 356, 356 }, { 10, 10, 356, 356 }, { 100, 100, 356, 356 }, + { 0, 0, 260, 39 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, { 0, 10, 511, 306 }, @@ -2420,6 +2435,36 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) else compare_hash(hdc, bmi, bits, "AlphaBlend src 1-bpp" ); } + /* blitting with 1-bpp ddb source */ + + bmp = CreateBitmap( 16, 16, 1, 1, ddb_brush_bits ); + DeleteObject( SelectObject( src_dc, bmp ) ); + + old_text = GetTextColor( hdc ); + old_bkgnd = GetBkColor( hdc ); + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, RGB( i, 2*i, 255 - i ) ); + SetBkColor(hdc, RGB( 255 - i, i / 3, i ) ); + BitBlt( hdc, i, 0, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, PALETTEINDEX( i )); + SetBkColor(hdc, PALETTEINDEX( i + 3 )); + BitBlt( hdc, i, 13, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + for (i = 0; i < 256; i += 13) + { + SetTextColor(hdc, DIBINDEX( i )); + SetBkColor(hdc, DIBINDEX( i + 3 )); + BitBlt( hdc, i, 26, 13, 13, src_dc, 0, 0, SRCCOPY ); + } + SetTextColor( hdc, old_text ); + SetBkColor( hdc, old_bkgnd ); + compare_hash_broken_todo(hdc, bmi, bits, "BitBlt src 1-bpp ddb SRCCOPY", 0, + bmi->bmiHeader.biBitCount <= 8 /* todo: DIBINDEX for indexed formats */ ); + DeleteDC( src_dc ); DeleteObject( bmp );

1 0

Nikolay Sivov : ole32/tests: Some tests for returned apartment type in implicit MTA case.
by Alexandre Julliard Dec. 27, 2016

Dec. 27, 2016

Module: wine Branch: master Commit: 3e2ed9c7617cdf43db39fad51f970cb9a2cd42fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2ed9c7617cdf43db39fad51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 25 01:19:07 2016 +0300 ole32/tests: Some tests for returned apartment type in implicit MTA case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b8bdaff..4468ad9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -617,6 +617,26 @@ static DWORD CALLBACK ole_initialize_thread(LPVOID pv) return hr; } +#define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) +static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, + BOOL todo_qualifier, int line) +{ + APTTYPEQUALIFIER qualifier = ~0u; + APTTYPE type = ~0u; + HRESULT hr; + + if (!pCoGetApartmentType) + return; + + hr = pCoGetApartmentType(&type, &qualifier); + ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); +todo_wine_if(todo_type) + ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); +todo_wine_if(todo_qualifier) + ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, + expected_qualifier); +} + static void test_CoCreateInstance(void) { HRESULT hr; @@ -661,6 +681,8 @@ static void test_CoCreateInstance(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -672,6 +694,8 @@ static void test_CoCreateInstance(void) ok( !WaitForSingleObject(info.wait, 10000 ), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pUnk = (IUnknown *)0xdeadbeef; hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); @@ -687,6 +711,8 @@ static void test_CoCreateInstance(void) CloseHandle(thread); CloseHandle(info.wait); CloseHandle(info.stop); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); } static void test_CoGetClassObject(void) @@ -713,6 +739,8 @@ static void test_CoGetClassObject(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -724,6 +752,8 @@ static void test_CoGetClassObject(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); if(hr == REGDB_E_CLASSNOTREG) @@ -745,6 +775,8 @@ static void test_CoGetClassObject(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + if (!pRegOverridePredefKey) { win_skip("RegOverridePredefKey not available\n"); @@ -1798,6 +1830,8 @@ static void test_CoGetObjectContext(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -1809,6 +1843,8 @@ static void test_CoGetObjectContext(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); @@ -1842,8 +1878,12 @@ static void test_CoGetObjectContext(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok_ole_success(hr, "CoGetObjectContext"); @@ -2028,6 +2068,8 @@ static void test_CoGetContextToken(void) /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -2039,6 +2081,8 @@ static void test_CoGetContextToken(void) ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + token = 0; hr = pCoGetContextToken(&token); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); @@ -2059,8 +2103,12 @@ static void test_CoGetContextToken(void) CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + CoInitialize(NULL); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + hr = pCoGetContextToken(NULL); ok(hr == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hr);

1 0

Alexandre Julliard : Wine release 2.0-rc3
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: website Branch: master Commit: af89816b033a66f8d0dbd4636611b683699a75cc URL: http://source.winehq.org/git/website.git/?a=commit;h=af89816b033a66f8d0dbd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:54:10 2016 +0100 Wine release 2.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016122301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2016122301.xml b/news/en/2016122301.xml new file mode 100644 index 0000000..3a4b705 --- /dev/null +++ b/news/en/2016122301.xml @@ -0,0 +1,12 @@ +<news> +<date>December 23, 2016</date> +<title>Wine 2.0-rc3 Released</title> +<body> + The Wine development release 2.0-rc3 is now available. + <a href="{$root}/announce/2.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hugh McMaster : msvcrt: Fix typo in message_format array.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 87c1ce80f3aef5d2b6b0aae429a91e383ef6dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c1ce80f3aef5d2b6b0aae42… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 23 11:38:56 2016 +0000 msvcrt: Fix typo in message_format array. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2034ddf..318bafb 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -113,7 +113,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess static const MSVCRT_wchar_t message_format[] = {'%','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','s','\n', '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', - 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + 't','h','e',' ','W','i','n','e',' ','d','e','b','u','g','g','e','r','.','\n',0}; static const WCHAR title[] = {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0};

1 0

Tag wine-2.0-rc3 : Alexandre Julliard : Release 2.0-rc3
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: refs/tags/wine-2.0-rc3 Tag: 90f249050cda178bcb67bcab4c0e2eeb75e288f6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=90f249050cda178bcb67bcab4c0e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:52:14 2016 +0100 Release 2.0-rc3

1 0

Alexandre Julliard : Release 2.0-rc3.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 80d2edd5845c09b98cb5b6b7779b4455dfbc1095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d2edd5845c09b98cb5b6b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 23 20:52:13 2016 +0100 Release 2.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 178 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +++---- 3 files changed, 98 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80d2edd5845c09b98cb5b…

1 0

Austin English : webservices: Allocate enough memory for WS_XML_TEXT_TYPE_DOUBLE on Valgrind.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 59112f2194873c3d19934cdc7b6cc48910bdbcd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59112f2194873c3d19934cdc7… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 23 12:52:39 2016 +0100 webservices: Allocate enough memory for WS_XML_TEXT_TYPE_DOUBLE on Valgrind. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index c1f1b0c..1ccac53 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1369,7 +1369,7 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, WS_XML_UTF8_TEXT **ret case WS_XML_TEXT_TYPE_DOUBLE: { const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; - unsigned char buf[24]; /* "-1.1111111111111111E-308" */ + unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ unsigned short fpword; ULONG len;

1 0

Hans Leidekker : webservices/tests: Add a helper to print the contents of the output buffer.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 3b050d615d99dc46fd6dc3f6f37fedef6e47d1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b050d615d99dc46fd6dc3f6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 12:52:38 2016 +0100 webservices/tests: Add a helper to print the contents of the output buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b5288a5..6ad691f 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -339,6 +339,41 @@ static void test_WsSetOutputToBuffer(void) WsFreeHeap( heap ); } +static char strbuf[512]; +static const char *debugstr_bytes( const BYTE *bytes, ULONG len ) +{ + const BYTE *src = bytes; + char *dst = strbuf; + + while (len) + { + BYTE c = *src++; + if (dst - strbuf > sizeof(strbuf) - 7) break; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + default: + if (c >= ' ' && c < 127) *dst++ = c; + else + { + sprintf( dst, "\\%02x", c ); + dst += 3; + } + } + len--; + } + if (len) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return strbuf; +} + static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned int line ) { WS_BYTES bytes; @@ -351,7 +386,8 @@ static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned ok( hr == S_OK, "%u: got %08x\n", line, hr ); ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); if (bytes.length != len) return; - ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, bytes.bytes, expected ); + ok( !memcmp( bytes.bytes, expected, len ), + "%u: got %s expected %s\n", line, debugstr_bytes(bytes.bytes, bytes.length), expected ); } static void test_WsWriteStartElement(void)

1 0

Nikolay Sivov : winspool: Fix potential string buffer leaks (Coverity).
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 614ad0c8c284d6a75039704fe8340b542d7a02f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614ad0c8c284d6a75039704fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:02:02 2016 +0300 winspool: Fix potential string buffer leaks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2c6a816..f09745d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8565,17 +8565,17 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) if (doc->lpszDocName) { docnameW = asciitounicode(&usBuffer, doc->lpszDocName); - if (!(docW.lpszDocName = docnameW)) return NULL; + if (!(docW.lpszDocName = docnameW)) goto failed; } if (doc->lpszOutput) { outputW = asciitounicode(&usBuffer, doc->lpszOutput); - if (!(docW.lpszOutput = outputW)) return NULL; + if (!(docW.lpszOutput = outputW)) goto failed; } if (doc->lpszDatatype) { datatypeW = asciitounicode(&usBuffer, doc->lpszDatatype); - if (!(docW.lpszDatatype = datatypeW)) return NULL; + if (!(docW.lpszDatatype = datatypeW)) goto failed; } docW.fwType = doc->fwType; @@ -8589,6 +8589,7 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) HeapFree(GetProcessHeap(), 0, retW); } +failed: HeapFree(GetProcessHeap(), 0, datatypeW); HeapFree(GetProcessHeap(), 0, outputW); HeapFree(GetProcessHeap(), 0, docnameW);

1 0

Nikolay Sivov : winspool: Initialize string pointers passed to StartDocDlgW() (Coverity).
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: a3aad9d80fb2cf0bbfee6f3741e89c5a7c44ca13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3aad9d80fb2cf0bbfee6f374… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:02:01 2016 +0300 winspool: Initialize string pointers passed to StartDocDlgW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 39ae4eb..2c6a816 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8556,7 +8556,7 @@ end: LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) { UNICODE_STRING usBuffer; - DOCINFOW docW; + DOCINFOW docW = { 0 }; LPWSTR retW; LPWSTR docnameW = NULL, outputW = NULL, datatypeW = NULL; LPSTR ret = NULL;

1 0

Nikolay Sivov : mscoree: Free argument buffer on error (Coverity).
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: cee34cb14125d981183f57c7463fc5647c8a2e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee34cb14125d981183f57c74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:23:22 2016 +0300 mscoree: Free argument buffer on error (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 86eb759..eed96da 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1423,7 +1423,10 @@ __int32 WINAPI _CorExeMain(void) filenameA = WtoA(filename); if (!filenameA) + { + HeapFree(GetProcessHeap(), 0, argv); return -1; + } FixupVTable(GetModuleHandleW(NULL));

1 0

Alex Henrie : msvcrt: Pass wide char caption string to MessageBoxIndirectW.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: df37daf175fb9b47e23bc2591853bae6d7ed424f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df37daf175fb9b47e23bc2591… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 22 15:06:35 2016 -0700 msvcrt: Pass wide char caption string to MessageBoxIndirectW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9ba0891..2034ddf 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,8 +41,6 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; -static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; - extern int MSVCRT_app_type; extern MSVCRT_wchar_t *MSVCRT__wpgmptr; @@ -116,6 +114,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + static const WCHAR title[] = + {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0}; MSGBOXPARAMSW msgbox; MSVCRT_wchar_t text[2048]; @@ -126,8 +126,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow(); msgbox.hInstance = 0; - msgbox.lpszText = (LPCWSTR)text; - msgbox.lpszCaption = (LPCWSTR)szMsgBoxTitle; + msgbox.lpszText = text; + msgbox.lpszCaption = title; msgbox.dwStyle = MB_OKCANCEL|MB_ICONERROR; msgbox.lpszIcon = NULL; msgbox.dwContextHelpId = 0;

1 0

André Hentschel : hlink/tests: Ignore single character fails on Win10.
by Alexandre Julliard Dec. 23, 2016

Dec. 23, 2016

Module: wine Branch: master Commit: 00c47a2a09b8bb142bd4e4e622ef9b5f8feab8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c47a2a09b8bb142bd4e4e62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 20 23:21:26 2016 +0100 hlink/tests: Ignore single character fails on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 8a01f19..42fe6cb 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -400,6 +400,11 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, same = TRUE; for (i = 0; i < min(data_size, expected_data_alt_size); i++) { + if ((expected_data_alt == expected_hlink_data_ie7 && i == 89) /* Win10 */ || + (expected_data_alt == expected_hlink_data2_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) + continue; if ((expected_data_alt[i] != data[i]) && (((expected_data_alt != expected_hlink_data2) && (expected_data_alt != expected_hlink_data3)) ||

1 0

Piotr Caban : msvcrt/tests: Correctly declare base class to avoid a compiler warning.
by Alexandre Julliard Dec. 22, 2016

Dec. 22, 2016

Module: wine Branch: master Commit: da071d939fb5acb3bfcf197a29806d0b6b65891b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da071d939fb5acb3bfcf197a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 15:06:25 2016 +0100 msvcrt/tests: Correctly declare base class to avoid a compiler warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 490ddee..cf5e4c7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -969,7 +969,11 @@ static void test_rtti(void) void *child_class_sig0 = &child_class_sig0_vtbl[1]; void *virtual_base_class_vtbl[2] = {&virtual_base_class_rtti.object_locator}; int virtual_base_class_vbtbl[2] = {0, 0x100}; - void *virtual_base_class[2] = {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl}; + struct { + void *virtual_base[2]; + char data[0x110-sizeof(void*)]; + void *vbthis; + } virtual_base_class = { {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl} }; static const char* e_name = "name"; type_info *ti,*bti; @@ -1082,7 +1086,7 @@ static void test_rtti(void) ok(casted == (char*)&child_class+4, "failed cast to child class (%p %p)\n", casted, &child_class); casted = p__RTDynamicCast(&virtual_base_class, 0, &virtual_base_class_rtti.type_info[0], &virtual_base_class_rtti.type_info[1], 0); - ok(casted == (char*)&virtual_base_class+0x110+sizeof(void*), "failed cast to child class (%p %p)\n", casted, &virtual_base_class); + ok(casted == &virtual_base_class.vbthis, "failed cast to child class (%p %p)\n", casted, &virtual_base_class); } struct _demangle {

1 0

Alexandre Julliard : wineconsole: Leave room for wide characters only when using a DBCS codepage.
by Alexandre Julliard Dec. 22, 2016

Dec. 22, 2016

Module: wine Branch: master Commit: 29533e4844761c499c16be73e2db7dc055776fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29533e4844761c499c16be73e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 14:23:54 2016 +0100 wineconsole: Leave room for wide characters only when using a DBCS codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index eb68373..316c011 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -449,6 +449,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, TEXTMETRICW tm; HDC hDC; HFONT hFont, hOldFont; + CPINFO cpinfo; if (!(hDC = GetDC(hWnd))) return NULL; if (!(hFont = CreateFontIndirectW(lf))) @@ -461,12 +462,16 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, SelectObject(hDC, hOldFont); ReleaseDC(hWnd, hDC); - config->cell_width = tm.tmMaxCharWidth; + config->cell_width = tm.tmAveCharWidth; config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpyW(config->face_name, lf->lfFaceName); if (el) *el = tm.tmExternalLeading; + /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ + if (GetCPInfo( GetConsoleOutputCP(), &cpinfo ) && cpinfo.MaxCharSize > 1) + config->cell_width = tm.tmMaxCharWidth; + return hFont; }

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard Dec. 22, 2016

Dec. 22, 2016

Module: wine Branch: master Commit: a8511a3e1757eb986e9cbf33ea86b9ef03370dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8511a3e1757eb986e9cbf33e… Author: Can Taşan <betax34(a)hotmail.com> Date: Thu Dec 22 10:59:58 2016 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 734 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 336 insertions(+), 398 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8511a3e1757eb986e9cb…

1 0

Alexandre Julliard : msvcirt/tests: Silence a compiler warning.
by Alexandre Julliard Dec. 22, 2016

Dec. 22, 2016

Module: wine Branch: master Commit: c28816cc378a580258bfb35a8fc8a32d1b40afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28816cc378a580258bfb35a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 15:07:05 2016 +0100 msvcirt/tests: Silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2234abf..63582e8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2122,14 +2122,14 @@ static void test_strstreambuf(void) ok(ssb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb1.base.allocated); ok(ssb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb1.base.unbuffered); ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); - ok(ssb1.base.ebuf == buffer + 0x7fffffff || ssb1.base.ebuf == (char*)-1, + ok(ssb1.base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.ebuf == (char*)-1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.ebuf); ok(ssb1.base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, ssb1.base.eback); ok(ssb1.base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, ssb1.base.gptr); ok(ssb1.base.egptr == buffer + 20, "wrong get end, expected %p got %p\n", buffer + 20, ssb1.base.egptr); ok(ssb1.base.pbase == buffer + 20, "wrong put base, expected %p got %p\n", buffer + 20, ssb1.base.pbase); ok(ssb1.base.pptr == buffer + 20, "wrong put pointer, expected %p got %p\n", buffer + 20, ssb1.base.pptr); - ok(ssb1.base.epptr == buffer + 0x7fffffff || ssb1.base.epptr == (char*)-1, + ok(ssb1.base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.epptr == (char*)-1, "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); @@ -4208,14 +4208,14 @@ static void test_ostrstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer + 4, "wrong put pointer, expected %p got %p\n", buffer + 4, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_ostrstream_dtor, &os1.base_ios); @@ -6858,14 +6858,14 @@ static void test_strstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer, "wrong put pointer, expected %p got %p\n", buffer, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_strstream_vbase_dtor, &ios1);

1 0

Nikolay Sivov : shell32: Fix potential destination buffer overrun.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: f7cc41d7ae11e22163bd8b205bb30c43e2b6f7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cc41d7ae11e22163bd8b205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:56 2016 +0300 shell32: Fix potential destination buffer overrun. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 1674ad2..9307b08 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -323,7 +323,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN if (SUCCEEDED(hr)) { - hr = IShellLinkW_GetIconLocation(psl, szIconFile, MAX_PATH, piIndex); + hr = IShellLinkW_GetIconLocation(psl, szIconFile, cchMax, piIndex); if (SUCCEEDED(hr) && *szIconFile) found = TRUE;

1 0

Nikolay Sivov : shell32: Don't trace output string buffer contents.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: 490ffe7f4081f7bac874997ba432835eea6e1fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490ffe7f4081f7bac874997ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 21 16:00:55 2016 +0300 shell32: Don't trace output string buffer contents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index cf26caf..1674ad2 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + TRACE("(%p) (flags=%u, %p, %u, %p, %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); if (pwFlags)

1 0

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: c03ea1971b3a16291615cac25e169aeb78290c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ea1971b3a16291615cac25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

1 0

Alexandre Julliard : msvcrt: Disable relay for the __libm_sse2 functions.
by Alexandre Julliard Dec. 21, 2016

Dec. 21, 2016

Module: wine Branch: master Commit: cf51752d5f13ad24d9a4abea29d5aecba803adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf51752d5f13ad24d9a4abea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 17:11:09 2016 +0100 msvcrt: Disable relay for the __libm_sse2 functions. The relay code can use the SSE registers too. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-math-l1-1-0.spec | 64 +++++++++++----------- dlls/msvcr100/msvcr100.spec | 42 +++++++------- dlls/msvcr110/msvcr110.spec | 64 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 64 +++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 64 +++++++++++----------- dlls/msvcr80/msvcr80.spec | 42 +++++++------- dlls/msvcr90/msvcr90.spec | 42 +++++++------- dlls/msvcrt/msvcrt.spec | 42 +++++++------- dlls/ucrtbase/ucrtbase.spec | 64 +++++++++++----------- 9 files changed, 244 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf51752d5f13ad24d9a4a…

1 0

Alexandre Julliard : winex11: Also ignore BadWindow errors caused by XSendEvent.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: adc349c38edd82902571fb7100014241205b3731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc349c38edd82902571fb710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:08:28 2016 +0100 winex11: Also ignore BadWindow errors caused by XSendEvent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1c4ecfd..2127df4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -196,8 +196,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && - (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + if ((event->request_code == X_SetInputFocus || + event->request_code == X_ChangeWindowAttributes || + event->request_code == X_SendEvent) && + (event->error_code == BadMatch || + event->error_code == BadWindow)) return TRUE; /* the clipboard display interacts with external windows, ignore all errors */ if (display == clipboard_display) return TRUE;

1 0

Hans Leidekker : setupapi/tests: Skip InstallHinfSection tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 53b7a36319895f929e3dcdc0433cc2e55020dd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b7a36319895f929e3dcdc04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:08:35 2016 +0100 setupapi/tests: Skip InstallHinfSection tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 5015e31..558453c 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -455,6 +455,14 @@ static void test_profile_items(void) goto cleanup; } + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + if (!CreateDirectoryA(path, NULL) && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + return; + } + RemoveDirectoryA(path); + create_inf_file(inffile, inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path);

1 0

Nikolay Sivov : dwrite: Fully initialize shared factory vtable.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 6d0fa4cebce4b5711fdd291c7ef54f27e14abe6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0fa4cebce4b5711fdd291c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 02:09:27 2016 +0300 dwrite: Fully initialize shared factory vtable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9d5b1be..50a4c1c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1536,7 +1536,10 @@ static const struct IDWriteFactory4Vtbl shareddwritefactoryvtbl = { dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, dwritefactory3_GetSystemFontCollection, - dwritefactory3_GetFontDownloadQueue + dwritefactory3_GetFontDownloadQueue, + dwritefactory4_TranslateColorGlyphRun, + dwritefactory4_ComputeGlyphOrigins_, + dwritefactory4_ComputeGlyphOrigins }; static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type)

1 0

Zebediah Figura : advapi32: Add tests for StartTrace().
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 1bcd38f788bb5165cc65a830ea912ff4eda50b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcd38f788bb5165cc65a830e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 18 15:25:59 2016 -0600 advapi32: Add tests for StartTrace(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 92 ++++++++++++++++++++++++++++++++++++++++++ include/evntrace.h | 1 + 2 files changed, 93 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 7daaeaf..d86a924 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -20,12 +20,15 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winnt.h" #include "winreg.h" #include "sddl.h" +#include "wmistr.h" +#include "evntrace.h" #include "wine/test.h" @@ -1143,6 +1146,92 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_start_trace(void) +{ + const char sessionname[] = "wine"; + const char filepath[] = "wine.etl"; + const char filepath2[] = "eniw.etl"; + EVENT_TRACE_PROPERTIES *properties; + TRACEHANDLE handle; + LONG buffersize; + LONG ret; + + buffersize = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname) + sizeof(filepath); + properties = (EVENT_TRACE_PROPERTIES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + properties->Wnode.BufferSize = buffersize; + properties->Wnode.Flags = WNODE_FLAG_TRACED_GUID; + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + strcpy((char *)properties + properties->LogFileNameOffset, filepath); + + properties->Wnode.BufferSize = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH || + ret == ERROR_INVALID_PARAMETER, /* XP and 2k3 */ + "Expected ERROR_BAD_LENGTH, got %d\n", ret); + properties->Wnode.BufferSize = buffersize; + + ret = StartTraceA(&handle, "this name is too long", properties); + todo_wine + ok(ret == ERROR_BAD_LENGTH, "Expected ERROR_BAD_LENGTH, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, NULL); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = StartTraceA(NULL, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + properties->LogFileNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + properties->LoggerNameOffset = 1; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); + + properties->LogFileMode = EVENT_TRACE_FILE_MODE_SEQUENTIAL | EVENT_TRACE_FILE_MODE_CIRCULAR; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; + /* XP creates a file we can't delete, so change the filepath to something else */ + strcpy((char *)properties + properties->LogFileNameOffset, filepath2); + + properties->Wnode.Guid = SystemTraceControlGuid; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + properties->Wnode.Guid = (GUID){0}; + + properties->LogFileNameOffset = 0; + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_BAD_PATHNAME, "Expected ERROR_BAD_PATHNAME, got %d\n", ret); + properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname); + + ret = StartTraceA(&handle, sessionname, properties); + ok(ret == ERROR_SUCCESS, "Expected success, got %d\n", ret); + + ret = StartTraceA(&handle, sessionname, properties); + todo_wine + ok(ret == ERROR_ALREADY_EXISTS || + ret == ERROR_SHARING_VIOLATION, /* 2k3 */ + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + + /* clean up */ + ControlTraceA(handle, sessionname, properties, EVENT_TRACE_CONTROL_STOP); + HeapFree(GetProcessHeap(), 0, properties); + DeleteFileA(filepath); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -1172,4 +1261,7 @@ START_TEST(eventlog) test_autocreation(); cleanup_eventlog(); } + + /* Trace tests */ + test_start_trace(); } diff --git a/include/evntrace.h b/include/evntrace.h index bb1ce03..5722b28 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -236,6 +236,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG MaximumFileSize; ULONG LogFileMode; ULONG FlushTimer; + ULONG EnableFlags; LONG AgeLimit; ULONG NumberOfBuffers; ULONG FreeBuffers;

1 0

Marcus Meissner : xmllite: Hr was uninitialized in error path (Coverity).
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: f900879d9e86d9f0991be3357e1a3a455b39cc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900879d9e86d9f0991be3357… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 17 12:37:10 2016 +0100 xmllite: Hr was uninitialized in error path (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0fedd91..460eeab 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -547,8 +547,10 @@ static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *lo } element = reader_alloc_zero(reader, sizeof(*element)); - if (!element) + if (!element) { + hr = E_OUTOFMEMORY; goto failed; + } if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK ||

1 0

Hans Leidekker : user32/tests: Disable automatic shell restart during SetShellWindow tests.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: ef743e41eec277341dcf5a323c8c5422d8a7dfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef743e41eec277341dcf5a323… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:09:05 2016 +0100 user32/tests: Disable automatic shell restart during SetShellWindow tests. This test kills the desktop shell process so it can set a different shell window. Modern Windows will automatically restart the desktop shell when it dies, and if that happens soon enough it will interfere with the remaining tests. Disabling automatic restart requires admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 375d387..ca99de4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -32,6 +32,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "wine/test.h" @@ -1239,10 +1240,42 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) return CallNextHookEx(hhook, nCode, wParam, lParam); } +static const WCHAR winlogonW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','l','o','g','o','n',0}; +static const WCHAR autorestartshellW[] = + {'A','u','t','o','R','e','s','t','a','r','t','S','h','e','l','l',0}; + +static DWORD get_autorestart(void) +{ + DWORD type, val, len = sizeof(val); + REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; + HKEY hkey; + LONG res; + + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return 0; + res = RegQueryValueExW( hkey, autorestartshellW, NULL, &type, (BYTE *)&val, &len ); + RegCloseKey( hkey ); + return (!res && type == REG_DWORD) ? val : 0; +} + +static BOOL set_autorestart( DWORD val ) +{ + REGSAM access = KEY_ALL_ACCESS|KEY_WOW64_64KEY; + HKEY hkey; + LONG res; + + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, winlogonW, 0, 0, 0, access, NULL, &hkey, 0 )) return FALSE; + res = RegSetValueExW( hkey, autorestartshellW, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + RegCloseKey( hkey ); + return !res; +} + static void test_shell_window(void) { BOOL ret; - DWORD error; + DWORD error, restart = get_autorestart(); HMODULE hinst, hUser32; BOOL (WINAPI*SetShellWindow)(HWND); HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; @@ -1254,6 +1287,12 @@ static void test_shell_window(void) return; } + if (restart && !set_autorestart(0)) + { + skip("cannot disable automatic shell restart (needs admin rights\n"); + return; + } + shellWindow = GetShellWindow(); hinst = GetModuleHandleA(NULL); hUser32 = GetModuleHandleA("user32"); @@ -1271,6 +1310,7 @@ static void test_shell_window(void) if (!hProcess) { skip( "cannot get access to shell process\n" ); + set_autorestart(restart); return; } @@ -1367,6 +1407,7 @@ static void test_shell_window(void) DestroyWindow(hwnd3); DestroyWindow(hwnd4); DestroyWindow(hwnd5); + set_autorestart(restart); } /************** MDI test ****************/

1 0

Hans Leidekker : shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: a2556760ec6995932e883e11fa93563b271a3951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2556760ec6995932e883e11f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:52 2016 +0100 shell32/tests: Skip SHFileOperation tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d74c59a..4ae93ff 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -820,7 +820,7 @@ static void test_rename(void) retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %u\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ @@ -2517,6 +2517,11 @@ static void test_unicode(void) skip("Unicode tests skipped on non-unicode system\n"); return; } + if (GetLastError()==ERROR_ACCESS_DENIED) + { + skip("test needs admin rights\n"); + return; + } CloseHandle(file); /* Try to delete a file with unicode filename */ @@ -2575,6 +2580,7 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + DeleteFileW(UNICODE_PATH_TO); /* Check last error after a failed file operation. */ DeleteFileW(UNICODE_PATH);

1 0

Hans Leidekker : shell32/tests: Accept another error from SHFileOperationA.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 748f7e26cbab9d91993d555d124bd193c4cafcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=748f7e26cbab9d91993d555d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:07:51 2016 +0100 shell32/tests: Accept another error from SHFileOperationA. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 0e502fc..d74c59a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -817,6 +817,7 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_CANCELLED || retval == DE_DIFFDIR || /* Vista */ + retval == DE_FILEDESTISFLD || /* Vista, running from c: */ broken(retval == DE_OPCANCELLED) || /* Win9x */ broken(retval == 65652), /* NT4 */ "Expected ERROR_CANCELLED or DE_DIFFDIR\n");

1 0

Hugh McMaster : reg/tests: Add tests for line concatenation when importing.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: d4be360b01dcf1ebb53342e21fdd36120f92a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4be360b01dcf1ebb53342e21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 20 11:08:28 2016 +0000 reg/tests: Add tests for line concatenation when importing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e8a9d80..edc3b08 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1064,6 +1064,24 @@ static void test_import(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1322,6 +1340,24 @@ static void test_import(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Add tests for line concatenation when importing.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: e7d5503347de95441525bd8277d57b442b861584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5503347de95441525bd827… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 20 11:08:17 2016 +0000 regedit/tests: Add tests for line concatenation when importing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e09d188..445efb7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -427,6 +427,22 @@ static void test_comments(void) dword = 0x00000004; todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hans Leidekker : setupapi/tests: Skip SetupGetInfInformation tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 0e3a0e13ef64f52e569e162ab8a76d488ed08707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3a0e13ef64f52e569e162ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 20 12:08:34 2016 +0100 setupapi/tests: Skip SetupGetInfInformation tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/query.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 17c24bf..6b6d1bd 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -99,13 +99,16 @@ static const char inf_data6[] = "[CopyAlways.Windir.Files]\n" "WindowsCodecs.dll\n"; -static void create_inf_file(LPSTR filename, const char *data, DWORD size) +static BOOL create_inf_file(LPSTR filename, const char *data, DWORD size) { + BOOL ret; DWORD dwNumberOfBytesWritten; HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); + if (hf == INVALID_HANDLE_VALUE) return FALSE; + ret = WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); + return ret; } static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) @@ -258,7 +261,13 @@ static void test_SetupGetInfInformation(void) lstrcpyA(inf_two, WIN_DIR); lstrcatA(inf_two, "\\system32\\"); lstrcatA(inf_two, "test.inf"); - create_inf_file(inf_two, inf_data1, sizeof(inf_data1) - 1); + ret = create_inf_file(inf_two, inf_data1, sizeof(inf_data1) - 1); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + goto done; + } + ok(ret, "can't create inf file %u\n", GetLastError()); HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); @@ -291,8 +300,8 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); +done: HeapFree(GetProcessHeap(), 0, info); - DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two);

1 0

Nikolay Sivov : dwrite: Improve strikethrough and underline thickness extraction logic.
by Alexandre Julliard Dec. 20, 2016

Dec. 20, 2016

Module: wine Branch: master Commit: 6e356742e3a7758182b722b73dcf432573ebc4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e356742e3a7758182b722b73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 20 12:37:03 2016 +0300 dwrite: Improve strikethrough and underline thickness extraction logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++---------- dlls/dwrite/tests/font.c | 12 +++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c666275..c829813 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1243,17 +1243,10 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - /* use any of thickness values if another one is zero, if both are zero use estimate */ - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; /* estimate missing metrics */ if (metrics->xHeight == 0) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index eb47a05..ba9866a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1725,16 +1725,10 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } - if (metrics->strikethroughThickness || metrics->underlineThickness) { - if (!metrics->strikethroughThickness) - metrics->strikethroughThickness = metrics->underlineThickness; - if (!metrics->underlineThickness) - metrics->underlineThickness = metrics->strikethroughThickness; - } - else { - metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + if (metrics->underlineThickness == 0) metrics->underlineThickness = metrics->designUnitsPerEm / 14; - } + if (metrics->strikethroughThickness == 0) + metrics->strikethroughThickness = metrics->underlineThickness; if (tt_os2) IDWriteFontFace_ReleaseFontTable(fontface, os2_context);

1 0

Lauri Kenttä : cmd: Fix memory leak in WCMD_reduce.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 21dd04670c1e2fa06bfc5bbb5b0c6f4537cde9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dd04670c1e2fa06bfc5bbb5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Dec 17 10:33:27 2016 +0200 cmd: Fix memory leak in WCMD_reduce. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cd319f8..f3dbe3a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3689,7 +3689,7 @@ static WCHAR WCMD_popoperator(OPSTACK **opstack) { * Returns non-zero on error. */ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { - OPSTACK *thisop; + WCHAR thisop; int var1,var2; int rc = 0; @@ -3699,13 +3699,12 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { } /* Remove the top operator */ - thisop = *opstack; - *opstack = (*opstack)->next; - WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop->op); + thisop = WCMD_popoperator(opstack); + WINE_TRACE("Reducing the stacks - processing operator %c\n", thisop); /* One variable operators */ var1 = WCMD_popnumber(varstack); - switch (thisop->op) { + switch (thisop) { case '!': WCMD_pushnumber(NULL, !var1, varstack); break; case '~': WCMD_pushnumber(NULL, ~var1, varstack); @@ -3721,7 +3720,7 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { WINE_TRACE("No operands left for the reduce?\n"); return WCMD_NOOPERAND; } - switch (thisop->op) { + switch (thisop) { case '!': case '~': case OP_POSITIVE: @@ -3792,11 +3791,11 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { /* Make the operand stack grow by pushing the assign operator plus the operator to perform */ while (calcassignments[i].op != ' ' && - calcassignments[i].calculatedop != thisop->op) { + calcassignments[i].calculatedop != thisop) { i++; } if (calcassignments[i].calculatedop == ' ') { - WINE_ERR("Unexpected operator %c\n", thisop->op); + WINE_ERR("Unexpected operator %c\n", thisop); return WCMD_NOOPERATOR; } WCMD_pushoperator('=', WCMD_getprecedence('='), opstack); @@ -3820,10 +3819,9 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { break; } - default: WINE_ERR("Unrecognized operator %c\n", thisop->op); + default: WINE_ERR("Unrecognized operator %c\n", thisop); } - heap_free(thisop); return rc; }

1 0

Nikolay Sivov : gdiplus/tests: Test for initial properties of adjustable arrow caps.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 134cb70fed15e55b3461808fb5244371bb54dce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134cb70fed15e55b3461808fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 15:21:12 2016 +0300 gdiplus/tests: Test for initial properties of adjustable arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/customlinecap.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index f70c134..c2a1dab 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -217,6 +217,56 @@ static void test_scale(void) GdipDeletePath(path); } +static void test_create_adjustable_cap(void) +{ + GpAdjustableArrowCap *cap; + REAL inset, scale; + GpLineJoin join; + GpStatus stat; + GpLineCap base; + + stat = GdipCreateAdjustableArrowCap(10.0, 10.0, TRUE, NULL); +todo_wine + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &cap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(inset == 0.0f, "Unexpected middle inset %f\n", inset); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); + + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapWidthScale((GpCustomLineCap*)cap, &scale); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(scale == 1.0f, "Unexpected width scale %f\n", scale); + + stat = GdipGetCustomLineCapStrokeJoin((GpCustomLineCap*)cap, &join); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(join == LineJoinMiter, "Unexpected stroke join %d\n", join); + + GdipDeleteCustomLineCap((GpCustomLineCap*)cap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -233,6 +283,7 @@ START_TEST(customlinecap) test_linejoin(); test_inset(); test_scale(); + test_create_adjustable_cap(); GdiplusShutdown(gdiplusToken); }

1 0

Hugh McMaster : regedit: Load Binary editor from context menu.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: dc6e2eaf09be532daaee68582744c27dca52e7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6e2eaf09be532daaee68582… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Dec 19 10:10:55 2016 +0000 regedit: Load Binary editor from context menu. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0a56f94..b1611cf 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -730,6 +730,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } case ID_EDIT_MODIFY: + case ID_EDIT_MODIFY_BIN: { LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);

1 0

Hans Leidekker : wintrust/tests: Fix test failures on Windows 8.1 and 10.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 14444fab92662d2d7da5ec9a442b397c1e3f8d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14444fab92662d2d7da5ec9a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:55 2016 +0100 wintrust/tests: Fix test failures on Windows 8.1 and 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index cfed53b..503831e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1020,8 +1020,11 @@ static void test_cdf_parsing(void) catmember = NULL; catmembertag = NULL; while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, cdf_callback, &catmember, FALSE, NULL))) ; - todo_wine - CHECK_EXPECT(CRYPTCAT_E_AREA_MEMBER, CRYPTCAT_E_CDF_MEMBER_FILE_PATH); + ok(error_area == 0xffffffff || broken(error_area == CRYPTCAT_E_AREA_MEMBER) /* < win81 */, + "Expected area 0xffffffff, got %08x\n", error_area); + ok(local_error == 0xffffffff || broken(local_error == CRYPTCAT_E_CDF_MEMBER_FILE_PATH) /* < win81 */, + "Expected error 0xffffffff, got %08x\n", local_error); + pCryptCATCDFClose(catcdf); DeleteFileA(cdffileA); todo_wine

1 0

Hans Leidekker : setupapi/tests: Skip SetupCopyOEMInfA tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 0922deda9360259a8d1c374599e5ced80357d037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0922deda9360259a8d1c37459… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:51 2016 +0100 setupapi/tests: Skip SetupCopyOEMInfA tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 04b2171..dbe684b 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -231,6 +231,11 @@ static void test_SetupCopyOEMInf(void) strcat(path, tmpfile); SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); + if (!res && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("SetupCopyOEMInfA() failed on insufficient permissions\n"); + return; + } ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); @@ -792,7 +797,7 @@ static void test_SetupLogError(void) ret = SetupOpenLog(FALSE); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { - win_skip("SetupOpenLog() failed on insufficient permissions\n"); + skip("SetupOpenLog() failed on insufficient permissions\n"); return; } ok(ret, "SetupOpenLog failed, error %d\n", GetLastError());

1 0

Hans Leidekker : mstask/tests: Skip ITaskScheduler:: SetTargetComputer tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 64c1353925a9ed3f9023561a36c3d34bc86ba655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1353925a9ed3f9023561a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:50 2016 +0100 mstask/tests: Skip ITaskScheduler::SetTargetComputer tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_scheduler.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 3bf660f..31d2848 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -184,6 +184,11 @@ static void test_SetTargetComputer(void) /* the two backslashes are optional */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + if (hres == E_ACCESSDENIED) + { + skip("SetTargetComputer failed with E_ACCESSDENIED (needs admin rights)\n"); + goto done; + } ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); /* the case is ignored */ @@ -198,6 +203,7 @@ static void test_SetTargetComputer(void) hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); +done: CoTaskMemFree(oldname); ITaskScheduler_Release(test_task_scheduler); return;

1 0

Józef Kucia : d2d1/tests: Change scale factors in test_bitmap_brush().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 89ffad1f20dd93f18982c60984b0a223a7b5b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ffad1f20dd93f18982c6098… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:27 2016 +0100 d2d1/tests: Change scale factors in test_bitmap_brush(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 941a43a..cde8579 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1145,7 +1145,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_SetTransform(rt, &matrix); set_matrix_identity(&matrix); translate_matrix(&matrix, -80.0f, -60.0f); - scale_matrix(&matrix, 40.0f, 30.0f); + scale_matrix(&matrix, 64.0f, 32.0f); ID2D1BitmapBrush_SetTransform(brush, &matrix); ID2D1BitmapBrush_SetOpacity(brush, 0.75f); set_rect(&dst_rect, -80.0f, -60.0f, 80.0f, 60.0f); @@ -1167,7 +1167,7 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"); + match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_BeginDraw(rt);

1 0

Józef Kucia : wined3d: Always check if context window needs to be updated.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 6b94fb1e4a6828f5a2f366bd065609bd127aa55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b94fb1e4a6828f5a2f366bd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:25 2016 +0100 wined3d: Always check if context window needs to be updated. Fixes a regression introduced by commit 8673dca87df76b8f94be65c82e4a1a389c13dd9b. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fdd297..6112b40 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1114,18 +1114,21 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD } } -static void context_update_window(struct wined3d_context *context, HWND win_handle) +static void context_update_window(struct wined3d_context *context) { - if (context->win_handle == win_handle) + if (!context->swapchain) + return; + + if (context->win_handle == context->swapchain->win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context, context->win_handle, win_handle); + context, context->win_handle, context->swapchain->win_handle); if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - context->win_handle = win_handle; + context->win_handle = context->swapchain->win_handle; context->hdc_is_private = FALSE; context->hdc_has_format = FALSE; context->needs_set = 1; @@ -3616,7 +3619,6 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); - struct wined3d_swapchain *swapchain = NULL; struct wined3d_texture *target_texture; unsigned int target_sub_resource_idx; struct wined3d_context *context; @@ -3656,11 +3658,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str { context = current_context; } - else if ((swapchain = target_texture->swapchain)) + else if (target_texture->swapchain) { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(swapchain); + context = swapchain_get_context(target_texture->swapchain); } else { @@ -3669,19 +3671,13 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str /* Stay with the current context if possible. Otherwise use the * context for the primary swapchain. */ if (current_context && current_context->device == device) - { context = current_context; - } else - { - swapchain = device->swapchains[0]; - context = swapchain_get_context(swapchain); - } + context = swapchain_get_context(device->swapchains[0]); } context_enter(context); - if (swapchain) - context_update_window(context, swapchain->win_handle); + context_update_window(context); context_setup_target(context, target_texture, target_sub_resource_idx); if (!context->valid) return context;

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 7aedfe0e9fa761c23dd82fab6485d2f39f2030f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aedfe0e9fa761c23dd82fab6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 19 08:43:04 2016 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 321 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 131 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aedfe0e9fa761c23dd82…

1 0

Hans Leidekker : urlmon/tests: Skip domain tests if the user doesn' t have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 3a8801b1cc3aa2720dd2e189fc35cf856afb282c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8801b1cc3aa2720dd2e189f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:54 2016 +0100 urlmon/tests: Skip domain tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index ad0fcf6..33e295a 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -758,7 +758,7 @@ static const zone_domain_mapping zone_domain_mappings[] = { {"wine.testing",NULL,"*",URLZONE_CUSTOM2} }; -static void register_zone_domains(void) +static BOOL register_zone_domains(void) { HKEY domains; DWORD res, i; @@ -771,6 +771,12 @@ static void register_zone_domains(void) DWORD zone = URLZONE_CUSTOM; res = RegCreateKeyA(domains, "local.machine", &domain); + if (res == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + RegCloseKey(domains); + return FALSE; + } ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); res = RegSetValueExA(domain, "http", 0, REG_DWORD, (BYTE*)&zone, sizeof(DWORD)); @@ -810,6 +816,7 @@ static void register_zone_domains(void) } RegCloseKey(domains); + return TRUE; } static void unregister_zone_domains(void) @@ -964,7 +971,7 @@ static void test_zone_domains(void) test_zone_domain_cache(); - register_zone_domains(); + if (!register_zone_domains()) return; run_child_process(); unregister_zone_domains(); }

1 0

Hans Leidekker : setupapi/tests: Skip devinst tests if the user doesn' t have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 162a40e1455725501e0f55c36fec2d32ecc612fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=162a40e1455725501e0f55c36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:52 2016 +0100 setupapi/tests: Skip devinst tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c8452d6..6ca0e92 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1349,8 +1349,17 @@ static void testSetupDiGetINFClassA(void) START_TEST(devinst) { + HKEY hkey; + init_function_pointers(); + if ((hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS)) == INVALID_HANDLE_VALUE) + { + skip("needs admin rights\n"); + return; + } + RegCloseKey(hkey); + if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

Aric Stewart : hidclass.sys: Do not use device after free.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 3af89f1d96f74e81f159a3a6b3deb2c5cb69e42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af89f1d96f74e81f159a3a6b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 17 12:21:11 2016 -0600 hidclass.sys: Do not use device after free. Spotted by Marcus Meissner (Coverity issue 1372459). Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5df7692..b92457f 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -255,8 +255,9 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_REMOVE_DEVICE: { + rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(&minidriver->minidriver, device); - return minidriver->PNPDispatch(device, irp); + return rc; } default: {

1 0

Józef Kucia : d3d11/tests: Skip test_depth_stencil_sampling() on AMD Windows drivers.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 6d5048d5602baeb13eeaf560561d92284d5dd34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5048d5602baeb13eeaf5605… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:28 2016 +0100 d3d11/tests: Skip test_depth_stencil_sampling() on AMD Windows drivers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 98aaa4a..1957ad3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -962,9 +962,8 @@ static ID3D11Device *create_device(const struct device_desc *desc) return NULL; } -static BOOL is_warp_device(ID3D11Device *device) +static void get_device_adapter_desc(ID3D11Device *device, DXGI_ADAPTER_DESC *adapter_desc) { - DXGI_ADAPTER_DESC adapter_desc; IDXGIDevice *dxgi_device; IDXGIAdapter *adapter; HRESULT hr; @@ -974,15 +973,31 @@ static BOOL is_warp_device(ID3D11Device *device) hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); IDXGIDevice_Release(dxgi_device); - hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + hr = IDXGIAdapter_GetDesc(adapter, adapter_desc); ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); +} +static BOOL is_warp_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + get_device_adapter_desc(device, &adapter_desc); return !adapter_desc.SubSysId && !adapter_desc.Revision && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); } +static BOOL is_amd_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x1002; +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, const struct swapchain_desc *swapchain_desc) { DXGI_SWAP_CHAIN_DESC dxgi_desc; @@ -6442,6 +6457,14 @@ static void test_depth_stencil_sampling(void) device = test_context.device; context = test_context.immediate_context; + if (is_amd_device(device)) + { + /* Reads from depth/stencil shader resource views return stale values on some AMD drivers. */ + win_skip("Some AMD drivers have a bug affecting the test.\n"); + release_test_context(&test_context); + return; + } + sampler_desc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;

1 0