June 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Improve parsing of cookie values.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 41cf9a8372e698ecfa81254fd9ed67459607c3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cf9a8372e698ecfa81254fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:25 2015 +0200 winhttp: Improve parsing of cookie values. --- dlls/winhttp/cookie.c | 53 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 6e104b2..4bf0808 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -134,22 +134,14 @@ static cookie_t *parse_cookie( const WCHAR *string ) const WCHAR *p; int len; - if (!(p = strchrW( string, '=' ))) - { - WARN("no '=' in %s\n", debugstr_w(string)); - return NULL; - } - if (p == string) - { - WARN("empty cookie name in %s\n", debugstr_w(string)); - return NULL; - } + if (!(p = strchrW( string, '=' ))) p = string + strlenW( string ); + len = p - string; + while (len && string[len - 1] == ' ') len--; + if (!len) return NULL; if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; - list_init( &cookie->entry ); - len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( cookie ); @@ -158,18 +150,20 @@ static cookie_t *parse_cookie( const WCHAR *string ) memcpy( cookie->name, string, len * sizeof(WCHAR) ); cookie->name[len] = 0; - p++; /* skip '=' */ - while (*p == ' ') p++; - - len = strlenW( p ); - if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (*p++ == '=') { - free_cookie( cookie ); - return NULL; - } - memcpy( cookie->value, p, len * sizeof(WCHAR) ); - cookie->value[len] = 0; + while (*p && *p == ' ') p++; + len = strlenW( p ); + while (len && p[len - 1] == ' ') len--; + if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + free_cookie( cookie ); + return NULL; + } + memcpy( cookie->value, p, len * sizeof(WCHAR) ); + cookie->value[len] = 0; + } return cookie; } @@ -259,14 +253,21 @@ BOOL add_cookie_headers( request_t *request ) if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR format[] = {'C','o','o','k','i','e',':',' ','%','s','=','%','s',0}; - int len; + const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + int len, len_cookie = sizeof(cookieW) / sizeof(cookieW[0]), len_name = strlenW( cookie->name ); WCHAR *header; - len = strlenW( cookie->name ) + strlenW( format ) + strlenW( cookie->value ); + len = len_cookie + len_name; + if (cookie->value) len += strlenW( cookie->value ) + 1; if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - sprintfW( header, format, cookie->name, cookie->value ); + memcpy( header, cookieW, len_cookie * sizeof(WCHAR) ); + strcpyW( header + len_cookie, cookie->name ); + if (cookie->value) + { + header[len_cookie + len_name] = '='; + strcpyW( header + len_cookie + len_name + 1, cookie->value ); + } TRACE("%s\n", debugstr_w(header)); add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3860461..10a3f06 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1799,6 +1799,15 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notokmsg[] = +"HTTP/1.1 400 Bad Request\r\n" +"\r\n"; + +static const char cookiemsg[] = +"HTTP/1.1 200 OK\r\n" +"Set-Cookie: name = value \r\n" +"\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\n" "Server: winetest\r\n" @@ -1917,6 +1926,16 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, headmsg, sizeof headmsg - 1, 0); continue; } + if (strstr(buffer, "GET /cookie2")) + { + if (strstr(buffer, "Cookie: name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } + else if (strstr(buffer, "GET /cookie")) + { + if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2503,6 +2522,103 @@ static void test_multiple_reads(int port) WinHttpCloseHandle(ses); } +static void test_cookies( int port ) +{ + static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; + static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookieW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + 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 ); + + WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + 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 ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + 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 ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + 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 ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -3478,6 +3594,7 @@ START_TEST (winhttp) test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port); + test_cookies(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

Huw Davies : user32/tests: Add some optional messages for Win XP.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 683ffd7ff163274ceb2e110d82b46063008928a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683ffd7ff163274ceb2e110d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 15 14:23:18 2015 +0100 user32/tests: Add some optional messages for Win XP. --- dlls/user32/tests/msg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5cbfec8..b5f9e6a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -793,6 +793,9 @@ static const struct message WmShowMaxPopupSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Ken Thomases : configure: Only check for libunwind.h on OS X.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a9f9dd05c3b9df77c44c916… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 15 20:42:33 2015 -0500 configure: Only check for libunwind.h on OS X. --- configure | 13 ++++++++++++- configure.ac | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a104097..c0951db 100755 --- a/configure +++ b/configure @@ -6626,7 +6626,6 @@ for ac_header in \ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -7849,6 +7848,18 @@ uninstall:: ;; darwin*|macosx*) + for ac_header in libunwind.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default" +if test "x$ac_cv_header_libunwind_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUNWIND_H 1 +_ACEOF + +fi + +done + LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress" diff --git a/configure.ac b/configure.ac index df28b27..f9df3f0 100644 --- a/configure.ac +++ b/configure.ac @@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\ lber.h \ ldap.h \ libproc.h \ - libunwind.h \ link.h \ linux/cdrom.h \ linux/compiler.h \ @@ -751,6 +750,7 @@ uninstall:: ;; darwin*|macosx*) + AC_CHECK_HEADERS(libunwind.h) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LIBWINE_LDFLAGS="-multiply_defined suppress"

1 0

Bruno Jesus : ws2_32/tests: Add UDP select() test for unbound socket.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 213419961ce5095f5fd9ba9904ca82e7da71da67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213419961ce5095f5fd9ba990… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jun 15 10:10:20 2015 -0300 ws2_32/tests: Add UDP select() test for unbound socket. --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 610a563..7335faa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3868,6 +3868,20 @@ todo_wine ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); + + /* test UDP behavior of unbound sockets */ + select_timeout.tv_sec = 0; + select_timeout.tv_usec = 250000; + fdWrite = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(fdWrite != INVALID_SOCKET, "socket call failed\n"); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine + ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + closesocket(fdWrite); } #undef FD_SET_ALL #undef FD_ZERO_ALL

1 0

Henri Verbeet : d3d10core: Translate d3d10 usage to wined3d usage for buffers.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 8dd93c7e333d6734ef436372feeab4742afd4591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd93c7e333d6734ef436372f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:10 2015 +0200 d3d10core: Translate d3d10 usage to wined3d usage for buffers. --- dlls/d3d10core/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index dcf323c..84882a7 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -233,10 +233,8 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi buffer->refcount = 1; wined3d_private_store_init(&buffer->private_store); - FIXME("Implement DXGI<->wined3d usage conversion\n"); - wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = desc->Usage; + wined3d_desc.usage = wined3d_usage_from_d3d10core(0, desc->Usage); wined3d_desc.bind_flags = desc->BindFlags; wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags;

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLine().
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 95a12f246a6567a82852ff7f383266badfba7426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a12f246a6567a82852ff7f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:06 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLine(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 818a5d0..4ba851d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -108,7 +108,9 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface, D2D1_POINT_2F point) { - FIXME("iface %p, point {%.8e, %.8e} stub!\n", iface, point.x, point.y); + TRACE("iface %p, point {%.8e, %.8e}.\n", iface, point.x, point.y); + + d2d_geometry_sink_AddLines(iface, &point, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier)

1 0

Henri Verbeet : d2d1: Implement d2d_text_renderer_DrawGlyphRun().
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 1fd0cf680f701b53873048a8ed7da5a6df2e1f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd0cf680f701b53873048a8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:09 2015 +0200 d2d1: Implement d2d_text_renderer_DrawGlyphRun(). --- dlls/d2d1/render_target.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3870295..9e99156 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1293,12 +1293,27 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " - "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; + struct d2d_draw_text_layout_ctx *context = ctx; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " + "measuring_mode %#x, glyph_run %p, desc %p, effect %p.\n", iface, ctx, baseline_origin_x, baseline_origin_y, measuring_mode, glyph_run, desc, effect); - return E_NOTIMPL; + if (desc) + FIXME("Ignoring glyph run description %p.\n", desc); + if (effect) + FIXME("Ignoring effect %p.\n", effect); + if (context->options) + FIXME("Ignoring options %#x.\n", context->options); + + TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength)); + ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + baseline_origin, glyph_run, context->brush, measuring_mode); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx,

1 0

Julian Rüger : German translation for release 1.7.45
by Jeremy Newman June 15, 2015

June 15, 2015

Module: website Branch: master Commit: fa76686423f20af15f8b3b8b28bf89c8ac65fba5 URL: http://source.winehq.org/git/website.git/?a=commit;h=fa76686423f20af15f8b3b… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 14 15:56:19 2015 +0200 German translation for release 1.7.45 >From 8bde2c64ebcddddbea7adc50a44bfc7aac97f06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCger?= <jr98(a)gmx.net> Date: Sun, 14 Jun 2015 15:47:06 +0200 Subject: German translation for release 1.7.45 --- news/de/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015061201.xml b/news/de/2015061201.xml new file mode 100644 index 0000000..905cdfe --- /dev/null +++ b/news/de/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Juni 2015</date> +<title>Wine 1.7.45 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.45 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.45">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Debugging-Unterstützung unter 64-Bit Mac OS X.</li> + <li>Kleinere Fortschritte der DirectWrite-Implementierung.</li> + <li>Einige Korrekturen am RichEdit-Steuerelement.</li> + <li>Anfänge einer Implementierung der alten MSVCIRT C++-Laufzeit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.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

Łukasz Wojniłowicz : Polish translation for release 1.7.45
by Jeremy Newman June 15, 2015

June 15, 2015

Module: website Branch: master Commit: 65f185d15d9bd1556d68e847e0e765bebe5e5b08 URL: http://source.winehq.org/git/website.git/?a=commit;h=65f185d15d9bd1556d68e8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jun 12 20:29:26 2015 +0200 Polish translation for release 1.7.45 --- news/pl/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015061201.xml b/news/pl/2015061201.xml new file mode 100644 index 0000000..f6ad156 --- /dev/null +++ b/news/pl/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 12, 2015</date> +<title>Wydano Wine 1.7.45</title> +<body> + Wydanie rozwojowe Wine 1.7.45 jest już dostępne. + <a href="{$root}/announce/1.7.45">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza wsparcie diagnostyki na 64-bitowym Mac OS X.</li> + <li>Postęo w implementacji DirectWrite.</li> + <li>Kilka poprawek do kontrolek RichEdit.</li> + <li>Początki implementacji starej biblioteki uruchomieniowej MSVCIRT C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.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

Henri Verbeet : wined3d: Implement SM4 discard in the GLSL shader backend.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: c9227bccc5a1bf94fbf5bf335fae7f4b16c888ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9227bccc5a1bf94fbf5bf335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:33 2015 +0200 wined3d: Implement SM4 discard in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f69a2ce..fa96fbe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4704,22 +4704,29 @@ static void shader_glsl_texreg2rgb(const struct wined3d_shader_instruction *ins) * If any of the first 3 components are < 0, discard this pixel */ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { - struct glsl_dst_param dst_param; + if (ins->ctx->reg_maps->shader_version.major >= 4) + { + struct glsl_src_param src_param; - /* The argument is a destination parameter, and no writemasks are allowed */ - shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); - if (ins->ctx->reg_maps->shader_version.major >= 2) + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (bool(floatBitsToUint(%s))) discard;\n", src_param.param_str); + } + else { - if (ins->ctx->reg_maps->shader_version.major >= 4) - FIXME("SM4 discard not implemented.\n"); - /* 2.0 shaders compare all 4 components in texkill */ - shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); - } else { - /* 1.X shaders only compare the first 3 components, probably due to the nature of the texkill - * instruction as a tex* instruction, and phase, which kills all a / w components. Even if all - * 4 components are defined, only the first 3 are used - */ - shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_param.reg_name); + struct glsl_dst_param dst_param; + + /* The argument is a destination parameter, and no writemasks are allowed */ + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + + /* 2.0 shaders compare all 4 components in texkill. */ + if (ins->ctx->reg_maps->shader_version.major >= 2) + shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); + /* 1.x shaders only compare the first 3 components, probably due to + * the nature of the texkill instruction as a tex* instruction, and + * phase, which kills all .w components. Even if all 4 components are + * defined, only the first 3 are used. */ + else + shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_param.reg_name); } }

1 0