March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Map buffers in wined3d_device_process_vertices().
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 8bdbbf4fcff87aa42a5142aa1159eef18a05e793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bdbbf4fcff87aa42a5142aa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:22 2017 +0100 wined3d: Map buffers in wined3d_device_process_vertices(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07f2f0a..6092db4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3079,8 +3079,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, { struct wined3d_state *state = &device->state; struct wined3d_stream_info stream_info; - const struct wined3d_gl_info *gl_info; + struct wined3d_resource *resource; struct wined3d_context *context; + struct wined3d_box box = {0}; struct wined3d_shader *vs; unsigned int i; HRESULT hr; @@ -3094,13 +3095,11 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (declaration) FIXME("Output vertex declaration not implemented yet.\n"); - /* Need any context to write to the vbo. */ - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; + context = context_acquire(device, NULL, 0); context_stream_info_from_declaration(context, state, &stream_info); + context_release(context); state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into @@ -3111,29 +3110,33 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) { struct wined3d_stream_info_element *e; - struct wined3d_buffer *buffer; + struct wined3d_map_desc map_desc; if (!(map & 1)) continue; e = &stream_info.elements[i]; - buffer = state->streams[e->stream_idx].buffer; + resource = &state->streams[e->stream_idx].buffer->resource; + box.left = src_start_idx * e->stride; + box.right = box.left + vertex_count * e->stride; + if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READONLY))) + ERR("Failed to map resource.\n"); e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); - if (buffer->buffer_object) - { - GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); - buffer->buffer_object = 0; - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - } - if (e->data.addr) - e->data.addr += e->stride * src_start_idx; + e->data.addr += (ULONG_PTR)map_desc.data; } hr = process_vertices_strided(device, dst_idx, vertex_count, &stream_info, dst_buffer, flags, dst_fvf); - context_release(context); + for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + { + if (!(map & 1)) + continue; + + resource = &state->streams[stream_info.elements[i].stream_idx].buffer->resource; + if (FAILED(wined3d_resource_unmap(resource, 0))) + ERR("Failed to unmap resource.\n"); + } return hr; }

1 0

Julian Rüger : German translation for release 2.1
by Jeremy Newman March 6, 2017

March 6, 2017

Module: website Branch: master Commit: a52ed14ba76dd19936fa6043e098bed613d4e886 URL: http://source.winehq.org/git/website.git/?a=commit;h=a52ed14ba76dd19936fa60… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:06:57 2017 +0100 German translation for release 2.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017020301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/de/2017020301.xml b/news/de/2017020301.xml new file mode 100644 index 0000000..3bb61cb --- /dev/null +++ b/news/de/2017020301.xml @@ -0,0 +1,19 @@ +<news> +<date>3. Februar 2017</date> +<title>Wine 2.1 freigegeben</title> +<body> + Die Entwicklungsversion 2.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Korrekturen, die aufgrund des Code-freezes aufgeschoben wurden.</li> + <li>Weitere Shader-Model-5-Befehle.</li> + <li>Verbesserungen bei der Verarbeitung von MIME-Nachrichten.</li> + <li>Verbesserungen am Verhalten von Zeilenumbrüchen in DirectWrite.</li> + <li>Der HID-Busdienst läuft nun standardmäßig.</li> + <li>Direct2D Rendering-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> + <li>XZ-Komprimierung für Tarballs der Quelltextveröffentlichungen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.1.tar.xz">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

Julian Rüger : German translation for release 1.8.7
by Jeremy Newman March 6, 2017

March 6, 2017

Module: website Branch: master Commit: fa04f111079dab83678741127bb40b4487dab13b URL: http://source.winehq.org/git/website.git/?a=commit;h=fa04f111079dab83678741… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:19:51 2017 +0100 German translation for release 1.8.7 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017022801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2017022801.xml b/news/de/2017022801.xml new file mode 100644 index 0000000..f937eec --- /dev/null +++ b/news/de/2017022801.xml @@ -0,0 +1,14 @@ +<news> +<date>28. Februar 2017</date> +<title>Wine 1.8.7 freigegeben</title> +<body> + Die Wartungsversion 1.8.7 von Wine ist jetzt verfügbar. Dies ist das letzte Release der 1.8.x-Serie. + <a href="{$root}/announce/1.8.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Einige weitere Grafikkarten zur GPU-Beschreibungstabelle hinzugefügt.</li> + <li>Aktualiserung der türkischen Übersetzung.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.7.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

Julian Rüger : German translation for release 2.3
by Jeremy Newman March 6, 2017

March 6, 2017

Module: website Branch: master Commit: 4c5c330a0fa8b295407c686380fddf0a6ba4165a URL: http://source.winehq.org/git/website.git/?a=commit;h=4c5c330a0fa8b295407c68… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:29:35 2017 +0100 German translation for release 2.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017030301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017030301.xml b/news/de/2017030301.xml new file mode 100644 index 0000000..e2d7ed5 --- /dev/null +++ b/news/de/2017030301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. März 2017</date> +<title>Wine 2.3 freigegeben</title> +<body> + Die Entwicklungsversion 2.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Obsoletes Wineinstall-Script entfernt.</li> + <li>Weitere Arbeit am Direct3D-Command-Stream.</li> + <li>Wenige weitere Shader-Model-5-Befehle.</li> + <li>Besseres Rendern von Unterstreichungen in DirectWrite.</li> + <li>Verbesserte Unterstützung von ODBC unter 64-Bit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.3.tar.xz">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

Julian Rüger : German translation for release 2.2
by Jeremy Newman March 6, 2017

March 6, 2017

Module: website Branch: master Commit: aca400f81113d46a8f9358463e8aea577b0bf7a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=aca400f81113d46a8f9358… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:14:15 2017 +0100 German translation for release 2.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017021701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017021701.xml b/news/de/2017021701.xml new file mode 100644 index 0000000..c8d062c --- /dev/null +++ b/news/de/2017021701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Februar 2017</date> +<title>Wine 2.2 freigegeben</title> +<body> + Die Entwicklungsversion 2.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Windows-Version wird für neue Präfixe nun auf Windows 7 gesetzt.</li> + <li>Weitere Schritte in Richtung Direct3D-Commandstream.</li> + <li>Noch weitere Shader-Model-5-Befehle.</li> + <li>Anfängliche Unterstützung des doppelt gepuffertem Zeichnen von Themes.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.2.tar.xz">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

Alexandre Julliard : Wine release 2.3
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: website Branch: master Commit: 4939301251b08b91749893ba3a342202a80d40f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4939301251b08b91749893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 21:20:46 2017 +0100 Wine release 2.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017030301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017030301.xml b/news/en/2017030301.xml new file mode 100644 index 0000000..d75ef9b --- /dev/null +++ b/news/en/2017030301.xml @@ -0,0 +1,17 @@ +<news> +<date>March 3, 2017</date> +<title>Wine 2.3 Released</title> +<body> + The Wine development release 2.3 is now available. + <a href="{$root}/announce/2.3">What's new</a> in this release: +<ul> + <li>Obsolete wineinstall script removed.</li> + <li>More Direct3D command stream work.</li> + <li>A few more Shader Model 5 instructions.</li> + <li>Better underline rendering in DirectWrite.</li> + <li>Improved ODBC support on 64-bit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.3.tar.xz">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

Jetro Jormalainen : dinput: Handle username in EnumDevicesBySemantics.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: 41b126b5fcf2a8c7b4c36afda3fb15f549d42bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b126b5fcf2a8c7b4c36afda… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Thu Mar 2 20:51:41 2017 +0200 dinput: Handle username in EnumDevicesBySemantics. EnumDevicesBySemantics enums only devices with given username when DIEDBSFL_THISUSER is set and only unowned devices when DIEDBSFL_AVAILABLEDEVICES is set. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 111 ++++++++++++++++++++++++++++++++++++++------ dlls/dinput8/tests/dinput.c | 11 ++++- 2 files changed, 105 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41b126b5fcf2a8c7b4c36…

1 0

Alexandre Julliard : Release 2.3.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: a2460b2424163bbf5b885db6a5423c3d98f883e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2460b2424163bbf5b885db6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 21:18:32 2017 +0100 Release 2.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 919 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 446 insertions(+), 495 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2460b2424163bbf5b885…

1 0

Józef Kucia : ntdll: Fix NtFlushBuffersFile() for files with FILE_APPEND_DATA access.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: c530fb9e28208db784f70b3794cbb16f2ce56ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c530fb9e28208db784f70b379… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 16:21:08 2017 +0100 ntdll: Fix NtFlushBuffersFile() for files with FILE_APPEND_DATA access. Fixes a regression introduced by commit f7d40d45da7a1bc0accd58bca6d6da4e34861937. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 ++ dlls/ntdll/tests/file.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3f38c6f..e2cfe7f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3418,6 +3418,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock int fd, needs_close; ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); + if (ret == STATUS_ACCESS_DENIED) + ret = server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); if (!ret && type == FD_TYPE_SERIAL) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5e7e1ee..09bf688 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4441,7 +4441,6 @@ static void test_flush_buffers_file(void) ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, &io_status_block); - todo_wine ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); CloseHandle(hfile);

1 0

Józef Kucia : ntdll/tests: Add test for flushing file with FILE_APPEND_DATA access.
by Alexandre Julliard March 3, 2017

March 3, 2017

Module: wine Branch: master Commit: a0aac4959166d4c01a787bef348e62b8ccf18972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0aac4959166d4c01a787bef3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 16:21:07 2017 +0100 ntdll/tests: Add test for flushing file with FILE_APPEND_DATA access. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3d91cb1..5e7e1ee 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4436,6 +4436,15 @@ static void test_flush_buffers_file(void) CloseHandle(hfileread); CloseHandle(hfile); + hfile = CreateFileA(buffer, FILE_APPEND_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + + status = pNtFlushBuffersFile(hfile, &io_status_block); + todo_wine + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + + CloseHandle(hfile); DeleteFileA(buffer); }

1 0