wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Stefan Dösinger : d3d8/tests: Accept Nvidia results in test_sample_mask as broken.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 080b2c86046017b5162edea736e1ec9ae9ec7dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=080b2c86046017b5162edea7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 21 12:58:13 2022 +0300 d3d8/tests: Accept Nvidia results in test_sample_mask as broken. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3c61426e17f..8d5f9d39df8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11171,7 +11171,15 @@ static void test_sample_mask(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + /* Multiple generations of Nvidia cards return broken results. + * A mask with no bits or all bits set produce the expected results (0x00 / 0xff), + * but any other mask behaves almost as if the result is 0.5 + (enabled / total) + * samples. It's not quite that though (you'd expect 0xbf or 0xc0 instead of 0xbc). + * + * I looked at a few other possible problems: Incorrectly enabled Z test, alpha test, + * culling, the multisample mask affecting CopyRects. Neither of these make a difference. */ + ok(color_match(colour, 0xffff8080, 1) || broken(color_match(colour, 0xffffbcbc, 1)), + "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); hr = IDirect3DDevice8_EndScene(device);

1 0

Stefan Dösinger : d3d9/tests: Accept Nvidia results in test_sample_mask as broken.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: fc98f7d9f9ac3fa048548f60931d6d4c1bd92fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc98f7d9f9ac3fa048548f60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 21 12:58:12 2022 +0300 d3d9/tests: Accept Nvidia results in test_sample_mask as broken. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f4aa45f91fa..89f9e9cf2c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26911,7 +26911,15 @@ static void test_sample_mask(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + /* Multiple generations of Nvidia cards return broken results. + * A mask with no bits or all bits set produce the expected results (0x00 / 0xff), + * but any other mask behaves almost as if the result is 0.5 + (enabled / total) + * samples. It's not quite that though (you'd expect 0xbf or 0xc0 instead of 0xbc). + * + * I looked at a few other possible problems: Incorrectly enabled Z test, alpha test, + * culling, the multisample mask affecting CopyRects. Neither of these make a difference. */ + ok(color_match(colour, 0xffff8080, 1) || broken(color_match(colour, 0xffffbcbc, 1)), + "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); hr = IDirect3DDevice9_EndScene(device);

1 0

Nikolay Sivov : dwrite/tests: Use a better invalid value to make a test pass reliably.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 47f5a50260e5e9221c063fc61c5f194d0d2d9a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f5a50260e5e9221c063fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 15:57:17 2022 +0300 dwrite/tests: Use a better invalid value to make a test pass reliably. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a610491e09c..af2f3a4104d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4150,8 +4150,8 @@ static void test_GetInformationalStrings(void) ok(hr == S_OK, "got 0x%08x\n", hr); exists = TRUE; - strings = (void*)0xdeadbeef; - hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1, &strings, &exists); + strings = (void *)0xdeadbeef; + hr = IDWriteFont_GetInformationalStrings(font, 0xdead, &strings, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == FALSE, "got %d\n", exists); ok(strings == NULL, "got %p\n", strings);

1 0

Nikolay Sivov : dwrite: Partially implement newer TranslateColorGlyphRun() variant.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: cb0b746f9a154289727e107723d2e14155ff1ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb0b746f9a154289727e1077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 15:57:16 2022 +0300 dwrite: Partially implement newer TranslateColorGlyphRun() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +- dlls/dwrite/font.c | 38 ++++++++++----- dlls/dwrite/main.c | 22 +++++---- dlls/dwrite/tests/font.c | 108 +++++++++++++++++++++++++++++++++++++++---- 4 files changed, 140 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb0b746f9a154289727e…

1 0

Nikolay Sivov : include: Fixup DWRITE_COLOR_GLYPH_RUN1 definition.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: d967200938435db18185f7d0bfcbfb19a74de714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d967200938435db18185f7d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 15:57:15 2022 +0300 include: Fixup DWRITE_COLOR_GLYPH_RUN1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 0db2de71cf1..3542fbc8f1d 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -795,17 +795,22 @@ interface IDWriteFontFace5 : IDWriteFontFace4 BOOL Equals(IDWriteFontFace *fontface); } -typedef struct DWRITE_COLOR_GLYPH_RUN1 -{ - DWRITE_GLYPH_RUN glyphRun; - DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription; - FLOAT baselineOriginX; - FLOAT baselineOriginY; - DWRITE_COLOR_F runColor; - UINT16 paletteIndex; - DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat; - DWRITE_MEASURING_MODE measuringMode; -} DWRITE_COLOR_GLYPH_RUN1; +typedef struct DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1; + +cpp_quote("struct DWRITE_COLOR_GLYPH_RUN1") +cpp_quote("{") +cpp_quote(" DWRITE_GLYPH_RUN glyphRun;") +cpp_quote(" DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription;") +cpp_quote(" FLOAT baselineOriginX;") +cpp_quote(" FLOAT baselineOriginY;") +cpp_quote(" DWRITE_COLOR_F runColor;") +cpp_quote(" UINT16 paletteIndex;") +cpp_quote("#ifdef _WIN64") +cpp_quote(" UINT32 _pad;") +cpp_quote("#endif") +cpp_quote(" DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat;") +cpp_quote(" DWRITE_MEASURING_MODE measuringMode;") +cpp_quote("};") [ local,

1 0

Rémi Bernon : mf/tests: Add some WMA decoder creation tests.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 9969d452da16a96d3ae03443e542d55287a3afdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9969d452da16a96d3ae03443… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 20 11:41:50 2022 +0100 mf/tests: Add some WMA decoder creation tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 80fe2bf9d1e..1ba1bc4691d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -28,7 +28,9 @@ #include "winbase.h" #include "initguid.h" +#include "mediaobj.h" #include "ole2.h" +#include "wmcodecdsp.h" #include "propvarutil.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -5350,6 +5352,132 @@ static void test_MFRequireProtectedEnvironment(void) IMFPresentationDescriptor_Release(pd); } +static BOOL create_transform(GUID category, MFT_REGISTER_TYPE_INFO *input_type, + MFT_REGISTER_TYPE_INFO *output_type, const WCHAR *expect_name, + const media_type_desc *expect_input, ULONG expect_input_count, + const media_type_desc *expect_output, ULONG expect_output_count, + IMFTransform **transform, GUID *class_id) +{ + MFT_REGISTER_TYPE_INFO *input_types = NULL, *output_types = NULL; + UINT32 input_count = 0, output_count = 0; + GUID *class_ids = NULL; + ULONG count = 0, i; + WCHAR *name; + HRESULT hr; + + hr = MFTEnum(category, 0, input_type, output_type, NULL, &class_ids, &count); + if (FAILED(hr)) + { + todo_wine + win_skip("Failed to enumerate %s, skipping tests.\n", debugstr_w(expect_name)); + return FALSE; + } + + ok(hr == S_OK, "MFTEnum returned %x\n", hr); + ok(count == 1, "got %u\n", count); + *class_id = class_ids[0]; + CoTaskMemFree(class_ids); + + hr = MFTGetInfo(*class_id, &name, &input_types, &input_count, &output_types, &output_count, NULL); + if (FAILED(hr)) + { + todo_wine + win_skip("Failed to get %s info, skipping tests.\n", debugstr_w(expect_name)); + } + else + { + ok(hr == S_OK, "MFTEnum returned %x\n", hr); + ok(!wcscmp(name, expect_name), "got name %s\n", debugstr_w(name)); + ok(input_count == expect_input_count, "got input_count %u\n", input_count); + for (i = 0; i < input_count; ++i) + { + ok(IsEqualGUID(&input_types[i].guidMajorType, expect_input[i][0].value.puuid), + "got input[%u] major %s\n", i, debugstr_guid(&input_types[i].guidMajorType)); + ok(IsEqualGUID(&input_types[i].guidSubtype, expect_input[i][1].value.puuid), + "got input[%u] subtype %s\n", i, debugstr_guid(&input_types[i].guidSubtype)); + } + ok(output_count == expect_output_count, "got output_count %u\n", output_count); + for (i = 0; i < output_count; ++i) + { + ok(IsEqualGUID(&output_types[i].guidMajorType, expect_output[i][0].value.puuid), + "got output[%u] major %s\n", i, debugstr_guid(&output_types[i].guidMajorType)); + ok(IsEqualGUID(&output_types[i].guidSubtype, expect_output[i][1].value.puuid), + "got output[%u] subtype %s\n", i, debugstr_guid(&output_types[i].guidSubtype)); + } + CoTaskMemFree(output_types); + CoTaskMemFree(input_types); + CoTaskMemFree(name); + } + + hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)transform); + if (FAILED(hr)) + { + todo_wine + win_skip("Failed to create %s instance, skipping tests.\n", debugstr_w(expect_name)); + return FALSE; + } + + return TRUE; +} + +static void test_wma_decoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MEDIASUBTYPE_MSAUDIO1), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV9), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudio_Lossless), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + }, + }; + + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_AUDIO_DECODER, &input_type, &output_type, L"WMAudio Decoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + todo_wine + check_interface(transform, &IID_IMediaObject, TRUE); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -5383,4 +5511,5 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_wma_decoder(); }

1 0

Rémi Bernon : mf/tests: Simplify static media type definition.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 3134b3a971de6fee1ececdd681aeee6e741fc69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3134b3a971de6fee1ececdd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 20 11:41:49 2022 +0100 mf/tests: Simplify static media type definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 238 +++++++++++++++++++++++------------------------------ 1 file changed, 102 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3134b3a971de6fee1ece…

1 0

Rémi Bernon : include: Define MEDIASUBTYPE_MSAUDIO1 in wmcodecdsp.idl.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: f44936d293292de32c0e9c807cd15bd897aea5b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f44936d293292de32c0e9c80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 20 11:41:48 2022 +0100 include: Define MEDIASUBTYPE_MSAUDIO1 in wmcodecdsp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 1e43766a358..809e528d7e2 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -20,6 +20,7 @@ import "mediaobj.idl"; import "strmif.idl"; cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_MSAUDIO1,0x00000160,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a)

1 0

Paul Gofman : winhttp: Consider short read from netconn_recv() in receive_bytes().
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: b5b066f62aaef7eb3f5ebdcac6b61bf48fb22f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b066f62aaef7eb3f5ebdca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 20 18:35:34 2022 +0300 winhttp: Consider short read from netconn_recv() in receive_bytes(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f215b984f6e..af04292ea06 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3328,7 +3328,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ret; } -static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD *ret_len ) +static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD *ret_len, BOOL read_full_buffer ) { DWORD err, size = 0, needed = len; char *ptr = buf; @@ -3342,8 +3342,17 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * needed -= size; ptr += size; } - if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; - if ((*ret_len = size + received) != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + while (size != len) + { + if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; + if (!received) break; + size += received; + if (!read_full_buffer) break; + needed -= received; + ptr += received; + } + *ret_len = size; + if (size != len && (read_full_buffer || !size)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3368,7 +3377,7 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o DWORD ret, len, count; char hdr[2]; - if ((ret = receive_bytes( socket, hdr, sizeof(hdr), &count ))) return ret; + if ((ret = receive_bytes( socket, hdr, sizeof(hdr), &count, TRUE ))) return ret; if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; @@ -3380,13 +3389,13 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o if (len == 126) { USHORT len16; - if ((ret = receive_bytes( socket, (char *)&len16, sizeof(len16), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len16, sizeof(len16), &count, TRUE ))) return ret; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; - if ((ret = receive_bytes( socket, (char *)&len64, sizeof(len64), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len64, sizeof(len64), &count, TRUE ))) return ret; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3434,7 +3443,7 @@ static DWORD socket_drain( struct socket *socket ) while (socket->read_size) { char buf[1024]; - if ((ret = receive_bytes( socket, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + if ((ret = receive_bytes( socket, buf, min(socket->read_size, sizeof(buf)), &count, TRUE ))) return ret; socket->read_size -= count; } return ERROR_SUCCESS; @@ -3496,9 +3505,12 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (ret) break; } } - if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count ); + if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); if (!ret) { + if (count < socket->read_size) + WARN("Short read.\n"); + socket->read_size -= count; if (!async) { @@ -3685,9 +3697,9 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (count) { DWORD reason_len = count - sizeof(socket->status); - if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) goto done; socket->status = RtlUshortByteSwap( socket->status ); - if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len ))) goto done; + if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) goto done; } socket->state = SOCKET_STATE_CLOSED;

1 0

Paul Gofman : winhttp: Allow receive on shutdown web socket.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 3a914ff48847dd7c7f7679729e914420cd8982bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a914ff48847dd7c7f767972… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 20 18:35:33 2022 +0300 winhttp: Allow receive on shutdown web socket. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/notification.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 907ee538f54..f215b984f6e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3554,7 +3554,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; } - if (socket->state != SOCKET_STATE_OPEN) + if (socket->state > SOCKET_STATE_SHUTDOWN) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index ce585087370..6b0e11023da 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -659,9 +659,9 @@ static const struct notification websocket_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, - { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, @@ -793,6 +793,11 @@ static void test_websocket(BOOL secure) ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE ); + setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); + err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; size = 0xdeadbeef; @@ -815,11 +820,6 @@ static void test_websocket(BOOL secure) ok( type == 0xdeadbeef, "got %u\n", type ); ok( buffer[0] == 'h', "unexpected data\n" ); - setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); - err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); - WaitForSingleObject( info.wait, INFINITE ); - setup_test( &info, winhttp_websocket_close, __LINE__ ); ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); ok( err == ERROR_SUCCESS, "got %u\n", err );

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
73
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 January 2022