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