December 2015 - Wine-Commits

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

Dec. 15, 2015

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

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

Dec. 15, 2015

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

Stephen Kitt : winebuild: Add support for -march.
by Alexandre Julliard Dec. 15, 2015

Dec. 15, 2015

Module: wine Branch: master Commit: 33c729bb1b47c3ffd10c8a37c1ec2a121c4099ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c729bb1b47c3ffd10c8a37c… Author: Stephen Kitt <steve(a)sk2.org> Date: Sun Dec 13 21:01:19 2015 +0100 winebuild: Add support for -march. 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/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 1 + tools/winebuild/winebuild.man.in | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 4a71eed..e32e7a9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,6 +362,7 @@ extern struct strarray *cc_command; extern struct strarray *ld_command; extern struct strarray *nm_command; extern char *cpu_option; +extern char *arch_option; extern int thumb_mode; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index d1717c0..08c8c2c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -89,6 +89,7 @@ struct strarray *cc_command = NULL; struct strarray *ld_command = NULL; struct strarray *nm_command = NULL; char *cpu_option = NULL; +char *arch_option = NULL; #ifdef __thumb__ int thumb_mode = 1; @@ -408,6 +409,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); + else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 83eb803..4860a19 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -388,6 +388,7 @@ struct strarray *get_as_command(void) if (force_pointer_size) strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); if (cpu_option) strarray_add_one( args, strmake("-mcpu=%s", cpu_option) ); + if (arch_option) strarray_add_one( args, strmake("-march=%s", arch_option) ); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index df91cb8..2063738 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,7 +156,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-mcpu= option +.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option Set code generation options for the assembler. .TP .BI \-M,\ --main-module= module

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8-rc3
by Jeremy Newman Dec. 14, 2015

Dec. 14, 2015

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 Dec. 14, 2015

Dec. 14, 2015

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 Dec. 12, 2015

Dec. 12, 2015

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

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

Dec. 12, 2015

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

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

Dec. 12, 2015

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

Tag wine-1.8-rc4 : Alexandre Julliard : Release 1.8-rc4
by Alexandre Julliard Dec. 12, 2015

Dec. 12, 2015

Module: wine Branch: refs/tags/wine-1.8-rc4 Tag: dfd18199c01a9f541ec50568409834210ffcec4a URL: http://source.winehq.org/git/wine.git/?a=tag;h=dfd18199c01a9f541ec505684098… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 17:33:44 2015 +0100 Release 1.8-rc4

1 0

Alexandre Julliard : Release 1.8-rc4.
by Alexandre Julliard Dec. 12, 2015

Dec. 12, 2015

Module: wine Branch: master Commit: ca9001d6bda3084ab9bc80baa7d6e5533252c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9001d6bda3084ab9bc80baa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 17:33:44 2015 +0100 Release 1.8-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 293 +++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 136 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca9001d6bda3084ab9bc8…

1 0