wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Fabian Maurer : shell32: Prevent user after free in error case (Coverity).
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: d98646f915823d3bdf865743bb5b95c00e77cfa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98646f915823d3bdf865743… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 26 21:03:19 2022 +0200 shell32: Prevent user after free in error case (Coverity). Otherwise when hr is not SUCCEEDED we use array and free it again. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 0381fa67f0d..ada98705483 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1452,15 +1452,15 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, psia); - heap_free(array); - if(SUCCEEDED(ret)) - return ret; } - for(i = 0; i < cidl; i++) - if(array[i]) IShellItem_Release(array[i]); + if(FAILED(ret)) + { + for(i = 0; i < cidl; i++) + if(array[i]) IShellItem_Release(array[i]); + *psia = NULL; + } heap_free(array); - *psia = NULL; return ret; }

1 0

Connor McAdams : uiautomationcore: Make hwnd_host_provider_vtbl static const.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 5a231b0bfc5727fafa0f8cf8c6b754c254b5d1b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a231b0bfc5727fafa0f8cf8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 28 13:57:36 2022 -0400 uiautomationcore: Make hwnd_host_provider_vtbl static const. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index e4bb83a3fc5..9f257684333 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -248,7 +248,7 @@ HRESULT WINAPI hwnd_host_provider_get_HostRawElementProvider(IRawElementProvider return S_OK; } -IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { +static const IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { hwnd_host_provider_QueryInterface, hwnd_host_provider_AddRef, hwnd_host_provider_Release,

1 0

Zebediah Figura : ws2_32/tests: Verify that AFD_POLL_CONNECT and AFD_POLL_WRITE are signaled simultaneously.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 5f49fd85fd9c6d2591056dd74ac60be5112ddf43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f49fd85fd9c6d2591056dd7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:30 2022 -0500 ws2_32/tests: Verify that AFD_POLL_CONNECT and AFD_POLL_WRITE are signaled simultaneously. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 5152469f02f..43c401c940a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -724,7 +724,42 @@ static void test_poll(void) ok(out_params->sockets[0].flags == AFD_POLL_ACCEPT, "got flags %#x\n", out_params->sockets[0].flags); ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + server = accept(listener, NULL, NULL); + ok(server != -1, "got error %u\n", WSAGetLastError()); + closesocket(server); closesocket(client); + + /* Verify that CONNECT and WRITE are signaled simultaneously. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = client; + in_params->sockets[0].flags = ~0; + params_size = offsetof(struct afd_poll_params, sockets[1]); + + ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].flags == (AFD_POLL_CONNECT | AFD_POLL_WRITE), + "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + server = accept(listener, NULL, NULL); + ok(server != -1, "got error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + closesocket(listener); /* Test UDP sockets. */

1 0

Zebediah Figura : ws2_32/tests: Test selecting for FD_ACCEPT while there is a pending AcceptEx() call.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 543624005974dea7e9a4363d7ae1460179e5ae8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=543624005974dea7e9a4363d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:29 2022 -0500 ws2_32/tests: Test selecting for FD_ACCEPT while there is a pending AcceptEx() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3e8b1f21c1d..f17b4bb0ffa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5308,12 +5308,23 @@ static void test_accept_events(struct event_test_ctx *ctx) { const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; SOCKET listener, server, client, client2; + GUID acceptex_guid = WSAID_ACCEPTEX; struct sockaddr_in destaddr; + OVERLAPPED overlapped = {0}; + LPFN_ACCEPTEX pAcceptEx; + char buffer[32]; int len, ret; + DWORD size; + + overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); @@ -5511,7 +5522,44 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(server); closesocket(client); + /* Connect while there is a pending AcceptEx(). */ + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = pAcceptEx(listener, server, buffer, 0, 0, sizeof(buffer), NULL, &overlapped); + ok(!ret, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)listener, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(!size, "got size %lu\n", size); + + check_events_todo(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + check_events_todo(ctx, FD_ACCEPT, 0, 200); + check_events(ctx, 0, 0, 0); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + closesocket(listener); + CloseHandle(overlapped.hEvent); } static void test_connect_events(struct event_test_ctx *ctx)

1 0

Zebediah Figura : ws2_32/tests: Test selecting for FD_READ while there is a pending WSARecv() call.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 59beffb46c813a3de2eae6f28e3f7f321f666e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59beffb46c813a3de2eae6f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:28 2022 -0500 ws2_32/tests: Test selecting for FD_READ while there is a pending WSARecv() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d501930b32d..3e8b1f21c1d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5709,11 +5709,16 @@ static void test_write_events(struct event_test_ctx *ctx) static void test_read_events(struct event_test_ctx *ctx) { + OVERLAPPED overlapped = {0}; SOCKET server, client; + DWORD size, flags = 0; unsigned int i; char buffer[8]; + WSABUF wsabuf; int ret; + overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + tcp_socketpair(&client, &server); set_blocking(client, FALSE); @@ -5788,8 +5793,36 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); + /* Send data while there is a pending WSARecv(). */ + + select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); + + wsabuf.buf = buffer; + wsabuf.len = 1; + ret = WSARecv(server, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)server, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(size == 1, "got size %lu\n", size); + + check_events(ctx, 0, 0, 0); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + check_events(ctx, FD_READ, 0, 200); + check_events(ctx, 0, 0, 0); + closesocket(server); closesocket(client); + CloseHandle(overlapped.hEvent); } static void test_oob_events(struct event_test_ctx *ctx)

1 0

Zebediah Figura : ws2_32/tests: Test polling for AFD_POLL_ACCEPT while there is a pending AcceptEx() call.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: c01c6fa67ae3647ebf9d5ff18ade7be31910a7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01c6fa67ae3647ebf9d5ff1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:27 2022 -0500 ws2_32/tests: Test polling for AFD_POLL_ACCEPT while there is a pending AcceptEx() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9d1600a7f6a..5152469f02f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -153,8 +153,10 @@ static void test_poll(void) struct afd_poll_params *in_params = (struct afd_poll_params *)in_buffer; struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; + GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET client, server, listener; OVERLAPPED overlapped = {0}; + LPFN_ACCEPTEX pAcceptEx; struct sockaddr_in addr; DWORD size, flags = 0; char *large_buffer; @@ -180,6 +182,10 @@ static void test_poll(void) ret = getsockname(listener, (struct sockaddr *)&addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); + ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid), + &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL); + ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError()); + params_size = offsetof(struct afd_poll_params, sockets[1]); in_params->count = 1; @@ -673,6 +679,52 @@ static void test_poll(void) closesocket(client); + /* Test connecting while there is a pending AcceptEx(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = listener; + in_params->sockets[0].flags = AFD_POLL_ACCEPT; + + ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = pAcceptEx(listener, server, large_buffer, 0, 0, sizeof(struct sockaddr_in) + 16, NULL, &overlapped); + ok(!ret, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)listener, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(!size, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + closesocket(server); + closesocket(client); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == listener, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_ACCEPT, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + closesocket(client); closesocket(listener); /* Test UDP sockets. */

1 0

Zebediah Figura : ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 0b7f9abc98d70966e3eacb035a855d7e19085f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7f9abc98d70966e3eacb03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 22:02:26 2022 -0500 ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e385715f102..9d1600a7f6a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -154,11 +154,14 @@ static void test_poll(void) struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; SOCKET client, server, listener; + OVERLAPPED overlapped = {0}; struct sockaddr_in addr; + DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; + WSABUF wsabuf; HANDLE event; int ret, len; @@ -166,6 +169,7 @@ static void test_poll(void) memset(in_buffer, 0, sizeof(in_buffer)); memset(out_buffer, 0, sizeof(out_buffer)); event = CreateEventW(NULL, TRUE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); @@ -329,6 +333,50 @@ static void test_poll(void) check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); check_poll(server, event, AFD_POLL_CONNECT); + /* Test sending data while there is a pending WSARecv(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = server; + in_params->sockets[0].flags = AFD_POLL_READ; + + ret = NtDeviceIoControlFile((HANDLE)server, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + wsabuf.buf = large_buffer; + wsabuf.len = 1; + ret = WSARecv(server, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)server, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(size == 1, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == server, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_READ, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + ret = recv(server, large_buffer, 1, 0); + ok(ret == 1, "got %d\n", ret); + /* Test sending out-of-band data. */ ret = send(client, "a", 1, MSG_OOB); @@ -745,6 +793,7 @@ static void test_poll(void) closesocket(client); closesocket(server); + CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); }

1 0

Torge Matthies : sc: Allow using separate arguments for parameter name and value.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 2259cc34a8624a892b02270593bda94b796b72fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2259cc34a8624a892b022705… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Apr 29 15:40:47 2022 +0200 sc: Allow using separate arguments for parameter name and value. In addition to using one argument for both parameter name and value. This fixes a regression from commit 8b38c91d83844dea882922055ced7cdeb79c1693. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 101 +++++++++++++++++++++++++++++++++---------------- programs/sc/tests/sc.c | 95 +++++++++++++++++++++++++--------------------- 2 files changed, 120 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2259cc34a8624a892b02…

1 0

Torge Matthies : sc/tests: Add tests.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: a2bc9e5f368a98af9e3f1569d515baa76898156a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2bc9e5f368a98af9e3f1569… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Fri Apr 29 15:40:46 2022 +0200 sc/tests: Add tests. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/sc/tests/Makefile.in | 5 + programs/sc/tests/sc.c | 402 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 409 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2bc9e5f368a98af9e3f…

1 0

Eric Pouech : dbghelp: Properly fail on PDB files generated by MSVC compiler version 14.31.
by Alexandre Julliard 03 May '22

03 May '22

Module: wine Branch: master Commit: 4643bb28528e2a10060e12b8544301c0be3d3060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4643bb28528e2a10060e12b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue May 3 11:26:01 2022 +0200 dbghelp: Properly fail on PDB files generated by MSVC compiler version 14.31. Some internal bits of PDB files are different, so report & abort loading of such PDB file until it's properly understood & supported (instead of crashing). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 56c0f8b58e8..28b6bd12f2e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2856,7 +2856,7 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) HeapFree(GetProcessHeap(), 0, pdb_file->stream_dict); } -static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) +static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const char* str, unsigned cb) { DWORD* pdw; DWORD* ok_bits; @@ -2869,7 +2869,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha count = *pdw++; pdb_file->stream_dict = HeapAlloc(GetProcessHeap(), 0, (numok + 1) * sizeof(struct pdb_stream_name) + cb); - if (!pdb_file->stream_dict) return; + if (!pdb_file->stream_dict) return FALSE; cpstr = (char*)(pdb_file->stream_dict + numok + 1); memcpy(cpstr, str, cb); @@ -2879,7 +2879,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha if (*pdw++ != 0) { FIXME("unexpected value\n"); - return; + return FALSE; } for (i = j = 0; i < count; i++) @@ -2895,6 +2895,7 @@ static void pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha /* add sentinel */ pdb_file->stream_dict[numok].name = NULL; pdb_file->fpoext_stream = -1; + return TRUE; } static unsigned pdb_get_stream_by_name(const struct pdb_file_info* pdb_file, const char* name) @@ -3169,8 +3170,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found JG for %s: age=%x timestamp=%x\n", pdb_lookup->filename, root->Age, root->TimeDateStamp); - pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); - + ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); pdb_free(root); } else if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) @@ -3206,7 +3206,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* pdb_lookup->filename, root->Age, pdb_lookup->age); TRACE("found DS for %s: age=%x guid=%s\n", pdb_lookup->filename, root->Age, debugstr_guid(&root->guid)); - pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); + ret = pdb_load_stream_name_table(pdb_file, &root->names[0], root->cbNames); pdb_free(root); } @@ -3377,7 +3377,8 @@ static BOOL pdb_process_internal(const struct process* pcs, break; default: FIXME("Unknown PDB_STREAM_INDEXES size (%u)\n", symbols.stream_index_size); - break; + pdb_free(symbols_image); + return FALSE; } files_image = pdb_read_strings(pdb_file); if (files_image) files_size = *(const DWORD*)(files_image + 8);

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
91
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 May 2022