wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : regedit/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: acdbe6c2965268886e756c20586363afbc7ab36c URL: https://source.winehq.org/git/wine.git/?a=commit;h=acdbe6c2965268886e756c20… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:22 2022 +0100 regedit/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/Makefile.in | 1 - programs/regedit/tests/regedit.c | 80 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acdbe6c2965268886e75…

1 0

Eric Pouech : fsutil/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 9111ef38c8f8e516125e7ced3608077861e04794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9111ef38c8f8e516125e7ced… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:16 2022 +0100 fsutil/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/tests/Makefile.in | 1 - programs/fsutil/tests/fsutil.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index 01605e695f7..f0490b3b660 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = fsutil.exe IMPORTS = advapi32 user32 diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index aa0d5d3884b..0e02d8cac65 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -97,7 +97,7 @@ static void test_hardlink(void) FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "failed to open the hardlink\n"); boolrc = GetFileInformationByHandle(hfile, &info); - ok(boolrc, "failed to get info about hardlink, error %#x\n", GetLastError()); + ok(boolrc, "failed to get info about hardlink, error %#lx\n", GetLastError()); CloseHandle(hfile); ok(info.nNumberOfLinks == 2, "our link is not a hardlink\n"); @@ -109,9 +109,9 @@ static void test_hardlink(void) ok(rc == 1, "fsutil didn't complain about nonexisting source file\n"); boolrc = DeleteFileA("link"); - ok(boolrc, "failed to delete the hardlink, error %#x\n", GetLastError()); + ok(boolrc, "failed to delete the hardlink, error %#lx\n", GetLastError()); boolrc = DeleteFileA("file"); - ok(boolrc, "failed to delete the file, error %#x\n", GetLastError()); + ok(boolrc, "failed to delete the file, error %#lx\n", GetLastError()); } START_TEST(fsutil)

1 0

Eric Pouech : find/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 18100a15a01e2602a1f75aafac64cdb29f6add95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18100a15a01e2602a1f75aaf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:10 2022 +0100 find/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/tests/Makefile.in | 1 - programs/find/tests/find.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in index 5c4e5e39250..c5b359bd98f 100644 --- a/programs/find/tests/Makefile.in +++ b/programs/find/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = find.exe IMPORTS = user32 diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b7c2d7b77c4..a85bda85bec 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -174,7 +174,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); + ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %ld\n", exitcode_expected, exitcode); heap_free(child_output); }

1 0

Eric Pouech : conhost/tests: Enable compilation with long types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 7783f021fb2840fd8fa0125f1be6fa314f22483f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7783f021fb2840fd8fa0125f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 12:04:04 2022 +0100 conhost/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/Makefile.in | 1 - programs/conhost/tests/tty.c | 128 ++++++++++++++++++------------------- 2 files changed, 64 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7783f021fb2840fd8fa0…

1 0

Piotr Caban : msvcrt: Use InitOnceExecuteOnce to allocate TLS index.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 3fbfddbd534709f9e0185d608f954390baf4f45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fbfddbd534709f9e0185d60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 2 19:48:19 2022 +0100 msvcrt: Use InitOnceExecuteOnce to allocate TLS index. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index e9047ab41b9..f0a97f98e41 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -345,7 +345,7 @@ enum ConcRT_EventType CONCRT_EVENT_DETACH }; -static int context_tls_index = TLS_OUT_OF_INDEXES; +static DWORD context_tls_index = TLS_OUT_OF_INDEXES; static CRITICAL_SECTION default_scheduler_cs; static CRITICAL_SECTION_DEBUG default_scheduler_cs_debug = @@ -620,21 +620,23 @@ static Context* try_get_current_context(void) return TlsGetValue(context_tls_index); } +static BOOL WINAPI init_context_tls_index(INIT_ONCE *once, void *param, void **context) +{ + context_tls_index = TlsAlloc(); + return context_tls_index != TLS_OUT_OF_INDEXES; +} + static Context* get_current_context(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; Context *ret; - if (context_tls_index == TLS_OUT_OF_INDEXES) { - int tls_index = TlsAlloc(); - if (tls_index == TLS_OUT_OF_INDEXES) { - scheduler_resource_allocation_error e; - scheduler_resource_allocation_error_ctor_name(&e, NULL, - HRESULT_FROM_WIN32(GetLastError())); - _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); - } - - if(InterlockedCompareExchange(&context_tls_index, tls_index, TLS_OUT_OF_INDEXES) != TLS_OUT_OF_INDEXES) - TlsFree(tls_index); + if(!InitOnceExecuteOnce(&init_once, init_context_tls_index, NULL, NULL)) + { + scheduler_resource_allocation_error e; + scheduler_resource_allocation_error_ctor_name(&e, NULL, + HRESULT_FROM_WIN32(GetLastError())); + _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); } ret = TlsGetValue(context_tls_index);

1 0

Alistair Leslie-Hughes : dplayx: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 2a74dc51f254330be106331f64710cd2e12fc5d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a74dc51f254330be106331f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 3 20:43:50 2022 +1100 dplayx: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/Makefile.in | 1 - dlls/dplayx/dplay.c | 198 +++++++++++++++++++++--------------------- dlls/dplayx/dplaysp.c | 34 ++++---- dlls/dplayx/dplayx_global.c | 24 ++--- dlls/dplayx/dplayx_main.c | 2 +- dlls/dplayx/dplayx_messages.c | 18 ++-- dlls/dplayx/dplobby.c | 68 +++++++-------- dlls/dplayx/lobbysp.c | 4 +- 8 files changed, 174 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a74dc51f254330be106…

1 0

Eric Pouech : vbscript: Use correct integral type.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 32deecbca16e3a8f823c03a51899ee1d6e5ff883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32deecbca16e3a8f823c03a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:15 2022 +0100 vbscript: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbdisp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d9d1eee741..f33454604d0 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -563,7 +563,7 @@ static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, V } for(i=0; i<argc; i++) { - hres = to_int(get_arg(dp, i), indices+i); + hres = to_int(get_arg(dp, i), (int *)(indices+i)); if(FAILED(hres)) { heap_free(indices); SafeArrayUnlock(array); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6b9a1a0a5d0..d67a1831bbe 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1683,7 +1683,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */); IDispatchEx_Release(dispex); }else { - ULONG err = 0; + UINT err = 0; TRACE("using IDispatch\n"); hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err);

1 0

Eric Pouech : mfplat: Use correct integral types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 98c0f3dac4af52a172f202527a31fd4c80c661fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c0f3dac4af52a172f20252… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:25:42 2022 +0300 mfplat: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 7 ++++--- dlls/mfplat/main.c | 8 +++++--- dlls/mfplat/mediatype.c | 26 +++++++++++++++----------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 9081dc39eab..f161bb29d80 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,7 @@ struct buffer struct { BYTE *linear_buffer; - unsigned int plane_size; + DWORD plane_size; BYTE *scanline0; unsigned int width; @@ -1306,9 +1306,10 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - unsigned int stride, max_length, plane_size; - struct buffer *object; + unsigned int stride, max_length; unsigned int row_alignment; + struct buffer *object; + DWORD plane_size; GUID subtype; BOOL is_yuv; HRESULT hr; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e2f892ed91d..e79f59d41dd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,9 +702,10 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size, ret; WCHAR str[250]; UINT8 *blob; + UINT32 size; + DWORD ret; guid_to_string(buffer, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); @@ -6094,8 +6095,9 @@ static const IRtwqAsyncCallbackVtbl source_resolver_callback_url_vtbl = static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler) { - unsigned int j = 0, name_length, type; + DWORD name_length, type; HRESULT hr = E_FAIL; + unsigned int j = 0; WCHAR clsidW[39]; CLSID clsid; @@ -9207,7 +9209,7 @@ static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom) { ULARGE_INTEGER q1, q0, rhat; ULARGE_INTEGER v, cmp1, cmp2; - unsigned int s = 0; + DWORD s = 0; v.QuadPart = llabs(denom); diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 4f24ccbd237..41dbda572d5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2926,8 +2926,10 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) format->nChannels = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value))) + format->nSamplesPerSec = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value))) + format->nAvgBytesPerSec = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) format->nBlockAlign = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) @@ -2939,7 +2941,8 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) format_ext->Samples.wSamplesPerBlock = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value))) + format_ext->dwChannelMask = value; memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); } @@ -3085,8 +3088,8 @@ HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaT return S_OK; } -static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, - UINT32 *denominator) +static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, DWORD *numerator, + DWORD *denominator) { UINT64 value; @@ -3102,7 +3105,7 @@ static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UIN */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 flags, palette_size = 0, avgrate; + UINT32 flags, palette_size = 0, value; MFVIDEOFORMAT *format; INT32 stride; GUID guid; @@ -3162,11 +3165,12 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &avgrate))) - format->compressedInfo.AvgBitrate = avgrate; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate))) - format->compressedInfo.AvgBitErrorRate = avgrate; - IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing); + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &value))) + format->compressedInfo.AvgBitrate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &value))) + format->compressedInfo.AvgBitErrorRate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &value))) + format->compressedInfo.MaxKeyFrameSpacing = value; /* Palette. */ if (palette_size)

1 0

Eric Pouech : mf: Use correct integral types.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 8b17e3e8218a76d07fc79dbd55fa40b78e81fc85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b17e3e8218a76d07fc79dbd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 10:32:49 2022 +0300 mf: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/copier.c | 4 ++-- dlls/mf/evr.c | 4 ++-- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 7 ++++--- dlls/mf/session.c | 31 +++++++++++++++++-------------- dlls/mf/topology.c | 11 ++++++----- 6 files changed, 33 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b17e3e8218a76d07fc7…

1 0

Paul Gofman : winhttp: Use lock when attempting to send frame synchronously().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 6d7d92269a7cde33c44db0b19d9af1151f5ad6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7d92269a7cde33c44db0b1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 2 15:38:24 2022 +0300 winhttp: Use lock when attempting to send frame synchronously(). 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 | 15 +++++++++++---- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 728b1895ba7..a3a6389a938 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3111,6 +3111,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeSRWLock( &socket->send_lock ); addref_object( &request->hdr ); socket->request = request; @@ -3391,6 +3392,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ERROR_OUTOFMEMORY; } + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3419,10 +3421,11 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { TRACE("sent sync.\n"); - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); socket_send_complete( socket, ret, type, len ); ret = ERROR_SUCCESS; @@ -3535,6 +3538,7 @@ static DWORD socket_send_pong( struct socket *socket ) if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1; if (!async_send) { @@ -3563,6 +3567,7 @@ static DWORD socket_send_pong( struct socket *socket ) InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); } + ReleaseSRWLockExclusive( &socket->send_lock ); return ret; } return send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); @@ -3817,6 +3822,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (!(s = malloc( sizeof(*s) ))) return FALSE; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3845,9 +3851,10 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); if (send_callback) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 3e4e1eb298d..732f0afaa88 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -259,6 +259,7 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + SRWLOCK send_lock; }; struct send_request

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-commits February 2022