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

Multiplayer with Directplay

by Mike Ward

Hi Michael, Please can you assist me. I have succeeded to get Age of Empires working on Mac with Wine but can't get MULTIPLAYER to work. I have read that I must: "To use this with multiplayer go to Wine -> Winetricks, and install directplay." However, I can't find how to add DIRECTPLAY to Winetricks. I've also seen this: $ wget http://winezeug.googlecode.com/svn/trunk/winetricks $ sh winetricks directplay But don't know where to type that!! Sorry, but I'm very clueless when it comes to coding etc. Please can you assist - my 13 year old son and I will be most grateful as we haven't played the game since I switched from Windows 4 years ago! Many thanks Mike

May 1, 2018

[PATCH] msvcr120: Add Concurrency::details::platform::GetCurrentThreadId export

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

May 1, 2018

[PATCH] d3d10core/tests: Add test for depth clip.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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(); } -- 2.7.4

May 1, 2018

Re: [PATCH] msvcrt: Try SNAME when matching locale.

by Piotr Caban

Hi Daniel, On 04/30/18 22:53, Daniel Lehman wrote: > + ret = setlocale(LC_ALL, "en-GB"); > + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); > + if(ret) > + ok(!strcmp(ret, "English_United Kingdom.1252") > + || broken(!strcmp(ret, "English_United States.1252")) /* XP & 2003 */, > + "ret = %s\n", ret); As far as I can see all of the tests you are adding are failing with newer versions of msvcrt (e.g. on testbot ret != NULL only on XP and 2003 machines). Do you have a machine that returns "English_United Kingdom.1252" in this case? What version of msvcrt.dll does it have? Are there any newer versions of Windows that are passing your tests (not returning NULL and falling into broken condition)? What application depends on that behavior? As long as there's no application depending on it I prefer wine to behave the same as newer versions of the dll. Thanks, Piotr

May 1, 2018

Re: [PATCH] include: Add wcstof.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

May 1, 2018

Re: [PATCH] include: Add _countof macro.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

May 1, 2018

Re: [PATCH v2 2/2] msi: Don't load a custom action DLL in the main process.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

May 1, 2018

Re: [PATCH v2 1/2] msi: Execute the custom action server with the correct bitness.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

May 1, 2018

Re: [PATCH] msi/tests: Add trailing '\n's to ok() calls.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

May 1, 2018

[PATCH] d3d11: Partially implement UpdateSubresource1()

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=41063 dlls/d3d11/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 18fa670b33..809e3ba802 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2603,11 +2603,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, - UINT rowpitch, UINT depth_pitch, UINT flags) + ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, + UINT row_pitch, UINT depth_pitch, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", - iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x.\n", + iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Update flags are ignored, %#x.\n", flags); + + d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface, -- 2.17.0

May 1, 2018