wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Gabriel Ivăncescu : mshtml: Handle empty status text when processing the response.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 0fd3b8ad3760120bb19c53fcd2991850960b9a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd3b8ad3760120bb19c53fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:27 2022 +0300 mshtml: Handle empty status text when processing the response. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e750ff28ee1..d5ec368e375 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1690,8 +1690,9 @@ static HRESULT process_response_status_text(const WCHAR *header, const WCHAR *he return E_FAIL; header = wcschr(header + 1, ' '); if(!header || header >= header_end) - return E_FAIL; - ++header; + header = header_end; + else + ++header; *status_text = heap_strndupWtoU(header, header_end - header);

1 0

Gabriel Ivăncescu : mshtml: Handle empty strings in heap_strndupWtoU.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 239b5726d412958a5df42314574807f7c723d910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239b5726d412958a5df42314… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:26 2022 +0300 mshtml: Handle empty strings in heap_strndupWtoU. The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca091fa..0a7c3a2556e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae81e2..bc1b829fca2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n"

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateComputeShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 7d7d16623393a9eefad0eb12ed5ad02376bc36bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7d16623393a9eefad0eb12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:13:56 2022 +0300 d3d11: Always initialize out shader pointer in CreateComputeShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b73df94b50c..3f08ae5f4f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3615,6 +3615,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2 TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 06cb2bc4273..9a1bd88dc8b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4823,6 +4823,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) struct device_desc device_desc; ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; + ID3D11ComputeShader *cs; ID3D11VertexShader *vs; ID3D11DomainShader *ds; ID3D11PixelShader *ps; @@ -5014,6 +5015,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!ds, "Unexpected pointer %p.\n", ds); + /* Compute shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateComputeShader(device, gs_4_0, sizeof(gs_4_0), NULL, &cs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!cs, "Unexpected pointer %p.\n", cs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateDomainShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 72046ad7c4103490ab205e5f40b19adaae64c19a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72046ad7c4103490ab205e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:07:31 2022 +0300 d3d11: Always initialize out shader pointer in CreateDomainShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 286874af993..b73df94b50c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3592,6 +3592,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device2 * TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 690f468e6cf..06cb2bc4273 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4824,6 +4824,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; ID3D11VertexShader *vs; + ID3D11DomainShader *ds; ID3D11PixelShader *ps; ID3D11HullShader *hs; HRESULT hr; @@ -5007,6 +5008,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!hs, "Unexpected pointer %p.\n", hs); + /* Domain shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateDomainShader(device, gs_4_0, sizeof(gs_4_0), NULL, &ds); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!ds, "Unexpected pointer %p.\n", ds); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateHullShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 1a869de18772b630acea5b9143fcd3ccaa3ff659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a869de18772b630acea5b91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:02:24 2022 +0300 d3d11: Always initialize out shader pointer in CreateHullShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7b1c1b9bae0..286874af993 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3569,6 +3569,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *if TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb3ac35b824..690f468e6cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4825,6 +4825,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader *gs; ID3D11VertexShader *vs; ID3D11PixelShader *ps; + ID3D11HullShader *hs; HRESULT hr; device_desc.feature_level = &feature_level; @@ -5000,6 +5001,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader_Release(gs); } + /* Hull shader */ + hs = (void *)0xdeadbeef; + hr = ID3D11Device_CreateHullShader(device, gs_4_0, sizeof(gs_4_0), NULL, &hs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!hs, "Unexpected pointer %p.\n", hs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreatePixelShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 3dd9a78a1a3c7b69204969d26c44534bb19d0866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd9a78a1a3c7b69204969d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:54:20 2022 +0300 d3d11: Always initialize out shader pointer in CreatePixelShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 5 +++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e292c27f7a1..d796087ef3f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3906,6 +3906,11 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) ok(!vs, "Unexpected pointer %p.\n", vs); /* pixel shader */ + ps = (void *)0xdeadbeef; + hr = ID3D10Device_CreatePixelShader(device, vs_2_0, sizeof(vs_2_0), &ps); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected pointer %p.\n", ps); + expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 pixel shader, hr %#x.\n", hr); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c2cb941ecb0..7b1c1b9bae0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3546,6 +3546,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device2 *i TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); @@ -6284,6 +6286,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i TRACE("iface %p, byte_code %p, byte_code_length %Iu, shader %p.\n", iface, byte_code, byte_code_length, shader); + *shader = NULL; + if (FAILED(hr = d3d_pixel_shader_create(device, byte_code, byte_code_length, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2096e6d25c5..eb3ac35b824 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4848,6 +4848,11 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == S_OK, "Feature level %#x: Got unexpected hr %#lx.\n", feature_level, hr); ID3D11PixelShader_Release(ps); + ps = (void *)0xdeadbeef; + hr = ID3D11Device_CreatePixelShader(device, vs_2_0, sizeof(vs_2_0), NULL, &ps); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!ps, "Unexpected pointer %p.\n", ps); + /* vertex shader */ vs = (void *)0xdeadbeef; hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs);

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 6c8181652514f6821b73cf6ad1b256d8c49b3c06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8181652514f6821b73cf6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:45:15 2022 +0300 d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 396211561ff..c2cb941ecb0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3520,13 +3520,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutp iface, byte_code, byte_code_length, so_entries, entry_count, buffer_strides, strides_count, rasterizer_stream, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, so_entries, entry_count, buffer_strides, strides_count, rasterizer_stream, &object))) { - *shader = NULL; return hr; } @@ -6226,10 +6227,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); + *shader = NULL; + if (!output_stream_decl_count && output_stream_stride) { WARN("Stride must be 0 when declaration entry count is 0.\n"); - *shader = NULL; return E_INVALIDARG; } @@ -6237,7 +6239,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp && !(so_entries = heap_calloc(output_stream_decl_count, sizeof(*so_entries)))) { ERR("Failed to allocate D3D11 SO declaration array memory.\n"); - *shader = NULL; return E_OUTOFMEMORY; } @@ -6257,7 +6258,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp { WARN("Stride must be 0 when multiple output slots are used.\n"); heap_free(so_entries); - *shader = NULL; return E_INVALIDARG; } } @@ -6267,10 +6267,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp so_entries, output_stream_decl_count, &output_stream_stride, stride_count, 0, &object); heap_free(so_entries); if (FAILED(hr)) - { - *shader = NULL; return hr; - } *shader = &object->ID3D10GeometryShader_iface;

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateGeometryShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: ec8f304bcfe80f07c726b8f194597bedaa397e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8f304bcfe80f07c726b8f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:32:48 2022 +0300 d3d11: Always initialize out shader pointer in CreateGeometryShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 3d8a5621a49..e292c27f7a1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15121,6 +15121,12 @@ float4 main(struct ps_data ps_input) : SV_Target device = test_context.device; + /* Failing case */ + gs = (void *)0xdeadbeef; + hr = ID3D10Device_CreateGeometryShader(device, vs_code, sizeof(vs_code), &gs); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!gs, "Unexpected pointer %p.\n", gs); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c1207bf7bc9..396211561ff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3492,6 +3492,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2 TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); @@ -6198,6 +6200,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1 TRACE("iface %p, byte_code %p, byte_code_length %Iu, shader %p.\n", iface, byte_code, byte_code_length, shader); + *shader = NULL; + if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, NULL, 0, NULL, 0, 0, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7ba39cc3447..2096e6d25c5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25526,6 +25526,12 @@ float4 main(struct ps_data ps_input) : SV_Target device = test_context.device; context = test_context.immediate_context; + /* Failing case */ + gs = (void *)0xdeadbeef; + hr = ID3D11Device_CreateGeometryShader(device, vs_code, sizeof(vs_code), NULL, &gs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!gs, "Unexpected pointer %p.\n", gs); + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateVertexShader().
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: be4a332e47a1d89b43dd0f109807071bc4961b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4a332e47a1d89b43dd0f10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 14:07:41 2022 +0300 d3d11: Always initialize out shader pointer in CreateVertexShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 15f306f9559..3d8a5621a49 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3890,14 +3890,20 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) refcount = ID3D10VertexShader_Release(vs); ok(!refcount, "Vertex shader has %u references left.\n", refcount); + vs = (void *)0xdeadbeef; hr = ID3D10Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), &vs); ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x\n", hr); + ok(!vs, "Unexpected pointer %p.\n", vs); + vs = (void *)0xdeadbeef; hr = ID3D10Device_CreateVertexShader(device, vs_3_0, sizeof(vs_3_0), &vs); ok(hr == E_INVALIDARG, "Created a SM3 vertex shader, hr %#x\n", hr); + ok(!vs, "Unexpected pointer %p.\n", vs); + vs = (void *)0xdeadbeef; hr = ID3D10Device_CreateVertexShader(device, ps_4_0, sizeof(ps_4_0), &vs); ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x\n", hr); + ok(!vs, "Unexpected pointer %p.\n", vs); /* pixel shader */ expected_refcount = get_refcount(device) + 1; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 263613911f8..c1207bf7bc9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3469,6 +3469,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device2 * TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); @@ -6176,6 +6178,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 * TRACE("iface %p, byte_code %p, byte_code_length %Iu, shader %p.\n", iface, byte_code, byte_code_length, shader); + *shader = NULL; + if (FAILED(hr = d3d_vertex_shader_create(device, byte_code, byte_code_length, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8225237568f..7ba39cc3447 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4849,14 +4849,20 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11PixelShader_Release(ps); /* vertex shader */ + vs = (void *)0xdeadbeef; hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs); ok(hr == E_INVALIDARG, "Feature level %#x: Got unexpected hr %#lx.\n", feature_level, hr); + ok(!vs, "Unexpected pointer %p.\n", vs); + vs = (void *)0xdeadbeef; hr = ID3D11Device_CreateVertexShader(device, vs_3_0, sizeof(vs_3_0), NULL, &vs); ok(hr == E_INVALIDARG, "Feature level %#x: Got unexpected hr %#lx.\n", feature_level, hr); + ok(!vs, "Unexpected pointer %p.\n", vs); + vs = (void *)0xdeadbeef; hr = ID3D11Device_CreateVertexShader(device, ps_4_0, sizeof(ps_4_0), NULL, &vs); ok(hr == E_INVALIDARG, "Feature level %#x: Got unexpected hr %#lx.\n", feature_level, hr); + ok(!vs, "Unexpected pointer %p.\n", vs); expected_refcount = get_refcount(device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), NULL, &vs);

1 0

Jacek Caban : winemac: Directly use ntdll in more places.
by Alexandre Julliard 27 May '22

27 May '22

Module: wine Branch: master Commit: 671f6b2af60250f5e0e9d07a821a1d935d67b898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=671f6b2af60250f5e0e9d07a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 01:32:31 2022 +0200 winemac: Directly use ntdll in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 10 +++++----- dlls/winemac.drv/macdrv_main.c | 10 +++++----- dlls/winemac.drv/mouse.c | 6 +++--- dlls/winemac.drv/opengl.c | 2 +- dlls/winemac.drv/window.c | 17 +++++++++-------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index d7d28c69acb..dca62997028 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -190,7 +190,7 @@ static DWORD clipboard_thread_id; static HWND clipboard_hwnd; static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; -static ULONG64 last_clipboard_update; +static ULONG last_clipboard_update; static DWORD last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats; @@ -1542,7 +1542,7 @@ static void grab_win32_clipboard(void) if (!NtUserOpenClipboard(clipboard_hwnd, 0)) return; NtUserEmptyClipboard(); is_clipboard_owner = TRUE; - last_clipboard_update = GetTickCount64(); + last_clipboard_update = NtGetTickCount(); set_win32_clipboard_formats_from_mac_pasteboard(types); NtUserCloseClipboard(); NtUserSetTimer(clipboard_hwnd, 1, CLIPBOARD_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING); @@ -1559,15 +1559,15 @@ static void update_clipboard(void) { static BOOL updating; - TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n", - is_clipboard_owner, (unsigned long long)last_clipboard_update, (unsigned long long)GetTickCount64()); + TRACE("is_clipboard_owner %d last_clipboard_update %u now %u\n", + is_clipboard_owner, last_clipboard_update, NtGetTickCount()); if (updating) return; updating = TRUE; if (is_clipboard_owner) { - if (GetTickCount64() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY) + if (NtGetTickCount() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY) grab_win32_clipboard(); } else if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index fbd4663373b..a0dc9c494da 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -507,7 +507,7 @@ static void set_queue_display_fd(int fd) if (wine_server_fd_to_handle(fd, GENERIC_READ | SYNCHRONIZE, 0, &handle)) { MESSAGE("macdrv: Can't allocate handle for event queue fd\n"); - ExitProcess(1); + NtTerminateProcess(0, 1); } SERVER_START_REQ(set_queue_fd) { @@ -518,9 +518,9 @@ static void set_queue_display_fd(int fd) if (ret) { MESSAGE("macdrv: Can't store handle for event queue fd\n"); - ExitProcess(1); + NtTerminateProcess(0, 1); } - CloseHandle(handle); + NtClose(handle); } @@ -537,13 +537,13 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) if (!(data = calloc(1, sizeof(*data)))) { ERR("could not create data\n"); - ExitProcess(1); + NtTerminateProcess(0, 1); } if (!(data->queue = macdrv_create_event_queue(macdrv_handle_event))) { ERR("macdrv: Can't create event queue.\n"); - ExitProcess(1); + NtTerminateProcess(0, 1); } macdrv_get_input_source_info(&data->keyboard_layout_uchr, &data->keyboard_type, &data->iso_keyboard, &input_source); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 4d672029833..d5db014dece 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -853,7 +853,7 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) TRACE("win %p button %d %s at (%d,%d) time %lu (%lu ticks ago)\n", hwnd, event->mouse_button.button, (event->mouse_button.pressed ? "pressed" : "released"), event->mouse_button.x, event->mouse_button.y, - event->mouse_button.time_ms, (GetTickCount() - event->mouse_button.time_ms)); + event->mouse_button.time_ms, (NtGetTickCount() - event->mouse_button.time_ms)); if (event->mouse_button.pressed) { @@ -900,7 +900,7 @@ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window, (event->type == MOUSE_MOVED) ? "relative" : "absolute", event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, - event->mouse_moved.time_ms, (GetTickCount() - event->mouse_moved.time_ms)); + event->mouse_moved.time_ms, (NtGetTickCount() - event->mouse_moved.time_ms)); if (event->type == MOUSE_MOVED_ABSOLUTE) flags |= MOUSEEVENTF_ABSOLUTE; @@ -920,7 +920,7 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) TRACE("win %p/%p scroll (%d,%d) at (%d,%d) time %lu (%lu ticks ago)\n", hwnd, event->window, event->mouse_scroll.x_scroll, event->mouse_scroll.y_scroll, event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms)); + event->mouse_scroll.time_ms, (NtGetTickCount() - event->mouse_scroll.time_ms)); if (event->mouse_scroll.y_scroll) send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 9f884e33c18..cf58588981f 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2218,7 +2218,7 @@ static void macdrv_glFlush(void) if (skip_single_buffer_flushes) { const pixel_format *pf = &pixel_formats[context->format - 1]; - DWORD now = GetTickCount(); + DWORD now = NtGetTickCount(); TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, context->last_flush_time, now); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4d55a277833..36e34abbd12 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -918,7 +918,7 @@ static void set_focus(HWND hwnd, BOOL raise) if (data->cocoa_window && data->on_screen) { - BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); + BOOL activate = activate_on_focus_time && (NtGetTickCount() - activate_on_focus_time < 2000); /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window, activate); activate_on_focus_time = 0; @@ -959,7 +959,7 @@ static void show_window(struct macdrv_win_data *data) data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); if (!prev_window) - activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); + activate = activate_on_focus_time && (NtGetTickCount() - activate_on_focus_time < 2000); macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); data->on_screen = TRUE; @@ -1236,7 +1236,7 @@ static void move_window_bits(HWND hwnd, macdrv_window window, const RECT *old_re */ void activate_on_following_focus(void) { - activate_on_focus_time = GetTickCount(); + activate_on_focus_time = NtGetTickCount(); if (!activate_on_focus_time) activate_on_focus_time = 1; } @@ -1617,7 +1617,7 @@ void macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (hwnd == get_capture()) macdrv_SetCapture(0, 0); - if (data->drag_event) SetEvent(data->drag_event); + if (data->drag_event) NtSetEvent(data->drag_event, NULL); destroy_cocoa_window(data); destroy_cocoa_view(data); @@ -2555,6 +2555,7 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) DWORD style = NtUserGetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; HANDLE drag_event = NULL; + OBJECT_ATTRIBUTES attr; BOOL loop = TRUE; MSG msg; @@ -2566,8 +2567,8 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) if (!(data = get_win_data(hwnd))) return; if (data->drag_event) goto done; - drag_event = CreateEventW(NULL, TRUE, FALSE, NULL); - if (!drag_event) goto done; + InitializeObjectAttributes(&attr, NULL, OBJ_OPENIF, NULL, NULL); + if (NtCreateEvent(&drag_event, EVENT_ALL_ACCESS, &attr, NotificationEvent, FALSE)) goto done; data->drag_event = drag_event; release_win_data(data); @@ -2624,7 +2625,7 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) done: release_win_data(data); - if (drag_event) CloseHandle(drag_event); + if (drag_event) NtClose(drag_event); } @@ -2641,7 +2642,7 @@ void macdrv_window_drag_end(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (data->drag_event) - SetEvent(data->drag_event); + NtSetEvent(data->drag_event, NULL); release_win_data(data); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022