wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[PATCH 0/1] MR126: Draft: ddraw: Limit max texture size to fit a 16bit signed integer
by Fabian Maurer (＠DarkShadow44) 02 Jun '22

02 Jun '22

Since ddraw propably never allowed sizes that big anyways, this should not cause any issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51512 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/126

5 9

[PATCH v3 1/6] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu 02 Jun '22

02 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 6

[PATCH 0/1] MR175: d3d11: Do not return uninitialized values on Map() failure.
by Nikolay Sivov (＠nsivov) 02 Jun '22

02 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/175

3 2

[PATCH 0/1] MR174: include: Provide iswspace, wcstol and wcstoul in unixlib.h.
by Jacek Caban (＠jacek) 02 Jun '22

02 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/174

2 1

[PATCH v2 0/12] MR160: secur32: Add wow64 support.
by Nikolay Sivov (＠nsivov) 02 Jun '22

02 Jun '22

This seems to work for me on Linux. -- v2: secur32: Add wow64 support to the unixlib. secur32: Store certificate credentials object pointer as 64-bit. secur32: Use 32-bit sizes in parameters structures. secur32: Remove unused pointer parameter from send request. secur32: Remove duplicate check. secur32: Get rid of buffer iteration callback in unixlib. secur32: Prepare schan_send() buffers on PE side. secur32: Update output buffer offset on return from schan_send() call. secur32: Simplify input buffer handling for schan_recv() call. secur32: Pass single input and output buffers for handshake call. secur32: Manage gnutls transport data in unixlib. secur32: Remove unused argument from buffer iteration helpers. https://gitlab.winehq.org/wine/wine/-/merge_requests/160

2 12

[PATCH 0/6] MR173: preparation for sharing code in d3dx10/d3dx11
by Piotr Caban (＠piotr) 02 Jun '22

02 Jun '22

- use CRT allocators - share data loading code - implement D3DX10CreateAsyncTextureInfoProcessor -- https://gitlab.winehq.org/wine/wine/-/merge_requests/173

2 6

[PATCH 0/5] MR171: dinput/tests: Preparation for virtual HID mouse / keyboard tests.
by Rémi Bernon (＠rbernon) 02 Jun '22

02 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/171

3 8

[PATCH v2 0/2] MR157: win32u/clipboard: Set bitmap and palette as system object.
by Jactry Zeng (＠jactry) 02 Jun '22

02 Jun '22

-- v2: win32u/clipboard: Set handle of bitmap and palette as system object. user32/tests: Add more tests of SetClipboardData(). https://gitlab.winehq.org/wine/wine/-/merge_requests/157

4 4

[PATCH 0/6] MR170: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 02 Jun '22

02 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/170

3 7

[PATCH 1/2] d2d1/tests: Test custom effect properties.
by Ziqing Hui 02 Jun '22

02 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 251 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c73039504d3..ae1cc9f553d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10886,6 +10886,256 @@ done: release_test_context(&ctx); } +static void test_effect_properties(BOOL d3d11) +{ + UINT32 i, min_inputs, max_inputs, integer, index; + ID2D1EffectContext *effect_context; + D2D1_BUFFER_PRECISION precision; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + WCHAR buffer[128]; + CLSID clsid; + BOOL cached; + HRESULT hr; + + static const WCHAR *effect_author = L"The Wine Project"; + static const WCHAR *effect_category = L"Test"; + static const WCHAR *effect_description = L"Test effect."; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, + {L"Context", NULL, effect_impl_get_context}, + }; + + const struct system_property_test + { + const WCHAR *xml; + const WCHAR *display_name; + const WCHAR *author; + const WCHAR *category; + const WCHAR *description; + UINT32 min_inputs; + UINT32 max_inputs; + } + system_property_tests[] = + { + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + /* Test system properties */ + + for (i = 0; i < ARRAY_SIZE(system_property_tests); ++i) + { + const struct system_property_test *test = &system_property_tests[i]; + 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); + + effect = NULL; + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto next; + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, + D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_TestEffect), "Got unexpected clsid %s, expected %s.\n", + debugstr_guid(&clsid), debugstr_guid(&CLSID_TestEffect)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->display_name), "Got unexpected display name %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->display_name)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_AUTHOR, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->author), "Got unexpected author %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->author)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CATEGORY, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->category), "Got unexpected category %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->category)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DESCRIPTION, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->description), "Got unexpected description %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->description)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, + D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(cached == FALSE, "Got unexpected cached %d.\n", cached); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %#x.\n", precision); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(min_inputs == test->min_inputs, "Got unexpected min inputs %u, expected %u.\n", + min_inputs, test->min_inputs); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MAX_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", + max_inputs, test->max_inputs); + + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CLSID, + D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_AUTHOR, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CATEGORY, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CACHED, + D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_PRECISION, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_MIN_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_MAX_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + next: + if (effect) + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + winetest_pop_context(); + } + + /* Test custom properties */ + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding, 2, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect = NULL; + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); + ok(index == 0, "Got unexpected index %u.\n", index); + index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); + ok(index == 1, "Got unexpected index %u.\n", index); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, + "Got unexpected effect context %p.\n", effect_context); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, + "Got unexpected effect context %p.\n", effect_context); + + hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.", integer); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.", integer); + + integer = 20; + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 20, "Got unexpected integer %u.", integer); + + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Test custom properties without binding */ + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_c, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); + ok(index == 0, "Got unexpected index %u.\n", index); + index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); + ok(index == 1, "Got unexpected index %u.\n", index); + + hr = ID2D1Effect_GetValueByName(effect, L"DeadBeef", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 0, "Got unexpected integer %u.", integer); + + hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + +done: + if (effect) + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -12004,6 +12254,7 @@ START_TEST(d2d1) queue_test(test_mt_factory); queue_test(test_effect_register); queue_test(test_effect_context); + queue_test(test_effect_properties); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

2 3

[PATCH v2 0/8] MR165: ntdll: Improve block size rounding compatibility.
by Rémi Bernon (＠rbernon) 02 Jun '22

02 Jun '22

-- v2: ntdll: Use a more compact block layout. ntdll: Round free block size to block size alignment. ntdll: Improve block size rounding compatibility. ntdll: Remove unnecessary constants and typedefs. ntdll: Use a fixed block tail size. ntdll: Call mark_block_tail outside of initialize_block. ntdll: Fix handling of free blocks in RtlWalkHeap. kernelbase: Convert RtlWalkHeap structure on input too. https://gitlab.winehq.org/wine/wine/-/merge_requests/165

3 11

[PATCH v2 1/2] xmllite/tests: Test depth for MoveToAttributeByName().
by Ziqing Hui 02 Jun '22

02 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/xmllite/tests/reader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c1778a9764e..7b68365ac48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2570,11 +2570,13 @@ static void test_attribute_by_name(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 0); hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); @@ -2590,14 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2608,18 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader); -- 2.25.1

2 3

[PATCH 1/2] xmllite/tests: Test depth for MoveToAttributeByName().
by Ziqing Hui 02 Jun '22

02 Jun '22

3 3

[PATCH v2 0/5] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.
by Rémi Bernon (＠rbernon) 02 Jun '22

02 Jun '22

-- v2: winegstreamer: Enforce frame size in H264 decoder SetOutputType. winegstreamer: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE. winegstreamer: Request native buffer alignment using video pool meta. winegstreamer: Reply with a video buffer pool to ALLOCATION queries. winegstreamer: Use a custom flag instead of sample info for caps change. https://gitlab.winehq.org/wine/wine/-/merge_requests/139

4 14

[PATCH v3 0/6] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 02 Jun '22

02 Jun '22

-- v3: user32: Factor out raw input device enumeration. user32: Use HID ioctls directly. user32: Use GUID_DEVINTERFACE_HID directly. user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure. user32: Handle failure from HID APIs. user32: Populate the RID_DEVICE_INFO structure in add_device(). https://gitlab.winehq.org/wine/wine/-/merge_requests/130

4 8

[PATCH] d3d9/tests: Do not test the alpha channel in test_multisample_get_front_buffer_data().
by Zebediah Figura 02 Jun '22

02 Jun '22

This avoids test failures on radeonsi. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d8fe10fc79..c53873f76c1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17730,7 +17730,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, @@ -17742,7 +17742,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); IDirect3DTexture9_Release(texture); -- 2.36.1

2 1

[PATCH 2/2] d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation
by Andrew Eikum 02 Jun '22

02 Jun '22

The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fc148aca4a8..86ac7cf5109 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4925,12 +4925,24 @@ static void test_pinned_buffers(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9Ex *device; D3DCOLOR color; ULONG refcount; HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); if (!(device = create_device(window, NULL))) { @@ -4954,6 +4966,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(!!device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9Ex_Release(device); } START_TEST(d3d9ex) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2913583916a..bd394d071af 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26122,6 +26122,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCOLOR color; @@ -26129,6 +26130,17 @@ static void test_desktop_window(void) HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -26156,6 +26168,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + /* test device with NULL HWND */ + device = create_device(d3d, NULL, NULL, TRUE); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); } -- 2.36.1

2 1

[PATCH 1/2] d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex
by Andrew Eikum 02 Jun '22

02 Jun '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fc148aca4a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4923,6 +4923,39 @@ static void test_pinned_buffers(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); + + device = create_device(GetDesktopWindow(), NULL); + ok(!!device, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4982,6 +5015,7 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.36.1

2 1

[PATCH] ws2_32: Add WSAConnectByName() functions
by Julian Klemann 02 Jun '22

02 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50941 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- dlls/ws2_32/socket.c | 168 +++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 151 +++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 2 + dlls/ws2_32/ws2_32_private.h | 12 +++ include/winsock2.h | 3 + 5 files changed, 336 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88089fa8d74..6a93d00730a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1284,6 +1284,174 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam } +/*********************************************************************** + * WSAConnectByNameA (WS2_32.@) + */ +BOOL WINAPI WSAConnectByNameA(SOCKET s, const char *node_name, const char *service_name, + DWORD *local_addr_len, struct sockaddr *local_addr, + DWORD *remote_addr_len, struct sockaddr *remote_addr, + const struct timeval *timeout, WSAOVERLAPPED *reserved) +{ + WSAPROTOCOL_INFOA proto_info; + WSAPOLLFD pollout; + struct addrinfo *service, hints; + int ret, proto_len, sockaddr_size, sockname_size, sock_err, int_len; + + TRACE("socket %#Ix, node_name %s, service_name %s, local_addr_len %p, local_addr %p, \ + remote_addr_len %p, remote_addr %p, timeout %p, reserved %p\n", + s, debugstr_a(node_name), debugstr_a(service_name), local_addr_len, local_addr, + remote_addr_len, remote_addr, timeout, reserved ); + + if (!node_name || !service_name || reserved) + { + SetLastError(WSAEINVAL); + return FALSE; + } + + if (!s) + { + SetLastError(WSAENOTSOCK); + return FALSE; + } + + if (timeout) + FIXME("WSAConnectByName timeout stub\n"); + + proto_len = sizeof(WSAPROTOCOL_INFOA); + ret = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&proto_info, &proto_len); + if (ret) + return FALSE; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_socktype = proto_info.iSocketType; + hints.ai_family = proto_info.iAddressFamily; + hints.ai_protocol = proto_info.iProtocol; + ret = getaddrinfo(node_name, service_name, &hints, &service); + if (ret) + return FALSE; + + if (proto_info.iSocketType != SOCK_STREAM) + { + freeaddrinfo(service); + SetLastError(WSAEFAULT); + return FALSE; + } + + switch (proto_info.iAddressFamily) + { + case AF_INET: + sockaddr_size = sizeof(SOCKADDR_IN); + break; + case AF_INET6: + sockaddr_size = sizeof(SOCKADDR_IN6); + break; + default: + freeaddrinfo(service); + SetLastError(WSAENOTSOCK); + return FALSE; + } + + ret = connect(s, service->ai_addr, sockaddr_size); + if (ret) + { + freeaddrinfo(service); + return FALSE; + } + + pollout.fd = s; + pollout.events = POLLWRNORM; + ret = WSAPoll(&pollout, 1, -1); + if (ret == SOCKET_ERROR) + { + freeaddrinfo(service); + return FALSE; + } + if (pollout.revents & (POLLERR | POLLHUP | POLLNVAL)) + { + freeaddrinfo(service); + int_len = sizeof(int); + ret = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *)&sock_err, &int_len); + if (ret == SOCKET_ERROR) + return FALSE; + SetLastError(sock_err); + return FALSE; + } + + if (remote_addr_len && remote_addr) + { + if (*remote_addr_len >= sockaddr_size) + { + memcpy(remote_addr, service->ai_addr, sockaddr_size); + *remote_addr_len = sockaddr_size; + } + else + { + freeaddrinfo(service); + SetLastError(WSAEFAULT); + return FALSE; + } + } + + freeaddrinfo(service); + + if (local_addr_len && local_addr) + { + if (*local_addr_len >= sockaddr_size) + { + sockname_size = sockaddr_size; + ret = getsockname(s, local_addr, &sockname_size); + if (ret) + return FALSE; + if (proto_info.iAddressFamily == AF_INET6) + ((SOCKADDR_IN6 *)local_addr)->sin6_port = 0; + else + ((SOCKADDR_IN *)local_addr)->sin_port = 0; + *local_addr_len = sockaddr_size; + } + else + { + SetLastError(WSAEFAULT); + return FALSE; + } + } + + return TRUE; +} + + +/*********************************************************************** + * WSAConnectByNameW (WS2_32.@) + */ +BOOL WINAPI WSAConnectByNameW(SOCKET s, const WCHAR *node_name, const WCHAR *service_name, + DWORD *local_addr_len, struct sockaddr *local_addr, + DWORD *remote_addr_len, struct sockaddr *remote_addr, + const struct timeval *timeout, WSAOVERLAPPED *reserved) +{ + char *node_nameA, *service_nameA; + BOOL ret; + + if (!node_name || !service_name) + { + SetLastError(WSAEINVAL); + return FALSE; + } + + node_nameA = strdupWtoA(node_name); + service_nameA = strdupWtoA(service_name); + if (!node_nameA || !service_nameA) + { + SetLastError(WSAENOBUFS); + return FALSE; + } + + ret = WSAConnectByNameA(s, node_nameA, service_nameA, local_addr_len, local_addr, + remote_addr_len, remote_addr, timeout, reserved); + free(node_nameA); + free(service_nameA); + return ret; +} + + static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD flags, DWORD reserved ) { IO_STATUS_BLOCK iosb, *piosb = &iosb; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bdb683e6796..15e029b3b8f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3197,6 +3197,156 @@ static void test_WSADuplicateSocket(void) closesocket(source); } +static void test_WSAConnectByName(void) +{ + SOCKET s; + SOCKADDR_IN local_addr = {0}, remote_addr = {0}, + sock_addr = {0}, peer_addr = {0}; + DWORD local_len, remote_len, conn_ctx; + int ret, err, sock_len, peer_len; + WSAOVERLAPPED overlap; + struct addrinfo *first_addrinfo, first_hints; + + conn_ctx = TRUE; + + /* First call of getaddrinfo fails on w8adm */ + first_addrinfo = NULL; + memset(&first_hints, 0, sizeof(struct addrinfo)); + first_hints.ai_socktype = SOCK_STREAM; + first_hints.ai_family = AF_INET; + first_hints.ai_protocol = IPPROTO_TCP; + getaddrinfo("winehq.org", "http", &first_hints, &first_addrinfo); + if (first_addrinfo) + freeaddrinfo(first_addrinfo); + SetLastError(0xdeadbeef); + + /* Fill all fields */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + local_len = remote_len = sizeof(SOCKADDR_IN); + ret = WSAConnectByNameA(s, "winehq.org", "http", &local_len, (struct sockaddr *)&local_addr, + &remote_len, (struct sockaddr *)&remote_addr, NULL, NULL); + ok(ret, "WSAConnectByNameA should have succeeded, error %u\n", WSAGetLastError()); + setsockopt(s, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, (char *)&conn_ctx, sizeof(DWORD)); + sock_len = peer_len = sizeof(SOCKADDR_IN); + ret = getsockname(s, (struct sockaddr *)&sock_addr, &sock_len); + ok(!ret, "getsockname should have succeeded, error %u\n", WSAGetLastError()); + ret = getpeername(s, (struct sockaddr *)&peer_addr, &peer_len); + ok(!ret, "getpeername should have succeeded, error %u\n", WSAGetLastError()); + ok(sock_len == sizeof(SOCKADDR_IN), "got sockname size of %d\n", sock_len); + ok(peer_len == sizeof(SOCKADDR_IN), "got peername size of %d\n", peer_len); + ok(local_len == sizeof(SOCKADDR_IN), "got local size of %lu\n", local_len); + ok(remote_len == sizeof(SOCKADDR_IN), "got remote size of %lu\n", remote_len); + ok(!local_addr.sin_port, "local_addr has non-zero sin_port: %hu.\n", local_addr.sin_port); + ok(!memcmp(&sock_addr.sin_addr, &local_addr.sin_addr, sizeof(struct in_addr)), + "local_addr did not receive data.\n"); + ok(!memcmp(&peer_addr, &remote_addr, sizeof(SOCKADDR_IN)), "remote_addr did not receive data.\n"); + closesocket(s); + + /* Passing NULL length but a pointer to a sockaddr */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + local_len = remote_len = sizeof(SOCKADDR_IN); + memset(&local_addr, 0, sizeof(SOCKADDR_IN)); + memset(&remote_addr, 0, sizeof(SOCKADDR_IN)); + memset(&sock_addr, 0, sizeof(SOCKADDR_IN)); + memset(&peer_addr, 0, sizeof(SOCKADDR_IN)); + ret = WSAConnectByNameA(s, "winehq.org", "http", NULL, (struct sockaddr *)&local_addr, + NULL, (struct sockaddr *)&remote_addr, NULL, NULL); + ok(ret, "WSAConnectByNameA should have succeeded, error %u\n", WSAGetLastError()); + setsockopt(s, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, (char *)&conn_ctx, sizeof(DWORD)); + sock_len = peer_len = sizeof(SOCKADDR_IN); + ret = getsockname(s, (struct sockaddr *)&sock_addr, &sock_len); + ok(!ret, "getsockname should have succeeded, error %u\n", WSAGetLastError()); + ret = getpeername(s, (struct sockaddr *)&peer_addr, &peer_len); + ok(!ret, "getpeername should have succeeded, error %u\n", WSAGetLastError()); + ok(sock_len == sizeof(SOCKADDR_IN), "got sockname size of %d\n", sock_len); + ok(peer_len == sizeof(SOCKADDR_IN), "got peername size of %d\n", peer_len); + ok(!local_addr.sin_family, "local_addr received data.\n"); + ok(!remote_addr.sin_family, "remote_addr received data.\n"); + closesocket(s); + + /* Passing NULLs for node or service */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, NULL, "http", NULL, NULL, NULL, NULL, NULL, NULL); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSAEINVAL, "expected error %u (WSAEINVAL), got %u\n", WSAEINVAL, err); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + closesocket(s); + ret = WSAConnectByNameA(s, "winehq.org", NULL, NULL, NULL, NULL, NULL, NULL, NULL); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSAEINVAL, "expected error %u (WSAEINVAL), got %u\n", WSAEINVAL, err); + closesocket(s); + + /* Passing NULL for the addresses and address lengths */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "http", NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret, "WSAConnectByNameA should have succeeded, error %u\n", WSAGetLastError()); + closesocket(s); + + /* Passing NULL for the addresses and passing correct lengths */ + local_len = remote_len = sizeof(SOCKADDR_IN); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "http", &local_len, NULL, + &remote_len, NULL, NULL, NULL); + ok(ret, "WSAConnectByNameA should have succeeded, error %u\n", WSAGetLastError()); + ok(local_len == sizeof(SOCKADDR_IN), "local_len should have been %llu, got %ld\n", sizeof(SOCKADDR_IN), + local_len); + ok(remote_len == sizeof(SOCKADDR_IN), "remote_len should have been %llu, got %ld\n", sizeof(SOCKADDR_IN), + remote_len); + closesocket(s); + + /* Passing addresses and passing short lengths */ + local_len = remote_len = 3; + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "http", &local_len, (struct sockaddr *)&local_addr, + &remote_len, (struct sockaddr *)&remote_addr, NULL, NULL); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSAEFAULT, "expected error %u (WSAEFAULT), got %u\n", WSAEFAULT, err); + ok(local_len == 3, "local_len should have been 3, got %ld\n", local_len); + ok(remote_len == 3, "remote_len should have been 3, got %ld\n", remote_len); + closesocket(s); + + /* Passing addresses and passing long lengths */ + local_len = remote_len = 50; + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "http", &local_len, (struct sockaddr *)&local_addr, + &remote_len, (struct sockaddr *)&remote_addr, NULL, NULL); + ok(ret, "WSAConnectByNameA should have succeeded, error %u\n", WSAGetLastError()); + ok(local_len == sizeof(SOCKADDR_IN), "local_len should have been %llu, got %ld\n", sizeof(SOCKADDR_IN), + local_len); + ok(remote_len == sizeof(SOCKADDR_IN), "remote_len should have been %llu, got %ld\n", sizeof(SOCKADDR_IN), + remote_len); + closesocket(s); + + /* Unknown service */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "nonexistentservice", NULL, NULL, NULL, NULL, NULL, NULL); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSATYPE_NOT_FOUND, "expected error %u (WSATYPE_NOT_FOUND), got %u\n", + WSATYPE_NOT_FOUND, err); + closesocket(s); + + /* Connecting with a UDP socket */ + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAConnectByNameA(s, "winehq.org", "https", NULL, NULL, NULL, NULL, NULL, NULL); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSAEINVAL || err == WSAEFAULT, "expected error %u (WSAEINVAL) or %u (WSAEFAULT), got %u\n", + WSAEINVAL, WSAEFAULT, err); /* WSAEFAULT win10 >= 1809 */ + closesocket(s); + + /* Passing non-null as the reserved parameter */ + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = WSAConnectByNameA(s, "winehq.org", "http", NULL, NULL, NULL, NULL, NULL, &overlap); + err = WSAGetLastError(); + ok(!ret, "WSAConnectByNameA should have failed\n"); + ok(err == WSAEINVAL, "expected error %u (WSAEINVAL), got %u\n", WSAEINVAL, err); + closesocket(s); +} + static void test_WSAEnumNetworkEvents(void) { SOCKET s, s2; @@ -12573,6 +12723,7 @@ START_TEST( sock ) test_WSASocket(); test_WSADuplicateSocket(); + test_WSAConnectByName(); test_WSAEnumNetworkEvents(); test_errors(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 1fbd8c55c75..6a07895d2f6 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -68,6 +68,8 @@ @ stdcall WSAAddressToStringW(ptr long ptr ptr ptr) @ stdcall WSACloseEvent(long) @ stdcall WSAConnect(long ptr long ptr ptr ptr ptr) +@ stdcall WSAConnectByNameA(long str str ptr ptr ptr ptr ptr ptr) +@ stdcall WSAConnectByNameW(long str str ptr ptr ptr ptr ptr ptr) @ stdcall WSACreateEvent () @ stdcall WSADuplicateSocketA(long long ptr) @ stdcall WSADuplicateSocketW(long long ptr) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index f6b6ecc7eba..b21936a34e1 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -61,6 +61,18 @@ 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 } +static inline char *strdupWtoA( const WCHAR *str ) +{ + char *ret = NULL; + if (str) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = malloc( len ))) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + } + return ret; +} + static const char magic_loopback_addr[] = {127, 12, 34, 56}; const char *debugstr_sockaddr( const struct sockaddr *addr ) DECLSPEC_HIDDEN; diff --git a/include/winsock2.h b/include/winsock2.h index f1d43acad40..8394ea6471a 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -1157,6 +1157,9 @@ int WINAPI WSACancelBlockingCall(void); int WINAPI WSACleanup(void); BOOL WINAPI WSACloseEvent(WSAEVENT); int WINAPI WSAConnect(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS); +BOOL WINAPI WSAConnectByNameA(SOCKET,const char *,const char *,DWORD *,struct sockaddr *,DWORD *,struct sockaddr *,const struct timeval *,WSAOVERLAPPED *); +BOOL WINAPI WSAConnectByNameW(SOCKET,const WCHAR *,const WCHAR *,DWORD *,struct sockaddr *,DWORD *,struct sockaddr *,const struct timeval *,WSAOVERLAPPED *); +#define WSAConnectByName WINELIB_NAME_AW(WSAConnectByName) WSAEVENT WINAPI WSACreateEvent(void); INT WINAPI WSADuplicateSocketA(SOCKET,DWORD,LPWSAPROTOCOL_INFOA); INT WINAPI WSADuplicateSocketW(SOCKET,DWORD,LPWSAPROTOCOL_INFOW); -- 2.36.1

2 2

[PATCH v2 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) 02 Jun '22

02 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

4 3

[PATCH 1/3] wined3d: Pause transform feedback in wined3d_context_gl_draw_shaded_quad().
by Zebediah Figura 02 Jun '22

02 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5ae237db54b..f2e1fc0ea75 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5946,6 +5946,8 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); + wined3d_context_gl_get_rt_size(context_gl, &dst_size); w = dst_size.cx; h = dst_size.cy; -- 2.36.1

1 2

[PATCH vkd3d 1/7] tests: Test how matrix types interact with semantics.
by Giovanni Mascellani 02 Jun '22

02 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Use the new single component syntax --- Makefile.am | 1 + tests/matrix-semantics.shader_test | 71 ++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/matrix-semantics.shader_test diff --git a/Makefile.am b/Makefile.am index dd3ce1ff..74c23b2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/matrix-semantics.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test new file mode 100644 index 00000000..6a089683 --- /dev/null +++ b/tests/matrix-semantics.shader_test @@ -0,0 +1,71 @@ +[pixel shader] +float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader] +row_major float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[require] +shader model >= 4.0 + +[pixel shader] +row_major float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +void main(out row_major float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail todo] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[pixel shader] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target4) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all r (1.0) -- 2.36.1

2 9

[PATCH v3 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 01 Jun '22

01 Jun '22

-- v3: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

3 6

Re: [PATCH v2 0/4] MR168: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 01 Jun '22

01 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/168

1 0

Re: [PATCH v2 0/1] MR166: include: Add touch and pointer input related winuser.h declarations. - approved
by Alexandre Julliard (＠julliard) 01 Jun '22

01 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/166

1 0

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-devel