May 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9/tests: Add more tests for out of bounds array selector.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: be12c5bc4f189901541fdca41da267f8a0ef873d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be12c5bc4f189901541fdca41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 12 15:24:12 2017 +0300 d3dx9/tests: Add more tests for out of bounds array selector. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 49 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a1cdfc2..7991b80 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4695,6 +4695,11 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4703,13 +4708,51 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) effect->lpVtbl->EndPass(effect); + /* Second try reports success and selects array element used previously. + * Probably array index is not recomputed and previous index value is used. */ hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 2, TRUE); + /* Confirm that array element selected is the previous good one and does not depend + * on computed (out of bound) index value. */ + ivect[2] = 1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, FALSE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine + ok(hr == E_FAIL, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, TRUE); + + /* End and begin effect again to ensure it will not trigger array + * index recompute and error return from BeginPass. */ + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, TRUE); + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4730,7 +4773,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 2, TRUE); + test_effect_preshader_compare_shader(device, 1, TRUE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4773,7 +4816,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 1, FALSE); + test_effect_preshader_compare_shader(device, 1, TRUE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Józef Kucia : gdiplus: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: c2a4f194cab6e3b7aaedb1598977c2de5f8747c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a4f194cab6e3b7aaedb1598… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 09:46:36 2017 +0200 gdiplus: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 69d8a16..d5b1b14 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -19,6 +19,8 @@ #include <stdarg.h> #include <math.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -947,7 +949,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) bounds_rc.right = ceilf(metafile->auto_frame_max.X * x_scale); bounds_rc.bottom = ceilf(metafile->auto_frame_max.Y * y_scale); - gdi_bounds_rc = header.EmfHeader.rclBounds; + gdi_bounds_rc = header.u.EmfHeader.rclBounds; if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) { bounds_rc.left = min(bounds_rc.left, gdi_bounds_rc.left); @@ -1913,7 +1915,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); - header->EmfHeader = emfheader; + header->u.EmfHeader = emfheader; if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) { @@ -2016,11 +2018,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.frame_count = 1; (*metafile)->image.xres = header.DpiX; (*metafile)->image.yres = header.DpiY; - (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; - (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; - (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) + (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left) / 2540.0 * header.DpiX; - (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) + (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top) / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = header.Type;

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Stop redefinition of QWORD.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 0c07a33c4c86fce7923f8e18bd99b75243c9d9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c07a33c4c86fce7923f8e18b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 13 22:57:17 2017 +0000 include/wmsdkidl.idl: Stop redefinition of QWORD. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index b621826..ea8d63b 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -20,8 +20,6 @@ import "oaidl.idl"; import "wmsbuffer.idl"; import "drmexternals.idl"; -typedef unsigned __int64 QWORD; - typedef struct _WMMediaType { GUID majortype;

1 0

Nikolay Sivov : wshom: Fix IWshShell3::Invoke() call to use correct implementation pointer.
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 2619bdb94fa59034a0ebef8bd7f4ba84d67acbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2619bdb94fa59034a0ebef8bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 06:44:34 2017 +0300 wshom: Fix IWshShell3::Invoke() call to use correct implementation pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index f8c2a4b..b00bc10 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1192,7 +1192,7 @@ static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, R hr = get_typeinfo(IWshShell3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &WshShell3, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, &WshShell3.IWshShell3_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Nikolay Sivov : comctl32/tests: Remove some dead code (Coverity).
by Alexandre Julliard 15 May '17

15 May '17

Module: wine Branch: master Commit: 1f97ef8ec505320a7c353e66c1d87c013c6da8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f97ef8ec505320a7c353e66c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 23:26:25 2017 +0300 comctl32/tests: Remove some dead code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index d54352f..41cf165 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -164,17 +164,6 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam message == WM_DRAWITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { - switch (message) - { - /* ignore */ - case WM_NCHITTEST: - return HTCLIENT; - case WM_SETCURSOR: - case WM_MOUSEMOVE: - case WM_NCMOUSEMOVE: - return 0; - } - msg.message = message; msg.flags = sent|parent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc;

1 0

Rosanne DiMesio : Update licenses field
by Jeremy Newman 12 May '17

12 May '17

Module: appdb Branch: master Commit: 05c4ab3ef02a4de3a78e28a41171cf24514582d2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=05c4ab3ef02a4de3a78e28a4… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 12 12:10:14 2017 -0500 Update licenses field Affected entries in the production database have been fixed. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 1 + tables/appdb_tables.sql | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/alter.sql b/tables/alter.sql new file mode 100644 index 0000000..36876a9 --- /dev/null +++ b/tables/alter.sql @@ -0,0 +1 @@ +ALTER TABLE `appVersion` CHANGE `license` `license` ENUM('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL; diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index beb1743..d60ee68 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -48,7 +48,6 @@ create table appFamily ( /* * a version of an application - * TODO: remove Steam and GOG from the list of licenses after entries using them have been corrected in the live database */ create table appVersion ( versionId int not null auto_increment, @@ -59,7 +58,7 @@ create table appVersion ( ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share','Steam','GOG'), + license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', hasMaintainer enum('true','false') NOT NULL default 'false',

1 0

Jeremy Newman : changes made to live db
by Jeremy Newman 12 May '17

12 May '17

Module: appdb Branch: master Commit: aa6236d359fa817a031bbd4f9fa33f0f0d20a1cd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aa6236d359fa817a031bbd4f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 12 13:33:21 2017 -0500 changes made to live db Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 36876a9..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1 +1,2 @@ -ALTER TABLE `appVersion` CHANGE `license` `license` ENUM('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL; +/* append to this file when changes are required to the live db */ +/* it will be cleared when the changes go live */

1 0

Alexandre Julliard : Wine release 2.8
by Alexandre Julliard 12 May '17

12 May '17

Module: website Branch: master Commit: ec1bc4aaac62aca0c308cc0b30a9cb42f6f78928 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec1bc4aaac62aca0c308cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 18:48:15 2017 +0200 Wine release 2.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017051201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017051201.xml b/news/en/2017051201.xml new file mode 100644 index 0000000..dded6ea --- /dev/null +++ b/news/en/2017051201.xml @@ -0,0 +1,16 @@ +<news> +<date>May 12, 2017</date> +<title>Wine 2.8 Released</title> +<body> + The Wine development release 2.8 is now available. + <a href="{$root}/announce/2.8">What's new</a> in this release: +<ul> + <li>Direct3D command stream runs asynchronously.</li> + <li>Better serial and parallel ports autodetection.</li> + <li>Still more fixes for high DPI settings.</li> + <li>System tray notifications on macOS.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.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

Dmitry Timoshkov : include: Fix typos in WICPersistOptions enumeration names.
by Alexandre Julliard 12 May '17

12 May '17

Module: wine Branch: master Commit: 35483da628a4a376b51a9284439c84532060bf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35483da628a4a376b51a92844… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 10 18:20:10 2017 +0200 include: Fix typos in WICPersistOptions enumeration names. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 4 ++-- dlls/windowscodecs/imgfactory.c | 4 ++-- dlls/windowscodecs/metadatahandler.c | 6 +++--- dlls/windowscodecs/tests/metadata.c | 28 ++++++++++++++-------------- dlls/windowscodecs/tiffformat.c | 6 +++--- include/wincodecsdk.idl | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35483da628a4a376b51a9…

1 0

Józef Kucia : wined3d: Add support for patch constant signatures.
by Alexandre Julliard 12 May '17

12 May '17

Module: wine Branch: master Commit: 487d2e027979dc1e5f1b3cad7edb96782514d064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487d2e027979dc1e5f1b3cad7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:17 2017 +0200 wined3d: Add support for patch constant signatures. 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 49 ++++++++++++++++++++++--------------- dlls/d3d8/shader.c | 2 ++ dlls/d3d9/shader.c | 2 ++ dlls/wined3d/shader.c | 55 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 71 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=487d2e027979dc1e5f1b3…

1 0