December 2017 - Wine-Commits

Józef Kucia : d3d9: Set depth test state while resetting device.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 48504e73e97b0edcef9ab267211521ff4cd70f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48504e73e97b0edcef9ab2672… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:22 2017 +0100 d3d9: Set depth test state while resetting device. wined3d will not do this anymore. 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/d3d9/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 20f73c0..51b4896 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -812,11 +812,13 @@ static HRESULT d3d9_device_get_swapchains(struct d3d9_device *device) static HRESULT d3d9_device_reset(struct d3d9_device *device, D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { + BOOL extended = device->d3d_parent->extended; struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode wined3d_mode; HRESULT hr; - if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) + + if (!extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; @@ -831,8 +833,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.scanline_ordering = mode->ScanLineOrdering; } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, - device->d3d_parent->extended)) + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); @@ -852,10 +853,16 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) + mode ? &wined3d_mode : NULL, reset_enum_callback, !extended))) { HeapFree(GetProcessHeap(), 0, device->implicit_swapchains); + if (!extended) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + } + if (FAILED(hr = d3d9_device_get_swapchains(device))) { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; @@ -871,7 +878,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } } - else if (!device->d3d_parent->extended) + else if (!extended) { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; }

1 0

Józef Kucia : d3d11/tests: Add test for relative addressing of vertex shader inputs.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 8cb937f71928c6a511eebb6c621bcf772573b525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb937f71928c6a511eebb6c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:17 2017 +0100 d3d11/tests: Add test for relative addressing of vertex shader inputs. 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/tests/d3d11.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 705be4f..96b3b05 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12228,6 +12228,127 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_vs_input_relative_addressing(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + unsigned int offset, stride; + unsigned int index[4] = {0}; + ID3D11PixelShader *ps; + ID3D11Buffer *vb, *cb; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : POSITION; + float4 colors[4] : COLOR; + }; + + uint index; + + void main(vertex vin, out float4 position : SV_Position, + out float4 color : COLOR) + { + position = vin.position; + color = vin.colors[index]; + } +#endif + 0x43425844, 0x8623dd89, 0xe37fecf5, 0xea3fdfe1, 0xdf36e4e4, 0x00000001, 0x000001f4, 0x00000003, + 0x0000002c, 0x000000c4, 0x00000118, 0x4e475349, 0x00000090, 0x00000005, 0x00000008, 0x00000080, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000089, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000089, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x00000089, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000f0f, 0x00000089, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, + 0xab00524f, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000d4, + 0x00010040, 0x00000035, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005f, 0x001010f2, + 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x0300005f, 0x001010f2, 0x00000002, 0x0300005f, + 0x001010f2, 0x00000003, 0x0300005f, 0x001010f2, 0x00000004, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x001010f2, + 0x00000001, 0x00000004, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x06000036, + 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000001, + 0x00d01e46, 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct vs_out i) : SV_TARGET + { + return i.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 0, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 1, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 4, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 2, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 8, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + {"COLOR", 3, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 12, D3D11_INPUT_PER_INSTANCE_DATA, 1}, + }; + static const unsigned int colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000, 0xff0f0f0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &cb); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(colors), colors); + stride = sizeof(colors); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 1, 1, &vb, &stride, &offset); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < ARRAY_SIZE(colors); ++i) + { + *index = i; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, index, 0, 0); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine_if(i > 0) + check_texture_color(test_context.backbuffer, colors[i], 1); + } + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(vb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_getdc(void) { static const struct @@ -23420,6 +23541,7 @@ START_TEST(d3d11) test_draw_depth_only(); test_draw_uav_only(); test_cb_relative_addressing(); + test_vs_input_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching(); test_shader_interstage_interface();

1 0

Józef Kucia : ddraw: Also store supported user clip planes.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 8999dfac6169e363d90c9d5e6f7db9546d3c7b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8999dfac6169e363d90c9d5e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:16 2017 +0100 ddraw: Also store supported user clip planes. 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/ddraw/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 32a2f1a..542f23a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6469,11 +6469,14 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); - if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + if (idx < ARRAY_SIZE(device->user_clip_planes)) { - WARN("Clip plane %u is not supported.\n", idx); device->user_clip_planes[idx] = *wined3d_plane; - hr = D3D_OK; + if (hr == WINED3DERR_INVALIDCALL) + { + WARN("Clip plane %u is not supported.\n", idx); + hr = D3D_OK; + } } wined3d_mutex_unlock();

1 0

Alexandre Julliard : ntdll: Display floating point arguments in relay debugging on i386 and x86-64.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 8c1bb2aa61abd8a6458c446efa55f8b261f63da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1bb2aa61abd8a6458c446ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 11:14:02 2017 +0100 ntdll: Display floating point arguments in relay debugging on i386 and x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 397 ++++++++++++++++++++++++++++++++--------------- tools/winebuild/build.h | 1 + tools/winebuild/spec32.c | 169 ++++++++++++-------- 3 files changed, 383 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c1bb2aa61abd8a6458c4…

1 0

Jacek Caban : rsaenh: Use bcrypt for MD4 hashes.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 2b7fcef811dda082fb0f79aaa2986fa026f426bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7fcef811dda082fb0f79aaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:47:06 2017 +0100 rsaenh: Use bcrypt for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index af87b43..c12a27c 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -33,10 +33,6 @@ #include <stdio.h> -/* Function prototypes copied from dlls/advapi32/crypt_md4.c */ -VOID WINAPI MD4Init( MD4_CTX *ctx ); -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); -VOID WINAPI MD4Final( MD4_CTX *ctx ); /* Function prototypes copied from dlls/advapi32/crypt_md5.c */ VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); @@ -56,8 +52,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_MD4: - MD4Init(&pHashContext->md4); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD4_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_MD5: MD5Init(&pHashContext->md5); @@ -95,10 +91,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb { switch (aiAlgid) { - case CALG_MD4: - MD4Update(&pHashContext->md4, pbData, dwDataLen); - break; - case CALG_MD5: MD5Update(&pHashContext->md5, pbData, dwDataLen); break; @@ -114,11 +106,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash { switch (aiAlgid) { - case CALG_MD4: - MD4Final(&pHashContext->md4); - memcpy(pbHashValue, pHashContext->md4.digest, 16); - break; - case CALG_MD5: MD5Final(&pHashContext->md5); memcpy(pbHashValue, pHashContext->md5.digest, 16); @@ -138,7 +125,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { switch (aiAlgid) { - case CALG_MD4: case CALG_MD5: *pDestHashContext = *pSrcHashContext; return TRUE; diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 59e98c3..e874aaa 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,14 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -/* Next typedef copied from dlls/advapi32/crypt_md4.c */ -typedef struct tagMD4_CTX { - unsigned int buf[4]; - unsigned int i[2]; - unsigned char in[64]; - unsigned char digest[16]; -} MD4_CTX; - /* Next typedef copied from dlls/advapi32/crypt_md5.c */ typedef struct tagMD5_CTX { @@ -47,7 +39,6 @@ typedef struct tagMD5_CTX } MD5_CTX; typedef union tagHASH_CONTEXT { - MD4_CTX md4; MD5_CTX md5; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Jacek Caban : rsaenh: Use bcrypt for SHA1 hashes.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: b0329620ddf169063cda81768bad727ee26e802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0329620ddf169063cda81768… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:41 2017 +0100 rsaenh: Use bcrypt for SHA1 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 17 ++--------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 58fd727..af87b43 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -41,10 +41,6 @@ VOID WINAPI MD4Final( MD4_CTX *ctx ); VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); VOID WINAPI MD5Final( MD5_CTX *ctx ); -/* Function prototypes copied from dlls/advapi32/crypt_sha.c */ -VOID WINAPI A_SHAInit(PSHA_CTX Context); -VOID WINAPI A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize); -VOID WINAPI A_SHAFinal(PSHA_CTX Context, PULONG Result); /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); @@ -68,8 +64,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) return TRUE; case CALG_SHA: - A_SHAInit(&pHashContext->sha); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_SHA_256: status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); @@ -107,10 +103,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb MD5Update(&pHashContext->md5, pbData, dwDataLen); break; - case CALG_SHA: - A_SHAUpdate(&pHashContext->sha, pbData, dwDataLen); - break; - default: BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); } @@ -132,10 +124,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash memcpy(pbHashValue, pHashContext->md5.digest, 16); break; - case CALG_SHA: - A_SHAFinal(&pHashContext->sha, (PULONG)pbHashValue); - break; - default: BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); BCryptDestroyHash(pHashContext->bcrypt_hash); @@ -152,7 +140,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { case CALG_MD4: case CALG_MD5: - case CALG_SHA: *pDestHashContext = *pSrcHashContext; return TRUE; default: diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 446f843..59e98c3 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -46,19 +46,9 @@ typedef struct tagMD5_CTX unsigned char digest[16]; } MD5_CTX; -/* Next typedef copied form dlls/advapi32/crypt_sha.c */ -typedef struct tagSHA_CTX -{ - ULONG Unknown[6]; - ULONG State[5]; - ULONG Count[2]; - UCHAR Buffer[64]; -} SHA_CTX, *PSHA_CTX; - typedef union tagHASH_CONTEXT { MD4_CTX md4; MD5_CTX md5; - SHA_CTX sha; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Piotr Caban : msvcp: Disable relay for _Thrd_current function.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 87c3421ddbcfb97f7afb58bc1db7ead077fc0470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c3421ddbcfb97f7afb58bc1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 6 20:42:16 2017 +0100 msvcp: Disable relay for _Thrd_current function. Spotted by Stefan. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 001b9ad..9e3e070 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3857,7 +3857,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) -@ cdecl _Thrd_current() +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) @ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 729657c..e66e722 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) -@ cdecl _Thrd_current() +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) @ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 62668d2..7be1814 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create -@ cdecl _Thrd_current() msvcp120._Thrd_current +@ cdecl -norelay _Thrd_current() msvcp120._Thrd_current @ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach @ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5d55181..4fc8e3c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3721,7 +3721,7 @@ @ stub _Temp_get @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create -@ cdecl _Thrd_current() _Thrd_current +@ cdecl -norelay _Thrd_current() @ cdecl _Thrd_detach(int64) _Thrd_detach @ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit

1 0

Henri Verbeet : wined3d: Raise the default max_gl_version for specific cases.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 62651d65f4f8e4dc6e1f4fb5d589526613d419aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62651d65f4f8e4dc6e1f4fb5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 7 19:26:27 2017 +0330 wined3d: Raise the default max_gl_version for specific cases. Effectively, this will enable Direct3D 11 by default on AMD and Intel hardware. Yes, this patch is awful. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 22 ++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc8a78c..c145944 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6527,6 +6527,22 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } +static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) +{ + const char *gl_vendor, *gl_renderer; + + if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + return wined3d_settings.max_gl_version; + + gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); + gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); + if (!gl_vendor || !gl_renderer + || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) + return wined3d_settings.max_gl_version; + + return MAKEDWORD_VERSION(4, 4); +} + static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -6539,6 +6555,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int i; DISPLAY_DEVICEW display_device; + DWORD max_gl_version; TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); @@ -6583,15 +6600,16 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } + max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) + if (supported_gl_versions[i] <= max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); + max_gl_version >> 16, max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 54ddc23..28a34a7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,6 +73,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { FALSE, /* No multithreaded CS by default. */ + FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -215,12 +216,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) { - if (tmpvalue != wined3d_settings.max_gl_version) - { - ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", - tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.max_gl_version = tmpvalue; - } + ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", + tmpvalue >> 16, tmpvalue & 0xffff); + wined3d_settings.explicit_gl_version = TRUE; + wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c6a347..ab24f12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; + BOOL explicit_gl_version; DWORD max_gl_version; BOOL glslRequested; int offscreen_rendering_mode;

1 0

Józef Kucia : wined3d: Do not modify depth test state in wined3d_device_reset().
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 198340ff6728b73c57b76993b23de624b72e20c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198340ff6728b73c57b76993b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:24 2017 +0100 wined3d: Do not modify depth test state in wined3d_device_reset(). For consistency with wined3d_device_init_3d(). 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/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2655702..a25b98d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4880,8 +4880,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->update_state = &device->state; device_init_swapchain_state(device, swapchain); - wined3d_device_set_render_state(device, - WINED3D_RS_ZENABLE, !!swapchain->desc.enable_auto_depth_stencil); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); }

1 0

Józef Kucia : d3d8: Set depth test state while resetting device.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: a34c7f26169dbfde077cf6609e02a86403177d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34c7f26169dbfde077cf6609… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:21 2017 +0100 d3d8: Set depth test state while resetting device. wined3d will not do this anymore. 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/d3d8/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f77fb27..506961a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -747,6 +747,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, { present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); device->device_state = D3D8_DEVICE_STATE_OK; } else

1 0