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

Dmitry Timoshkov : mstask: Move trigger management to the ITask implementation.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 3b1e5c81f4c75d3c5e14df3f54854cebded89d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b1e5c81f4c75d3c5e14df3f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 14 15:49:25 2018 +0800 mstask: Move trigger management to the ITask implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/mstask_private.h | 4 +- dlls/mstask/task.c | 193 ++++++++++++++++++++++++++++++++++--- dlls/mstask/task_trigger.c | 203 ++++----------------------------------- dlls/mstask/tests/task_trigger.c | 11 --- 4 files changed, 203 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b1e5c81f4c75d3c5e14…

1 0

Zebediah Figura : msi/tests: Add a header for some common functions.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: ab522d694d5ffe08a410320988100b1a0fb2f077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab522d694d5ffe08a4103209… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 14 00:28:58 2018 -0500 msi/tests: Add a header for some common functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 469 +---------------------------------------- dlls/msi/tests/install.c | 72 +++---- dlls/msi/tests/msi.c | 527 +++-------------------------------------------- dlls/msi/tests/utils.h | 60 ++++++ 4 files changed, 117 insertions(+), 1011 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab522d694d5ffe08a410…

1 0

Zebediah Figura : msi/tests: Add the custom action DLL in create_database_wordcount().
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: bf0b9b97e08879637750f721fc96ca766e6ff61a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0b9b97e08879637750f721… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 14 00:29:00 2018 -0500 msi/tests: Add the custom action DLL in create_database_wordcount(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/install.c | 142 +++++++++++++++++++++++------------------------ dlls/msi/tests/msi.c | 2 +- 2 files changed, 69 insertions(+), 75 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a2b95d1..f0e4857 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2551,6 +2551,73 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, MsiCloseHandle(summary); } +static char *load_resource(const char *name) +{ + static char path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempFileNameA(".", name, 0, path); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return path; +} + +static INT CALLBACK ok_callback(void *context, UINT message_type, MSIHANDLE record) +{ + if (message_type == INSTALLMESSAGE_USER) + { + char file[200]; + char msg[2000]; + DWORD len; + + len = sizeof(file); + MsiRecordGetStringA(record, 2, file, &len); + len = sizeof(msg); + MsiRecordGetStringA(record, 5, msg, &len); + + todo_wine_if(MsiRecordGetInteger(record, 1)) + ok_(file, MsiRecordGetInteger(record, 3)) (MsiRecordGetInteger(record, 4), "%s", msg); + + return 1; + } + return 0; +} + +static void add_custom_dll(MSIHANDLE hdb) +{ + MSIHANDLE record; + UINT res; + + if (!customdll) + customdll = load_resource("custom.dll"); + + MsiSetExternalUIRecord(ok_callback, INSTALLLOGMODE_USER, NULL, NULL); + + res = run_query(hdb, 0, "CREATE TABLE `Binary` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)"); + ok(res == ERROR_SUCCESS, "failed to create Binary table: %u\n", res); + + record = MsiCreateRecord(1); + res = MsiRecordSetStreamA(record, 1, customdll); + ok(res == ERROR_SUCCESS, "failed to add %s to stream: %u\n", customdll, res); + + res = run_query(hdb, record, "INSERT INTO `Binary` (`Name`, `Data`) VALUES ('custom.dll', ?)"); + ok(res == ERROR_SUCCESS, "failed to insert into Binary table: %u\n", res); + + MsiCloseHandle(record); +} + void create_database_wordcount(const CHAR *name, const msi_table *tables, int num_tables, INT version, INT wordcount, const char *template, const char *packagecode) { @@ -2580,6 +2647,7 @@ void create_database_wordcount(const CHAR *name, const msi_table *tables, int nu } write_msi_summary_info(db, version, wordcount, template, packagecode); + add_custom_dll(db); r = MsiDatabaseCommit(db); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -2634,29 +2702,6 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) return RegDeleteKeyA( key, subkey ); } -static char *load_resource(const char *name) -{ - static char path[MAX_PATH]; - DWORD written; - HANDLE file; - HRSRC res; - void *ptr; - - GetTempFileNameA(".", name, 0, path); - - file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); - - res = FindResourceA(NULL, name, "TESTDLL"); - ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); - CloseHandle( file ); - - return path; -} - static void test_MsiInstallProduct(void) { UINT r; @@ -4082,52 +4127,6 @@ error: DeleteFileA("augustus"); } -static void add_custom_dll(void) -{ - MSIHANDLE hdb = 0, record; - UINT res; - - res = MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb); - ok(res == ERROR_SUCCESS, "failed to open db: %u\n", res); - - res = run_query(hdb, 0, "CREATE TABLE `Binary` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)"); - ok(res == ERROR_SUCCESS, "failed to create Binary table: %u\n", res); - - record = MsiCreateRecord(1); - res = MsiRecordSetStreamA(record, 1, customdll); - ok(res == ERROR_SUCCESS, "failed to add %s to stream: %u\n", customdll, res); - - res = run_query(hdb, record, "INSERT INTO `Binary` (`Name`, `Data`) VALUES ('custom.dll', ?)"); - ok(res == ERROR_SUCCESS, "failed to insert into Binary table: %u\n", res); - - res = MsiDatabaseCommit(hdb); - ok(res == ERROR_SUCCESS, "failed to commit database: %u\n", res); - - MsiCloseHandle(record); - MsiCloseHandle(hdb); -} - -static INT CALLBACK ok_callback(void *context, UINT message_type, MSIHANDLE record) -{ - if (message_type == INSTALLMESSAGE_USER) - { - char file[200]; - char msg[2000]; - DWORD len; - - len = sizeof(file); - MsiRecordGetStringA(record, 2, file, &len); - len = sizeof(msg); - MsiRecordGetStringA(record, 5, msg, &len); - - todo_wine_if(MsiRecordGetInteger(record, 1)) - ok_(file, MsiRecordGetInteger(record, 3)) (MsiRecordGetInteger(record, 4), "%s", msg); - - return 1; - } - return 0; -} - static void test_customaction1(void) { MSIHANDLE hdb, record; @@ -4135,7 +4134,6 @@ static void test_customaction1(void) create_test_files(); create_database(msifile, ca1_tables, sizeof(ca1_tables) / sizeof(msi_table)); - add_custom_dll(); /* create a test table */ MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb); @@ -6106,7 +6104,6 @@ static void test_deferred_action(void) sprintf(buffer, "TESTPATH=\"%s\"", file); create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); - add_custom_dll(); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -6234,9 +6231,6 @@ START_TEST(install) lstrcatA(log_file, "\\msitest.log"); MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); - customdll = load_resource("custom.dll"); - MsiSetExternalUIRecord(ok_callback, INSTALLLOGMODE_USER, NULL, NULL); - if (pSRSetRestorePointA) /* test has side-effects on win2k3 that cause failures in following tests */ test_MsiInstallProduct(); test_MsiSetComponentState(); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3778019..21a0358 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -14442,6 +14442,7 @@ START_TEST(msi) test_getcomponentpath(); test_MsiGetFileHash(); test_MsiSetInternalUI(); + test_MsiSetExternalUI(); if (!pConvertSidToStringSidA) win_skip("ConvertSidToStringSidA not implemented\n"); @@ -14474,7 +14475,6 @@ START_TEST(msi) test_MsiConfigureProductEx(); test_MsiSetFeatureAttributes(); test_MsiGetFeatureInfo(); - test_MsiSetExternalUI(); test_lastusedsource(); test_setpropertyfolder(); test_sourcedir_props();

1 0

Alistair Leslie-Hughes : shell32: Choose return value for SHFileOperationA depending on windows version.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: c88a65f2abba4e471bd60b68ff10da1a11fb60cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c88a65f2abba4e471bd60b68… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 14 02:03:15 2018 +0000 shell32: Choose return value for SHFileOperationA depending on windows version. Based on a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..c7bd54d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ break; }

1 0

Michael Müller : ntdll: Add stub for RtlIpv6StringToAddressExW.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 3f4af3afce5a32a55af92ff1d2837ff72a96ecdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4af3afce5a32a55af92ff1… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 11 04:17:46 2018 +0000 ntdll: Add stub for RtlIpv6StringToAddressExW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38ffad3..e2f5117 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -735,7 +735,7 @@ # @ stub RtlIpv6AddressToStringW # @ stub RtlIpv6StringToAddressA # @ stub RtlIpv6StringToAddressExA -# @ stub RtlIpv6StringToAddressExW +@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) # @ stub RtlIpv6StringToAddressW @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8ade752..1311604 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ #include "wine/unicode.h" #include "ntdll_misc.h" #include "inaddr.h" +#include "in6addr.h" #include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -903,6 +904,15 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const } /*********************************************************************** + * RtlIpv6StringToAddressExW [NTDLL.@] + */ +NTSTATUS NTAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * RtlIpv4AddressToStringExW [NTDLL.@] * * Convert the given ipv4 address and optional the port to a string diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 46c03ec..137f518 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1096,7 +1096,7 @@ @ stub RtlIpv6AddressToStringW @ stub RtlIpv6StringToAddressA @ stub RtlIpv6StringToAddressExA -@ stub RtlIpv6StringToAddressExW +@ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) @ stub RtlIpv6StringToAddressW @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl

1 0

Nikolay Sivov : dxgi: Add IDXGIDevice2 stub.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: e4034dcc838b01a8c41de08c63d3db4b4906890f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4034dcc838b01a8c41de08c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 1 08:21:18 2018 +0300 dxgi: Add IDXGIDevice2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 30 ++++++++++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5a810fa..2c85c1d 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -41,6 +41,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) + || IsEqualGUID(riid, &IID_IDXGIDevice2) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -275,6 +276,31 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev return E_NOTIMPL; } +static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, DXGI_OFFER_RESOURCE_PRIORITY priority) +{ + FIXME("iface %p, resource_count %u, resources %p, priority %u stub!\n", iface, resource_count, + resources, priority); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_ReclaimResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, BOOL *discarded) +{ + FIXME("iface %p, resource_count %u, resources %p, discarded %p stub!\n", iface, resource_count, + resources, discarded); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *iface, HANDLE event) +{ + FIXME("iface %p, event %p stub!\n", iface, event); + + return E_NOTIMPL; +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -355,6 +381,10 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = /* IDXGIDevice1 methods */ dxgi_device_SetMaximumFrameLatency, dxgi_device_GetMaximumFrameLatency, + /* IDXGIDevice2 methods */ + dxgi_device_OfferResources, + dxgi_device_ReclaimResources, + dxgi_device_EnqueueSetEvent, /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 2c57342..3a1d6fa 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,7 @@ import "dxgi1_5.idl"; local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice1 +interface IWineDXGIDevice : IDXGIDevice2 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture,

1 0

Zebediah Figura : d3d10core/tests: Add test for depth clip.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 1a88022bbda59ae1d1e0fe7dd892273b90d600de URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a88022bbda59ae1d1e0fe7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 1 09:41:32 2018 -0500 d3d10core/tests: Add test for depth clip. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a1924f9..65f610d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16750,6 +16750,77 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_RASTERIZER_DESC rs_desc; + ID3D10DepthStencilView *dsv; + ID3D10RasterizerState *rs; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int count; + D3D10_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D10Device_RSGetViewports(device, &count, &vp); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D10_FILL_SOLID; + rs_desc.CullMode = D3D10_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_RSSetState(device, rs); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D10DepthStencilView_Release(dsv); + ID3D10Texture2D_Release(texture); + ID3D10RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16853,4 +16924,5 @@ START_TEST(device) test_alpha_to_coverage(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); }

1 0

Matteo Bruni : wined3d: Don't add pixel center offset twice.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: ede35244d78e149ed32d4bd449e8102957567a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ede35244d78e149ed32d4bd4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:00 2018 +0200 wined3d: Don't add pixel center offset twice. Fixes cf312011c0e1f43123682f7f2e783174fea65425. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87c7346..175fd14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4091,13 +4091,10 @@ static void viewport_miscpart_cc(struct wined3d_context *context, for (i = 0; i < state->viewport_count; ++i) { - vp[i].x += pixel_center_offset; - vp[i].y += pixel_center_offset; - depth_ranges[i * 2] = vp[i].min_z; depth_ranges[i * 2 + 1] = vp[i].max_z; - viewports[i * 4 ] = vp[i].x + pixel_center_offset; + viewports[i * 4] = vp[i].x + pixel_center_offset; viewports[i * 4 + 1] = vp[i].y + pixel_center_offset; viewports[i * 4 + 2] = vp[i].width; viewports[i * 4 + 3] = vp[i].height;

1 0

Matteo Bruni : wined3d: Skip match_broken_arb_fog() quirk check on core profile.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: master Commit: 064bf225a0ba651b21895f995a7e6f2f75c81e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064bf225a0ba651b21895f99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:01 2018 +0200 wined3d: Skip match_broken_arb_fog() quirk check on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7deefaf..89506b1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -854,6 +854,8 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w return FALSE; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return FALSE; gl_info->gl_ops.gl.p_glGenTextures(1, &tex); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex);

1 0

Francois Gouget : testbot: Requeue the task in case the script gets stuck.
by Alexandre Julliard 14 May '18

14 May '18

Module: tools Branch: master Commit: 129508e7e60130f979b6715db00114d5100011a4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=129508e7e60130f979b6715… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 14 13:21:30 2018 +0200 testbot: Requeue the task in case the script gets stuck. Count how many times the task has been requeued to avoid infinite loops, just like the scripts themselves normally do. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 72dd3ff..36cbfad 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -165,11 +165,25 @@ sub UpdateStatus($$) close TASKLOG; } umask($OldUMask); - # This probably indicates a bug in the task script. - # Don't requeue the task to avoid an infinite loop. + require WineTestBot::Log; WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); - $self->Status("boterror"); + + # A crash probably indicates a bug in the task script but getting stuck + # could happen due to network issues. So requeue the task like its script + # would and count attempts to avoid getting into an infinite loop. + if ($self->CanRetry()) + { + $Status = "queued"; + $self->TestFailures(($self->TestFailures || 0) + 1); + $self->Started(undef); + $self->Ended(undef); + } + else + { + $Status = "boterror"; + } + $self->Status($Status); $self->Save(); if ($VM->Status eq "running") @@ -181,8 +195,6 @@ sub UpdateStatus($$) $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore - - $Status = "boterror"; } elsif ($Skip && $Status eq "queued") {

1 0