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

Józef Kucia : wined3d: Add extension detection for ARB_copy_buffer.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 6a5a51be1b57c804b1fb2894594e4798e852c79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5a51be1b57c804b1fb28945… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:25 2016 +0100 wined3d: Add extension detection for ARB_copy_buffer. 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/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd048fd..be3fdb0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -2499,6 +2500,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetFragDataIndex) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) + /* GL_ARB_copy_buffer */ + USE_GL_FUNC(glCopyBufferSubData) /* GL_ARB_debug_output */ USE_GL_FUNC(glDebugMessageCallbackARB) USE_GL_FUNC(glDebugMessageControlARB) @@ -3452,6 +3455,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD * EXT_framebuffer_multisample and EXT_packed_depth_stencil * are integrated into ARB_framebuffer_object. */ + {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e344ff1..8943cb0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -45,6 +45,7 @@ enum wined3d_gl_extension /* ARB */ ARB_BLEND_FUNC_EXTENDED, ARB_COLOR_BUFFER_FLOAT, + ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE,

1 0

Rob Walker : wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: e4c75a88fde88a1f7d1bca38a18eb91c80dbbd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c75a88fde88a1f7d1bca38a… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Sat Mar 19 12:31:25 2016 +0000 wined3d: Add Nvidia GPU SKUs 950,950M,960,960M. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da66aac..dd048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1281,6 +1281,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, @@ -1729,6 +1733,10 @@ cards_nvidia_binary[] = /* Direct 3D 11 */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ + {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ + {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ + {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a5feeb..99f2e53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1716,6 +1716,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, + CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, + CARD_NVIDIA_GEFORCE_GTX960 = 0x1401, + CARD_NVIDIA_GEFORCE_GTX960M = 0x139B, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8,

1 0

Alexandre Julliard : winebuild: Use strarray objects for a few more string arrays.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: d65446af3db98499a43fc8dd856cc1f404424b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65446af3db98499a43fc8dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:22:30 2016 +0900 winebuild: Use strarray objects for a few more string arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 +-- tools/winebuild/import.c | 68 +++++++++++++++++------------------------------- tools/winebuild/main.c | 20 ++++++-------- tools/winebuild/utils.c | 14 +++------- 4 files changed, 36 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d65446af3db98499a43fc…

1 0

Frédéric Delanoy : French translation for release 1.9.6
by Jeremy Newman March 21, 2016

March 21, 2016

Module: website Branch: master Commit: 9b42fc5359d8f1041442baa599a6276120f6bd6f URL: http://source.winehq.org/git/website.git/?a=commit;h=9b42fc5359d8f1041442ba… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 18 21:16:39 2016 +0100 French translation for release 1.9.6 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016031801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016031801.xml b/news/fr/2016031801.xml new file mode 100644 index 0000000..7a81ab8 --- /dev/null +++ b/news/fr/2016031801.xml @@ -0,0 +1,14 @@ +<news> +<date>18 mars 2016</date> +<title>Sortie de Wine 1.9.6</title> +<body> +La version de développement 1.9.6 de Wine est disponible. +<a href="{$root}/announce/1.9.6">Nouveautés</a> de cette version : +<ul> + <li>Meilleurs détection des cartes vidéo lorsque Mesa est utilisé.</li> + <li>Prise en charge des shaders Shader Model 5.</li> + <li>Améliorations dans le traitement des exceptions C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : testbot: Let the WineRunTask script take screenshots.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: tools Branch: master Commit: 8d728648bed2b17b73c34749ae79e9a083b028ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=8d728648bed2b17b73c34749… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:35:22 2016 +0100 testbot: Let the WineRunTask script take screenshots. Taking a screenshot is a blocking operation that takes time. So it must not be done from the Engine. But taking screenshots from the task scripts is fine. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 5 ++++- testbot/lib/WineTestBot/VMs.pm | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 75a8851..956f180 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -523,7 +523,10 @@ sub HandleGetScreenshot($) return "0Unknown VM $VMName"; } - my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); + # FIXME: Taking a screenshot leaks libvirt connections, takes a long time and + # blocks the Engine during the whole operation. So live screenshots are + # disabled for now. + my ($ErrMessage, $ImageSize, $ImageBytes) = ("Screenshotting has been disabled for the time being", undef, undef); #$VM->CaptureScreenImage(); if (defined($ErrMessage)) { LogMsg "Failed to take screenshot of $VMName: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2400efc..c41b77a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -432,9 +432,6 @@ sub CaptureScreenImage($) { my ($self) = @_; - # FIXME: Disable screenshots for now - return ("Screenshotting has been disabled for the time being", undef, undef); - my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage);

1 0

Jeremy Newman : fix opening PHP tag for PHP 5.6
by Jeremy Newman March 21, 2016

March 21, 2016

Module: website Branch: master Commit: 174c1335fc2650d31b4c37d83241912ba78f636d URL: http://source.winehq.org/git/website.git/?a=commit;h=174c1335fc2650d31b4c37… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Mar 21 08:45:49 2016 -0500 fix opening PHP tag for PHP 5.6 --- include/wwn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wwn.php b/include/wwn.php index 1d81e7c..7203b2f 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -1,4 +1,4 @@ -<? +<?php /* WineHQ

1 0

Alexandre Julliard : Wine release 1.9.6
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: website Branch: master Commit: 83070d379296c35588419df138066d75c338f752 URL: http://source.winehq.org/git/website.git/?a=commit;h=83070d379296c35588419d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:33:14 2016 +0900 Wine release 1.9.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016031801.xml b/news/en/2016031801.xml new file mode 100644 index 0000000..83393e1 --- /dev/null +++ b/news/en/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>March 18, 2016</date> +<title>Wine 1.9.6 Released</title> +<body> + The Wine development release 1.9.6 is now available. + <a href="{$root}/announce/1.9.6">What's new</a> in this release: +<ul> + <li>Better video card detection when using Mesa.</li> + <li>Support for Shader Model 5 shaders.</li> + <li>C++ exception handling improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.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

Francois Gouget : d3dx9/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: wine Branch: master Commit: 8fda75fe4a7294cd99968e960dc60c23ae3f8b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fda75fe4a7294cd99968e960… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 17 23:38:56 2016 +0100 d3dx9/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index e43bbdc..13467ed 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2904,7 +2904,7 @@ static void test_effect_states(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); if (hr == D3D_OK) - ok(!bval, "Got result %u, expected 0.", bval); + ok(!bval, "Got result %u, expected 0.\n", bval); hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); hr = effect->lpVtbl->Begin(effect, &npasses, 0);

1 0

Francois Gouget : shlwapi/tests: Fix a test failure on Windows 10.
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: wine Branch: master Commit: 637799db984c7a7595c6b2df88ebd9fba50452cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=637799db984c7a7595c6b2df8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 17 23:38:42 2016 +0100 shlwapi/tests: Fix a test failure on Windows 10. AssocQueryString() can return S_FALSE with the size of the required buffer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/assoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index cbc40ce..266f3fd 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -102,9 +102,11 @@ static void test_getstring_bad(void) hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || - hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ + hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ || + hr == S_FALSE, /* Win10 */ "Unexpected result : %08x\n", hr); - ok(len == 0xdeadbeef, "got %u\n", len); + ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len == 0xdeadbeef, + "got hr=%08x and len=%u\n", hr, len); len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DUSAGE_OVERLAY check in gdi_surface_private_setup().
by Alexandre Julliard March 18, 2016

March 18, 2016

Module: wine Branch: master Commit: 687642fafaaa7220e847d33398945d5c77a2bb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687642fafaaa7220e847d3339… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:06 2016 +0100 wined3d: Get rid of the WINED3DUSAGE_OVERLAY check in gdi_surface_private_setup(). Overlays shouldn't be any more broken for "GDI" surfaces than for regular surfaces. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 846b78f..297a34d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1094,12 +1094,6 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->resource.usage & WINED3DUSAGE_OVERLAY) - { - ERR("Overlays not yet supported by GDI surfaces.\n"); - return WINED3DERR_INVALIDCALL; - } - /* Sysmem textures have memory already allocated - release it, * this avoids an unnecessary memcpy. */ hr = surface_create_dib_section(surface);

1 0