wine-devel December 2021

85 participants
585 discussions

[PATCH] msi: Fix memory leak in get_fusion_filename (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir); -- 2.34.1

2 years, 4 months

[PATCH] adsldp: Fix memory leak in search_ExecuteSearch (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..c8f63a25e0c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) -- 2.34.1

2 years, 4 months

[PATCH] winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); } -- 2.34.1

2 years, 4 months

[PATCH] winegstreamer: Use the size of the data read when allocating the read buffer.

by Zebediah Figura

Instead of the size of the data requested, which may be e.g. UINT_MAX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52277 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 67 ++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0178538fa81..013566b25e9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -80,11 +80,11 @@ struct wg_parser pthread_cond_t read_cond, read_done_cond; struct { - void *data; + GstBuffer *buffer; uint64_t offset; uint32_t size; bool done; - bool ret; + GstFlowReturn ret; } read_request; bool flushing, sink_connected; @@ -556,7 +556,7 @@ static NTSTATUS wg_parser_get_next_read_offset(void *args) pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.data) + while (parser->sink_connected && !parser->read_request.size) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -580,12 +580,35 @@ static NTSTATUS wg_parser_push_data(void *args) uint32_t size = params->size; pthread_mutex_lock(&parser->mutex); - parser->read_request.size = size; - parser->read_request.done = true; - parser->read_request.ret = !!data; + if (data) - memcpy(parser->read_request.data, data, size); - parser->read_request.data = NULL; + { + if (size) + { + GstMapInfo map_info; + + /* Note that we don't allocate the buffer until we have a size. + * midiparse passes a NULL buffer and a size of UINT_MAX, in an + * apparent attempt to read the whole input stream at once. */ + if (!parser->read_request.buffer) + parser->read_request.buffer = gst_buffer_new_and_alloc(size); + gst_buffer_map(parser->read_request.buffer, &map_info, GST_MAP_WRITE); + memcpy(map_info.data, data, size); + gst_buffer_unmap(parser->read_request.buffer, &map_info); + parser->read_request.ret = GST_FLOW_OK; + } + else + { + parser->read_request.ret = GST_FLOW_EOS; + } + } + else + { + parser->read_request.ret = GST_FLOW_ERROR; + } + parser->read_request.done = true; + parser->read_request.size = 0; + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); @@ -1279,9 +1302,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { struct wg_parser *parser = gst_pad_get_element_private(pad); - GstBuffer *new_buffer = NULL; - GstMapInfo map_info; - bool ret; + GstFlowReturn ret; GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); @@ -1289,25 +1310,22 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(size); - if (!size) { /* asfreader occasionally asks for zero bytes. gst_buffer_map() will * return NULL in this case. Avoid confusing the read thread by asking * it for zero bytes. */ + if (!*buffer) + *buffer = gst_buffer_new_and_alloc(0); gst_buffer_set_size(*buffer, 0); GST_LOG("Returning empty buffer."); return GST_FLOW_OK; } - gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); - pthread_mutex_lock(&parser->mutex); - assert(!parser->read_request.data); - parser->read_request.data = map_info.data; + assert(!parser->read_request.size); + parser->read_request.buffer = *buffer; parser->read_request.offset = offset; parser->read_request.size = size; parser->read_request.done = false; @@ -1320,21 +1338,14 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, while (!parser->read_request.done) pthread_cond_wait(&parser->read_done_cond, &parser->mutex); + *buffer = parser->read_request.buffer; ret = parser->read_request.ret; - gst_buffer_set_size(*buffer, parser->read_request.size); pthread_mutex_unlock(&parser->mutex); - gst_buffer_unmap(*buffer, &map_info); - - GST_LOG("Request returned %d.", ret); + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); - if ((!ret || !size) && new_buffer) - gst_buffer_unref(new_buffer); - - if (ret) - return size ? GST_FLOW_OK : GST_FLOW_EOS; - return GST_FLOW_ERROR; + return ret; } static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) -- 2.34.1

2 years, 4 months

[PATCH] po: Update Korean translation.

by Byeongsik Jeon

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 111 ++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6e42d3ba1e7..d6c304bfa8d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-02 20:37+0900\n" +"PO-Revision-Date: 2021-12-30 11:19+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -6984,7 +6984,7 @@ msgstr "타블로이드" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "회계 원장" +msgstr "레저" #: dlls/localspl/localspl.rc:41 msgid "Legal" @@ -6992,11 +6992,11 @@ msgstr "리갈" #: dlls/localspl/localspl.rc:42 msgid "Statement" -msgstr "Statement" +msgstr "스테이트먼트" #: dlls/localspl/localspl.rc:43 msgid "Executive" -msgstr "Executive" +msgstr "익스큐티브" #: dlls/localspl/localspl.rc:44 msgid "A3" @@ -7024,11 +7024,11 @@ msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "Folio" +msgstr "폴리오" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "Quarto" +msgstr "쿼토" #: dlls/localspl/localspl.rc:52 msgid "10x14" @@ -7044,23 +7044,23 @@ msgstr "노트" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "봉투 #9" +msgstr "봉투 9호" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "봉투 #10" +msgstr "봉투 10호" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "봉투 #11" +msgstr "봉투 11호" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "봉투 #12" +msgstr "봉투 12호" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "봉투 #14" +msgstr "봉투 14호" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" @@ -7236,7 +7236,7 @@ msgstr "A3 엑스트라 가로" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "일본 이중 엽서" +msgstr "일본 왕복 엽서" #: dlls/localspl/localspl.rc:104 msgid "A6" @@ -7244,19 +7244,19 @@ msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "일본 봉투 Kaku #2" +msgstr "일본 봉투 각형 2호" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "일본 봉투 Kaku #3" +msgstr "일본 봉투 각형 3호" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "일본 봉투 Chou #3" +msgstr "일본 봉투 장형 3호" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "일본 봉투 Chou #4" +msgstr "일본 봉투 장형 4호" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" @@ -7288,7 +7288,7 @@ msgstr "일본 엽서 회전" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "이중 일본 엽서 회전" +msgstr "일본 왕복 엽서 회전" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" @@ -7296,19 +7296,19 @@ msgstr "A6 회전" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "일본 봉투 Kaku #2 회전" +msgstr "일본 봉투 각형 2호 회전" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "일본 봉투 Kaku #3 회전" +msgstr "일본 봉투 각형 3호 회전" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "일본 봉투 Chou #3 회전" +msgstr "일본 봉투 장형 3호 회전" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "일본 봉투 Chou #4 회전" +msgstr "일본 봉투 장형 4호 회전" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" @@ -7324,115 +7324,115 @@ msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "일본 봉투 You #4" +msgstr "일본 봉투 서양형 4호" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "일본 봉투 You #4 회전" +msgstr "일본 봉투 서양형 4호 회전" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "PRC 16K" +msgstr "중국 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "PRC 32K" +msgstr "중국 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "PRC 32K(대)" +msgstr "중국 32K(대)" #: dlls/localspl/localspl.rc:130 msgid "PRC Envelope #1" -msgstr "PRC 봉투 #1" +msgstr "중국 봉투 1호" #: dlls/localspl/localspl.rc:131 msgid "PRC Envelope #2" -msgstr "PRC 봉투 #2" +msgstr "중국 봉투 2호" #: dlls/localspl/localspl.rc:132 msgid "PRC Envelope #3" -msgstr "PRC 봉투 #3" +msgstr "중국 봉투 3호" #: dlls/localspl/localspl.rc:133 msgid "PRC Envelope #4" -msgstr "PRC 봉투 #4" +msgstr "중국 봉투 4호" #: dlls/localspl/localspl.rc:134 msgid "PRC Envelope #5" -msgstr "PRC 봉투 #5" +msgstr "중국 봉투 5호" #: dlls/localspl/localspl.rc:135 msgid "PRC Envelope #6" -msgstr "PRC 봉투 #6" +msgstr "중국 봉투 6호" #: dlls/localspl/localspl.rc:136 msgid "PRC Envelope #7" -msgstr "PRC 봉투 #7" +msgstr "중국 봉투 7호" #: dlls/localspl/localspl.rc:137 msgid "PRC Envelope #8" -msgstr "PRC 봉투 #8" +msgstr "중국 봉투 8호" #: dlls/localspl/localspl.rc:138 msgid "PRC Envelope #9" -msgstr "PRC 봉투 #9" +msgstr "중국 봉투 9호" #: dlls/localspl/localspl.rc:139 msgid "PRC Envelope #10" -msgstr "PRC 봉투 #10" +msgstr "중국 봉투 10호" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "PRC 16K 회전" +msgstr "중국 16K 회전" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "PRC 32K 회전" +msgstr "중국 32K 회전" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "PRC 32K(대) 회전" +msgstr "중국 32K(대) 회전" #: dlls/localspl/localspl.rc:143 msgid "PRC Envelope #1 Rotated" -msgstr "PRC 봉투 #1 회전" +msgstr "중국 봉투 1호 회전" #: dlls/localspl/localspl.rc:144 msgid "PRC Envelope #2 Rotated" -msgstr "PRC 봉투 #2 회전" +msgstr "중국 봉투 2호 회전" #: dlls/localspl/localspl.rc:145 msgid "PRC Envelope #3 Rotated" -msgstr "PRC 봉투 #3 회전" +msgstr "중국 봉투 3호 회전" #: dlls/localspl/localspl.rc:146 msgid "PRC Envelope #4 Rotated" -msgstr "PRC 봉투 #4 회전" +msgstr "중국 봉투 4호 회전" #: dlls/localspl/localspl.rc:147 msgid "PRC Envelope #5 Rotated" -msgstr "PRC 봉투 #5 회전" +msgstr "중국 봉투 5호 회전" #: dlls/localspl/localspl.rc:148 msgid "PRC Envelope #6 Rotated" -msgstr "PRC 봉투 #6 회전" +msgstr "중국 봉투 6호 회전" #: dlls/localspl/localspl.rc:149 msgid "PRC Envelope #7 Rotated" -msgstr "PRC 봉투 #7 회전" +msgstr "중국 봉투 7호 회전" #: dlls/localspl/localspl.rc:150 msgid "PRC Envelope #8 Rotated" -msgstr "PRC 봉투 #8 회전" +msgstr "중국 봉투 8호 회전" #: dlls/localspl/localspl.rc:151 msgid "PRC Envelope #9 Rotated" -msgstr "PRC 봉투 #9 회전" +msgstr "중국 봉투 9호 회전" #: dlls/localspl/localspl.rc:152 msgid "PRC Envelope #10 Rotated" -msgstr "PRC 봉투 #10 회전" +msgstr "중국 봉투 10호 회전" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10505,22 +10505,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 더블린, 에든버러, 리스본, 런던" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "수단 표준시" +msgstr "남수단 표준시" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "수단 일광 절약시" +msgstr "남수단 일광 절약시" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 예루살렘" +msgstr "(UTC+02:00) 주바" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13332,7 +13326,6 @@ msgstr "" "ECHO OFF는 ECHO ON과 반대 효과가 있습니다(기본값은 ECHO OFF입니다).\n" "ECHO OFF 앞에 @ 기호룰 두어서 ECHO OFF 명령어 자체가 화면에\n" "표시되는 것을 막을 수 있습니다.\n" -"\n" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -- 2.34.1

2 years, 4 months

[PATCH v2] ws2_32/tests: Increase tolerance in a timing test.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: adjust the message too (thanks Gijs for catching this.) dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 95f858a86e3..8d4af019f16 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3235,7 +3235,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); -- 2.34.1

2 years, 4 months

[PATCH 1/2] ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 46f26d32e50..ec428acaf32 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5222,6 +5222,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned from accept() inherits the same parameters. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT | FD_WRITE); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + ctx->socket = server; + check_events_todo(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + closesocket(listener); } static void test_connect_events(struct event_test_ctx *ctx) -- 2.34.1

2 years, 4 months

[PATCH 1/4] ws2_32/tests: Test selecting the same socket twice.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a678f619342..95f858a86e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,6 +3325,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + /* select the same socket twice */ + writefds.fd_count = 2; + writefds.fd_array[0] = fdWrite; + writefds.fd_array[1] = fdWrite; + ret = select(0, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(writefds.fd_count == 1, "got count %u\n", writefds.fd_count); + ok(writefds.fd_array[0] == fdWrite, "got fd %#Ix\n", writefds.fd_array[0]); + ok(writefds.fd_array[1] == fdWrite, "got fd %#Ix\n", writefds.fd_array[1]); + /* tests for overlapping fd_set pointers */ FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); -- 2.34.1

2 years, 4 months

[PATCH] po: Update on Brazilian Portuguese

by Roberto Pungartnik

2 years, 4 months

[PATCH] wininet: Do not call InternetUnlockRequestFile when locking failed.

by Robert Wilhelm

This should fix crashes on W10L vms, when we pass NULL to InternetUnlockRequestFile after prior lock already failed. Crashes are here: https://test.winehq.org/data/tests/wininet:http.html Behavior after crash is here: https://testbot.winehq.org/JobDetails.pl?Key=104580 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wininet/tests/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..ee56c64fbd9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1718,10 +1718,13 @@ static void InternetLockRequestFile_test(void) ret = InternetLockRequestFile(req.request, &lock2); ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock2 != NULL, "lock2 == NULL\n"); ok(lock == lock2, "lock != lock2\n"); - ret = InternetUnlockRequestFile(lock2); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + if (lock2) { + ret = InternetUnlockRequestFile(lock2); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); @@ -1731,8 +1734,12 @@ static void InternetLockRequestFile_test(void) ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); - ret = InternetUnlockRequestFile(lock); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + ok(lock != NULL, "lock == 0\n"); + if (lock) + { + ret = InternetUnlockRequestFile(lock); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(ret, "Deleting file returned %x(%u)\n", ret, GetLastError()); -- 2.31.1

2 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
...
59
Older →

Jump to page:

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 December 2021