December 2015 - Wine-commits

Stephen Kitt : winegcc: Pass through -march to winebuild.
by Alexandre Julliard 15 Dec '15

15 Dec '15

Module: wine Branch: master Commit: 312b7b43cb0be43cf8221dcd92b3409b2e62fb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=312b7b43cb0be43cf8221dcd9… Author: Stephen Kitt <steve(a)sk2.org> Date: Sun Dec 13 21:01:20 2015 +0100 winegcc: Pass through -march to winebuild. Signed-off-by: Stephen Kitt <steve(a)sk2.org> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c07243b..1326afe 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1525,7 +1525,7 @@ int main(int argc, char **argv) strarray_add(opts.winebuild_args, argv[i]); raw_linker_arg = 1; } - else if (strncmp("-mcpu=", argv[i], 6) == 0) + else if (strncmp("-mcpu=", argv[i], 6) == 0 || strncmp("-march=", argv[i], 7) == 0) strarray_add(opts.winebuild_args, argv[i]); break; case 'n':

1 0

Nikolay Sivov : gdi32/tests: Some tests for GetICMProfile().
by Alexandre Julliard 15 Dec '15

15 Dec '15

Module: wine Branch: master Commit: f0223182af1a72720a228b827f5b1559fb12e216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0223182af1a72720a228b827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 14 19:39:40 2015 +0300 gdi32/tests: Some tests for GetICMProfile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/icm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 4afae6b..764d0d2 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -50,6 +50,13 @@ static void test_GetICMProfileA( HDC dc ) size = MAX_PATH; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); + ok( size > 0, "got %u\n", size ); + + size = 0; + ret = GetICMProfileA( dc, &size, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); +todo_wine + ok( size > 0, "got %u\n", size ); size = MAX_PATH; ret = GetICMProfileA( NULL, &size, filename ); @@ -109,6 +116,11 @@ static void test_GetICMProfileW( HDC dc ) ok( !ret, "GetICMProfileW succeeded\n" ); size = 0; + ret = GetICMProfileW( dc, &size, NULL ); + ok( !ret, "GetICMProfileW succeeded\n" ); + ok( size > 0, "got %u\n", size ); + + size = 0; SetLastError(0xdeadbeef); ret = GetICMProfileW( dc, &size, filename ); error = GetLastError();

1 0

André Hentschel : ddraw/tests: Rename mips to mipmaps.
by Alexandre Julliard 15 Dec '15

15 Dec '15

Module: wine Branch: master Commit: c465401984ec732f8e76bb1b71cd65427ae088f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c465401984ec732f8e76bb1b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 13 22:33:44 2015 +0100 ddraw/tests: Rename mips to mipmaps. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/dsurface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index bfa1386..50dff29 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1101,7 +1101,7 @@ struct compare { DWORD width, height; DWORD caps, caps2; - UINT mips; + UINT mipmaps; }; static HRESULT WINAPI CubeTestPaletteEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) @@ -1121,9 +1121,9 @@ static HRESULT WINAPI CubeTestPaletteEnum(IDirectDrawSurface7 *surface, DDSURFAC static HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { - UINT *mips = context; + UINT *mipmaps = context; - (*mips)++; + (*mipmaps)++; IDirectDrawSurface7_EnumAttachedSurfaces(surface, context, CubeTestLvl2Enum); @@ -1133,7 +1133,7 @@ static HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDE static HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { - UINT mips = 0; + UINT mipmaps = 0; UINT *num = context; static const struct compare expected[] = { @@ -1175,16 +1175,16 @@ static HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDE }, }; - mips = 0; + mipmaps = 0; IDirectDrawSurface7_EnumAttachedSurfaces(surface, - &mips, + &mipmaps, CubeTestLvl2Enum); ok(desc->dwWidth == expected[*num].width, "Surface width is %d expected %d\n", desc->dwWidth, expected[*num].width); ok(desc->dwHeight == expected[*num].height, "Surface height is %d expected %d\n", desc->dwHeight, expected[*num].height); ok(desc->ddsCaps.dwCaps == expected[*num].caps, "Surface caps are %08x expected %08x\n", desc->ddsCaps.dwCaps, expected[*num].caps); ok(desc->ddsCaps.dwCaps2 == expected[*num].caps2, "Surface caps2 are %08x expected %08x\n", desc->ddsCaps.dwCaps2, expected[*num].caps2); - ok(mips == expected[*num].mips, "Surface has %d mipmaps, expected %d\n", mips, expected[*num].mips); + ok(mipmaps == expected[*num].mipmaps, "Surface has %d mipmaps, expected %d\n", mipmaps, expected[*num].mipmaps); (*num)++;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8-rc3
by Jeremy Newman 14 Dec '15

14 Dec '15

Module: website Branch: master Commit: 13700a2893b05a77c03209b44616c760b6cd674e URL: http://source.winehq.org/git/website.git/?a=commit;h=13700a2893b05a77c03209… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 12 10:20:52 2015 +0100 Polish translation for release 1.8-rc3 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/pl/2015120401.xml b/news/pl/2015120401.xml new file mode 100644 index 0000000..a64767c --- /dev/null +++ b/news/pl/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>Grudzień 4, 2015</date> +<title>Wydano Wine 1.8-rc3</title> +<body> + Wydanie rozwojowe Wine 1.8-rc3 jest już dostępne. + <a href="{$root}/announce/1.8-rc3">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Theodore Dubois : bugzilla: fix theme on sidebar for shared searches.
by Jeremy Newman 14 Dec '15

14 Dec '15

Module: bugzilla Branch: master Commit: d378d95008eab37f4f385086c25336b57cc141de URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=d378d95008eab37f4f385… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Sun Dec 13 18:09:21 2015 -0800 bugzilla: fix theme on sidebar for shared searches. Fixes bug #38835. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- template/en/default/global/sidebar.html.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index d00bf4c..07b81e2 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -66,9 +66,10 @@ [% print_pipe = 0 %] [% FOREACH q = user.queries_subscribed %] [% IF new_line %] - <tr class="sideMenu"><td> - Shared Searches: - </li> + [% INCLUDE global/menu_end.html.tmpl %] + [% INCLUDE global/menu_start.html.tmpl + bt = 'Shared Searches' + %] [% new_line = 0 %] [% END %] <li> @@ -76,7 +77,6 @@ href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd= [% q.name FILTER uri %]&sharer_id= [% q.user.id FILTER uri %]" - class="shared" title="Shared by [% q.user.identity FILTER html %]" >[% q.name FILTER html FILTER no_break %]</a></li> [% print_pipe = 1 %]

1 0

Alexandre Julliard : Wine release 1.8-rc4
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: website Branch: master Commit: b5ee134c727520ece80c63c1acb97c030b8c138f URL: http://source.winehq.org/git/website.git/?a=commit;h=b5ee134c727520ece80c63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 17:41:52 2015 +0100 Wine release 1.8-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015121201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2015121201.xml b/news/en/2015121201.xml new file mode 100644 index 0000000..49c09e8 --- /dev/null +++ b/news/en/2015121201.xml @@ -0,0 +1,12 @@ +<news> +<date>December 12, 2015</date> +<title>Wine 1.8-rc4 Released</title> +<body> + The Wine development release 1.8-rc4 is now available. + <a href="{$root}/announce/1.8-rc4">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/1.8/wine-1.8-rc4.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

Stefan Dösinger : wined3d: Clip software cursor blits.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: bcabae6f40fcd5338f1cd5acb7a77e6bcebf9d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcabae6f40fcd5338f1cd5acb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Dec 10 20:02:35 2015 +0000 wined3d: Clip software cursor blits. This prevents the SW cursor from disappearing when it is at the edge of the screen. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 12 ++++++++++-- dlls/wined3d/utils.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e45fe17..069b071 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -467,13 +467,21 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, }; + RECT src_rect = + { + 0, 0, + swapchain->device->cursor_texture->resource.width, + swapchain->device->cursor_texture->resource.height + }; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; TRACE("Rendering the software cursor.\n"); if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_ALPHATEST, - NULL, WINED3D_TEXF_POINT); + if (wined3d_clip_blit(&clip_rect, &destRect, &src_rect)) + wined3d_surface_blt(back_buffer, &destRect, cursor, &src_rect, WINEDDBLT_ALPHATEST, + NULL, WINED3D_TEXF_POINT); } TRACE("Presenting HDC %p.\n", context->hdc); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 17ac29d..4406067 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4994,3 +4994,25 @@ void wined3d_release_dc(HWND window, HDC dc) else if (!ReleaseDC(window, dc)) ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); } + +BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) +{ + RECT orig = *clipped; + float scale_x = (float)(orig.right - orig.left) / (float)(other->right - other->left); + float scale_y = (float)(orig.bottom - orig.top) / (float)(other->bottom - other->top); + + IntersectRect(clipped, clipped, clip_rect); + + if (IsRectEmpty(clipped)) + { + SetRectEmpty(other); + return FALSE; + } + + other->left += (LONG)((clipped->left - orig.left) / scale_x); + other->top += (LONG)((clipped->top - orig.top) / scale_y); + other->right -= (LONG)((orig.right - clipped->right) / scale_x); + other->bottom -= (LONG)((orig.bottom - clipped->bottom) / scale_y); + + return TRUE; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 464bdf6..53ef63e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1396,6 +1396,7 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format,

1 0

Ken Thomases : loader: Add the CFBundleAllowMixedLocalizations key to the embedded Info.plist to allow Cocoa to localize its strings.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: 19cb98aa1de0e6a69bfd59604d9b415240ffdf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb98aa1de0e6a69bfd59604… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 10 16:37:12 2015 -0600 loader: Add the CFBundleAllowMixedLocalizations key to the embedded Info.plist to allow Cocoa to localize its strings. The loader itself is not a bundled application, so it has no localizations as far as the Mac APIs are concerned. Its CFBundleDevelopmentRegion is English, so that's the preferred localization that the Mac APIs choose for it. Cocoa manages the Enter Full Screen menu item that the Mac driver creates. By default, Cocoa prefers not to mix localizations. Therefore, even though Cocoa contains localized strings for "Enter Full Screen", it was just using the English one for Wine, regardless of system language. Setting this key tells it to use the non-English localizations from Cocoa even though the loader's own preferred localization is English. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine_info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine_info.plist.in b/loader/wine_info.plist.in index 2895aea..6495b8f 100644 --- a/loader/wine_info.plist.in +++ b/loader/wine_info.plist.in @@ -2,6 +2,8 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>CFBundleAllowMixedLocalizations</key> + <true/> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key>

1 0

Nikolay Sivov : winecfg: Fix a crash on empty size field in Desktop Integration.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: a11b8ded1dc86f04ef07265def0c0d5e95326b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11b8ded1dc86f04ef07265de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 11 16:44:14 2015 +0300 winecfg: Fix a crash on empty size field in Desktop Integration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 52e64eb..8db457f 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1214,8 +1214,17 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); - metrics[index].size = atoi(text); - HeapFree(GetProcessHeap(), 0, text); + + if (text) + { + metrics[index].size = atoi(text); + HeapFree(GetProcessHeap(), 0, text); + } + else + { + /* for empty string set to minimum value */ + SendDlgItemMessageW(hDlg, IDC_SYSPARAM_SIZE_UD, UDM_GETRANGE32, (WPARAM)&metrics[index].size, 0); + } SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); break;

1 0

Andrew Eikum : winepulse.drv: Print a winediag error when PA buffer size is too small.
by Alexandre Julliard 12 Dec '15

12 Dec '15

Module: wine Branch: master Commit: a599ea83c8148685c2b3e69102aaf4cf3c2d48f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a599ea83c8148685c2b3e6910… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 10 10:35:55 2015 -0600 winepulse.drv: Print a winediag error when PA buffer size is too small. winepulse depends on PulseAudio to allocate the entire requested buffer size. If it allocates less than that size, then mmdevapi clients may not be able to write as much data as they expect. So, we should warn the user that the PA buffer is too small. This is a common symptom of users setting the PULSE_LATENCY_MSEC environment variable, which would help in some situations with winealsa, but is no longer required with winepulse. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0e6cf9f..ef171d3 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -57,6 +57,7 @@ #include "audiopolicy.h" WINE_DEFAULT_DEBUG_CHANNEL(pulse); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -1336,9 +1337,16 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, const pa_buffer_attr *attr = pa_stream_get_buffer_attr(This->stream); /* Update frames according to new size */ dump_attr(attr); - if (This->dataflow == eRender) + if (This->dataflow == eRender) { + if (attr->tlength < This->bufsize_bytes) { + const char *latenv = getenv("PULSE_LATENCY_MSEC"); + if (latenv && *latenv) + ERR_(winediag)("PulseAudio buffer too small (%u < %u) - PULSE_LATENCY_MSEC is %s\n", attr->tlength, This->bufsize_bytes, latenv); + else + ERR_(winediag)("PulseAudio buffer too small (%u < %u)\n", attr->tlength, This->bufsize_bytes); + } This->bufsize_bytes = attr->tlength; - else { + } else { This->capture_period = period_bytes = attr->fragsize; if ((unalign = This->bufsize_bytes % period_bytes)) This->bufsize_bytes += period_bytes - unalign;

1 0