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

Alexandre Julliard : user32: Preserve the surface contents when changing the WS_EX_LAYERED bit.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: e5ef460d7dc9c9739da92349eb5d6bf827d7ce8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ef460d7dc9c9739da92349e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 20:10:24 2015 +0900 user32: Preserve the surface contents when changing the WS_EX_LAYERED bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 887fd48..e378ab9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -438,11 +438,13 @@ static void send_parent_notify( HWND hwnd, UINT msg ) */ static void update_window_state( HWND hwnd ) { - RECT window_rect, client_rect; + RECT window_rect, client_rect, valid_rects[2]; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + valid_rects[0] = valid_rects[1] = client_rect; set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, + &window_rect, &client_rect, valid_rects ); }

1 0

Dmitry Timoshkov : user32: Call the EnumChildWindows callback using a wrapper.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: b08c400fe2924bf7137e350c3673b11d3a6378c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08c400fe2924bf7137e350c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 9 13:11:16 2015 +0800 user32: Call the EnumChildWindows callback using a wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e378ab9..2ef49fa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3356,6 +3356,31 @@ BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) } +#ifdef __i386__ +/* Some apps pass a non-stdcall proc to EnumChildWindows, + * so we need a small assembly wrapper to call the proc. + */ +extern LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ) +{ + return proc( hwnd, lparam ); +} +#endif /* __i386__ */ + /********************************************************************** * WIN_EnumChildWindows * @@ -3373,7 +3398,7 @@ static BOOL WIN_EnumChildWindows( HWND *list, WNDENUMPROC func, LPARAM lParam ) /* Build children list first */ childList = WIN_ListChildren( *list ); - ret = func( *list, lParam ); + ret = enum_callback_wrapper( func, *list, lParam ); if (childList) {

1 0

Józef Kucia : wined3d: Use correct initial color for FFP texture blending in GLSL backend.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: 2e00982a6144bf9701f0ac7aff85133a6b4ba080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e00982a6144bf9701f0ac7af… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:01 2015 +0100 wined3d: Use correct initial color for FFP texture blending in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6fe0ff6..6fa9521 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6023,10 +6023,7 @@ static const char *shader_glsl_get_ffp_fragment_op_arg(struct wined3d_string_buf break; case WINED3DTA_CURRENT: - if (!stage) - ret = "ffp_varying_diffuse"; - else - ret = "ret"; + ret = "ret"; break; case WINED3DTA_TEXTURE: @@ -6128,8 +6125,6 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un switch (op) { case WINED3D_TOP_DISABLE: - if (!stage) - shader_addline(buffer, "%s%s = ffp_varying_diffuse%s;\n", dstreg, dstmask, dstmask); break; case WINED3D_TOP_SELECT_ARG1: @@ -6262,7 +6257,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; BOOL tempreg_used = FALSE, tfactor_used = FALSE; - const char *final_combiner_src = "ret"; UINT lowest_disabled_stage; GLuint shader_id; DWORD arg0, arg1, arg2; @@ -6453,7 +6447,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (lowest_disabled_stage < 7 && settings->emul_clipplanes) shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); - /* Generate texture sampling instructions) */ + /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { const char *texture_function, *coord_mask; @@ -6602,17 +6596,15 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, " discard;\n"); } + shader_addline(buffer, "ret = ffp_varying_diffuse;\n"); + /* Generate the main shader */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { BOOL op_equal; if (settings->op[stage].cop == WINED3D_TOP_DISABLE) - { - if (!stage) - final_combiner_src = "ffp_varying_diffuse"; break; - } if (settings->op[stage].cop == WINED3D_TOP_SELECT_ARG1 && settings->op[stage].aop == WINED3D_TOP_SELECT_ARG1) @@ -6637,8 +6629,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - if (!stage) - shader_addline(buffer, "ret.w = ffp_varying_diffuse.w;\n"); } else if (op_equal) { @@ -6657,7 +6647,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } } - shader_addline(buffer, "gl_FragData[0] = ffp_varying_specular * specular_enable + %s;\n", final_combiner_src); + shader_addline(buffer, "gl_FragData[0] = ffp_varying_specular * specular_enable + ret;\n"); if (settings->sRGB_write) shader_glsl_generate_srgb_write_correction(buffer);

1 0

Józef Kucia : wined3d: Use correct initial color for FFP texture blending in ARB program shader backend.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: c251d0217102b6c8c987f87795d1c1ef7bbb8b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c251d0217102b6c8c987f8779… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:02 2015 +0100 wined3d: Use correct initial color for FFP texture blending in ARB program shader backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2af9845..be3d727 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6082,8 +6082,7 @@ static const char *get_argreg(struct wined3d_string_buffer *buffer, DWORD argnum ret = "fragment.color.primary"; break; case WINED3DTA_CURRENT: - if (!stage) ret = "fragment.color.primary"; - else ret = "ret"; + ret = "ret"; break; case WINED3DTA_TEXTURE: @@ -6163,8 +6162,6 @@ static void gen_ffp_instr(struct wined3d_string_buffer *buffer, unsigned int sta switch (op) { case WINED3D_TOP_DISABLE: - if (!stage) - shader_addline(buffer, "MOV %s%s, fragment.color.primary;\n", dstreg, dstmask); break; case WINED3D_TOP_SELECT_ARG2: @@ -6309,7 +6306,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con DWORD arg0, arg1, arg2; BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; - const char *final_combiner_src = "ret"; BOOL custom_linear_fog = FALSE; struct color_fixup_masks masks; @@ -6440,7 +6436,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (tempreg_used || settings->sRGB_write) shader_addline(&buffer, "MOV tempreg, 0.0;\n"); - /* Generate texture sampling instructions) */ + /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { if (!tex_read[stage]) @@ -6516,15 +6512,13 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "KIL -TMP;\n"); /* discard if true */ } + shader_addline(&buffer, "MOV ret, fragment.color.primary;\n"); + /* Generate the main shader */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { if (settings->op[stage].cop == WINED3D_TOP_DISABLE) - { - if (!stage) - final_combiner_src = "fragment.color.primary"; break; - } if (settings->op[stage].cop == WINED3D_TOP_SELECT_ARG1 && settings->op[stage].aop == WINED3D_TOP_SELECT_ARG1) @@ -6549,8 +6543,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - if (!stage) - shader_addline(&buffer, "MOV ret.w, fragment.color.primary.w;\n"); } else if (op_equal) { @@ -6569,7 +6561,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (settings->sRGB_write || custom_linear_fog) { - shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); + shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, ret;\n"); if (settings->sRGB_write) arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg", FALSE); if (custom_linear_fog) @@ -6578,8 +6570,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else { - shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", - final_combiner_src); + shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, ret;\n"); } /* Footer */

1 0

Józef Kucia : d3d9/tests: Add tests for FFP texture blending.
by Alexandre Julliard Dec. 9, 2015

Dec. 9, 2015

Module: wine Branch: master Commit: c3be8d748f44b53e99e9022c77ee70e413c3abdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3be8d748f44b53e99e9022c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:03 2015 +0100 d3d9/tests: Add tests for FFP texture blending. 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/d3d9/tests/visual.c | 851 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 851 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3be8d748f44b53e99e90…

1 0

Francois Gouget : po: Translate 'batch file' to French.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 5d61cdf4a11539b51b96d403ee0ef3592dc404e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d61cdf4a11539b51b96d403e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 8 12:58:42 2015 +0100 po: Translate 'batch file' to French. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 58 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index 12972e3..5e1c0f7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9722,14 +9722,14 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <fichierbatch> sert à appeler un fichier batch depuis un autre fichier\n" -"batch. Quand le fichier appelé sort, le contrôle revient au fichier " -"appelant.\n" -"La commande CALL peut fournir des paramètres à la procédure appelée.\n" +"CALL <fichier_commandes> appelle un fichier de commandes depuis un autre\n" +"fichier de commandes. Quand le fichier appelé sort, le contrôle revient au\n" +"fichier appelant.\n" +"La commande CALL peut fournir des paramètres du fichier invoqué.\n" "\n" "Les changements de répertoire courant, de variables d'environnement et " "autres\n" -"effectués dans une procédure appelée sont répercutés dans l'appelant.\n" +"effectués dans le fichier appelé sont répercutés dans l'appelant.\n" #: cmd.rc:44 msgid "" @@ -9820,13 +9820,13 @@ msgid "" "GOTO has no effect when used interactively.\n" msgstr "" "La commande GOTO transfère l'exécution à une autre commande (située après\n" -"une étiquette donnée) dans un fichier batch.\n" +"une étiquette donnée) dans un fichier de commandes.\n" "\n" "L'étiquette cible du GOTO a une longueur de maximum 255 caractères mais ne\n" "peut inclure d'espaces (à la différence d'autres systèmes d'exploitation).\n" "Si deux étiquettes identiques (ou plus) existent dans le même fichier,\n" "seule la première sera utilisée. Essayer de sauter vers une étiquette non\n" -"existante termine l'exécution du fichier batch.\n" +"existante termine l'exécution du fichier de commandes.\n" "\n" "GOTO n'a pas d'effet si utilisé interactivement.\n" @@ -9930,7 +9930,7 @@ msgstr "" "PAUSE affiche un message à l'écran demandant à l'utilisateur d'appuyer sur\n" "une touche.\n" "\n" -"Principalement utilisé dans des fichiers batchs pour permettre à\n" +"Principalement utilisé dans les fichiers de commandes pour permettre à\n" "l'utilisateur de lire la sortie de la dernière commande avant qu'elle ne\n" "disparaisse de l'écran.\n" @@ -9986,7 +9986,8 @@ msgid "" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Une ligne de commande commençant par REM (suivi d'une espace) n'induit\n" -"aucune action, et peut donc servir de commentaire dans un fichier batch.\n" +"aucune action, et peut donc servir de commentaire dans un fichier de " +"commandes.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -10046,9 +10047,10 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"SHIFT est utilisé dans un fichier batch pour enlever le premier paramètre\n" -"de la liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite.\n" -"Il est sans effet s'il est appelé depuis la ligne de commande.\n" +"SHIFT est utilisé dans un fichier de commandes pour enlever le premier\n" +"paramètre de la liste ; ainsi, le paramètre 2 devient le paramètre 1 et " +"ainsi\n" +"de suite. Il est sans effet s'il est appelé depuis la ligne de commande.\n" #: cmd.rc:212 start.rc:56 msgid "" @@ -10160,7 +10162,7 @@ msgid "" "were introduced by a preceding SETLOCAL.\n" msgstr "" "ENDLOCAL met fin aux modifications locales de l'environnement dans un\n" -"fichier batch, introduites à la suite d'un SETLOCAL préalable.\n" +"fichier de commandes, introduites à la suite d'un SETLOCAL préalable.\n" #: cmd.rc:271 msgid "" @@ -10172,12 +10174,14 @@ msgid "" "settings are restored.\n" msgstr "" "SETLOCAL entame les modifications locales à l'environnement dans un fichier\n" -"batch.\n" +"de commandes.\n" "\n" -"Les modifications apportées à l'environnement après un SETLOCAL sont\n" -"locales au fichier batch, et sont préservées jusqu'au prochain ENDLOCAL\n" -"(ou à défaut jusqu'à la fin du fichier), après quoi les réglages\n" -"antérieurs de l'environnement sont restaurés.\n" +"Les modifications apportées à l'environnement après un SETLOCAL sont " +"locales\n" +"au fichier de commandes, et sont préservées jusqu'au prochain ENDLOCAL (ou " +"à\n" +"défaut jusqu'à la fin du fichier), après quoi les réglages antérieurs de\n" +"l'environnement sont restaurés.\n" #: cmd.rc:275 msgid "" @@ -10251,7 +10255,7 @@ msgstr "" "CHOICE affiche un message et bloque jusqu'à ce que l'utilisateur appuie sur\n" "une des touches spécifiées dans une liste configurable.\n" "CHOICE est principalement utilisé pour construire un menu dans un fichier\n" -"batch.\n" +"de commandes.\n" #: cmd.rc:312 msgid "" @@ -10305,7 +10309,7 @@ msgstr "" "Les commandes intégrées de CMD sont :\n" "ASSOC\t\tAffiche ou modifie les associations d'extensions de fichiers\n" "ATTRIB\t\tAffiche ou modifie les attributs de fichiers DOS\n" -"CALL\t\tInvoque un fichier batch à l'intérieur d'un autre\n" +"CALL\t\tInvoque un fichier de commandes depuis un autre\n" "CD (CHDIR)\tChange le répertoire courant\n" "CHOICE\t\tAttend l'appui d'une touche appartenant à une liste configurable\n" "CLS\t\tEfface l'écran\n" @@ -10316,7 +10320,7 @@ msgstr "" "DIR\t\tListe le contenu d'un répertoire\n" "ECHO\t\tAffiche du texte sur la console\n" "ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" -"\t\tfichier batch\n" +"\t\tfichier de commandes\n" "FTYPE\t\tAffiche ou modifie les commandes d'ouvertures associées à des\n" "\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" @@ -10324,7 +10328,7 @@ msgstr "" "MORE\t\tAffiche du texte par pages\n" "MOVE\t\tDéplace un fichier, un groupe de fichiers ou un répertoire\n" "PATH\t\tRègle ou affiche le chemin de recherche\n" -"PAUSE\t\tSuspend l'exécution d'un fichier batch\n" +"PAUSE\t\tSuspend l'exécution d'un fichier de commandes\n" "POPD\t\tRemplace le répertoire courant par le dernier enregistré avec\n" "\t\tPUSHD\n" "PROMPT\t\tChange l'invite de commande\n" @@ -10333,7 +10337,7 @@ msgstr "" "RD (RMDIR)\tEfface un répertoire\n" "SET\t\tRègle ou affiche les variables d'environnement\n" "SETLOCAL\tEntame les modifications locales à l'environnement dans un\n" -"\t\tfichier batch\n" +"\t\tfichier de commandes\n" "START\t\tLance un programme, ou ouvre un document dans le programme\n" "\t\tassocié\n" "TIME\t\tRègle ou affiche l'heure système courante\n" @@ -10379,7 +10383,8 @@ msgstr "Plus..." #: cmd.rc:360 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "Ligne du processus batch probablement tronquée. Utilisation de :\n" +msgstr "" +"Ligne du fichier de commandes probablement tronquée. Utilisation de :\n" #: cmd.rc:362 msgid "Argument missing\n" @@ -10423,7 +10428,8 @@ msgstr "Impossible d'ouvrir « %1 »\n" #: cmd.rc:373 msgid "Cannot call batch label outside of a batch script\n" -msgstr "Impossible d'appeler une étiquette de batch hors d'un script batch\n" +msgstr "" +"Impossible de sauter vers une étiquette hors d'un fichier de commandes\n" #: cmd.rc:374 xcopy.rc:45 msgctxt "All key" @@ -10507,7 +10513,7 @@ msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" "Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " -"traitement par lots.\n" +"commandes.\n" #: cmd.rc:393 msgid "Division by zero error.\n"

1 0

Alistair Leslie-Hughes : dxguid: Include d3dx10.h.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 748ac7a414645fe8b0e365c3b7203e6d7363b0e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748ac7a414645fe8b0e365c3b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 8 18:56:39 2015 +1100 dxguid: Include d3dx10.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxguid/dx10guid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c index 1d07a4d..8a447c7 100644 --- a/dlls/dxguid/dx10guid.c +++ b/dlls/dxguid/dx10guid.c @@ -33,5 +33,6 @@ #include "d3d10_1.h" #include "d3d11.h" +#include "d3dx10.h" #include "d3d10_1shader.h" #include "d3d11shader.h"

1 0

Dmitry Timoshkov : winhttp/tests: Send a not empty payload in the server authorization response, check the received data on the client side.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 12c983a6281c1c04206ae5ac3da0136a68a0a3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c983a6281c1c04206ae5ac3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 8 07:02:08 2015 +0800 winhttp/tests: Send a not empty payload in the server authorization response, check the received data on the client side. 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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7cc71b0..6153296 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2005,12 +2005,16 @@ static const char noauthmsg[] = "Server: winetest\r\n" "Connection: close\r\n" "WWW-Authenticate: Basic realm=\"placebo\"\r\n" +"Content-Length: 12\r\n" +"Content-Type: text/plain\r\n" "\r\n"; static const char okauthmsg[] = "HTTP/1.1 200 OK\r\n" "Server: winetest\r\n" "Connection: close\r\n" +"Content-Length: 11\r\n" +"Content-Type: text/plain\r\n" "\r\n"; static const char headmsg[] = @@ -2018,6 +2022,9 @@ static const char headmsg[] = "Content-Length: 100\r\n" "\r\n"; +static const char unauthorized[] = "Unauthorized"; +static const char hello_world[] = "Hello World"; + struct server_info { HANDLE event; @@ -2079,9 +2086,15 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "/auth")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + { send(c, okauthmsg, sizeof okauthmsg - 1, 0); + send(c, hello_world, sizeof hello_world - 1, 0); + } else + { send(c, noauthmsg, sizeof noauthmsg - 1, 0); + send(c, unauthorized, sizeof unauthorized - 1, 0); + } } if (strstr(buffer, "/big")) { @@ -2223,6 +2236,7 @@ static void test_basic_authentication(int port) static WCHAR pass2W[] = {'p','w','d','2',0}; HINTERNET ses, con, req; DWORD status, size, error, supported, first, target; + char buffer[32]; BOOL ret; ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); @@ -2295,6 +2309,14 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + ok(ret, "failed to read data %u\n", GetLastError()); +todo_wine + ok(size == 12, "expected 12, got %u\n", size); +todo_wine + ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); + supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); @@ -2356,6 +2378,12 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + 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); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses);

1 0

Francois Gouget : po: Tweak the French TYPE and ASSOC usage messages.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 57e230cc1f6ef873843d0bd1d1f5b958f3add2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e230cc1f6ef873843d0bd1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 8 12:58:53 2015 +0100 po: Tweak the French TYPE and ASSOC usage messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5e1c0f7..64e724e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10212,8 +10212,8 @@ msgstr "" "\n" "Syntaxe : ASSOC [.ext[=[typeFichier]]]\n" "\n" -"ASSOC sans paramètre affiche les associations d'extensions de fichiers en\n" -"cours. Si utilisé uniquement avec une extension de fichier, affiche\n" +"Sans paramètre ASSOC affiche les associations d'extensions de fichiers\n" +"existantes. Si seule une extension de fichier est spécifiée, affiche\n" "l'association actuelle. Si aucun type de fichier n'est spécifié après le\n" "signe égal, supprime l'association courante, si elle existe.\n" @@ -10321,7 +10321,7 @@ msgstr "" "ECHO\t\tAffiche du texte sur la console\n" "ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" "\t\tfichier de commandes\n" -"FTYPE\t\tAffiche ou modifie les commandes d'ouvertures associées à des\n" +"FTYPE\t\tAffiche ou modifie les commandes d'ouverture associées à des\n" "\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n"

1 0

Nikolay Sivov : dwrite/tests: Some tests for MapCharacters().
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 55e53648b4c009787b21e48c4a972a1effb614f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e53648b4c009787b21e48c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 8 18:28:33 2015 +0300 dwrite/tests: Some tests for MapCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 255 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55e53648b4c009787b21e…

1 0

Jacek Caban : mshtml: Properly return NULL parentElement.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 7b5e8497bfb46a3b02a592fa530a568721994b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5e8497bfb46a3b02a592fa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 15:14:05 2015 +0100 mshtml: Properly return NULL parentElement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 5 +++++ dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cd561b5..6c948d3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -848,6 +848,11 @@ static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLEl if(FAILED(hres)) return hres; + if(!node) { + *p = NULL; + return S_OK; + } + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)p); IHTMLDOMNode_Release(node); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b9f7935..b892ac0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5267,6 +5267,8 @@ static void test_insert_adjacent_elems(IHTMLDocument2 *doc, IHTMLElement *parent static const elem_type_t br_div_br[] = {ET_BR, ET_DIV, ET_BR}; elem = test_create_elem(doc, "BR"); + elem2 = test_elem_get_parent((IUnknown*)elem); + ok(!elem2, "get_parentElement returned %p\n", elem2); insert_adjacent_elem(parent, "BeforeEnd", elem); IHTMLElement_Release(elem);

1 0

Alex Henrie : winecfg: Widen "Folder" column to accommodate Catalan translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 7e5cb215403b621d205723dc9341806ca6431cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5cb215403b621d205723dc9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:10 2015 -0700 winecfg: Widen "Folder" column to accommodate Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1f4818b..52e64eb 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -750,7 +750,7 @@ static void init_shell_folder_listview_headers(HWND dialog) { LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)/sizeof(WCHAR)); GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); - width = (viewRect.right - viewRect.left) / 4; + width = (viewRect.right - viewRect.left) / 3; listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = szShellFolder;

1 0

Henri Verbeet : ddraw: Mark surfaces as lost on mode changes.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 571dc0faa502b63880e905c35d3e3da6d87c5599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571dc0faa502b63880e905c35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 8 14:27:18 2015 +0100 ddraw: Mark surfaces as lost on mode changes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 5 ++++- dlls/ddraw/tests/ddraw1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 42 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 167 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=571dc0faa502b63880e90…

1 0

Michael Müller : advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 79636bebbfa510b5f010098f57d422a4a2461e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79636bebbfa510b5f010098f5… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 8 16:07:44 2015 +0100 advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 3 ++- dlls/advapi32/tests/security.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c64981e..08f88c0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1167,7 +1167,8 @@ GetEffectiveRightsFromAclW( PACL pacl, PTRUSTEEW pTrustee, PACCESS_MASK pAccessR PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority( PSID pSid ) { - return RtlIdentifierAuthoritySid(pSid); + SetLastError(ERROR_SUCCESS); + return RtlIdentifierAuthoritySid(pSid); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b171a81..c71e6fe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -132,6 +132,7 @@ static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_S static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); static HMODULE hmod; static int myARGC; @@ -196,6 +197,7 @@ static void init(void) pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); + pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -6040,6 +6042,34 @@ static void test_GetWindowsAccountDomainSid(void) HeapFree(GetProcessHeap(), 0, user); } +static void test_GetSidIdentifierAuthority(void) +{ + char buffer[SECURITY_MAX_SID_SIZE]; + PSID authority_sid = (PSID *)buffer; + PSID_IDENTIFIER_AUTHORITY id; + BOOL ret; + + if (!pGetSidIdentifierAuthority) + { + win_skip("GetSidIdentifierAuthority not available\n"); + return; + } + + memset(buffer, 0xcc, sizeof(buffer)); + ret = IsValidSid(authority_sid); + ok(!ret, "expected FALSE, got %u\n", ret); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(authority_sid); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(NULL); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6084,4 +6114,5 @@ START_TEST(security) test_AdjustTokenPrivileges(); test_AddAce(); test_system_security_access(); + test_GetSidIdentifierAuthority(); }

1 0

Francois Gouget : po: Use lowercase+underscore names for the replaceable parts of the French usage messages.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 05d1618afd4c9099b202dad2465b4f664d0fdd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1618afd4c9099b202dad24… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 8 12:53:52 2015 +0100 po: Use lowercase+underscore names for the replaceable parts of the French usage messages. This brings consistency and this format keeps the spellchecker happy. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 64e724e..52ee555 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9659,7 +9659,7 @@ msgstr "" "\n" "Syntaxe :\n" "ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [lecteur:][chemin]" -"[nomFichier]\n" +"[nom_fichier]\n" " [/S [/D]]\n" "\n" "Où :\n" @@ -9670,7 +9670,7 @@ msgstr "" " A Attribut de fichier archive.\n" " S Attribut de fichier système.\n" " H Attribut de fichier caché.\n" -" [lecteur:][chemin][nomFichier]\n" +" [lecteur:][chemin][nom_fichier]\n" " Spécifie un ou plusieurs fichiers qu'attrib doit traiter.\n" " /S Traite les fichiers correspondants dans le dossier courant\n" " et tous les sous-dossiers.\n" @@ -10210,7 +10210,7 @@ msgid "" msgstr "" "ASSOC affiche ou modifie les associations d'extensions de fichiers.\n" "\n" -"Syntaxe : ASSOC [.ext[=[typeFichier]]]\n" +"Syntaxe : ASSOC [.ext[=[type_fichier]]]\n" "\n" "Sans paramètre ASSOC affiche les associations d'extensions de fichiers\n" "existantes. Si seule une extension de fichier est spécifiée, affiche\n" @@ -10233,7 +10233,7 @@ msgstr "" "FTYPE affiche ou modifie les commandes d'ouverture associées à des types\n" "de fichiers.\n" "\n" -"Syntaxe : FTYPE [typeFichier[=[commandeOuverture]]]\n" +"Syntaxe : FTYPE [type_fichier[=[commande_ouverture]]]\n" "\n" "Sans paramètre, affiche les types de fichiers pour lesquels des chaînes de\n" "commande d'ouverture sont actuellement définies.\n" @@ -12115,7 +12115,7 @@ msgid "" "\n" msgstr "" "Usage :\n" -" regsvr32 [/u] [/s] [/n] [/i[:commande]] NomDLL\n" +" regsvr32 [/u] [/s] [/n] [/i[:commande]] nom_dll\n" "\n" "Options:\n" " [/u] Annuler l'enregistrement d'un serveur.\n" @@ -12193,7 +12193,7 @@ msgstr "" #: taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" +msgstr "Usage : taskkill [/?] [/f] [/im nom_processus | /pid id_processus]\n" #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n"

1 0

Hugh McMaster : cmd: Do not overwrite a user-specified Prompt variable.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 05bc632add5f6bc56de62632612eb10a1bff2725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05bc632add5f6bc56de626326… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 8 19:53:41 2015 +1100 cmd: Do not overwrite a user-specified Prompt variable. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ba7d9ca..bf988f5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2422,6 +2422,8 @@ int wmain (int argc, WCHAR *argvW[]) /* Until we start to read from the keyboard, stay as non-interactive */ interactive = FALSE; + SetEnvironmentVariableW(promptW, defaultpromptW); + if (opt_c || opt_k) { int len; WCHAR *q1 = NULL,*q2 = NULL,*p; @@ -2683,7 +2685,6 @@ int wmain (int argc, WCHAR *argvW[]) * Loop forever getting commands and executing them. */ - SetEnvironmentVariableW(promptW, defaultpromptW); interactive = TRUE; if (!opt_k) WCMD_version (); while (TRUE) {

1 0

Dmitry Timoshkov : winhttp/tests: Use symbolic names for http status codes.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 545a41750e164cff4775bd14a09c61c678dc164d URL: http://source.winehq.org/git/wine.git/?a=commit;h=545a41750e164cff4775bd14a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 8 07:01:29 2015 +0800 winhttp/tests: Use symbolic names for http status codes. 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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index db789b3..7cc71b0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1061,7 +1061,7 @@ static void test_secure_connection(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1125,7 +1125,7 @@ static void test_request_parameter_defaults(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); @@ -1161,7 +1161,7 @@ static void test_request_parameter_defaults(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); done: WinHttpCloseHandle(req); @@ -2176,7 +2176,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2293,7 +2293,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 401, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2354,7 +2354,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2390,7 +2390,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2424,7 +2424,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 401, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2506,7 +2506,7 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == 204, "expected status 204, got %d\n", status); + ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %d\n", status); SetLastError(0xdeadbeef); size = sizeof(status); @@ -2580,14 +2580,14 @@ static void test_head_request(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == 200, "got %u\n", status); + ok(status == HTTP_STATUS_OK, "got %u\n", status); len = 0xdeadbeef; size = sizeof(len); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, &size, 0); ok(ret, "failed to get content-length header %u\n", GetLastError()); - ok(len == 100, "got %u\n", len); + ok(len == HTTP_STATUS_CONTINUE, "got %u\n", len); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); @@ -2783,7 +2783,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); @@ -2800,7 +2800,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -2821,7 +2821,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); @@ -2838,7 +2838,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200 || broken(status == 400), "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -2863,7 +2863,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 400, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 92657cf101bd7d121b17fb2d85c60a1a631b20dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=92657cf101bd7d121b17fb2d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:39 2015 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index f43a5c4..8681672 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-25 19:47-0700\n" +"PO-Revision-Date: 2015-12-07 09:53-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -3313,7 +3313,6 @@ msgctxt "home page" msgid "Home" msgstr "Inici" -# FIXME: The ellipsis makes this string too long (or not?) #: ieframe.rc:71 winhlp32.rc:69 msgid "Print..." msgstr "Imprimeix..." @@ -9649,7 +9648,6 @@ msgstr "Ana&lògic" msgid "Digi&tal" msgstr "Digi&tal" -# FIXME: The ellipsis makes this string too long (or not?) #: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84 msgid "&Font..." msgstr "T&ipus de lletra..." @@ -13679,11 +13677,11 @@ msgstr "Element ressaltat" #: winecfg.rc:127 msgid "Active Title Bar Gradient" -msgstr "Degradat de barra de títol actiu" +msgstr "Títol actiu--Degradat" #: winecfg.rc:128 msgid "Inactive Title Bar Gradient" -msgstr "Degradat de barra de títol inactiu" +msgstr "Títol inactiu--Degradat" #: winecfg.rc:129 msgid "Menu Highlight"

1 0

Alex Henrie : ieframe: Widen toolbar buttons to accommodate Catalan translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 9ca5cd317f96ef25df077b6f583a1655db781a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca5cd317f96ef25df077b6f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:22 2015 -0700 ieframe: Widen toolbar buttons to accommodate Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 07061fd..5b58aa2 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -471,7 +471,7 @@ static void create_rebar(InternetExplorer *ie) add_tb_button(ie, 4, ID_BROWSE_HOME, IDS_TB_HOME); add_tb_separator(ie); add_tb_button(ie, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); - SendMessageW(ie->toolbar_hwnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); + SendMessageW(ie->toolbar_hwnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(65,50)); SendMessageW(ie->toolbar_hwnd, TB_GETMAXSIZE, 0, (LPARAM)&toolbar_size); bandinf.cbSize = sizeof(bandinf);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: bc5f52c028e2f4d0bcee5420e608e6c725462756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5f52c028e2f4d0bcee5420e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 8 00:30:36 2015 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/po/ru.po b/po/ru.po index 38216e9..11f755a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -451,7 +451,7 @@ msgstr "Печатать" #: comdlg32.rc:206 comdlg32.rc:383 regedit.rc:219 msgid "&All" -msgstr "&Весь реестр" +msgstr "&Все" #: comdlg32.rc:207 msgid "S&election" @@ -543,7 +543,7 @@ msgstr "&Начертание:" #: comdlg32.rc:258 comdlg32.rc:435 winecfg.rc:294 msgid "&Size:" -msgstr "Размер:" +msgstr "&Размер:" #: comdlg32.rc:265 msgid "Effects" @@ -3807,11 +3807,11 @@ msgstr "Кончилась бумага.\n" #: winerror.mc:171 msgid "Write fault.\n" -msgstr "Не удаётся выполнить запись.\n" +msgstr "Ошибка записи.\n" #: winerror.mc:176 msgid "Read fault.\n" -msgstr "Не удаётся выполнить чтение.\n" +msgstr "Ошибка чтения.\n" #: winerror.mc:181 msgid "General failure.\n" @@ -3895,7 +3895,7 @@ msgstr "Закончилось место для хранения файлов, #: winerror.mc:281 msgid "Print canceled.\n" -msgstr "Вывод на печать отменён.\n" +msgstr "Печать отменена.\n" #: winerror.mc:286 msgid "Network name deleted.\n" @@ -3919,7 +3919,7 @@ msgstr "Слишком много сетевых имён.\n" #: winerror.mc:311 msgid "Too many network sessions.\n" -msgstr "Слишком много сетевых подключений NetBIOS.\n" +msgstr "Слишком много сетевых подключений.\n" #: winerror.mc:316 msgid "Sharing paused.\n" @@ -3927,7 +3927,7 @@ msgstr "Сервер остановлен или перезагружается. #: winerror.mc:321 msgid "Request not accepted.\n" -msgstr "Достигнут предел подключений к удалённому компьютеру.\n" +msgstr "Запрос не принят.\n" #: winerror.mc:326 msgid "Redirector paused.\n" @@ -4051,7 +4051,7 @@ msgstr "Недостаточный объём буфера.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "Неверное имя файла, каталога или метки тома.\n" +msgstr "Неверное имя.\n" #: winerror.mc:486 msgid "Invalid level.\n" @@ -4395,7 +4395,7 @@ msgstr "Неверно задано имя каталога.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" -msgstr "Расширенные атрибуты не помещаются.\n" +msgstr "Расширенные атрибуты не поместились.\n" #: winerror.mc:921 msgid "Extended attribute file corrupt.\n" @@ -4531,7 +4531,7 @@ msgstr "Невозможно записать ключ реестра.\n" #: winerror.mc:1086 msgid "Registry has been recovered.\n" -msgstr "Реестр восстановлен.\n" +msgstr "Реестр был восстановлен.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" @@ -4543,7 +4543,7 @@ msgstr "Не удалось выполнить чтение или запись #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "Нет файла реестра.\n" +msgstr "Файл не является файлом реестра.\n" #: winerror.mc:1106 msgid "Key deleted.\n" @@ -4583,7 +4583,7 @@ msgstr "Не удалось создать поток службы.\n" #: winerror.mc:1151 msgid "Service database locked.\n" -msgstr "База данных службы заблокирована.\n" +msgstr "База данных служб заблокирована.\n" #: winerror.mc:1156 msgid "Service already running.\n" @@ -4663,7 +4663,7 @@ msgstr "Система работает в режиме «Последняя у #: winerror.mc:1251 msgid "Service dependency deleted.\n" -msgstr "Необходимая служба удалена.\n" +msgstr "Зависимость службы была удалена.\n" #: winerror.mc:1256 msgid "Boot already accepted as last-good config.\n" @@ -4683,7 +4683,7 @@ msgstr "Другая учётная запись.\n" #: winerror.mc:1276 msgid "Driver failure cannot be detected.\n" -msgstr "Сбой драйвера не выявляется.\n" +msgstr "Сбой драйвера не может быть обнаружен.\n" #: winerror.mc:1281 msgid "Process abort cannot be detected.\n" @@ -4879,7 +4879,7 @@ msgstr "Недостаточно пользовательских дескрип #: winerror.mc:1521 msgid "Message can only be used in synchronous calls.\n" -msgstr "Сообщение может использоваться только в асинхронных вызовах.\n" +msgstr "Сообщение может использоваться только в синхронных вызовах.\n" #: winerror.mc:1526 msgid "The source element is empty.\n" @@ -4991,7 +4991,7 @@ msgstr "Не удалось открыть профиль сетевого со #: winerror.mc:1661 msgid "Corrupt network connection profile.\n" -msgstr "Профиль сетевого соединения испорчен.\n" +msgstr "Профиль сетевого соединения повреждён.\n" #: winerror.mc:1666 msgid "Not a container.\n" @@ -5175,7 +5175,7 @@ msgstr "Необходимо выполнять операцию даже при #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "Ошибка в профиле пользователя.\n" +msgstr "Неверный профиль пользователя.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5411,7 +5411,7 @@ msgstr "Превышено ограничение на число доменов #: winerror.mc:2191 msgid "Internal database corruption.\n" -msgstr "Разрушение внутренней базы данных.\n" +msgstr "Внутреннее повреждение базы данных.\n" #: winerror.mc:2196 msgid "Internal error.\n" @@ -7572,7 +7572,7 @@ msgstr "Настройки %s" #: serialui.rc:31 msgid "Baud Rate" -msgstr "Наибольшая скорость" +msgstr "Скорость" #: serialui.rc:33 msgid "Parity" @@ -7607,8 +7607,8 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"Вставьте установочный диск, и затем\n" -"проверьте что выбран нужный привод" +"Вставьте установочный диск, а затем\n" +"убедитесь что выбран нужный привод" #: setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -9125,7 +9125,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для воспроизведения, так как оно " -"занято. Подождите, пока устройство освободится, и попробуйте заново." +"занято. Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:114 msgid "" @@ -9133,7 +9133,7 @@ msgid "" "Wait until a wave device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для записи, так как оно занято. " -"Подождите, пока устройство освободится, и попробуйте заново." +"Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:115 msgid "" @@ -9141,7 +9141,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для воспроизведения, так как оно " -"занято. Подождите, пока устройство освободится, и попробуйте заново." +"занято. Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -9528,7 +9528,7 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Ещё не выполнено\n" +"Ещё не реализовано\n" "\n" #: attrib.rc:31 cmd.rc:364

1 0

Julian Rüger : German translation of the SFC fundraiser
by Jeremy Newman Dec. 7, 2015

Dec. 7, 2015

Module: website Branch: master Commit: c4130a73f5926d9378ef91e9d7d7d7850c08492b URL: http://source.winehq.org/git/website.git/?a=commit;h=c4130a73f5926d9378ef91… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Dec 6 15:10:22 2015 +0100 German translation of the SFC fundraiser Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015112901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2015112901.xml b/news/de/2015112901.xml new file mode 100644 index 0000000..d8cf55f --- /dev/null +++ b/news/de/2015112901.xml @@ -0,0 +1,18 @@ +<news> +<date>29. November 2015</date> +<title>Software Freedom Conservancy 2015 Spendenkampagne</title> +<body> +Die <a href="https://sfconservancy.org/">Software Freedom Conservancy</a> ist eine nicht-profitorientierte +Organisation die FLOSS-Projekte unterstützt, indem sie für Dinge wie die Verwaltung von Spenden und Vermögen, +grundlegende Rechtsberatung und die Durchsetzung der FLOSS-Lizenzen sorgt. Sie waren auch für das Wine-Projekt +immer äußerst hilfreich. + +Leider wurde der SFC in den letzten Jahren, besonders durch Aktivitäten wie der Durchsetzung von FLOSS-Lizenzen, +die kommerzielle Unterstützung einiger Unternehmen entzogen, so dass sie jetzt noch mehr auf individuelle Spender +angewiesen ist. Daher hat die SFC kürzlich ihre <a href="https://sfconservancy.org/supporter/">Spendenkampagne 2015</a> +gestartet und ihre Mitgliedsprojekte um Unterstützung bei der Bekanntmachung gebeten. + +Bitte ziehen auch Sie eine <a href="https://sfconservancy.org/donate/">Spende</a> in Betracht; Ihre Unterstützung +der SFC wird all ihren <a href="https://sfconservancy.org/members/current/">Mitgliedern</a> zu Gute kommen, +einschließlich des Wine-Projektes. +</body></news>

1 0

Julian Rüger : German translation for release 1.8-rc3
by Jeremy Newman Dec. 7, 2015

Dec. 7, 2015

Module: website Branch: master Commit: 66bd39f02db123926d56e61f2977c107658921bf URL: http://source.winehq.org/git/website.git/?a=commit;h=66bd39f02db123926d56e6… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Dec 6 15:12:08 2015 +0100 German translation for release 1.8-rc3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2015120401.xml b/news/de/2015120401.xml new file mode 100644 index 0000000..90eca43 --- /dev/null +++ b/news/de/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>4. Dezember 2015</date> +<title>Wine 1.8-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 1.8-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jacek Caban : mshtml: Return success in SetCorsIncludeCredentials and SetCorsMode.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 7c4c93a2bf0189e9911b9aba52e80654f1e062fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4c93a2bf0189e9911b9aba5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 17:32:47 2015 +0100 mshtml: Return success in SetCorsIncludeCredentials and SetCorsMode. Fixes regression in loading site-provided fonts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bd6a202..a2615c4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1922,8 +1922,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetCorsIncludeCredentials(nsIHttpCha cpp_bool aCorsIncludeCredentials) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->(%x)\n", This, aCorsIncludeCredentials); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%x)\n", This, aCorsIncludeCredentials); + return NS_OK; } static nsresult NSAPI nsHttpChannelInternal_GetCorsMode(nsIHttpChannelInternal *iface, UINT32 *aCorsMode) @@ -1936,8 +1936,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetCorsMode(nsIHttpChannelInternal * static nsresult NSAPI nsHttpChannelInternal_SetCorsMode(nsIHttpChannelInternal *iface, UINT32 aCorsMode) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->(%d)\n", This, aCorsMode); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%d)\n", This, aCorsMode); + return NS_OK; } static nsresult NSAPI nsHttpChannelInternal_GetTopWindowURI(nsIHttpChannelInternal *iface, nsIURI **aTopWindowURI)

1 0

Jacek Caban : mshtml: Fixed nsIHttpChannelInternal declaration.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 4dc8a96f78297c8b9033d6e07f959bf1d3989f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc8a96f78297c8b9033d6e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 17:31:57 2015 +0100 mshtml: Fixed nsIHttpChannelInternal declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 4 +++- dlls/mshtml/nsio.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 943cdb4..ccb2547 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -652,9 +652,11 @@ interface nsIHttpChannelInternal : nsISupports nsresult SetDocumentURI(nsIURI *aDocumentURI); nsresult GetRequestVersion(uint32_t *major, uint32_t *minor); nsresult GetResponseVersion(uint32_t *major, uint32_t *minor); - nsresult TakeAllSecurityMessages(void /*securityMessagesArray*/ *aMessages); + nsresult TakeAllSecurityMessages(void /*nsCOMArray<nsISecurityConsoleMessage>*/ *aMessages); nsresult SetCookie(const char *aCookieHeader); nsresult SetupFallbackChannel(const char *aFallbackKey); + nsresult GetThirdPartyFlags(uint32_t *aThirdPartyFlags); + nsresult SetThirdPartyFlags(uint32_t aThirdPartyFlags); nsresult GetForceAllowThirdPartyCookie(bool *aForceAllowThirdPartyCookie); nsresult SetForceAllowThirdPartyCookie(bool aForceAllowThirdPartyCookie); nsresult GetCanceled(bool *aCanceled); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c4efc5c..bd6a202 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1726,6 +1726,20 @@ static nsresult NSAPI nsHttpChannelInternal_SetupFallbackChannel(nsIHttpChannelI return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsHttpChannelInternal_GetThirdPartyFlags(nsIHttpChannelInternal *iface, UINT32 *aThirdPartyFlags) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aThirdPartyFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_SetThirdPartyFlags(nsIHttpChannelInternal *iface, UINT32 aThirdPartyFlags) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%x)\n", This, aThirdPartyFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + static nsresult NSAPI nsHttpChannelInternal_GetForceAllowThirdPartyCookie(nsIHttpChannelInternal *iface, cpp_bool *aForceThirdPartyCookie) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -1974,6 +1988,8 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_TakeAllSecurityMessages, nsHttpChannelInternal_SetCookie, nsHttpChannelInternal_SetupFallbackChannel, + nsHttpChannelInternal_GetThirdPartyFlags, + nsHttpChannelInternal_SetThirdPartyFlags, nsHttpChannelInternal_GetForceAllowThirdPartyCookie, nsHttpChannelInternal_SetForceAllowThirdPartyCookie, nsHttpChannelInternal_GetCanceled,

1 0

Francois Gouget : po: Fuzzy an incomplete Croatian translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 3975181a4d6dd2eaa1929eb5e740b162fd8dc052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3975181a4d6dd2eaa1929eb5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:25:45 2015 +0100 po: Fuzzy an incomplete Croatian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/hr.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/hr.po b/po/hr.po index 3566c1d..9046139 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11262,6 +11262,7 @@ msgid "File `%s' exists. Not overwritten." msgstr "Datoteka `%s' postoji. Nije prepisana." #: progman.rc:80 +#, fuzzy msgid "Save group as `%s to prevent overwriting original files." msgstr "Spremi grupi kao `%s' kako "

1 0