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

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

Dec. 12, 2015

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

Dec. 12, 2015

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

Sebastian Lackner : opengl32: Add alternative function for glVertexAttribDivisor.
by Alexandre Julliard Dec. 12, 2015

Dec. 12, 2015

Module: wine Branch: master Commit: f915f9db4cc11d58006efaa9b54710020ca1f9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f915f9db4cc11d58006efaa9b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 11 05:33:23 2015 +0100 opengl32: Add alternative function for glVertexAttribDivisor. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 88aa564..f3f78ef 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -881,7 +881,8 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) unsigned int i; static const struct { const char *name, *alt; } alternatives[] = { - { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + { "glVertexAttribDivisor", "glVertexAttribDivisorARB"}, /* needed by Caffeine */ }; for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++)

1 0

Stefan Dösinger : wined3d: Restore WINEDDBLT_ALPHATEST support.
by Alexandre Julliard Dec. 12, 2015

Dec. 12, 2015

Module: wine Branch: master Commit: 080dedaf6e248931c58f94a6312803af5758a66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=080dedaf6e248931c58f94a63… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Dec 10 20:02:34 2015 +0000 wined3d: Restore WINEDDBLT_ALPHATEST support. 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/arb_program_shader.c | 12 +++++++++++- dlls/wined3d/surface.c | 23 +++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index be3d727..6851620 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7774,6 +7774,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, TRACE("Color keying not supported with converted textures.\n"); return FALSE; } + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: case WINED3D_BLIT_OP_COLOR_BLIT: break; @@ -7828,7 +7829,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, +static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, const struct wined3d_color_key *color_key) @@ -7836,6 +7837,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, struct wined3d_context *context; RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; + struct wined3d_color_key alpha_test_key; /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface); @@ -7864,6 +7866,14 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + const struct wined3d_format *fmt = src_surface->resource.format; + alpha_test_key.color_space_low_value = 0; + alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + color_key = &alpha_test_key; + } + arbfp_blit_set(device->blit_priv, context, src_surface, color_key); /* Draw a textured quad */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29687c3..f8a1ba1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4230,6 +4230,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); @@ -4319,7 +4320,7 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, struct wined3d return WINED3D_OK; } -static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, +static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key) @@ -4335,8 +4336,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); context = context_acquire(device, dst_surface); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + glEnable(GL_ALPHA_TEST); + surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + glDisable(GL_ALPHA_TEST); + context_release(context); /* Restore the color key parameters */ @@ -5000,7 +5009,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } -static void cpu_blit_blit_surface(struct wined3d_device *device, DWORD filter, +static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key) @@ -5036,7 +5045,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_WAIT | WINEDDBLT_DEPTHFILL - | WINEDDBLT_DONOTWAIT; + | WINEDDBLT_DONOTWAIT + | WINEDDBLT_ALPHATEST; TRACE("dst_surface %p, dst_rect_in %s, src_surface %p, src_rect_in %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), @@ -5264,6 +5274,10 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC color_key = &src_surface->container->async.src_blt_color_key; blit_op = WINED3D_BLIT_OP_COLOR_BLIT_CKEY; } + else if (flags & WINEDDBLT_ALPHATEST) + { + blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; + } else if ((src_surface->locations & WINED3D_LOCATION_SYSMEM) && !(dst_surface->locations & WINED3D_LOCATION_SYSMEM)) { @@ -5335,7 +5349,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format); if (blitter) { - blitter->blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect, color_key); + blitter->blit_surface(device, blit_op, filter, src_surface, + &src_rect, dst_surface, &dst_rect, color_key); return WINED3D_OK; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abe1262..464bdf6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1362,6 +1362,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ enum wined3d_blit_op { WINED3D_BLIT_OP_COLOR_BLIT, + WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, WINED3D_BLIT_OP_COLOR_BLIT_CKEY, WINED3D_BLIT_OP_COLOR_FILL, WINED3D_BLIT_OP_DEPTH_FILL, @@ -1385,7 +1386,7 @@ struct blit_shader const RECT *dst_rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, float depth); - void (*blit_surface)(struct wined3d_device *device, DWORD filter, + void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key);

1 0

Alexandre Julliard : Revert "opengl32: Store alternative function in wglGetProcAddress."
by Alexandre Julliard Dec. 12, 2015

Dec. 12, 2015

Module: wine Branch: master Commit: 50da224be714a623a76646bbd6582b8d802a3d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50da224be714a623a76646bbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 12 05:24:56 2015 +0100 Revert "opengl32: Store alternative function in wglGetProcAddress." This reverts commit e44f8eaa0fce02032e6c3f43052821f40eaba53b. It mixes up the driver function and the WINAPI wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3b817a4..88aa564 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ }; - WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); - driver_func = NULL; - - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++) + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) { if (strcmp( name, alternatives[i].name )) continue; - WARN("Trying alternative %s for %s\n", alternatives[i].alt, name ); - driver_func = wglGetProcAddress( alternatives[i].alt ); + WARN("Extension %s required for %s not supported, trying %s\n", + ext_ret->extension, name, alternatives[i].alt ); + return wglGetProcAddress( alternatives[i].alt ); } + WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + return NULL; } if (driver_func == NULL)

1 0

Sebastian Lackner : opengl32: Store alternative function in wglGetProcAddress.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: e44f8eaa0fce02032e6c3f43052821f40eaba53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f8eaa0fce02032e6c3f430… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 10 01:47:47 2015 +0100 opengl32: Store alternative function in wglGetProcAddress. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 88aa564..3b817a4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ }; - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + driver_func = NULL; + + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++) { if (strcmp( name, alternatives[i].name )) continue; - WARN("Extension %s required for %s not supported, trying %s\n", - ext_ret->extension, name, alternatives[i].alt ); - return wglGetProcAddress( alternatives[i].alt ); + WARN("Trying alternative %s for %s\n", alternatives[i].alt, name ); + driver_func = wglGetProcAddress( alternatives[i].alt ); } - WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); - return NULL; } if (driver_func == NULL)

1 0

Viliam Lejcik : kernel32/nls: Regional settings translation for Czech and Slovak.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: 157d2e961a098f11155cf230c531743c850c6a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=157d2e961a098f11155cf230c… Author: Viliam Lejcik <lejcik(a)host.sk> Date: Thu Dec 10 00:16:14 2015 +0100 kernel32/nls: Regional settings translation for Czech and Slovak. Signed-off-by: Viliam Lejcik <lejcik(a)host.sk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/csy.nls | 34 +++++++++++++++++----------------- dlls/kernel32/nls/sky.nls | 34 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 2a39441..e1bfdaf 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -141,21 +141,21 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Z�padn� Evropa a Spojen� st�ty" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "St�edoevropsk� jazyky" + LGRPID_BALTIC+LGRPID_RES_BASE "Pobaltsk� jazyky" + LGRPID_GREEK+LGRPID_RES_BASE "�e�tina" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrilice" + LGRPID_TURKISH+LGRPID_RES_BASE "Tureck� jazyky" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�tina" + LGRPID_KOREAN+LGRPID_RES_BASE "Korej�tina" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "��n�tina (tradi�n�)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "��n�tina (zjednodu�en�)" + LGRPID_THAI+LGRPID_RES_BASE "Thaj�tina" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrej�tina" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabsk� jazyky" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnam�tina" + LGRPID_INDIC+LGRPID_RES_BASE "Indick� jazyky" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruz�n�tina" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�tina" } diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index c9a07f6..1e1065f 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -141,21 +141,21 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Z�padn� Eur�pa a Spojen� �t�ty" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Stredoeur�pske jazyky" + LGRPID_BALTIC+LGRPID_RES_BASE "Pobaltsk� jazyky" + LGRPID_GREEK+LGRPID_RES_BASE "Gr��tina" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrilika" + LGRPID_TURKISH+LGRPID_RES_BASE "Tureck� jazyky" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�ina" + LGRPID_KOREAN+LGRPID_RES_BASE "K�rej�ina" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "��n�tina (tradi�n�)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "��n�tina (zjednodu�en�)" + LGRPID_THAI+LGRPID_RES_BASE "Thaj�ina" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrej�ina" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabsk� jazyky" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnam�ina" + LGRPID_INDIC+LGRPID_RES_BASE "Indick� jazyky" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruz�n�ina" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�ina" }

1 0

Sebastian Lackner : ntdll/tests: Add more tests for ProcessDebugFlags.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: 85df0c61e5d6e081f54f42481e5a300c9e780ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85df0c61e5d6e081f54f42481… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 10 03:11:06 2015 +0100 ntdll/tests: Add more tests for ProcessDebugFlags. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 160 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 123 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85df0c61e5d6e081f54f4…

1 0

Alistair Leslie-Hughes : wevtapi: Add EvtClose stub.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: bf3f65e810cff47cfb29febeb55e04ca51bbfe55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3f65e810cff47cfb29febeb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 10 17:53:54 2015 +1100 wevtapi: Add EvtClose stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index ecb8427..0b88165 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -79,3 +79,9 @@ EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); return NULL; } + +BOOL WINAPI EvtClose(EVT_HANDLE handle) +{ + FIXME("(%p) stub\n", handle); + return TRUE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index a493da4..328b0db 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -1,7 +1,7 @@ @ stub EvtArchiveExportedLog @ stub EvtCancel @ stub EvtClearLog -@ stub EvtClose +@ stdcall EvtClose(ptr) @ stub EvtCreateBookmark @ stub EvtCreateRenderContext @ stub EvtExportLog

1 0

Dmitry Timoshkov : winhttp/tests: Add an authentication test using IWinHttpRequest.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: 97ac9d410fdd612db863fdccc538d8dd8d94d91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ac9d410fdd612db863fdccc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 10 21:54:30 2015 +0800 winhttp/tests: Add an authentication test using IWinHttpRequest. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 64 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6153296..9442085 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -27,6 +27,7 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> +#include <stdio.h> #include <initguid.h> #include <httprequest.h> #include <httprequestid.h> @@ -2095,6 +2096,7 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, noauthmsg, sizeof noauthmsg - 1, 0); send(c, unauthorized, sizeof unauthorized - 1, 0); } + continue; } if (strstr(buffer, "/big")) { @@ -2311,11 +2313,15 @@ static void test_basic_authentication(int port) size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret, "failed to read data %u\n", GetLastError()); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { todo_wine - ok(size == 12, "expected 12, got %u\n", size); + ok(size == 12, "expected 12, got %u\n", size); todo_wine - ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); + ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); + } supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2380,9 +2386,13 @@ todo_wine size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(size == 11, "expected 11, got %u\n", size); - ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { + ok(size == 11, "expected 11, got %u\n", size); + ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + } WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3078,7 +3088,7 @@ static void test_credentials(void) WinHttpCloseHandle(ses); } -static void test_IWinHttpRequest(void) +static void test_IWinHttpRequest(int port) { static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; @@ -3096,6 +3106,7 @@ static void test_IWinHttpRequest(void) static const WCHAR dateW[] = {'D','a','t','e',0}; static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; static const WCHAR utf8W[] = {'u','t','f','-','8',0}; + static const WCHAR unauthW[] = {'U','n','a','u','t','h','o','r','i','z','e','d',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; @@ -3108,6 +3119,7 @@ static void test_IWinHttpRequest(void) IStream *stream, *stream2; LARGE_INTEGER pos; char buf[128]; + WCHAR bufW[128]; DWORD count; GetSystemTime( &st ); @@ -3614,6 +3626,42 @@ static void test_IWinHttpRequest(void) IWinHttpRequest_Release( req ); + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + sprintf( buf, "http://localhost:%d/auth", port ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, sizeof(bufW)/sizeof(bufW[0]) ); + url = SysAllocString( bufW ); + method = SysAllocString( method3W ); + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); + SysFreeString( url ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + V_VT( &data ) = VT_BSTR; + V_BSTR( &data ) = SysAllocString( test_dataW ); + hr = IWinHttpRequest_Send( req, data ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( V_BSTR( &data ) ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); +todo_wine + ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); + SysFreeString( response ); + + status = 0xdeadbeef; + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); + + IWinHttpRequest_Release( req ); + CoUninitialize(); } @@ -4152,7 +4200,6 @@ START_TEST (winhttp) test_Timeouts(); test_resolve_timeout(); test_credentials(); - test_IWinHttpRequest(); test_IWinHttpRequest_Invoke(); test_WinHttpDetectAutoProxyConfigUrl(); test_WinHttpGetIEProxyConfigForCurrentUser(); @@ -4170,6 +4217,7 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; + test_IWinHttpRequest(si.port); test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port);

1 0

Piotr Caban : ole32: Fix minimal size check of compound file in StgOpenStorage.
by Alexandre Julliard Dec. 10, 2015

Dec. 10, 2015

Module: wine Branch: master Commit: 726698ab81cd9f916b7926b0e761ae9a05dc694d URL: http://source.winehq.org/git/wine.git/?a=commit;h=726698ab81cd9f916b7926b0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 10 14:09:52 2015 +0100 ole32: Fix minimal size check of compound file in StgOpenStorage. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bf1c1b3..2bc9d3d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8900,7 +8900,7 @@ HRESULT WINAPI StgOpenStorage( * Refuse to open the file if it's too small to be a structured storage file * FIXME: verify the file when reading instead of here */ - if (GetFileSize(hFile, NULL) < 0x100) + if (GetFileSize(hFile, NULL) < HEADER_SIZE) { CloseHandle(hFile); hr = STG_E_FILEALREADYEXISTS;

1 0

Alexandre Julliard : opengl32: Make it possible to use an alternative in wglGetProcAddress when an extension is missing.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: 5c9ddc55dcf6e64d747b1a8ab01e408d4b8d55e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ddc55dcf6e64d747b1a8ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 15:44:51 2015 +0900 opengl32: Make it possible to use an alternative in wglGetProcAddress when an extension is missing. --- dlls/opengl32/wgl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 42bf920..88aa564 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -878,6 +878,19 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) if (!is_extension_supported(ext_ret->extension)) { + unsigned int i; + static const struct { const char *name, *alt; } alternatives[] = + { + { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + }; + + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + { + if (strcmp( name, alternatives[i].name )) continue; + WARN("Extension %s required for %s not supported, trying %s\n", + ext_ret->extension, name, alternatives[i].alt ); + return wglGetProcAddress( alternatives[i].alt ); + } WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); return NULL; }

1 0

Alexandre Julliard : user32: SetLayeredWindowAttributes is no longer a stub.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: 2e56a912b458e63677738611e532db3b48efe918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e56a912b458e63677738611e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 20:09:52 2015 +0900 user32: SetLayeredWindowAttributes is no longer a stub. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1a3cd49..887fd48 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3682,7 +3682,7 @@ BOOL WINAPI SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO { BOOL ret; - TRACE("(%p,%08x,%d,%x): stub!\n", hwnd, key, alpha, flags); + TRACE("(%p,%08x,%d,%x)\n", hwnd, key, alpha, flags); SERVER_START_REQ( set_window_layered_info ) {

1 0

Józef Kucia : d3d8/tests: Port test_texture_blending( ) from d3d9.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: d29dcec6efa935abc2db2cbb726c48086a8e1a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29dcec6efa935abc2db2cbb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:04 2015 +0100 d3d8/tests: Port test_texture_blending() from d3d9. 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/d3d8/tests/visual.c | 585 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 585 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d29dcec6efa935abc2db2…

1 0

Nikolay Sivov : dwrite/tests: Some tests for fallback builder.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: 2bdf470177c1729bd15c369283fff39b67e4d530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdf470177c1729bd15c36928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 9 13:32:21 2015 +0300 dwrite/tests: Some tests for fallback builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d98ffea..6ea2734 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3903,6 +3903,162 @@ if (hr == S_OK) { IDWriteFactory2_Release(factory2); } +static void test_FontFallbackBuilder(void) +{ + static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; + static const WCHAR strW[] = {'A',0}; + IDWriteFontFallbackBuilder *builder; + IDWriteFontFallback *fallback; + DWRITE_UNICODE_RANGE range; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + const WCHAR *familyW; + UINT32 mappedlength; + IDWriteFont *font; + FLOAT scale; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + IDWriteFactory_Release(factory); + + if (factory2) + hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder); + + if (hr != S_OK) { + skip("IDWriteFontFallbackBuilder is not supported\n"); + return; + } + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_AddMapping(builder, NULL, 0, NULL, 0, NULL, NULL, NULL, 0.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + range.first = 'A'; + range.last = 'B'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 0, NULL, 0, NULL, NULL, NULL, 0.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 0, NULL, 0, NULL, NULL, NULL, 1.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* negative scaling factor */ + range.first = range.last = 0; + familyW = g_blahfontW; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, -1.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* empty range */ + range.first = range.last = 0; + familyW = g_blahfontW; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 1.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = range.last = 0; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 2.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 3.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = 'B'; + range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* fallback font missing from system collection */ + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = (void*)0xdeadbeef; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + ok(font == NULL, "got %p\n", font); + + IDWriteFontFallback_Release(fallback); + + /* remap with custom collection */ + range.first = range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 5.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallback_Release(fallback); + + range.first = 'B'; + range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 6.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallback_Release(fallback); + + /* explicit locale */ + range.first = 'A'; + range.last = 'B'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, localeW, NULL, 6.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallbackBuilder_Release(builder); + IDWriteFactory2_Release(factory2); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -3949,6 +4105,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_FontFallbackBuilder(); IDWriteFactory_Release(factory); }

1 0