May 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winemac: Use NtUserSetClipboardData in set_win32_clipboard_formats_from_mac_pasteboard.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 455e334a9e0a5b7a974a6d7f9675ab2a679aa70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=455e334a9e0a5b7a974a6d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 15:30:18 2022 +0200 winemac: Use NtUserSetClipboardData in set_win32_clipboard_formats_from_mac_pasteboard. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 1b637123e0f..d7d28c69acb 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1473,8 +1473,9 @@ static void set_win32_clipboard_formats_from_mac_pasteboard(CFArrayRef types) for (i = 0; i < count; i++) { + struct set_clipboard_params params = { 0 }; TRACE("adding format %s\n", debugstr_format(formats[i]->format_id)); - SetClipboardData(formats[i]->format_id, 0); + NtUserSetClipboardData(formats[i]->format_id, 0, &params); } free(current_mac_formats);

1 0

Dmitry Timoshkov : crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 559a83a8f434bd7d856b86010793be592b874a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=559a83a8f434bd7d856b8601… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 27 10:55:20 2022 +0300 crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success. One of Chrome crypto plugins depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 45 +++++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ad39b7d18c7..b57cc685212 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0f8684a5483..ea25826f4ed 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4305,45 +4305,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -4354,17 +4351,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key);

1 0

Ziqing Hui : d2d1/tests: Add more effect xml.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: bf3df0bdb1781360aa0b7e587b4c907d9db7111a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3df0bdb1781360aa0b7e58… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 26 16:40:54 2022 +0800 d2d1/tests: Add more effect xml. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 161 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 142 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 940205989bb..d5fa6f26e4d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -88,6 +88,88 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_minimum = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_version = +L"<Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_inputs = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_name = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_author = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_category = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_description = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_without_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description'/> \ + <Inputs/> \ + </Effect> \ +"; + static const DWORD test_vs[] = { #if 0 @@ -10497,6 +10579,26 @@ static void test_effect_register(BOOL d3d11) ID2D1Effect *effect; HRESULT hr; + const struct xml_test + { + const WCHAR *xml; + HRESULT hr; + } + xml_tests[] = + { + {effect_xml_a, S_OK}, + {effect_xml_b, S_OK}, + {effect_xml_c, S_OK}, + {effect_xml_minimum, S_OK}, + {effect_xml_without_version, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_without_inputs, E_INVALIDARG}, + {effect_xml_without_name, E_INVALIDARG}, + {effect_xml_without_author, E_INVALIDARG}, + {effect_xml_without_category, E_INVALIDARG}, + {effect_xml_without_description, E_INVALIDARG}, + {effect_xml_without_type, E_INVALIDARG}, + }; + const D2D1_PROPERTY_BINDING binding[] = { {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, @@ -10543,27 +10645,48 @@ static void test_effect_register(BOOL d3d11) } /* Register effect once */ - hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, - effect_xml_a, NULL, 0, effect_impl_create); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(xml_tests); ++i) + { + const struct xml_test *test = &xml_tests[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); + todo_wine_if(test->hr != S_OK) + ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); + if (hr == S_OK) + { + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + } + + winetest_pop_context(); + } /* Register effect multiple times */ - hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, - effect_xml_a, NULL, 0, effect_impl_create); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, - effect_xml_a, NULL, 0, effect_impl_create); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); - todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(xml_tests); ++i) + { + const struct xml_test *test = &xml_tests[i]; + + if (test->hr != S_OK) + continue; + + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + winetest_pop_context(); + } /* Register effect multiple times with different xml */ hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect,

1 0

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

May 27, 2022

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

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

May 27, 2022

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

Rémi Bernon : ntdll: Rename freeList variables to free_list.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 2cc6f00a7814348b26c04c07cfe37143021964a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc6f00a7814348b26c04c07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 27 09:15:42 2022 +0200 ntdll: Rename freeList variables to free_list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 411bb26aa3d..9ca7abb1bb3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -150,11 +150,11 @@ C_ASSERT( HEAP_MAX_SMALL_FREE_LIST % ALIGNMENT == 0 ); #define HEAP_NB_SMALL_FREE_LISTS (((HEAP_MAX_SMALL_FREE_LIST - HEAP_MIN_BLOCK_SIZE) / ALIGNMENT) + 1) /* Max size of the blocks on the free lists above HEAP_MAX_SMALL_FREE_LIST */ -static const SIZE_T HEAP_freeListSizes[] = +static const SIZE_T free_list_sizes[] = { 0x200, 0x400, 0x1000, ~(SIZE_T)0 }; -#define HEAP_NB_FREE_LISTS (ARRAY_SIZE( HEAP_freeListSizes ) + HEAP_NB_SMALL_FREE_LISTS) +#define HEAP_NB_FREE_LISTS (ARRAY_SIZE(free_list_sizes) + HEAP_NB_SMALL_FREE_LISTS) typedef union { @@ -200,7 +200,7 @@ typedef struct tagHEAP DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION cs; - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; + FREE_LIST_ENTRY free_lists[HEAP_NB_FREE_LISTS]; SUBHEAP subheap; } HEAP; @@ -425,16 +425,16 @@ static void notify_free_all( SUBHEAP *subheap ) /* size is the size of the whole block including the arena header */ static inline struct entry *find_free_list( HEAP *heap, SIZE_T block_size, BOOL last ) { - FREE_LIST_ENTRY *list, *end = heap->freeList + ARRAY_SIZE(heap->freeList); + FREE_LIST_ENTRY *list, *end = heap->free_lists + ARRAY_SIZE(heap->free_lists); unsigned int i; if (block_size <= HEAP_MAX_SMALL_FREE_LIST) i = (block_size - HEAP_MIN_BLOCK_SIZE) / ALIGNMENT; else for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) - if (block_size <= HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; + if (block_size <= free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; - list = heap->freeList + i; - if (last && ++list == end) list = heap->freeList; + list = heap->free_lists + i; + if (last && ++list == end) list = heap->free_lists; return &list->arena; } @@ -486,14 +486,14 @@ static void heap_dump( const HEAP *heap ) TRACE( "heap: %p\n", heap ); TRACE( " next %p\n", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); - TRACE( " free_lists: %p\n", heap->freeList ); + TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) { if (i < HEAP_NB_SMALL_FREE_LISTS) size = HEAP_MIN_BLOCK_SIZE + i * ALIGNMENT; - else size = HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]; - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->freeList + i, size, - LIST_ENTRY( heap->freeList[i].arena.entry.prev, struct entry, entry ), - LIST_ENTRY( heap->freeList[i].arena.entry.next, struct entry, entry ) ); + else size = free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]; + TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, size, + LIST_ENTRY( heap->free_lists[i].arena.entry.prev, struct entry, entry ), + LIST_ENTRY( heap->free_lists[i].arena.entry.next, struct entry, entry ) ); } TRACE( " subheaps: %p\n", &heap->subheap_list ); @@ -968,8 +968,8 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Build the free lists */ - list_init( &heap->freeList[0].arena.entry ); - for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) + list_init( &heap->free_lists[0].arena.entry ); + for (i = 0, pEntry = heap->free_lists; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { block_set_size( &pEntry->arena.block, BLOCK_FLAG_FREE_LINK, 0 ); block_set_type( &pEntry->arena.block, ARENA_FREE_MAGIC ); @@ -1025,7 +1025,7 @@ static struct block *find_free_block( HEAP *heap, SIZE_T block_size, SUBHEAP **s /* Find a suitable free list, and in it find a block large enough */ - while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) + while ((ptr = list_next( &heap->free_lists[0].arena.entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); block = (struct block *)entry; @@ -1078,8 +1078,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) unsigned int i; if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; - if (block_get_flags( block ) != BLOCK_FLAG_FREE_LINK) return FALSE; - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->freeList[i].arena.block) return TRUE; + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->free_lists[i].arena.block) return TRUE; return FALSE; }

1 0

Rémi Bernon : ntdll: Use struct entry directly for the free lists.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 0044e52784ed313af0cbe7f5fdcdbd71efc78715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0044e52784ed313af0cbe7f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 27 09:16:40 2022 +0200 ntdll: Use struct entry directly for the free lists. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 9ca7abb1bb3..16abc158e55 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -74,6 +74,8 @@ struct rtl_heap_entry /* header for heap blocks */ +#define ALIGNMENT (2 * sizeof(void *)) + typedef struct block { DWORD size; /* Block size; must be the first field */ @@ -92,11 +94,13 @@ C_ASSERT( sizeof(struct block) == 8 ); /* entry to link free blocks in free lists */ -typedef struct entry +struct DECLSPEC_ALIGN(ALIGNMENT) entry { struct block block; struct list entry; -} ARENA_FREE; +}; + +C_ASSERT( sizeof(struct entry) == 2 * ALIGNMENT ); typedef struct { @@ -122,7 +126,6 @@ typedef struct #define ARENA_FREE_FILLER 0xfeeefeee /* everything is aligned on 8 byte boundaries (16 for Win64) */ -#define ALIGNMENT (2*sizeof(void*)) #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ #define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) #define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ @@ -137,7 +140,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) #define HEAP_MIN_BLOCK_SIZE (HEAP_MIN_DATA_SIZE + sizeof(ARENA_INUSE)) /* minimum size that must remain to shrink an allocated block */ -#define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) +#define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(struct entry)) /* minimum size to start allocating large blocks */ #define HEAP_MIN_LARGE_BLOCK_SIZE (0x10000 * ALIGNMENT - 0x1000) /* extra size to add at the end of block for tail checking */ @@ -156,12 +159,6 @@ static const SIZE_T free_list_sizes[] = }; #define HEAP_NB_FREE_LISTS (ARRAY_SIZE(free_list_sizes) + HEAP_NB_SMALL_FREE_LISTS) -typedef union -{ - ARENA_FREE arena; - void *alignment[4]; -} FREE_LIST_ENTRY; - struct tagHEAP; typedef struct DECLSPEC_ALIGN(ALIGNMENT) tagSUBHEAP @@ -200,7 +197,7 @@ typedef struct tagHEAP DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION cs; - FREE_LIST_ENTRY free_lists[HEAP_NB_FREE_LISTS]; + struct entry free_lists[HEAP_NB_FREE_LISTS]; SUBHEAP subheap; } HEAP; @@ -249,7 +246,7 @@ static inline void block_set_type( struct block *block, UINT type ) static inline UINT block_get_overhead( const struct block *block ) { - if (block_get_flags( block ) & BLOCK_FLAG_FREE) return sizeof(struct entry); + if (block_get_flags( block ) & BLOCK_FLAG_FREE) return sizeof(*block) + sizeof(struct list); return sizeof(*block) + block->unused_bytes; } @@ -425,7 +422,7 @@ static void notify_free_all( SUBHEAP *subheap ) /* size is the size of the whole block including the arena header */ static inline struct entry *find_free_list( HEAP *heap, SIZE_T block_size, BOOL last ) { - FREE_LIST_ENTRY *list, *end = heap->free_lists + ARRAY_SIZE(heap->free_lists); + struct entry *list, *end = heap->free_lists + ARRAY_SIZE(heap->free_lists); unsigned int i; if (block_size <= HEAP_MAX_SMALL_FREE_LIST) @@ -435,7 +432,7 @@ static inline struct entry *find_free_list( HEAP *heap, SIZE_T block_size, BOOL list = heap->free_lists + i; if (last && ++list == end) list = heap->free_lists; - return &list->arena; + return list; } /* get the memory protection type to use for a given heap */ @@ -492,8 +489,8 @@ static void heap_dump( const HEAP *heap ) if (i < HEAP_NB_SMALL_FREE_LISTS) size = HEAP_MIN_BLOCK_SIZE + i * ALIGNMENT; else size = free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]; TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, size, - LIST_ENTRY( heap->free_lists[i].arena.entry.prev, struct entry, entry ), - LIST_ENTRY( heap->free_lists[i].arena.entry.next, struct entry, entry ) ); + LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), + LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); } TRACE( " subheaps: %p\n", &heap->subheap_list ); @@ -629,7 +626,7 @@ static inline BOOL subheap_commit( SUBHEAP *subheap, const struct block *block, SIZE_T size; void *addr; - commit_end = (char *)block + block_size + sizeof(ARENA_FREE); + commit_end = (char *)block + block_size + sizeof(struct entry); commit_end = ROUND_ADDR((char *)commit_end + COMMIT_MASK, COMMIT_MASK); if (commit_end > end) commit_end = end; @@ -908,8 +905,8 @@ static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena ) static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, SIZE_T commitSize, SIZE_T totalSize ) { + struct entry *pEntry; SUBHEAP *subheap; - FREE_LIST_ENTRY *pEntry; unsigned int i; if (!address) @@ -968,12 +965,12 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Build the free lists */ - list_init( &heap->free_lists[0].arena.entry ); + list_init( &heap->free_lists[0].entry ); for (i = 0, pEntry = heap->free_lists; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { - block_set_size( &pEntry->arena.block, BLOCK_FLAG_FREE_LINK, 0 ); - block_set_type( &pEntry->arena.block, ARENA_FREE_MAGIC ); - if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); + block_set_size( &pEntry->block, BLOCK_FLAG_FREE_LINK, 0 ); + block_set_type( &pEntry->block, ARENA_FREE_MAGIC ); + if (i) list_add_after( &pEntry[-1].entry, &pEntry->entry ); } /* Initialize critical section */ @@ -1025,7 +1022,7 @@ static struct block *find_free_block( HEAP *heap, SIZE_T block_size, SUBHEAP **s /* Find a suitable free list, and in it find a block large enough */ - while ((ptr = list_next( &heap->free_lists[0].arena.entry, ptr ))) + while ((ptr = list_next( &heap->free_lists[0].entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); block = (struct block *)entry; @@ -1048,7 +1045,7 @@ static struct block *find_free_block( HEAP *heap, SIZE_T block_size, SUBHEAP **s } /* make sure we can fit the block and a free entry at the end */ - total_size = sizeof(SUBHEAP) + block_size + sizeof(ARENA_FREE); + total_size = sizeof(SUBHEAP) + block_size + sizeof(struct entry); if (total_size < block_size) return NULL; /* overflow */ if ((*subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, @@ -1078,7 +1075,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) unsigned int i; if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->free_lists[i].arena.block) return TRUE; + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->free_lists[i].block) return TRUE; return FALSE; }

1 0

Jacek Caban : winemac: Use ntdll for UTF8 conversion.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 6e7701ae0655817094358466f3b53df2c9307fd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7701ae0655817094358466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 01:11:20 2022 +0200 winemac: Use ntdll for UTF8 conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index d2780aa8bcb..eefc915d6e2 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -808,7 +808,11 @@ static void *import_utf8_to_unicodetext(CFDataRef data, size_t *ret_size) dst[j++] = 0; if ((ret = malloc(j * sizeof(WCHAR)))) - *ret_size = MultiByteToWideChar(CP_UTF8, 0, dst, j, ret, j) * sizeof(WCHAR); + { + DWORD dst_size; + RtlUTF8ToUnicodeN(ret, j * sizeof(WCHAR), &dst_size, dst, j); + *ret_size = dst_size; + } free(dst); } @@ -1031,10 +1035,12 @@ static CFDataRef export_html(void *data, size_t size) static CFDataRef export_unicodetext_to_utf8(void *data, size_t size) { CFMutableDataRef ret; - INT dst_len; + WCHAR *src = data; + DWORD dst_len = 0; - dst_len = WideCharToMultiByte(CP_UTF8, 0, data, -1, NULL, 0, NULL, NULL); - if (dst_len) dst_len--; /* Leave off null terminator. */ + /* Leave off null terminator. */ + if (size >= sizeof(WCHAR) && !src[size / sizeof(WCHAR) - 1]) size -= sizeof(WCHAR); + RtlUnicodeToUTF8N(NULL, 0, &dst_len, src, size); ret = CFDataCreateMutable(NULL, dst_len); if (ret) { @@ -1043,7 +1049,7 @@ static CFDataRef export_unicodetext_to_utf8(void *data, size_t size) CFDataSetLength(ret, dst_len); dst = (LPSTR)CFDataGetMutableBytePtr(ret); - WideCharToMultiByte(CP_UTF8, 0, data, -1, dst, dst_len, NULL, NULL); + RtlUnicodeToUTF8N(dst, dst_len, &dst_len, src, size); /* Remove carriage returns */ for (i = 0, j = 0; i < dst_len; i++)

1 0

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

May 27, 2022

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

Jacek Caban : winemac: Use ntdll for Unicode conversion in export_hdrop_to_filenames.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 36e2d7e9583d3d9db9613be89cfbe158d7fec8ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e2d7e9583d3d9db9613be8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 01:19:40 2022 +0200 winemac: Use ntdll for Unicode conversion in export_hdrop_to_filenames. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index eefc915d6e2..1b637123e0f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -567,6 +567,21 @@ static void *import_html(CFDataRef data, size_t *ret_size) } +static CPTABLEINFO *get_ansi_cp(void) +{ + USHORT utf8_hdr[2] = { 0, CP_UTF8 }; + static CPTABLEINFO cp; + if (!cp.CodePage) + { + if (NtCurrentTeb()->Peb->AnsiCodePageData) + RtlInitCodePageTable(NtCurrentTeb()->Peb->AnsiCodePageData, &cp); + else + RtlInitCodePageTable(utf8_hdr, &cp); + } + return &cp; +} + + /* based on wine_get_dos_file_name */ static WCHAR *get_dos_file_name(const char *path) { @@ -942,21 +957,22 @@ static CFDataRef export_hdrop_to_filenames(void *data, size_t size) unixname = get_unix_file_name(p); else { - int len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); - if (len) - { - if (len > buffer_len) - { - free(buffer); - buffer_len = len * 2; - buffer = malloc(buffer_len * sizeof(*buffer)); - } + CPTABLEINFO *cp = get_ansi_cp(); + DWORD len = strlen(p) + 1; - MultiByteToWideChar(CP_ACP, 0, p, -1, buffer, buffer_len); - unixname = get_unix_file_name(buffer); + if (len * 3 > buffer_len) + { + free(buffer); + buffer_len = len * 3; + buffer = malloc(buffer_len * sizeof(*buffer)); } + + if (cp->CodePage == CP_UTF8) + RtlUTF8ToUnicodeN(buffer, buffer_len * sizeof(WCHAR), &len, p, len); else - unixname = NULL; + RtlCustomCPToUnicodeN(cp, buffer, buffer_len * sizeof(WCHAR), &len, p, len); + + unixname = get_unix_file_name(buffer); } if (!unixname) {

1 0